From nobody Mon Apr 13 17:04:57 2026 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 6E09CC433FE for ; Tue, 15 Nov 2022 12:21:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238235AbiKOMVV (ORCPT ); Tue, 15 Nov 2022 07:21:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230454AbiKOMVB (ORCPT ); Tue, 15 Nov 2022 07:21:01 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCD59252BF for ; Tue, 15 Nov 2022 04:20:27 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id o30so9541924wms.2 for ; Tue, 15 Nov 2022 04:20:27 -0800 (PST) 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=GqZxBgmVFxK0RvfpAaJX1POwshKoiOnk2il2KX/mpC4=; b=Km0fNSp8psPEzNuTZwTN9hN+2UQhiyilmLv07sznLh91zL21JlJSmvDPq9ahnXRLIH US8qAKVP9pW9HWxuQH6k8G4OC7GxjAy4mv/TQj5+a9+7djwsVZdGFXgYeGjm3ZUunFRJ vPfmERv2Gto5ze6wrF1/CyzXh9Ubh3VYZJHx7DEYBGvfNUOFD0WsTBxTboiWaZGnBB9U BZksIaJen2wYsYY1swkGgXcTGL1QJBCooULzmzxHhkB5KUzhbrAw4RXx9Z4wM370ABK4 X/ACtHNPYQfJ7AmRhFaTY09VUojD+iked5CH2IGPd1vUxZflbo5qgfMk/Vall1hkRWm8 Q9Fg== 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=GqZxBgmVFxK0RvfpAaJX1POwshKoiOnk2il2KX/mpC4=; b=OHQsiQY8HNczavUtsPyjatmiXq8ErIn0SBGfCeBSD+ADzaHqAcjQ6V2JtNYFPO2/K/ L6bYRJ5nIi/epDBVeeVBaWY7ykgjAlGd/K8p/E88O9ikC44DNmTvDqiy4AXaoXKAzzP1 nV8peSbokQijPTXc5exHJ100cVsyi+vg3AsEVg84otxK89VcKcY8SKUH0qgitwBtrv1Y R8oqc2wgroEQrh5llgXt1chbzH+L+C2o1NNL/oMcgXN+Vx5KaQOQyOfimP63Qaxgo5aH ZpAm64WfxGnAq3yRXztTfJsHe/hPnZi5Epw44WvCWBwxo/0VjvN5q2HNirto+acLQjZc tbSw== X-Gm-Message-State: ANoB5plXwALb0HkXtnAojUFFRvJeJPDvVzTsAFYvwJ+xH/DQnnTSrLbb n8RcLlYAN+3TErxPuod+WrjFIw== X-Google-Smtp-Source: AA0mqf7n9JR8JIprahuVlyhrGSgvTX+kEiYG7Z2XtC3G98cayuoYzA33yqgTi8lSmGMrE3et435Pzg== X-Received: by 2002:a1c:540d:0:b0:3c6:c796:1071 with SMTP id i13-20020a1c540d000000b003c6c7961071mr128813wmb.138.1668514824556; Tue, 15 Nov 2022 04:20:24 -0800 (PST) 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 w12-20020a05600c474c00b003b435c41103sm27108954wmo.0.2022.11.15.04.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 04:20:24 -0800 (PST) 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 v5 1/3] dt-bindings: hwmon: fan: Add fan binding to schema Date: Tue, 15 Nov 2022 13:20:03 +0100 Message-Id: <20221115122005.758519-2-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221115122005.758519-1-Naresh.Solanki@9elements.com> References: <20221115122005.758519-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwmon/fan-common.yaml diff --git a/Documentation/devicetree/bindings/hwmon/fan-common.yaml b/Docu= mentation/devicetree/bindings/hwmon/fan-common.yaml new file mode 100644 index 000000000000..1954882eed77 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/fan-common.yaml @@ -0,0 +1,42 @@ +# 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 + + target-rpm: + description: + Target RPM the fan should be configured during driver probe. + $ref: /schemas/types.yaml#/definitions/uint32 + + pwms: + description: + PWM provider. + + label: + description: + Optional fan label + + fan-supply: + description: + Power supply for fan. + +additionalProperties: true + +... --=20 2.37.3 From nobody Mon Apr 13 17:04:57 2026 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 C2C0DC4332F for ; Tue, 15 Nov 2022 12:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238394AbiKOMVZ (ORCPT ); Tue, 15 Nov 2022 07:21:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238251AbiKOMVE (ORCPT ); Tue, 15 Nov 2022 07:21:04 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42C51264AB for ; Tue, 15 Nov 2022 04:20:30 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id l14so23951705wrw.2 for ; Tue, 15 Nov 2022 04:20:30 -0800 (PST) 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=LXBfYsOqYyi9DKVQGkMLwQ+xTrxC76f34l8uPcGALOo=; b=QVuhYKf18L0AoojtU6p/3rxD6GxXhFGOP1Xd/AwvRbNUvNqS/Q9FbOsKPJ/fTcKRiG 0Pm4YQE6aECuWxAqkLca9LlwUWCIAQaVPYhbgzugvPiysQO0jLr2Y2O0C6H95GbbjFTa QcODlRj7+C6+R/GAJlcDbhLhvMBJ+4UbL/8i/aZve8Yqcv0AeBrg7mHJnm48Hph7pUHe 64Gd1Jew+tJcF/acGn1RLJDFOvZV8Dkasdc4tMQzB/VQIMYCTk1EMfvE36a8LveyUBjh IObqLWJVfSijorgbHoDnFMCAaxkTwa/tQreBtEyZaZ0B51ndEcmubmJAy1i1SE0CLXyN qwEg== 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=LXBfYsOqYyi9DKVQGkMLwQ+xTrxC76f34l8uPcGALOo=; b=XE1woyZKpGnRnNgzVo49JPuUbRZZDkoLLljmqHKv+MRg/cm5xD08yC+gncxg3uJS0Q Fr5NM6853dnTZswNHQHNIbkjNBWg8MI+Fmbf0WIY4NkvMx46yTsAQ3vFkGZDmlTk7GYg gynLcftSwut8aA0DRUqXyUUK3QrNs3PRn47JuzlY6/eSzOWrBjYCUWByFI5WHA55V90K bwJEW3NjDjHunEfmOEfdyBK4fua2xuPZPxJ5DCFHtHaRVnb0KM6hgSBwkf+Q4LioptAA sqV9RwzE1d66eGoNy2zc9VW5mh5OscOEf0MyJVlOIQjIxmrCbV5McKOH8QDN9X8kLgfD 4H0Q== X-Gm-Message-State: ANoB5pnVmc/W6KudMU9/lJaHuIGJuxWAFvYE0OeSEYDPv2TeqPs0EP9Z RzuIVvH2tSCZcrgsITCT84T8tA== X-Google-Smtp-Source: AA0mqf7j1Fo21UYRcFX4woKovJOTzba3enUtD3k+E0+gF7cNLcYCRUQcHtvoysCwtlAcoiA//j/0ig== X-Received: by 2002:a5d:694c:0:b0:238:b29e:4919 with SMTP id r12-20020a5d694c000000b00238b29e4919mr10655303wrw.583.1668514827503; Tue, 15 Nov 2022 04:20:27 -0800 (PST) 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 w12-20020a05600c474c00b003b435c41103sm27108954wmo.0.2022.11.15.04.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 04:20:27 -0800 (PST) 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 v5 2/3] dt-bindings: hwmon: Add binding for max6639 Date: Tue, 15 Nov 2022 13:20:04 +0100 Message-Id: <20221115122005.758519-3-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221115122005.758519-1-Naresh.Solanki@9elements.com> References: <20221115122005.758519-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max6639.y= aml diff --git a/Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml b/D= ocumentation/devicetree/bindings/hwmon/maxim,max6639.yaml new file mode 100644 index 000000000000..da040b11d2ab --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml @@ -0,0 +1,93 @@ +# 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-con= nected + 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 + + '#pwm-cells': + const: 3 + +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 =3D <1>; + #size-cells =3D <0>; + + fan1: fan-controller@10 { + compatible =3D "maxim,max6639"; + reg =3D <0x10>; + #address-cells =3D <1>; + #size-cells =3D <0>; + #pwm-cells =3D <3>; + + fan@0 { + reg =3D <0x0>; + pulses-per-revolution =3D <2>; + max-rpm =3D <4000>; + target-rpm =3D <1000>; + pwms =3D <&fan1 0 25000 0>; + }; + + fan@1 { + reg =3D <0x1>; + pulses-per-revolution =3D <2>; + max-rpm =3D <8000>; + pwms =3D <&fan1 1 25000 0>; + }; + }; + }; +... --=20 2.37.3 From nobody Mon Apr 13 17:04:57 2026 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 2053EC4332F for ; Tue, 15 Nov 2022 12:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238417AbiKOMVj (ORCPT ); Tue, 15 Nov 2022 07:21:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238214AbiKOMVL (ORCPT ); Tue, 15 Nov 2022 07:21:11 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8308B2A96E for ; Tue, 15 Nov 2022 04:20:37 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id z14so23802028wrn.7 for ; Tue, 15 Nov 2022 04:20:37 -0800 (PST) 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=JPVVmKupHXufx78iZ+1zTJn1ObV4U7i/qmWH2SMuCMI=; b=D5ZL5TbYLHBkgKzyVC9AJvdlEFuZkk/RLmsJVwaPghgAHCYYEXQmQgqMQY5jfel8y1 Kqe74IXHdq+/ZKMx2QE59rvNrsycuoGyT3zPc4PRWEv73yQwZZbQDqWOOGdkvOB+XNpc 17/IJmNeZq7QkASbFQ8soa2Gctn8R4lIMrN93QFDGH6NPg4xWjSjf5NkXCTuU1gMIh0z PpUtIKQjC+q7Lg7bDyL5+M8D7tCcHuCsjS1XXZq9oGIvBwHYutByqihmcvvo2TZeKkqf VwvNwzUoNIKJmWmuxKfA0JsvJmvoKYRiPorQN30fDYbbLknwUf0l4Og5suqwgS4P4Wpe XECQ== 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=JPVVmKupHXufx78iZ+1zTJn1ObV4U7i/qmWH2SMuCMI=; b=aw2on7e56UEfLw+SKhlL0XLFfZq+hmxEaGDN2KZ5Z7SSVmr5EPdZr9L93V+o8CoVcf ogsAZSKr/7l79jtWQkweFuimszXhDU+xKmyFOnwM0pavqhgQxIZB3cOQ4/ctbsA64mY0 NIld93QX0HlHmHZ4MPCRT4RUo3xsOHYUB80Pn03crP+y2VQ2xOlNRlCr1WQhxjKL71Pz M+Y2ieGX4RQy8yuLW0xUhqNfmGuJ/VkGNhcbPrTYAhx1np6IWMUH0rc08WieCEjMUFYL D/EGR/d84OyDpYFWmCB+R4sNN8j1FF8BT6/H8m9Iy9GiRxB5fhJEa0Gduf9LpUvaRHdR mopw== X-Gm-Message-State: ANoB5pnDyT88rx2ogb8IAvm9Zxs5gjV/RShCRnCpDV/L5/flRzjcImjY M9m1S8W9kCLOnatvQBkHsHtmPNl+uQfrIHI7 X-Google-Smtp-Source: AA0mqf6wsVwlDM/1nwIbmRrqBf86ywGZQByN/DHkgQIcHHWPFamSPG3GXx0OWUY2Bh2nV9AI8cwvCA== X-Received: by 2002:a5d:4386:0:b0:22e:3177:1401 with SMTP id i6-20020a5d4386000000b0022e31771401mr10249748wrq.148.1668514831907; Tue, 15 Nov 2022 04:20:31 -0800 (PST) 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 w12-20020a05600c474c00b003b435c41103sm27108954wmo.0.2022.11.15.04.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 04:20:31 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Thierry Reding , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki , Marcello Sylvester Bauer , linux-pwm@vger.kernel.org Subject: [PATCH v5 3/3] hwmon: (max6639) Change from pdata to dt configuration Date: Tue, 15 Nov 2022 13:20:05 +0100 Message-Id: <20221115122005.758519-4-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221115122005.758519-1-Naresh.Solanki@9elements.com> References: <20221115122005.758519-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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: Marcello Sylvester Bauer Signed-off-by: Naresh Solanki --- drivers/hwmon/Kconfig | 1 + drivers/hwmon/max6639.c | 465 +++++++++++++++++++++++++++++++++------- 2 files changed, 392 insertions(+), 74 deletions(-) diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 5695b266abcf..ad1f6742ca50 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1106,6 +1106,7 @@ config SENSORS_MAX6621 config SENSORS_MAX6639 tristate "Maxim MAX6639 sensor chip" depends on I2C + depends on PWM help If you say yes here you get support for the MAX6639 sensor chips. diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c index 9b895402c80d..d1ae77e8f72e 100644 --- a/drivers/hwmon/max6639.c +++ b/drivers/hwmon/max6639.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include =20 /* Addresses to scan */ static const unsigned short normal_i2c[] =3D { 0x2c, 0x2e, 0x2f, I2C_CLIEN= T_END }; @@ -54,11 +54,20 @@ static const unsigned short normal_i2c[] =3D { 0x2c, 0x= 2e, 0x2f, I2C_CLIENT_END }; #define MAX6639_GCONFIG_PWM_FREQ_HI 0x08 =20 #define MAX6639_FAN_CONFIG1_PWM 0x80 - +#define MAX6639_REG_FAN_CONFIG2a_PWM_POL 0x02 #define MAX6639_FAN_CONFIG3_THERM_FULL_SPEED 0x40 +#define MAX6639_FAN_CONFIG3_FREQ_MASK 0x03 +#define MAX6639_REG_TARGTDUTY_SLOT 120 =20 +/* Tach supported range. This internally controls tach frequency */ static const int rpm_ranges[] =3D { 2000, 4000, 8000, 16000 }; =20 +/* Supported PWM frequency */ +static const unsigned int freq_table[] =3D { 20, 33, 50, 100, 5000, 8333, = 12500, + 25000 }; + + + #define FAN_FROM_REG(val, rpm_range) ((val) =3D=3D 0 || (val) =3D=3D 255 ?= \ 0 : (rpm_ranges[rpm_range] * 30) / (val)) #define TEMP_LIMIT_TO_REG(val) clamp_val((val) / 1000, 0, 255) @@ -76,20 +85,24 @@ struct max6639_data { u16 temp[2]; /* Temperature, in 1/8 C, 0..255 C */ bool temp_fault[2]; /* Detected temperature diode failure */ u8 fan[2]; /* Register value: TACH count for fans >=3D30 */ + struct pwm_device *pwmd[2]; /* max6639 has two pwm device */ + u32 target_rpm[2]; + u32 max_rpm[2]; + u8 status; /* Detected channel alarms and fan failures */ =20 /* Register values only written to */ - u8 pwm[2]; /* Register value: Duty cycle 0..120 */ u8 temp_therm[2]; /* THERM Temperature, 0..255 C (->_max) */ u8 temp_alert[2]; /* ALERT Temperature, 0..255 C (->_crit) */ u8 temp_ot[2]; /* OT Temperature, 0..255 C (->_emergency) */ =20 /* 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 */ /* Optional regulator for FAN supply */ struct regulator *reg; + /* max6639 pwm chip */ + struct pwm_chip chip; }; =20 static struct max6639_data *max6639_update_device(struct device *dev) @@ -280,8 +293,12 @@ static ssize_t pwm_show(struct device *dev, struct dev= ice_attribute *dev_attr, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); + struct pwm_state state; + + pwm_get_state(data->pwmd[attr->index], &state); + + return sprintf(buf, "%d\n", pwm_get_relative_duty_cycle(&state, 255)); =20 - return sprintf(buf, "%d\n", data->pwm[attr->index] * 255 / 120); } =20 static ssize_t pwm_store(struct device *dev, @@ -290,9 +307,9 @@ static ssize_t pwm_store(struct device *dev, { struct sensor_device_attribute *attr =3D to_sensor_dev_attr(dev_attr); struct max6639_data *data =3D dev_get_drvdata(dev); - struct i2c_client *client =3D data->client; unsigned long val; int res; + struct pwm_state state; =20 res =3D kstrtoul(buf, 10, &val); if (res) @@ -300,12 +317,12 @@ static ssize_t pwm_store(struct device *dev, =20 val =3D clamp_val(val, 0, 255); =20 - mutex_lock(&data->update_lock); - data->pwm[attr->index] =3D (u8)(val * 120 / 255); - i2c_smbus_write_byte_data(client, - MAX6639_REG_TARGTDUTY(attr->index), - data->pwm[attr->index]); - mutex_unlock(&data->update_lock); + pwm_get_state(data->pwmd[attr->index], &state); + pwm_set_relative_duty_cycle(&state, val, 255); + res =3D pwm_apply_state(data->pwmd[attr->index], &state); + if (res) + return res; + return count; } =20 @@ -319,7 +336,7 @@ static ssize_t fan_input_show(struct device *dev, return PTR_ERR(data); =20 return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index], - data->rpm_range)); + data->rpm_range[attr->index])); } =20 static ssize_t alarm_show(struct device *dev, @@ -386,29 +403,41 @@ static struct attribute *max6639_attrs[] =3D { ATTRIBUTE_GROUPS(max6639); =20 /* - * 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 =3D 0; i < ARRAY_SIZE(rpm_ranges); i++) { - if (rpm_ranges[i] =3D=3D range) - return i; + if (rpm < 0) + return -EINVAL; + + /* Set index based on chip support */ + switch (rpm) { + case 0 ... 2000: + *index =3D 0; + break; + case 2001 ... 4000: + *index =3D 1; + break; + case 4001 ... 8000: + *index =3D 2; + break; + case 8001 ... 16000: + *index =3D 3; + break; + default: + /* Use max range for higher RPM */ + dev_warn(dev, + "RPM higher than supported range. Default to 16000 RPM"); + *index =3D 3; } - - return 1; /* default: 4000 RPM */ + return 0; } =20 static int max6639_init_client(struct i2c_client *client, struct max6639_data *data) { - struct max6639_platform_data *max6639_info =3D - dev_get_platdata(&client->dev); - int i; - int rpm_range =3D 1; /* default: 4000 RPM */ - int err; + int i, err; + struct pwm_state state; =20 /* Reset chip to default values, see below for GCONFIG setup */ err =3D i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, @@ -416,51 +445,29 @@ static int max6639_init_client(struct i2c_client *cli= ent, if (err) goto exit; =20 - /* Fans pulse per revolution is 2 by default */ - if (max6639_info && max6639_info->ppr > 0 && - max6639_info->ppr < 5) - data->ppr =3D max6639_info->ppr; - else - data->ppr =3D 2; - data->ppr -=3D 1; - - if (max6639_info) - rpm_range =3D rpm_range_to_reg(max6639_info->rpm_range); - data->rpm_range =3D rpm_range; - for (i =3D 0; i < 2; i++) { =20 /* Set Fan pulse per revolution */ - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_PPR(i), - data->ppr << 6); + err =3D i2c_smbus_write_byte_data(client, MAX6639_REG_FAN_PPR(i), + data->ppr[i] << 6); if (err) goto exit; =20 /* Fans config PWM, RPM */ err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG1(i), - MAX6639_FAN_CONFIG1_PWM | rpm_range); - if (err) - goto exit; - - /* Fans PWM polarity high by default */ - if (max6639_info && max6639_info->pwm_polarity =3D=3D 0) - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG2a(i), 0x00); - else - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_FAN_CONFIG2a(i), 0x02); + MAX6639_REG_FAN_CONFIG1(i), + MAX6639_FAN_CONFIG1_PWM | + data->rpm_range[i]); if (err) goto exit; =20 /* - * /THERM full speed enable, + * /THERM full speed disable, * PWM frequency 25kHz, see also GCONFIG below */ err =3D 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; =20 @@ -469,31 +476,35 @@ static int max6639_init_client(struct i2c_client *cli= ent, data->temp_alert[i] =3D 90; data->temp_ot[i] =3D 100; err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_THERM_LIMIT(i), - data->temp_therm[i]); + MAX6639_REG_THERM_LIMIT(i), + data->temp_therm[i]); if (err) goto exit; err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_ALERT_LIMIT(i), - data->temp_alert[i]); + MAX6639_REG_ALERT_LIMIT(i), + data->temp_alert[i]); if (err) goto exit; err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_OT_LIMIT(i), data->temp_ot[i]); + MAX6639_REG_OT_LIMIT(i), + data->temp_ot[i]); if (err) goto exit; =20 - /* PWM 120/120 (i.e. 100%) */ - data->pwm[i] =3D 120; - err =3D i2c_smbus_write_byte_data(client, - MAX6639_REG_TARGTDUTY(i), data->pwm[i]); + /* Configure PWM controller */ + pwm_get_state(data->pwmd[i], &state); + pwm_set_relative_duty_cycle(&state, data->target_rpm[i], + data->max_rpm[i]); + err =3D pwm_apply_state(data->pwmd[i], &state); if (err) goto exit; + } /* Start monitoring */ err =3D i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, MAX6639_GCONFIG_DISABLE_TIMEOUT | MAX6639_GCONFIG_CH2_LOCAL | MAX6639_GCONFIG_PWM_FREQ_HI); + exit: return err; } @@ -524,12 +535,276 @@ static void max6639_regulator_disable(void *data) regulator_disable(data); } =20 +static int max6639_probe_child_from_dt(struct i2c_client *client, + struct device_node *child, + struct max6639_data *data) + +{ + struct device *dev =3D &client->dev; + u32 i, maxrpm; + int val, err; + + err =3D of_property_read_u32(child, "reg", &i); + if (err) { + dev_err(dev, "missing reg property of %pOFn\n", child); + return err; + } + + if (i >=3D 2) { + dev_err(dev, "invalid reg %d of %pOFn\n", i, child); + return -EINVAL; + } + + err =3D of_property_read_u32(child, "pulses-per-revolution", &val); + if (err) { + dev_err(dev, "missing pulses-per-revolution property of %pOFn", + 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] =3D val; + + err =3D of_property_read_u32(child, "max-rpm", &maxrpm); + if (err) { + dev_err(dev, "missing max-rpm property of %pOFn\n", child); + return err; + } + + err =3D 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; + } + data->max_rpm[i] =3D maxrpm; + + err =3D of_property_read_u32(child, "target-rpm", &val); + /* Use provided target RPM else default to maxrpm */ + if (!err) + data->target_rpm[i] =3D val; + else + data->target_rpm[i] =3D maxrpm; + + /* Get pwms property for PWM control */ + data->pwmd[i] =3D devm_fwnode_pwm_get(dev, &child->fwnode, NULL); + + if (!IS_ERR(data->pwmd[i])) + return 0; + + if (PTR_ERR(data->pwmd[i]) =3D=3D -EPROBE_DEFER) + return PTR_ERR(data->pwmd[i]); + + dev_dbg(dev, "Using chip default PWM"); + data->pwmd[i] =3D pwm_request_from_chip(&data->chip, i, NULL); + if (!IS_ERR(data->pwmd[i])) + return 0; + + dev_dbg(dev, "Failed to configure pwm for fan %d", i); + return PTR_ERR_OR_ZERO(data->pwmd[i]); +} + +static int max6639_probe_from_dt(struct i2c_client *client, + struct max6639_data *data) +{ + struct device *dev =3D &client->dev; + const struct device_node *np =3D 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 =3D max6639_probe_child_from_dt(client, child, data); + if (err) { + of_node_put(child); + return err; + } + } + + return 0; +} + +static struct max6639_data *to_max6639_pwm(struct pwm_chip *chip) +{ + return container_of(chip, struct max6639_data, chip); +} + +static void max6639_pwm_get_state(struct pwm_chip *chip, + struct pwm_device *pwm, + struct pwm_state *state) +{ + + struct max6639_data *data =3D to_max6639_pwm(chip); + struct i2c_client *client =3D data->client; + int value, i =3D pwm->hwpwm, x; + unsigned int freq; + + mutex_lock(&data->update_lock); + + value =3D i2c_smbus_read_byte_data(client, MAX6639_REG_FAN_CONFIG1(i)); + if (value < 0) + goto abort; + + if (value & MAX6639_FAN_CONFIG1_PWM) { + state->enabled =3D true; + + /* Determine frequency from respective registers */ + value =3D i2c_smbus_read_byte_data(client, + MAX6639_REG_FAN_CONFIG3(i)); + if (value < 0) + goto abort; + x =3D value & MAX6639_FAN_CONFIG3_FREQ_MASK; + + value =3D i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG); + if (value < 0) + goto abort; + if (value & MAX6639_GCONFIG_PWM_FREQ_HI) + x |=3D 0x4; + x &=3D 0x7; + freq =3D freq_table[x]; + + state->period =3D DIV_ROUND_UP_ULL(NSEC_PER_SEC, freq); + + value =3D i2c_smbus_read_byte_data(client, + MAX6639_REG_TARGTDUTY(i)); + if (value < 0) + goto abort; + /* max6639 supports 120 slots only */ + state->duty_cycle =3D DIV_ROUND_UP_ULL(value * state->period, + 120); + + value =3D i2c_smbus_read_byte_data(client, + MAX6639_REG_FAN_CONFIG2a(i)); + if (value < 0) + goto abort; + value &=3D MAX6639_REG_FAN_CONFIG2a_PWM_POL; + state->polarity =3D (value !=3D 0); + } else + state->enabled =3D false; + +abort: + mutex_unlock(&data->update_lock); + +} + +static int max6639_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, + const struct pwm_state *state) +{ + struct max6639_data *data =3D to_max6639_pwm(chip); + struct i2c_client *client =3D data->client; + int value =3D 0, i =3D pwm->hwpwm, x; + unsigned int freq; + struct pwm_state cstate; + + pwm_get_state(pwm, &cstate); + + mutex_lock(&data->update_lock); + + if (state->period !=3D cstate.period) { + /* Configure frequency */ + freq =3D DIV_ROUND_UP_ULL(NSEC_PER_SEC, state->period); + /* Chip supports limited number of frequency */ + for (x =3D 0; x < sizeof(freq_table); x++) + if (freq < freq_table[x]) + break; + + value =3D i2c_smbus_read_byte_data(client, + MAX6639_REG_FAN_CONFIG3(i)); + if (value < 0) + goto abort; + value &=3D ~MAX6639_FAN_CONFIG3_FREQ_MASK; + value |=3D (x & MAX6639_FAN_CONFIG3_FREQ_MASK); + value =3D i2c_smbus_write_byte_data(client, + MAX6639_REG_FAN_CONFIG3(i), + value); + + value =3D i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG); + if (value < 0) + goto abort; + + if ((value & MAX6639_GCONFIG_PWM_FREQ_HI) && (x >> 2)) + value &=3D ~MAX6639_GCONFIG_PWM_FREQ_HI; + else + value |=3D MAX6639_GCONFIG_PWM_FREQ_HI; + value =3D i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, + value); + if (value < 0) + goto abort; + } + + /* Configure dutycycle */ + if (state->duty_cycle !=3D cstate.duty_cycle) { + value =3D DIV_ROUND_UP_ULL( + state->duty_cycle * MAX6639_REG_TARGTDUTY_SLOT, + state->period); + value =3D i2c_smbus_write_byte_data(client, + MAX6639_REG_TARGTDUTY(i), + value); + if (value < 0) + goto abort; + } + + /* Configure polarity */ + if (state->polarity !=3D cstate.polarity) { + value =3D i2c_smbus_read_byte_data(client, + MAX6639_REG_FAN_CONFIG2a(i)); + if (value < 0) + goto abort; + if (state->polarity =3D=3D PWM_POLARITY_NORMAL) + value |=3D MAX6639_REG_FAN_CONFIG2a_PWM_POL; + else + value &=3D ~MAX6639_REG_FAN_CONFIG2a_PWM_POL; + value =3D i2c_smbus_write_byte_data(client, + MAX6639_REG_FAN_CONFIG2a(i), + value); + if (value < 0) + goto abort; + } + + if (state->enabled =3D=3D cstate.enabled) + goto abort; + + value =3D i2c_smbus_read_byte_data(client, MAX6639_REG_FAN_CONFIG1(i)); + if (value < 0) + goto abort; + if (state->enabled) + value |=3D MAX6639_FAN_CONFIG1_PWM; + else + value &=3D ~MAX6639_FAN_CONFIG1_PWM; + + value =3D i2c_smbus_write_byte_data(client, MAX6639_REG_FAN_CONFIG1(i), + value); + if (value < 0) + goto abort; + value =3D 0; + +abort: + mutex_unlock(&data->update_lock); + + return value; +} + +static const struct pwm_ops max6639_pwm_ops =3D { + .apply =3D max6639_pwm_apply, + .get_state =3D max6639_pwm_get_state, + .owner =3D THIS_MODULE, +}; + static int max6639_probe(struct i2c_client *client) { struct device *dev =3D &client->dev; struct max6639_data *data; struct device *hwmon_dev; - int err; + int err, i; =20 data =3D devm_kzalloc(dev, sizeof(struct max6639_data), GFP_KERNEL); if (!data) @@ -537,11 +812,26 @@ static int max6639_probe(struct i2c_client *client) =20 data->client =3D client; =20 + /* Add PWM controller of max6639 */ + data->chip.dev =3D dev; + data->chip.ops =3D &max6639_pwm_ops; + data->chip.npwm =3D 2; + data->chip.of_pwm_n_cells =3D 3; + + err =3D devm_pwmchip_add(dev, &data->chip); + if (err < 0) { + dev_err(dev, "failed to add PWM chip %d\n", err); + return err; + } + data->reg =3D devm_regulator_get_optional(dev, "fan"); if (IS_ERR(data->reg)) { - if (PTR_ERR(data->reg) !=3D -ENODEV) - return PTR_ERR(data->reg); - + if (PTR_ERR(data->reg) !=3D -ENODEV) { + err =3D (int)PTR_ERR(data->reg); + dev_warn(dev, "Failed looking up fan supply: %d\n", + err); + return err; + } data->reg =3D NULL; } else { /* Spin up fans */ @@ -560,6 +850,22 @@ static int max6639_probe(struct i2c_client *client) =20 mutex_init(&data->update_lock); =20 + /* Below are defaults leter overridden by DT properties */ + for (i =3D 0; i < 2; i++) { + /* 4000 RPM */ + data->rpm_range[i] =3D 1; + data->ppr[i] =3D 2; + /* Max. temp. 80C/90C/100C */ + data->temp_therm[i] =3D 80; + data->temp_alert[i] =3D 90; + data->temp_ot[i] =3D 100; + } + + /* Probe from DT to get configuration */ + err =3D max6639_probe_from_dt(client, data); + if (err) + return err; + /* Initialize the max6639 chip */ err =3D max6639_init_client(client, data); if (err < 0) @@ -571,6 +877,7 @@ static int max6639_probe(struct i2c_client *client) return PTR_ERR_OR_ZERO(hwmon_dev); } =20 +#if IS_ENABLED(CONFIG_PM_SLEEP) static int max6639_suspend(struct device *dev) { struct i2c_client *client =3D to_i2c_client(dev); @@ -608,6 +915,7 @@ static int max6639_resume(struct device *dev) return i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG, ret & ~MAX6639_GCONFIG_STANDBY); } +#endif =20 static const struct i2c_device_id max6639_id[] =3D { {"max6639", 0}, @@ -616,13 +924,22 @@ static const struct i2c_device_id max6639_id[] =3D { =20 MODULE_DEVICE_TABLE(i2c, max6639_id); =20 -static DEFINE_SIMPLE_DEV_PM_OPS(max6639_pm_ops, max6639_suspend, max6639_r= esume); +#ifdef CONFIG_OF +static const struct of_device_id maxim_of_platform_match[] =3D { + {.compatible =3D "maxim,max6639"}, + {}, +}; +MODULE_DEVICE_TABLE(of, maxim_of_platform_match); +#endif + +static SIMPLE_DEV_PM_OPS(max6639_pm_ops, max6639_suspend, max6639_resume); =20 static struct i2c_driver max6639_driver =3D { .class =3D I2C_CLASS_HWMON, .driver =3D { .name =3D "max6639", .pm =3D pm_sleep_ptr(&max6639_pm_ops), + .of_match_table =3D of_match_ptr(maxim_of_platform_match), }, .probe_new =3D max6639_probe, .id_table =3D max6639_id, --=20 2.37.3