From patchwork Tue May 30 15:04:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 13260378 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6AEB3C7EE2C for ; Tue, 30 May 2023 15:05:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ucc9lC8azl76UpWe+SE0ArLMg30onV7mZ8LnbHACyBM=; b=pFsfmPPwJoXi3e z+ZkqICNi2mP8hxP0hCWl5bDNrBkzw6oBexcEqj0/qvDVh7N64CfEz+z/nLZ4nyDeNeHXdNgFwQ1R LSS4Rxg+XXUqsEVduxfv7tu6qu4owvT4fKQnBA6+BfBESyqgRzIyR0Q6Fgn0RltXTGwv3znmMcRp+ fl3CTyoRmUXdWpsdRIenXWqM2J6vA1qwxkryBhyZN52nCnkLJp9v6G4rtFIyF9B39nrR4hOveLFvq WaFRpVDiIP2B8fJ+8qxH3SIlRBYVTIGOXea83fpja2XSOqmlbFyEqavARHpgtAM/j6ciQpmyFJMAP NpCibGhMXcGMhibr0vTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q40u8-00EKu3-0C; Tue, 30 May 2023 15:04:56 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q40tf-00EKi3-0o; Tue, 30 May 2023 15:04:29 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 21A6A63209; Tue, 30 May 2023 15:04:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEB0CC4339B; Tue, 30 May 2023 15:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685459063; bh=+o5m6BKZjSps+olk91BJwnTeymdT4kDRa5cOcck98WI=; h=From:To:Cc:Subject:Date:From; b=Q6+OQIeZBNJsxfG83QUIzSLX95F8vwZd6mYhLLnW4l3e9hDZMRB+X2cVbbStmCWIZ xp8e7XLOtU443E8Nz9FC0CTnJXhhZPvQjtzmxsJFU1N23JwViUe3bnuB5lYEe3M2O6 qaA6hj6slJ74A5Q8UKtJidtiGMibLwObi3mvXFGpKDzTznnUliXQq8O/MPgcopLUKD ZflwEAayohmtfDCET6Qz6B04/Pxpit0dItWesKKRGdCzxGsEXPJh/ixIJhPwd4RvFn +CsVvAioP6pddS35LEY9658KwngAJGNaz4aiG4EdnvuNk8MGWDgMyiiJU2xYg7TK8g wCNJ85G2z5YPg== From: matthias.bgg@kernel.org To: rafael@kernel.org, Daniel Lezcano , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno Cc: devicetree@vger.kernel.org, Amit Kucheria , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Zhang Rui , linux-arm-kernel@lists.infradead.org, Matthias Brugger Subject: [PATCH 1/2] dt-bindings: thermal: mediatek: Move auxdac binding to yaml Date: Tue, 30 May 2023 17:04:12 +0200 Message-Id: <20230530150413.12918-1-matthias.bgg@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230530_080427_391387_D257AB94 X-CRM114-Status: GOOD ( 19.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Matthias Brugger Convert the older binding to yaml syntax. Signed-off-by: Matthias Brugger --- .../bindings/thermal/mediatek,thermal.yaml | 168 ++++++++++++++++++ .../bindings/thermal/mediatek-thermal.txt | 52 ------ 2 files changed, 168 insertions(+), 52 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/mediatek,thermal.yaml delete mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt diff --git a/Documentation/devicetree/bindings/thermal/mediatek,thermal.yaml b/Documentation/devicetree/bindings/thermal/mediatek,thermal.yaml new file mode 100644 index 000000000000..7aa2bdc43567 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mediatek,thermal.yaml @@ -0,0 +1,168 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/thermal/mediatek,thermal.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek Thermal Sensor + +maintainers: + - Matthias Brugger + +description: | + The MediaTek thermal controller measures the on-SoC temperatures. + This device does not have its own ADC, instead it directly controls + the AUXADC via AHB bus accesses. For this reason this device needs + phandles to the AUXADC. Also it controls a mux in the apmixedsys + register space via AHB bus accesses, so a phandle to the APMIXEDSYS + is also needed. + +properties: + compatible: + oneOf: + - enum: + - mediatek,mt2701-thermal + - mediatek,mt2712-thermal + - mediatek,mt7622-thermal + - mediatek,mt7986-thermal + - mediatek,mt8173-thermal + - mediatek,mt8183-thermal + - mediatek,mt8365-thermal + - items: + - const: mediatek,mt7981-thermal + - const: mediatek,mt7986-thermal + - items: + - const: mediatek,mt8516-thermal + - const: mediatek,mt2701-thermal + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 2 + + clock-names: + items: + - const: therm + - const: auxadc + + resets: + maxItems: 1 + description: Reference to the reset controller controlling the thermal controller. + + reset-names: + items: + - const: therm + + nvmem-cells: + items: + - description: Calibration eFuse data. If unspecified default values are used. + + nvmem-cell-names: + items: + - const: calibration-data + + mediatek,auxadc: + $ref: /schemas/types.yaml#/definitions/phandle + description: + A phandle to the AUXADC which the thermal controller uses. + + mediatek,apmixedsys: + $ref: /schemas/types.yaml#/definitions/phandle + description: + A phandle to the APMIXEDSYS controller. + + "#thermal-sensor-cells": + const: 1 + + bank0-supply: + description: Regulator node supplying voltage to the first bank + + bank1-supply: + description: Regulator node supplying voltage to the second bank + + +required: + - compatible + - reg + - interrupts + - clocks + - mediatek,auxadc + - mediatek,apmixedsys + - "#thermal-sensor-cells" + +additionalProperties: false + +examples: + - | + #include + #include + #include + + soc { + #address-cells = <2>; + #size-cells = <2>; + + auxadc: auxadc@11001000 { + compatible = "mediatek,mt8173-auxadc"; + reg = <0 0x11001000 0 0x1000>; + clocks = <&pericfg CLK_PERI_AUXADC>; + clock-names = "main"; + #io-channel-cells = <1>; + }; + + apmixedsys: clock-controller@10209000 { + compatible = "mediatek,mt8173-apmixedsys"; + reg = <0 0x10209000 0 0x1000>; + #clock-cells = <1>; + }; + + thermal: thermal@1100b000 { + #thermal-sensor-cells = <1>; + compatible = "mediatek,mt8173-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; + reset-names = "therm"; + mediatek,auxadc = <&auxadc>; + mediatek,apmixedsys = <&apmixedsys>; + nvmem-cells = <&thermal_calibration_data>; + nvmem-cell-names = "calibration-data"; + }; + + thermal-zones { + cpu_thermal: cpu-thermal { + polling-delay-passive = <1000>; + polling-delay = <1000>; + + thermal-sensors = <&thermal 0>; + sustainable-power = <1500>; + + trips { + threshold: trip-point0 { + temperature = <68000>; + hysteresis = <2000>; + type = "passive"; + }; + + target: trip-point1 { + temperature = <85000>; + hysteresis = <2000>; + type = "passive"; + }; + + cpu_crit: cpu_crit0 { + temperature = <115000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + }; + }; + }; +... diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt deleted file mode 100644 index ac39c7156fde..000000000000 --- a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt +++ /dev/null @@ -1,52 +0,0 @@ -* Mediatek Thermal - -This describes the device tree binding for the Mediatek thermal controller -which measures the on-SoC temperatures. This device does not have its own ADC, -instead it directly controls the AUXADC via AHB bus accesses. For this reason -this device needs phandles to the AUXADC. Also it controls a mux in the -apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS -is also needed. - -Required properties: -- compatible: - - "mediatek,mt8173-thermal" : For MT8173 family of SoCs - - "mediatek,mt2701-thermal" : For MT2701 family of SoCs - - "mediatek,mt2712-thermal" : For MT2712 family of SoCs - - "mediatek,mt7622-thermal" : For MT7622 SoC - - "mediatek,mt7981-thermal", "mediatek,mt7986-thermal" : For MT7981 SoC - - "mediatek,mt7986-thermal" : For MT7986 SoC - - "mediatek,mt8183-thermal" : For MT8183 family of SoCs - - "mediatek,mt8365-thermal" : For MT8365 family of SoCs - - "mediatek,mt8516-thermal", "mediatek,mt2701-thermal : For MT8516 family of SoCs -- reg: Address range of the thermal controller -- interrupts: IRQ for the thermal controller -- clocks, clock-names: Clocks needed for the thermal controller. required - clocks are: - "therm": Main clock needed for register access - "auxadc": The AUXADC clock -- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses -- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. -- #thermal-sensor-cells : Should be 0. See Documentation/devicetree/bindings/thermal/thermal-sensor.yaml for a description. - -Optional properties: -- resets: Reference to the reset controller controlling the thermal controller. -- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If - unspecified default values shall be used. -- nvmem-cell-names: Should be "calibration-data" - -Example: - - thermal: thermal@1100b000 { - #thermal-sensor-cells = <1>; - compatible = "mediatek,mt8173-thermal"; - reg = <0 0x1100b000 0 0x1000>; - interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; - clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; - clock-names = "therm", "auxadc"; - resets = <&pericfg MT8173_PERI_THERM_SW_RST>; - reset-names = "therm"; - mediatek,auxadc = <&auxadc>; - mediatek,apmixedsys = <&apmixedsys>; - nvmem-cells = <&thermal_calibration_data>; - nvmem-cell-names = "calibration-data"; - }; From patchwork Tue May 30 15:04:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 13260377 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0001C77B73 for ; Tue, 30 May 2023 15:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MHnpFtwngMZ6v7BtW5UffdMoQ1p6jo+bPR3Gcz+4u0Q=; b=h5EbQNl8BvKNsa lnrqrKpn/7rBJFwMq07F2nfXJxsoxUvif0fLqnwattMopQQeDmxi2kX+TcXbv8gHRMd7+dXShAip7 wEdTjZUlVivNkzwzXn9tkwmVSx50UnwmzcNSmtRn2ZbYAtfI2XJxskGtylirV/X5IczbjTXMjIMkc UBx1KK979cY0Q37Ib3OL2BeEpETUZPGTijCvvFByjVBZX99HTOKh86ZPTg13KiduoHmOllKCLUE5q MQ69Itv59rdF1KoXIGt/orpoHlEoNumkUg/iuFslnpCzVPChysoBkibJagk+S9xgNNgDEXK8Sdt3w 0Nv5T8+Ww2ETVZyFjeDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q40u8-00EKuc-2S; Tue, 30 May 2023 15:04:56 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q40tg-00EKjP-1W; Tue, 30 May 2023 15:04:29 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0E96E63219; Tue, 30 May 2023 15:04:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 181E2C433AE; Tue, 30 May 2023 15:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685459067; bh=QnEoh+X+SgNcIBxD5KzNnV5xmRN1TrKhb2ZElCWGT+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E3jWOhPweOzR2ItjP8ZU+908Aay1KcouvnvGiVgboQaHDLkc0/4LNgMeFKx4X94T/ Gp4aM6Fv0bxhFIuCsdWeqHbtcuIBymKu4iv0saqyg7A7J4Dx4hypkXKRKe9/nPQU3e ZZ0WCXNWC8FHoTBGTALmgCKcCrhhuZcRKuhNGjzMBkbkMpRyuGofpNZQTjMnaA3rql UAwIsY/DFwamgl6nb2/h0D7KwTV5axTLimNDik/dAq3qkq4OgmUOykOmxkl0/qoFqh 7Hsmo23aIkJ7CQgMwh/CqLsFhKR3IZwEx+EwjRBA0eDRUt8kRy4dODFixGHdZ07yrx BsTXkPms8MBsg== From: matthias.bgg@kernel.org To: rafael@kernel.org, Daniel Lezcano , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno Cc: devicetree@vger.kernel.org, Amit Kucheria , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Zhang Rui , linux-arm-kernel@lists.infradead.org, Matthias Brugger Subject: [PATCH 2/2] arm64: dts: mt8173: Update thermal node Date: Tue, 30 May 2023 17:04:13 +0200 Message-Id: <20230530150413.12918-2-matthias.bgg@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230530150413.12918-1-matthias.bgg@kernel.org> References: <20230530150413.12918-1-matthias.bgg@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230530_080428_544714_BE14889F X-CRM114-Status: GOOD ( 13.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Matthias Brugger Following the binding description, update to use thermal-sensor-cells = 1 Signed-off-by: Matthias Brugger --- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index c47d7d900f28..44c553bddd46 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -270,7 +270,7 @@ cpu_thermal: cpu-thermal { polling-delay-passive = <1000>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */ - thermal-sensors = <&thermal>; + thermal-sensors = <&thermal 0>; sustainable-power = <1500>; /* milliwatts */ trips { @@ -766,7 +766,7 @@ spi: spi@1100a000 { }; thermal: thermal@1100b000 { - #thermal-sensor-cells = <0>; + #thermal-sensor-cells = <1>; compatible = "mediatek,mt8173-thermal"; reg = <0 0x1100b000 0 0x1000>; interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>;