From patchwork Mon Apr 3 10:50:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 78495 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2214152vqo; Mon, 3 Apr 2023 04:06:11 -0700 (PDT) X-Google-Smtp-Source: AKy350Z6cNHaDL4GdcTqaFFMqf9mar1jvrmzVC0mW9mKfpxtyiok5eLYztu9Orpc7+hXSTXovRBr X-Received: by 2002:aa7:8bc3:0:b0:627:f964:7594 with SMTP id s3-20020aa78bc3000000b00627f9647594mr34957333pfd.12.1680519970979; Mon, 03 Apr 2023 04:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680519970; cv=none; d=google.com; s=arc-20160816; b=brNKG9qJ+Pdxj+9DQs4740gu5NmEtz6GnKq/BWvZWT2v1Nu2olpupRX14pNNWqYHTt XyWFc9cp3KoNGElqPqykbf8IxpQiSmALImn7BFgjnycTD9x3ao4gP6a4+HnKaC1Hzwh1 15utX7kMb2nYbjfdeGoPTlUzBvszOPzH4G91aeLjj8HX/eoJvqE0RHvKL8KM9vZJmaWn p18Shz7nduD7urd5BsFT+k+X5Njghp86J+3FyzY7CXCQYoDQHyFkDcWw/AmbyBLlTIhb IJsYINsmpnqyRX2cAPVqzFPnwg7sFiNTQYITCxziCtfhS2cyc7VW6Zl2poH4bAvXUHb2 EPLA== 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=GMJK3ar5fFaKCMZTrh/K2Tf3SaG//m0bUgH37qTl7MU=; b=Qhw7Hki+9KMumYbNJ22EDle7piJHYyplaFksiu2CESaJgbLwfDkfR6VXYWlB1E+KvI z4Rd/IY6C7KWoolFXEDWmaj9d4D7Hp31tHKu0Wr/Xd5LDSsu9s93Urv8GHj1xVEz0e84 6Ul+0ZsjYr2hKAVA6xORc86POJOI13jXS/4l0grrGGvaxard2Kh7GHIdTktZw9ydjYva ZWE7CAahOpgsfdG3LEW4F3wWB8eKOIBOHbmbqr6wN9MoEIrwrt3Brz3c2rn7/4YRMHnA N8vRxaZDuMaAp5QTMQ8geuYFh3AMzyhMduDhAcQj2w0RQK7VGUj5g0J45+v2LaQ25HnF P9Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=AM6QdN55; 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 l8-20020a635708000000b0050f76fb84adsi8088229pgb.575.2023.04.03.04.05.57; Mon, 03 Apr 2023 04:06:10 -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=AM6QdN55; 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 S231936AbjDCKvZ (ORCPT + 99 others); Mon, 3 Apr 2023 06:51:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231889AbjDCKvC (ORCPT ); Mon, 3 Apr 2023 06:51:02 -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 4721C8690; Mon, 3 Apr 2023 03:51:01 -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 8C2CA6601F5E; Mon, 3 Apr 2023 11:50:59 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680519059; bh=3p6JM3yd+WNtA17Lh4gwyYervmzfd8F94ozGs1R5ndg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AM6QdN55bibFuOhSGSqDXnGJ/x/2UP38lGYkrJph8AcpokSGG68FR7mJ+qFxbRoPv /yUpWdzsscPfJ5kGt3enNjNiyellhBMCZqWl3oykS0mhE4Engzmhp6Rqg4ih5Micro 5OD73v/HMboooby22jVWDbG8oNyMnF0FcIxOaqYcXPfkNhAjc8SnJPzFdPOJwQHcdU mGSJxSoSXHkuMQ4zwvONnA6iqGSfX/+Hjgw/g/x4aGNyW03TFwFi76KE5onUcwvH3t ynn82IAaAgRp+SQQuxewqr2hrzQc1IxZBY2QOCP4n9E5RveTXezF8FfIhwT6BXIltx 6KioWqEmb1vCg== 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 1/2] dt-bindings: hwmon: pwm-fan: Convert to DT schema Date: Mon, 3 Apr 2023 13:50:51 +0300 Message-Id: <20230403105052.426135-2-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230403105052.426135-1-cristian.ciocaltea@collabora.com> References: <20230403105052.426135-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?1762152909042871818?= X-GMAIL-MSGID: =?utf-8?q?1762152909042871818?= 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 | 109 ++++++++++++++++++ 2 files changed, 110 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..448b48ec5d73 --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/pwm-fan.yaml @@ -0,0 +1,109 @@ +# 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 in a range from 0 to 255 which correspond to + thermal cooling states. + $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. + + pulses-per-revolution: + description: + 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. + $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: The PWM fan can be referenced as a cooling-device. + 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 Mon Apr 3 10:50:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 78494 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2211421vqo; Mon, 3 Apr 2023 04:02:20 -0700 (PDT) X-Google-Smtp-Source: AKy350ZlaNw50xk7aE4elpJzMpUlHM8BS0UD8OgIa7lBgFQtkj7W0u5Rcme9SVlmAjqaebhMX1bd X-Received: by 2002:a17:906:9f1a:b0:947:405a:955f with SMTP id fy26-20020a1709069f1a00b00947405a955fmr13107404ejc.31.1680519740239; Mon, 03 Apr 2023 04:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680519740; cv=none; d=google.com; s=arc-20160816; b=Ws3SHnyf10kBHJm772D6+oab/OX5HlsCNvwL9xjKqS3mMMUziKKTPhA/HAVDikY1d+ X4s4YyjLEsNFZUCiMEtYl2TaCObqsd4jWPFgsxb9Nqxwr3lHul0vcyUajklcGQLciwBi EMGv8VOBoBEew2zXrqTfb0605F2sCGlxF00+4YZI0THb1kakTgVFrMmMplJSElwhe2yC lhVCueimEvOKb/2qXLtWcuXI0xxmrHU8VDNZ1l/c18spQlt1I9qZ34l5pA0DSsdlug/y 2sRww9uPeZiM+lGHDlw+PZEYd0008oIrcsRlFU1MjSF6zWvWNPGS6k8o9mB/TODc3uNU YI1w== 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=othrvWLOseR2iNmEDqc4+hmmB5BmhnCk3/NZ3yg0TFI=; b=N6JJ2ZUVunXOLA9kjYPJ3ES3+plrK2jJnLMcjE27gpdubIkyArrUe0ZQ/9kDfBSSsF H3arDWwVClxWhszoPg+TN4VBL0FGCSxH6o7Uq/CJKJjzr4smifEtOy3/y8Ce0LByeT6u QsRASIGvx1SGDH813pEAzoAA3ylbsTWzF7pmGc/BSmWu+y5GJH28JCsTpfYudirSJLBl pxbuiSyFtJjoQ0BK0x1vVmryUTzCZCQWnqDtHnUW1dtQPjmXbKBMZepMfIpkYEVdMvYJ D8IIq6yXkP7UPtc1wjwgxKiQwA2a268hNu84DG2BDjaPq8F+NUBhUCRk55+6COHMtYJ6 X1/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=fGAnFpQP; 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 q24-20020a170906389800b008d4d102a7bcsi61660ejd.216.2023.04.03.04.01.56; Mon, 03 Apr 2023 04:02:20 -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=fGAnFpQP; 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 S232059AbjDCKva (ORCPT + 99 others); Mon, 3 Apr 2023 06:51:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231946AbjDCKvE (ORCPT ); Mon, 3 Apr 2023 06:51:04 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12D1F8690; Mon, 3 Apr 2023 03:51:04 -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 BD0D16602040; Mon, 3 Apr 2023 11:51:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680519062; bh=97JLXa1qL1Q6tXE1ABA2Qq1JziV8s4pj8cdLUcAzWyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fGAnFpQPICXfoOONO/XSV8hsItw5JzWd7biiPsvvPzz1ud77H2sO0uf/KgHo5bGiR jiuWRlGZdIf41QPiW7LDytgPTzv1m//aW7160vN9iZFceJP1VOlueBcyFK1kZ5tSbI rr/VlFchlyQXHHo02/gNsFas7tme0//yhZwTqYT2f3Rjw0RAtePB7vMRMaLwa/STkI I9jBXGxPQ7gXsJwGcyWd2eJs/cfoguSfBRbmG7TGzXt0giy7c1mmZ1uhwEt62N4/qj C3KT0BHEbOdXP+3OQhLZFomKC0BjiyhoTisdjBsj2o4wlackXczgoCOKzSi5f/LYPm 4U+SDeM+e3JtQ== 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 2/2] arm64: dts: rockchip: rk3588-rock-5b: Add pwm-fan Date: Mon, 3 Apr 2023 13:50:52 +0300 Message-Id: <20230403105052.426135-3-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230403105052.426135-1-cristian.ciocaltea@collabora.com> References: <20230403105052.426135-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?1762152666805829869?= X-GMAIL-MSGID: =?utf-8?q?1762152666805829869?= 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;