From patchwork Tue Apr 4 17:38:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 79308 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp61563vqo; Tue, 4 Apr 2023 10:57:40 -0700 (PDT) X-Google-Smtp-Source: AKy350Z5mvhCTzGNbm9OMbAmZ9IxpUvrvj1IvZvfx++U8+/8s3trH48zugYhZ9MyPqFTR9cpCjkQ X-Received: by 2002:a17:902:f693:b0:19c:e6c8:db16 with SMTP id l19-20020a170902f69300b0019ce6c8db16mr4536802plg.27.1680631059776; Tue, 04 Apr 2023 10:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680631059; cv=none; d=google.com; s=arc-20160816; b=AiaSmzJNOctJgTtDpE9xjabHlS1I09o0YUG1WylAAfvs9jxsdFybsclImKK7ZrsmpZ OOIQ+52UdtcsUM3A/SRWHdh09UpNxx+cx5+N3mnZCWtp0vWnQ+BSHSyhaJfibxBHtiSQ HFDvADUXY+Gg7LDKSqQTa/0zXRqzZD6mFIsmd0yMLnCz30BtLe2mvom0/livkDoIbWF5 wmiSSTDxkSD0g0bL9g1JCTm9LNv3WHoUSQnhA90nKnwrW5mcI6J0d2SIoyZyFCSww+X3 7kveqx11njAtEHlwdOsABKOJgWPLLICGoKKKfp8/udCeNSKSf4Q1tSVuv2MUMgrxU6eH Ey0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cI404w2zVCifsqrrydQWqwF7f68G0gO8wOXgw8URI2Y=; b=Q9a7UIEJPbuU70Xnb67CJkW6zI+/TJYaWshgCD6FQ6riXaiGysIHSaxYCXj2uE2OxF T+PTIU7I+hudU733PhdsR7jUxQFj7Rgm4xprVEgudMBJkPJ94JaEiTxeYf4nkj7eU1fd sDx/nEHEXdfxg9viwaMUVnxhFHRPrGLNPO1s/7d7qgLCc4h4FyAyr/xBz0JnbZGoc9Jx CgaQNxapyeULxIeYaOSXnfI9ZPfGodJ01Fjn7IksDbp2zBduWgnrNNfcJl+/b1k026eV wNxaIh0NQlEvLRQuzsaf2eKFD9fyQQX6QLXqpgfznLNKnxy5hgDjFGUiQGSJbiTvj+p3 /5UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BVOB663g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g185-20020a636bc2000000b005138ea6bf60si1932967pgc.422.2023.04.04.10.57.25; Tue, 04 Apr 2023 10:57:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BVOB663g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235966AbjDDRi1 (ORCPT + 99 others); Tue, 4 Apr 2023 13:38:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235833AbjDDRiY (ORCPT ); Tue, 4 Apr 2023 13:38:24 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75FA34C2C; Tue, 4 Apr 2023 10:38:15 -0700 (PDT) Received: from localhost (unknown [188.27.34.213]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madras.collabora.co.uk (Postfix) with ESMTPSA id CE2826603182; Tue, 4 Apr 2023 18:38:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680629894; bh=KlijjLio97ihQkNKbDD0GN+ulVNt3WEfM5CnliYI74Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BVOB663gd/3mWfkxeUPSy0gPJN5Th6yxPq+eOYx1JKWzP9jGf5BdrataBkOfnmtUy eMnhIZWUYep9Et9AGLsYBHnuVvTSt+tnVsfr1fJ6V04NWjQYd0Dn/FEat1g9ZRHhjY 1l6xsMqYHBrSx8Q63UmcuxDAS5MWwDtHc2bgTe7LfTs4XBJoPTKR+cEDaJu+U/JQI3 iPKPmqusdWF2qq235soKndZn1f9RWt6f2rGwusI8MootKSREVtq38re/3gPWJpHWTo 6VY0++NYCCPsbTAhgUBhfB5I/EBxpLex4EjNquNlLwwmWdCCIkBkmJFlQtN6W6sEYY TxqsR1KjqUOJg== From: Cristian Ciocaltea To: Jean Delvare , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, kernel@collabora.com Subject: [PATCH v2 1/2] dt-bindings: hwmon: pwm-fan: Convert to DT schema Date: Tue, 4 Apr 2023 20:38:06 +0300 Message-Id: <20230404173807.490520-2-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230404173807.490520-1-cristian.ciocaltea@collabora.com> References: <20230404173807.490520-1-cristian.ciocaltea@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762269393989713780?= X-GMAIL-MSGID: =?utf-8?q?1762269393989713780?= Convert the PWM fan bindings to DT schema format. Signed-off-by: Cristian Ciocaltea --- .../devicetree/bindings/hwmon/pwm-fan.txt | 68 +--------- .../devicetree/bindings/hwmon/pwm-fan.yaml | 119 ++++++++++++++++++ 2 files changed, 120 insertions(+), 67 deletions(-) create mode 100644 Documentation/devicetree/bindings/hwmon/pwm-fan.yaml diff --git a/Documentation/devicetree/bindings/hwmon/pwm-fan.txt b/Documentation/devicetree/bindings/hwmon/pwm-fan.txt index 4509e688623a..48886f0ce415 100644 --- a/Documentation/devicetree/bindings/hwmon/pwm-fan.txt +++ b/Documentation/devicetree/bindings/hwmon/pwm-fan.txt @@ -1,67 +1 @@ -Bindings for a fan connected to the PWM lines - -Required properties: -- compatible : "pwm-fan" -- pwms : the PWM that is used to control the PWM fan -- cooling-levels : PWM duty cycle values in a range from 0 to 255 - which correspond to thermal cooling states - -Optional properties: -- fan-supply : phandle to the regulator that provides power to the fan -- interrupts : This contains an interrupt specifier for each fan - tachometer output connected to an interrupt source. - The output signal must generate a defined number of - interrupts per fan revolution, which require that - it must be self resetting edge interrupts. See - interrupt-controller/interrupts.txt for the format. -- pulses-per-revolution : define the number of pulses per fan revolution for - each tachometer input as an integer (default is 2 - interrupts per revolution). The value must be - greater than zero. - -Example: - fan0: pwm-fan { - compatible = "pwm-fan"; - #cooling-cells = <2>; - pwms = <&pwm 0 10000 0>; - cooling-levels = <0 102 170 230>; - }; - - thermal-zones { - cpu_thermal: cpu-thermal { - thermal-sensors = <&tmu 0>; - polling-delay-passive = <0>; - polling-delay = <0>; - trips { - cpu_alert1: cpu-alert1 { - temperature = <100000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "passive"; - }; - }; - cooling-maps { - map0 { - trip = <&cpu_alert1>; - cooling-device = <&fan0 0 1>; - }; - }; - }; - -Example 2: - fan0: pwm-fan { - compatible = "pwm-fan"; - pwms = <&pwm 0 40000 0>; - fan-supply = <®_fan>; - interrupt-parent = <&gpio5>; - interrupts = <1 IRQ_TYPE_EDGE_FALLING>; - pulses-per-revolution = <2>; - }; - -Example 3: - fan0: pwm-fan { - compatible = "pwm-fan"; - pwms = <&pwm1 0 25000 0>; - interrupts-extended = <&gpio1 1 IRQ_TYPE_EDGE_FALLING>, - <&gpio2 5 IRQ_TYPE_EDGE_FALLING>; - pulses-per-revolution = <2>, <1>; - }; +This file has moved to pwm-fan.yaml. diff --git a/Documentation/devicetree/bindings/hwmon/pwm-fan.yaml b/Documentation/devicetree/bindings/hwmon/pwm-fan.yaml new file mode 100644 index 000000000000..048b6ea794c7 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/pwm-fan.yaml @@ -0,0 +1,119 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/hwmon/pwm-fan.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Fan connected to PWM lines + +maintainers: + - Jean Delvare + - Guenter Roeck + +properties: + compatible: + const: pwm-fan + + cooling-levels: + description: PWM duty cycle values corresponding to thermal cooling states. + items: + maximum: 255 + $ref: /schemas/types.yaml#/definitions/uint32-array + + fan-supply: + description: Phandle to the regulator that provides power to the fan. + + interrupts: + description: + This contains an interrupt specifier for each fan tachometer output + connected to an interrupt source. The output signal must generate a + defined number of interrupts per fan revolution, which require that + it must be self resetting edge interrupts. + minItems: 1 + maxItems: 5 + + pulses-per-revolution: + description: + Define the number of pulses per fan revolution for each tachometer + input as an integer. + items: + minimum: 1 + maximum: 4 + default: 2 + minItems: 1 + maxItems: 5 + $ref: /schemas/types.yaml#/definitions/uint32-array + + pwms: + description: The PWM that is used to control the fan. + maxItems: 1 + + pwm-names: true + + "#cooling-cells": + description: + Must be 2, in order to specify minimum and maximum cooling state used in + the cooling-maps reference. The first cell is the minimum cooling state + and the second cell is the maximum cooling state requested. + const: 2 + +required: + - compatible + - pwms + +additionalProperties: false + +examples: + - | + pwm-fan { + compatible = "pwm-fan"; + cooling-levels = <0 102 170 230>; + pwms = <&pwm 0 10000 0>; + #cooling-cells = <2>; + }; + + thermal-zones { + cpu_thermal: cpu-thermal { + thermal-sensors = <&tmu 0>; + polling-delay-passive = <0>; + polling-delay = <0>; + + trips { + cpu_alert1: cpu-alert1 { + temperature = <100000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_alert1>; + cooling-device = <&fan0 0 1>; + }; + }; + }; + }; + + - | + #include + + pwm-fan { + compatible = "pwm-fan"; + pwms = <&pwm 0 40000 0>; + fan-supply = <®_fan>; + interrupt-parent = <&gpio5>; + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; + pulses-per-revolution = <2>; + }; + + - | + #include + + pwm-fan { + compatible = "pwm-fan"; + pwms = <&pwm1 0 25000 0>; + interrupts-extended = <&gpio1 1 IRQ_TYPE_EDGE_FALLING>, + <&gpio2 5 IRQ_TYPE_EDGE_FALLING>; + pulses-per-revolution = <2>, <1>; + }; From patchwork Tue Apr 4 17:38:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 79309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp62722vqo; Tue, 4 Apr 2023 10:59:46 -0700 (PDT) X-Google-Smtp-Source: AKy350YSs3Q1rTpgdcvTzgjYmdkA2qc4VQiQqcXUEaltPbyRoDtIzx/l1ABIp2dDpND4jG1ulmp3 X-Received: by 2002:a17:906:4f88:b0:930:6ead:f81 with SMTP id o8-20020a1709064f8800b009306ead0f81mr287936eju.71.1680631186499; Tue, 04 Apr 2023 10:59:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680631186; cv=none; d=google.com; s=arc-20160816; b=d14/pMfteOsErbknFLLY9iJCGsZhnREJQTvqz3FnbHpISKiLx3J98aHgMyaANv7KDy kFNazXTRTa4M8FoYtC+SRgZn+o2Qv4ocEALuR//CK45rvjfHd5+fhtOR/SponKeB3ke7 w1udZCLCPzgG1x351g4dH2S00ME8Llq5Iz7RCpTWbC1fNrYVxda+9fFwPWlNcdeTGu7D YQKU2e9pVq2L3fj7a7KVnLGhRLU0k3CVc5SFaYGCVbKLWV5SAPMczcR4IGWsRMd3BZ4y HRRF5SXCgs0qfpbVAtyQf6mDVwmv8epR2hkmy9tDu0yz/l1I4hLkpbezGr0tRzQQO38/ VxMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vjUYt2I2EiM+GuPLFlY6dMTz8CfOCNEFJfsi0HG6BLs=; b=hhIHQSiow0Kog78lV30D05k7LaxG+jSfa890c8ThRarLO37OLknNKns2+r7DD947L+ umolD9QTttWz02h5YnwbsBCoiYEFny9/yqOOefIH1+MLSvu83sVHf711pa6fMMR+nKwX 08rzjj5i58XhOFyaXYXcMhJaOaLrhW7/pTkSaEvzzWBeN7bebT1xqyPZWXnhEy1C7QfY OHTVOf/U96hioGz0biGjsySYGVqIhMYiAkx13FEeJnuLeJW40ueFW827RkTwepRgjx/T +HViRFpe3OhU/WNFShoB480DJCe2REeuv/Y+CHtBl1KJJRoVSbJMZWu9HcF/ReePM0BU a7Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=nYFqgjzb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a23-20020a1709063e9700b008d78cb027b7si10995668ejj.667.2023.04.04.10.59.22; Tue, 04 Apr 2023 10:59:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=nYFqgjzb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235833AbjDDRij (ORCPT + 99 others); Tue, 4 Apr 2023 13:38:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235968AbjDDRie (ORCPT ); Tue, 4 Apr 2023 13:38:34 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87288170F; Tue, 4 Apr 2023 10:38:18 -0700 (PDT) Received: from localhost (unknown [188.27.34.213]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madras.collabora.co.uk (Postfix) with ESMTPSA id A41E066031A5; Tue, 4 Apr 2023 18:38:16 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680629896; bh=cdstoqxPWhvdMsWzWtAKva88nlEDFRiEFVi8qwXMjAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nYFqgjzbtVADmMDipQDLIWdBpljOVNzX7Fk98T1+e8lpapf8vF8wgOiigtzGypbV+ SlM2wdOdpVb8aMPc9oZJns3JnBAHe3ZCSSnawHxALbmqOq3mkzadja0aPv0mknHq++ YXSie0py3d+cawXuTN1FONSHJ9/ltew/qNAkIyOSl5mReTuM7h1dawamDx2l01Ssj9 wD8UPnjraiSuud/1diImJTIamTnnViCHsCriBoFxWZrJ/JdOv9hJYXUPpTZ2jRIDB9 /ppbe6PYMYJXe7uY0WEiSgFzVBQf7+ze5vEHDnUFzvqbOf8bMH1UZqlE2jfs5bHWM0 i7HLrgnj27xyA== From: Cristian Ciocaltea To: Jean Delvare , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, kernel@collabora.com, Christopher Obbard Subject: [PATCH v2 2/2] arm64: dts: rockchip: rk3588-rock-5b: Add pwm-fan Date: Tue, 4 Apr 2023 20:38:07 +0300 Message-Id: <20230404173807.490520-3-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230404173807.490520-1-cristian.ciocaltea@collabora.com> References: <20230404173807.490520-1-cristian.ciocaltea@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762269527129262028?= X-GMAIL-MSGID: =?utf-8?q?1762269527129262028?= Add the necessary DT changes for the Rock 5B board to enable support for the PWM controlled heat sink fan. Signed-off-by: Cristian Ciocaltea Reviewed-by: Christopher Obbard --- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 95805cb0adfa..bd74d9da2c17 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -17,6 +17,14 @@ chosen { stdout-path = "serial2:1500000n8"; }; + fan: pwm-fan { + compatible = "pwm-fan"; + cooling-levels = <0 95 145 195 255>; + fan-supply = <&vcc5v0_sys>; + pwms = <&pwm1 0 50000 0>; + #cooling-cells = <2>; + }; + vcc5v0_sys: vcc5v0-sys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc5v0_sys"; @@ -27,6 +35,10 @@ vcc5v0_sys: vcc5v0-sys-regulator { }; }; +&pwm1 { + status = "okay"; +}; + &sdhci { bus-width = <8>; no-sdio;