From patchwork Thu Oct 13 09:48:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 13005815 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E46CBC43217 for ; Thu, 13 Oct 2022 09:48:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229565AbiJMJsr (ORCPT ); Thu, 13 Oct 2022 05:48:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229550AbiJMJsq (ORCPT ); Thu, 13 Oct 2022 05:48:46 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5347104531 for ; Thu, 13 Oct 2022 02:48:45 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id 13so2734819ejn.3 for ; Thu, 13 Oct 2022 02:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WTl7droVltKnXDsBoh0Qb/I0hZgySD4P2UJsI4/mO+E=; b=VcpBLoI2GZnFQeZ10p9jSVjI2ovSK6WLIhf1cD/WeK7vjOV+a/mi71G01oUTaDG9HY uX7LtYmSLtlo2i//Hg6RU7kr8zHq1eU+MJsqay6jTioLELp6ZxRV7DqHkKc5m0euXO/G ecXpb9faVxqjgYixI4uv7vejFPx9VqGQXV+JtBFegC52xyECEveXo4FVY0iA4qKp8HvY PQ8Ylyq4N90WcGHwYTSuIeBMWZpy/wYTc5T5KvmjKKHymXbajALB1/ZFCKI90+4ZlzE4 l695xSHTF7Gm4tF3itf1YfVpy+TiyI/V2TA9fOeL6vpPspVqc366VkF8pyMpGKJoW968 F9WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WTl7droVltKnXDsBoh0Qb/I0hZgySD4P2UJsI4/mO+E=; b=xKbwRpCYLcq9ciyW2kuBIuG/UXFOtCh0rabXMRAY0AXZZmBiTdBNKCkAJXTpMFmC+m AHVPjPJD9MAfEU2iSf+v1RUimbKi9XMcknjWL0ByAqrXqxHO4BqlDGnm96ivoQ5Ckp07 DJh4NrCVi3zd0A+QtrIAb5b3Fa5xPUiOiruPwwE6k61kHd+TDg4JaalI/KE1n2t0S4Ia TiJQZYUuzt6qad4zwlLTsXVeK1XIHkyqWvUYXZyg47XMcR2i6Ga7WXeJ53Vtu5SR1WlY Tb8B+JwN1T4qJFEFXXgh7luJouwy8ufaBMFHbEcQHcjI+ahlUUjCWRBFPLBmfc4HITZp VLGQ== X-Gm-Message-State: ACrzQf1k5YDvyQiGHVTn6F99Bt3F5UJ4wvqHVm8n6pJYOxtHURKZXdg5 qXwIJmfdgtDn/i/dkJ02ODlGQA== X-Google-Smtp-Source: AMsMyM789ERJ0LfcbR1x85Clgkt+MXg5q0WqipXrwNTkaf6aozBlkgvD95mFYi97DUcuvbhdtIWtaQ== X-Received: by 2002:a17:906:7945:b0:73b:e605:f31 with SMTP id l5-20020a170906794500b0073be6050f31mr25947222ejo.129.1665654524224; Thu, 13 Oct 2022 02:48:44 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id e14-20020a170906080e00b0078d25e0f74bsm2685353ejd.46.2022.10.13.02.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 02:48:43 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Rob Herring , Krzysztof Kozlowski , Naresh Solanki Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki Subject: [PATCH v4 1/3] dt-bindings: hwmon: fan: Add fan binding to schema Date: Thu, 13 Oct 2022 11:48:36 +0200 Message-Id: <20221013094838.1529153-2-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221013094838.1529153-1-Naresh.Solanki@9elements.com> References: <20221013094838.1529153-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Add common fan properties bindings to a schema. Bindings for fan controllers can reference the common schema for the fan child nodes: patternProperties: "^fan@[0-2]": type: object $ref: fan-common.yaml# Signed-off-by: Naresh Solanki --- .../devicetree/bindings/hwmon/fan-common.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwmon/fan-common.yaml base-commit: 0cf46a653bdae56683fece68dc50340f7520e6c4 diff --git a/Documentation/devicetree/bindings/hwmon/fan-common.yaml b/Documentation/devicetree/bindings/hwmon/fan-common.yaml new file mode 100644 index 000000000000..224f5013c93f --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/fan-common.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/hwmon/fan-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Common fan properties + +maintainers: + - Naresh Solanki + +properties: + max-rpm: + description: + Max RPM supported by fan. + $ref: /schemas/types.yaml#/definitions/uint32 + + pulses-per-revolution: + description: + The number of pulse from fan sensor per revolution. + $ref: /schemas/types.yaml#/definitions/uint32 + + default-rpm: + description: + Target RPM the fan should be configured during driver probe. + $ref: /schemas/types.yaml#/definitions/uint32 + + pwm-frequency: + description: + PWM frequency for fan in Hertz(Hz). + $ref: /schemas/types.yaml#/definitions/uint32 + + pwm-polarity-inverse: + description: + Inverse PWM polarity for fan. + type: boolean + + label: + description: + Optional fan label + + fan-supply: + description: + Power supply for fan. + +additionalProperties: true + +... From patchwork Thu Oct 13 09:48:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 13005816 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62C54C4332F for ; Thu, 13 Oct 2022 09:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229594AbiJMJsu (ORCPT ); Thu, 13 Oct 2022 05:48:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229576AbiJMJst (ORCPT ); Thu, 13 Oct 2022 05:48:49 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AF2E103DBB for ; Thu, 13 Oct 2022 02:48:47 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id d26so2676679eje.10 for ; Thu, 13 Oct 2022 02:48:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SQDCrD9Wm+r98pdwjZiH7GxtGGcAJJYePNbhmCe7RnU=; b=cfJPdRFNi+UMtvBJXLGOdH4w/iLiMNeJS18XrNNGN3uzphv2jysSYrcT3geWWXi93i /R9/I46muO3Mfn6zDudIqsSsRoV14WtjCTADJlBUzGuI4hedpsKv8hvnTu9yzXbPyGeH xiedfSugTtsnEeSgbStUdJmIcwDY2AtVZXR5G2cPvgGH9/0rasOGiRfRCB800MvMbWd4 ErUmWogCYPAaYwrTT4AYJQmMulJSea8/BvSzGKyHb0Mt8cWfKYf49pwAAeiRIrgbkVPk /q924vmYoujxM/+K0dZ5/KHmGz0vu6OZUylU+89csLn5n8cyHOe6xdEHirtr8sGEB88y eljQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SQDCrD9Wm+r98pdwjZiH7GxtGGcAJJYePNbhmCe7RnU=; b=wJrpsFU58+0p6OOrBseE0aCA6Bj4dODZAmQHC67Qyy+8bQ8LKj6YEngmAZnaH5nwHL iaRuJMK3VdqYqscpNvWzvIAdB3r+qQeoXfveJJPSSLc+0vdQJZaJQc8OpQPFhiA3w8u4 GvL9SAs9q/jSgJJAmVfYav6di9gYX0ZVSvoCVNhRaeekD+4A5w8oHOul9isOI3XUd+Re EM7USvdKtAxT4L7M7KFViBxRnybdl8DsNJzt0joJiOqp92mw11WEOlZn7lkRNoyquiSc BhM6sX9g9N9w5vaetqjeBaNh+MxZLQWMr8mKPwI6e/wfGq/lOkAdqwJ/j70VP7BOy45q B2dQ== X-Gm-Message-State: ACrzQf0R5u//N3zY9mQwnClDM31E1bSJiOHfQBcUQ+5nYyoSaNFe+F8a L9nEN68msco94VLd6ACkZcRN1A== X-Google-Smtp-Source: AMsMyM57MX82CrF1Za+xMEdjXmQ23yokVaaB1x107t6Dniv67wvVZdyip/IlBUrHge9PVCZnD1tMoA== X-Received: by 2002:a17:906:4783:b0:780:5be5:c81b with SMTP id cw3-20020a170906478300b007805be5c81bmr26275821ejc.76.1665654525464; Thu, 13 Oct 2022 02:48:45 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id e14-20020a170906080e00b0078d25e0f74bsm2685353ejd.46.2022.10.13.02.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 02:48:45 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Rob Herring , Krzysztof Kozlowski , Roland Stigge Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Marcello Sylvester Bauer , Naresh Solanki Subject: [PATCH v4 2/3] dt-bindings: hwmon: Add binding for max6639 Date: Thu, 13 Oct 2022 11:48:37 +0200 Message-Id: <20221013094838.1529153-3-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221013094838.1529153-1-Naresh.Solanki@9elements.com> References: <20221013094838.1529153-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Marcello Sylvester Bauer Add Devicetree binding documentation for Maxim MAX6639 temperature monitor with PWM fan-speed controller. Signed-off-by: Marcello Sylvester Bauer Signed-off-by: Naresh Solanki --- .../bindings/hwmon/maxim,max6639.yaml | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml diff --git a/Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml b/Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml new file mode 100644 index 000000000000..22065ea56880 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml @@ -0,0 +1,86 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- + +$id: http://devicetree.org/schemas/hwmon/maxim,max6639.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim max6639 + +maintainers: + - Roland Stigge + +description: | + The MAX6639 is a 2-channel temperature monitor with dual, automatic, PWM + fan-speed controller. It monitors its own temperature and one external + diode-connected transistor or the temperatures of two external diode-connected + transistors, typically available in CPUs, FPGAs, or GPUs. + + Datasheets: + https://datasheets.maximintegrated.com/en/ds/MAX6639-MAX6639F.pdf + +properties: + compatible: + enum: + - maxim,max6639 + + reg: + maxItems: 1 + + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + +required: + - compatible + - reg + +patternProperties: + "^fan@[0-1]$": + type: object + description: | + Represents the two fans and their specific configuration. + + $ref: fan-common.yaml# + + properties: + reg: + description: | + The fan number. + items: + minimum: 0 + maximum: 1 + + required: + - reg + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + fan-controller@10 { + compatible = "maxim,max6639"; + reg = <0x10>; + #address-cells = <1>; + #size-cells = <0>; + + fan@0 { + reg = <0x0>; + pulses-per-revolution = <2>; + max-rpm = <4000>; + }; + + fan@1 { + reg = <0x1>; + pulses-per-revolution = <2>; + max-rpm = <8000>; + }; + }; + }; +... From patchwork Thu Oct 13 09:48:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 13005817 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09A3FC4167B for ; Thu, 13 Oct 2022 09:48:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229617AbiJMJsx (ORCPT ); Thu, 13 Oct 2022 05:48:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbiJMJsv (ORCPT ); Thu, 13 Oct 2022 05:48:51 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2C85105373 for ; Thu, 13 Oct 2022 02:48:48 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id sc25so2659330ejc.12 for ; Thu, 13 Oct 2022 02:48:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XrFok4h2v8jURzBzEMcXB2G/WRQ1rwxuu8sh5z11Jc0=; b=OhcZulsln49JEb0d18L4nilP9WTYSDNOOMFBPXhjCQ1DRdUMDIex7Rut0SeVRW0VKI eJf/quec5C1j9pKwTkE/ZEEfHIWQzpkXrzIf49XmBx6vMfaFFyFfCs060SQTU5ruJ3wD WbHvErMVzD5cP4aRNk1YG2nd88nEUql0ioS5JTcQJGH0z3cDkXRHXtpcOsVUbk9a8G4r WJhSE/dAUWXu8erpY37QtMs7wZfn/y6VeDLr5ZnK5wePyZsqOr+e0GU6rwQx2g3Dzasv fDYPAO5dr+1To9AyElNn9t7OrJJDqvZ4jBM6OvgTqmThsB6pLZ1Xq2kGzLg+3+DErDkq jchA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XrFok4h2v8jURzBzEMcXB2G/WRQ1rwxuu8sh5z11Jc0=; b=AX0K7sE+9aCSLX6tYHZyMP1BJuw14MqvR8bNqdPeKuFteeM2tnc/dUMYut/Wytb+0o QlBBeTTTdaE+LepXUZaIh2BVxpZD9Zn7XAEAtKrJS8arhmOA9xOqki4ar8LJx8Y9jTFR LU5FTDvkOmFnAuhxNmVoIIzcGkM0cLADiSQTZiWO9E1YwmW95UOYpeFI6qhcG7Ws6f3W 0N8x+6KdIAmcGpUA9sMmIkVIg6RMlnQVbfqzYv0gOFZIYFUaurk/h6tXGe8m4MwNjqAl X6XAFa/EwuINpEY8vZwcGHcjqKsYVcDexWYFj2qyGQAv64HLm2sKXBYl6Pufdgnv9VIR gjig== X-Gm-Message-State: ACrzQf0DC8AnN7ydZNxLLvrgg3Y4pp4wNnylboaaOuM3FpRwripF8+LR FFS3O2dZIubJfpZtnBvmNC/d3Q== X-Google-Smtp-Source: AMsMyM5xhSAPz8Zv7eEOyGzqe+VRG5ILYM+kVIMgXCBEVHGFp0elf6skUfg5CivemEpk/dySLzZ46A== X-Received: by 2002:a17:907:7207:b0:78d:9b37:8d0c with SMTP id dr7-20020a170907720700b0078d9b378d0cmr19650226ejc.717.1665654526610; Thu, 13 Oct 2022 02:48:46 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id e14-20020a170906080e00b0078d25e0f74bsm2685353ejd.46.2022.10.13.02.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 02:48:46 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki Subject: [PATCH v4 3/3] hwmon: (max6639) Change from pdata to dt configuration Date: Thu, 13 Oct 2022 11:48:38 +0200 Message-Id: <20221013094838.1529153-4-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221013094838.1529153-1-Naresh.Solanki@9elements.com> References: <20221013094838.1529153-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org max6639_platform_data is not used by any in-kernel driver and does not address the MAX6639 fans separately. Move to device tree configuration with explicit properties to configure each fan. Non-DT platform can still use this module with its default configuration. Signed-off-by: Naresh Solanki --- drivers/hwmon/max6639.c | 206 +++++++++++++++++++++++++++++----------- 1 file changed, 153 insertions(+), 53 deletions(-) diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c index 9b895402c80d..bb6bcd61f34d 100644 --- a/drivers/hwmon/max6639.c +++ b/drivers/hwmon/max6639.c @@ -19,7 +19,6 @@ #include #include #include -#include /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x2c, 0x2e, 0x2f, I2C_CLIENT_END }; @@ -85,9 +84,9 @@ struct max6639_data { u8 temp_ot[2]; /* OT Temperature, 0..255 C (->_emergency) */ /* Register values initialized only once */ - u8 ppr; /* Pulses per rotation 0..3 for 1..4 ppr */ - u8 rpm_range; /* Index in above rpm_ranges table */ - + u8 ppr[2]; /* Pulses per rotation 0..3 for 1..4 ppr */ + u8 rpm_range[2]; /* Index in above rpm_ranges table */ + u8 pwm_polarity[2]; /* Fans PWM polarity, 0..1 */ /* Optional regulator for FAN supply */ struct regulator *reg; }; @@ -319,7 +318,7 @@ static ssize_t fan_input_show(struct device *dev, return PTR_ERR(data); return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index], - data->rpm_range)); + data->rpm_range[attr->index])); } static ssize_t alarm_show(struct device *dev, @@ -386,29 +385,40 @@ static struct attribute *max6639_attrs[] = { ATTRIBUTE_GROUPS(max6639); /* - * returns respective index in rpm_ranges table - * 1 by default on invalid range + * Get respective index in rpm_ranges table */ -static int rpm_range_to_reg(int range) +static int rpm_range_to_index(struct device *dev, u8 *index, int rpm) { - int i; - - for (i = 0; i < ARRAY_SIZE(rpm_ranges); i++) { - if (rpm_ranges[i] == range) - return i; + if (rpm < 0) + return -EINVAL; + + /* Set index based on chip support */ + switch (rpm) { + case 0 ... 2000: + *index = 0; + break; + case 2001 ... 4000: + *index = 1; + break; + case 4001 ... 8000: + *index = 2; + break; + case 8001 ... 16000: + *index = 3; + break; + default: + /* Use max range for higher RPM */ + dev_warn(dev, + "RPM higher than supported range. Default to 16000 RPM"); + *index = 3; } - - return 1; /* default: 4000 RPM */ + return 0; } static int max6639_init_client(struct i2c_client *client, struct max6639_data *data) { - struct max6639_platform_data *max6639_info = - dev_get_platdata(&client->dev); - int i; - int rpm_range = 1; /* default: 4000 RPM */ - int err; + int i, err; /* Reset chip to default values, see below for GCONFIG setup */ err = i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, @@ -416,51 +426,32 @@ static int max6639_init_client(struct i2c_client *client, if (err) goto exit; - /* Fans pulse per revolution is 2 by default */ - if (max6639_info && max6639_info->ppr > 0 && - max6639_info->ppr < 5) - data->ppr = max6639_info->ppr; - else - data->ppr = 2; - data->ppr -= 1; - - if (max6639_info) - rpm_range = rpm_range_to_reg(max6639_info->rpm_range); - data->rpm_range = rpm_range; - for (i = 0; i < 2; i++) { /* Set Fan pulse per revolution */ err = i2c_smbus_write_byte_data(client, MAX6639_REG_FAN_PPR(i), - data->ppr << 6); + data->ppr[i] << 6); if (err) goto exit; /* Fans config PWM, RPM */ err = i2c_smbus_write_byte_data(client, MAX6639_REG_FAN_CONFIG1(i), - MAX6639_FAN_CONFIG1_PWM | rpm_range); + MAX6639_FAN_CONFIG1_PWM | data->rpm_range[i]); if (err) goto exit; - /* Fans PWM polarity high by default */ - if (max6639_info && max6639_info->pwm_polarity == 0) - err = i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG2a(i), 0x00); - else - err = i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG2a(i), 0x02); - if (err) - goto exit; + /* Fans PWM polarity */ + err = i2c_smbus_write_byte_data(client, + MAX6639_REG_FAN_CONFIG2a(i), data->pwm_polarity[i] ? 0x02 : 0x00); /* - * /THERM full speed enable, + * /THERM full speed disable, * PWM frequency 25kHz, see also GCONFIG below */ err = i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG3(i), - MAX6639_FAN_CONFIG3_THERM_FULL_SPEED | 0x03); + MAX6639_REG_FAN_CONFIG3(i), 0x03); if (err) goto exit; @@ -483,8 +474,6 @@ static int max6639_init_client(struct i2c_client *client, if (err) goto exit; - /* PWM 120/120 (i.e. 100%) */ - data->pwm[i] = 120; err = i2c_smbus_write_byte_data(client, MAX6639_REG_TARGTDUTY(i), data->pwm[i]); if (err) @@ -524,12 +513,91 @@ static void max6639_regulator_disable(void *data) regulator_disable(data); } +static int max6639_probe_child_from_dt(struct i2c_client *client, + struct device_node *child, + struct max6639_data *data) + +{ + struct device *dev = &client->dev; + u32 i, val, maxrpm; + int err; + + err = of_property_read_u32(child, "reg", &i); + if (err) { + dev_err(dev, "missing reg property of %pOFn\n", child); + return err; + } + + if (i >= 2) { + dev_err(dev, "invalid reg %d of %pOFn\n", i, child); + return -EINVAL; + } + + err = of_property_read_u32(child, "pulses-per-revolution", &val); + if (err) { + dev_err(dev, "missing pulses-per-revolution property of %pOFn\n", child); + return err; + } + + if (val < 0 || val > 5) { + dev_err(dev, "invalid pulses-per-revolution %d of %pOFn\n", val, child); + return -EINVAL; + } + data->ppr[i] = val; + + err = of_property_read_u32(child, "max-rpm", &maxrpm); + if (err) { + dev_err(dev, "missing max-rpm property of %pOFn\n", child); + return err; + } + + err = rpm_range_to_index(dev, &data->rpm_range[i], maxrpm); + if (err) { + dev_err(dev, "invalid max-rpm %d of %pOFn\n", maxrpm, child); + return err; + } + + err = of_property_read_u32(child, "target-rpm", &val); + /* Convert to PWM from provided target RPM */ + if (!err && val != 0 && maxrpm > 0) + data->pwm[i] = + (u8)(val * 120 / maxrpm); + + data->pwm_polarity[i] = of_property_read_bool(child, "pwm-polarity-inverse"); + + return 0; +} +static int max6639_probe_from_dt(struct i2c_client *client, struct max6639_data *data) +{ + struct device *dev = &client->dev; + const struct device_node *np = dev->of_node; + struct device_node *child; + int err; + + /* Compatible with non-DT platforms */ + if (!np) + return 0; + + for_each_child_of_node(np, child) { + if (strcmp(child->name, "fan")) + continue; + + err = max6639_probe_child_from_dt(client, child, data); + if (err) { + of_node_put(child); + return err; + } + } + + return 0; +} + static int max6639_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct max6639_data *data; struct device *hwmon_dev; - int err; + int err, i; data = devm_kzalloc(dev, sizeof(struct max6639_data), GFP_KERNEL); if (!data) @@ -539,9 +607,11 @@ static int max6639_probe(struct i2c_client *client) data->reg = devm_regulator_get_optional(dev, "fan"); if (IS_ERR(data->reg)) { - if (PTR_ERR(data->reg) != -ENODEV) - return PTR_ERR(data->reg); - + if (PTR_ERR(data->reg) != -ENODEV) { + err = (int)PTR_ERR(data->reg); + dev_warn(dev, "Failed looking up fan supply: %d\n", err); + return err; + } data->reg = NULL; } else { /* Spin up fans */ @@ -560,6 +630,25 @@ static int max6639_probe(struct i2c_client *client) mutex_init(&data->update_lock); + /* Below are defaults leter overridden by DT properties */ + for (i = 0; i < 2; i++) { + /* 4000 RPM */ + data->rpm_range[i] = 1; + data->ppr[i] = 2; + data->pwm_polarity[i] = 0; + /* Max. temp. 80C/90C/100C */ + data->temp_therm[i] = 80; + data->temp_alert[i] = 90; + data->temp_ot[i] = 100; + /* PWM 120/120 (i.e. 100%) */ + data->pwm[i] = 120; + } + + /* Probe from DT to get configuration */ + err = max6639_probe_from_dt(client, data); + if (err) + return err; + /* Initialize the max6639 chip */ err = max6639_init_client(client, data); if (err < 0) @@ -571,6 +660,7 @@ static int max6639_probe(struct i2c_client *client) return PTR_ERR_OR_ZERO(hwmon_dev); } +#if IS_ENABLED(CONFIG_PM_SLEEP) static int max6639_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -608,6 +698,7 @@ static int max6639_resume(struct device *dev) return i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, ret & ~MAX6639_GCONFIG_STANDBY); } +#endif static const struct i2c_device_id max6639_id[] = { {"max6639", 0}, @@ -616,13 +707,22 @@ static const struct i2c_device_id max6639_id[] = { MODULE_DEVICE_TABLE(i2c, max6639_id); -static DEFINE_SIMPLE_DEV_PM_OPS(max6639_pm_ops, max6639_suspend, max6639_resume); +#ifdef CONFIG_OF +static const struct of_device_id maxim_of_platform_match[] = { + {.compatible = "maxim,max6639"}, + {}, +}; +MODULE_DEVICE_TABLE(of, maxim_of_platform_match); +#endif + +static SIMPLE_DEV_PM_OPS(max6639_pm_ops, max6639_suspend, max6639_resume); static struct i2c_driver max6639_driver = { .class = I2C_CLASS_HWMON, .driver = { .name = "max6639", .pm = pm_sleep_ptr(&max6639_pm_ops), + .of_match_table = of_match_ptr(maxim_of_platform_match), }, .probe_new = max6639_probe, .id_table = max6639_id,