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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B0DFC4332F for ; Tue, 2 Nov 2021 09:37:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E93F66044F for ; Tue, 2 Nov 2021 09:37:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230468AbhKBJj6 (ORCPT ); Tue, 2 Nov 2021 05:39:58 -0400 Received: from vm1.sequanux.org ([188.165.36.56]:52369 "EHLO vm1.sequanux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229823AbhKBJj4 (ORCPT ); Tue, 2 Nov 2021 05:39:56 -0400 X-Greylist: delayed 421 seconds by postgrey-1.27 at vger.kernel.org; Tue, 02 Nov 2021 05:39:54 EDT Received: from localhost (localhost.localdomain [127.0.0.1]) by vm1.sequanux.org (Postfix) with ESMTP id C07D4512003; Tue, 2 Nov 2021 10:30:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at vm1.sequanux.org Received: from vm1.sequanux.org ([127.0.0.1]) by localhost (vm1.sequanux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4KCfXqq-e3RC; Tue, 2 Nov 2021 10:30:14 +0100 (CET) Received: from localhost (softwrestling.org [188.165.144.248]) by vm1.sequanux.org (Postfix) with ESMTPSA id 59B50512001; Tue, 2 Nov 2021 10:30:14 +0100 (CET) Date: Tue, 2 Nov 2021 10:30:14 +0100 From: Simon Guinot To: David Heidelberg Cc: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Thierry Reding , Jonathan Hunter , ~okias/devicetree@lists.sr.ht, phone-devel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org Subject: Re: [PATCH v2 1/3] ARM: dts: make dts use gpio-fan matrix instead of array Message-ID: <20211102093014.GL13663@kw.sim.vm.gnt> References: <20211029114948.41841-1-david@ixit.cz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="3xQkynibq3FKlJyM" Content-Disposition: inline In-Reply-To: <20211029114948.41841-1-david@ixit.cz> User-Agent: Mutt/1.6.0 (2016-04-01) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --3xQkynibq3FKlJyM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi David, For the LaCie and Seagate boards: Acked-by: Simon Guinot In addition, can you ensure that the example in Documentation/devicetree/bindings/hwmon/gpio-fan.txt is updated as well ? Thanks. Simon On Fri, Oct 29, 2021 at 01:49:44PM +0200, David Heidelberg wrote: > No functional changes. >=20 > Adjust to comply with dt-schema requirements > and make possible to validate values. >=20 > Signed-off-by: David Heidelberg > --- > arch/arm/boot/dts/armada-370-rd.dts | 2 +- > .../boot/dts/armada-370-seagate-nas-2bay.dts | 8 +- > .../boot/dts/armada-370-seagate-nas-4bay.dts | 8 +- > .../boot/dts/armada-370-synology-ds213j.dts | 16 +-- > .../boot/dts/armada-385-synology-ds116.dts | 16 +-- > arch/arm/boot/dts/armada-388-gp.dts | 4 +- > arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +- > .../boot/dts/kirkwood-linkstation-6282.dtsi | 9 +- > .../boot/dts/kirkwood-linkstation-lswxl.dts | 9 +- > arch/arm/boot/dts/kirkwood-lsxl.dtsi | 9 +- > arch/arm/boot/dts/kirkwood-ns2max.dts | 18 ++-- > arch/arm/boot/dts/kirkwood-ns2mini.dts | 18 ++-- > arch/arm/boot/dts/kirkwood-synology.dtsi | 102 +++++++++--------- > arch/arm/boot/dts/mvebu-linkstation-fan.dtsi | 8 +- > arch/arm/boot/dts/tegra30-ouya.dts | 4 +- > 15 files changed, 123 insertions(+), 114 deletions(-) >=20 > diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/arma= da-370-rd.dts > index c910d157a686..041c99b99921 100644 > --- a/arch/arm/boot/dts/armada-370-rd.dts > +++ b/arch/arm/boot/dts/armada-370-rd.dts > @@ -96,7 +96,7 @@ button { > gpio-fan { > compatible =3D "gpio-fan"; > gpios =3D <&gpio0 8 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D <0 0 3000 1>; > + gpio-fan,speed-map =3D <0 0>, <3000 1>; > pinctrl-0 =3D <&fan_pins>; > pinctrl-names =3D "default"; > }; > diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts b/arch/arm= /boot/dts/armada-370-seagate-nas-2bay.dts > index 8dd242e668e6..6ec3dd3337f4 100644 > --- a/arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts > +++ b/arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts > @@ -25,9 +25,9 @@ / { > =20 > gpio-fan { > gpio-fan,speed-map =3D > - < 0 3 > - 950 2 > - 1400 1 > - 1800 0>; > + < 0 3>, > + < 950 2>, > + <1400 1>, > + <1800 0>; > }; > }; > diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts b/arch/arm= /boot/dts/armada-370-seagate-nas-4bay.dts > index 3cf70c72c5ca..d62e32e9ddb5 100644 > --- a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts > +++ b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts > @@ -109,10 +109,10 @@ NS_V2_LED_ON 1 0 > =20 > gpio-fan { > gpio-fan,speed-map =3D > - < 0 3 > - 800 2 > - 1050 1 > - 1300 0>; > + < 0 3>, > + < 800 2>, > + <1050 1>, > + <1300 0>; > }; > }; > =20 > diff --git a/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/arch/arm/= boot/dts/armada-370-synology-ds213j.dts > index 64f2ce254fb6..88aa2b7c4962 100644 > --- a/arch/arm/boot/dts/armada-370-synology-ds213j.dts > +++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts > @@ -113,14 +113,14 @@ gpio-fan-32-38 { > &gpio2 0 GPIO_ACTIVE_HIGH > &gpio2 1 GPIO_ACTIVE_HIGH>; > alarm-gpios =3D <&gpio1 6 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 1000 1 > - 1150 2 > - 1350 4 > - 1500 3 > - 1650 5 > - 1750 6 > - 1900 7 >; > + gpio-fan,speed-map =3D < 0 0>, > + <1000 1>, > + <1150 2>, > + <1350 4>, > + <1500 3>, > + <1650 5>, > + <1750 6>, > + <1900 7>; > }; > =20 > gpio-leds { > diff --git a/arch/arm/boot/dts/armada-385-synology-ds116.dts b/arch/arm/b= oot/dts/armada-385-synology-ds116.dts > index d8769956cbfc..26c6ef47354c 100644 > --- a/arch/arm/boot/dts/armada-385-synology-ds116.dts > +++ b/arch/arm/boot/dts/armada-385-synology-ds116.dts > @@ -131,14 +131,14 @@ gpio-fan { > gpios =3D <&gpio1 18 GPIO_ACTIVE_HIGH>, > <&gpio1 17 GPIO_ACTIVE_HIGH>, > <&gpio1 16 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 1500 1 > - 2500 2 > - 3000 3 > - 3400 4 > - 3700 5 > - 3900 6 > - 4000 7>; > + gpio-fan,speed-map =3D < 0 0>, > + <1500 1>, > + <2500 2>, > + <3000 3>, > + <3400 4>, > + <3700 5>, > + <3900 6>, > + <4000 7>; > #cooling-cells =3D <2>; > }; > =20 > diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/arma= da-388-gp.dts > index 9d873257ac45..9f8d7ab2c897 100644 > --- a/arch/arm/boot/dts/armada-388-gp.dts > +++ b/arch/arm/boot/dts/armada-388-gp.dts > @@ -237,8 +237,8 @@ pcie@3,0 { > gpio-fan { > compatible =3D "gpio-fan"; > gpios =3D <&expander1 3 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 3000 1>; > + gpio-fan,speed-map =3D < 0 0>, > + <3000 1>; > }; > }; > =20 > diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/ki= rkwood-dnskw.dtsi > index eb917462b219..0738eb679fcd 100644 > --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi > +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi > @@ -38,9 +38,9 @@ gpio_fan { > pinctrl-names =3D "default"; > gpios =3D <&gpio1 14 GPIO_ACTIVE_HIGH > &gpio1 13 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D <0 0 > - 3000 1 > - 6000 2>; > + gpio-fan,speed-map =3D <0 0>, > + <3000 1>, > + <6000 2>; > }; > =20 > gpio_poweroff { > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi b/arch/arm/= boot/dts/kirkwood-linkstation-6282.dtsi > index 377b6e970259..dfac2045a1eb 100644 > --- a/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi > +++ b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi > @@ -118,10 +118,11 @@ gpio_fan { > gpios =3D <&gpio0 17 GPIO_ACTIVE_LOW > &gpio0 16 GPIO_ACTIVE_LOW>; > =20 > - gpio-fan,speed-map =3D <0 3 > - 1500 2 > - 3250 1 > - 5000 0>; > + gpio-fan,speed-map =3D > + < 0 3>, > + <1500 2>, > + <3250 1>, > + <5000 0>; > =20 > alarm-gpios =3D <&gpio1 11 GPIO_ACTIVE_HIGH>; > }; > diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts b/arch/arm/= boot/dts/kirkwood-linkstation-lswxl.dts > index c6024b569423..0425df8cb91c 100644 > --- a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > +++ b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts > @@ -69,10 +69,11 @@ gpio_fan { > gpios =3D <&gpio1 16 GPIO_ACTIVE_LOW > &gpio1 15 GPIO_ACTIVE_LOW>; > =20 > - gpio-fan,speed-map =3D <0 3 > - 1500 2 > - 3250 1 > - 5000 0>; > + gpio-fan,speed-map =3D > + < 0 3>, > + <1500 2>, > + <3250 1>, > + <5000 0>; > =20 > alarm-gpios =3D <&gpio1 8 GPIO_ACTIVE_HIGH>; > }; > diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kir= kwood-lsxl.dtsi > index 7b151acb9984..74009ed9e423 100644 > --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi > +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi > @@ -167,10 +167,11 @@ gpio_fan { > pinctrl-names =3D "default"; > gpios =3D <&gpio0 19 GPIO_ACTIVE_LOW > &gpio0 18 GPIO_ACTIVE_LOW>; > - gpio-fan,speed-map =3D <0 3 > - 1500 2 > - 3250 1 > - 5000 0>; > + gpio-fan,speed-map =3D > + <0 3>, > + <1500 2>, > + <3250 1>, > + <5000 0>; > alarm-gpios =3D <&gpio1 8 GPIO_ACTIVE_HIGH>; > }; > =20 > diff --git a/arch/arm/boot/dts/kirkwood-ns2max.dts b/arch/arm/boot/dts/ki= rkwood-ns2max.dts > index c0a087e77408..044958bc55da 100644 > --- a/arch/arm/boot/dts/kirkwood-ns2max.dts > +++ b/arch/arm/boot/dts/kirkwood-ns2max.dts > @@ -29,15 +29,15 @@ &gpio0 7 GPIO_ACTIVE_LOW > &gpio1 1 GPIO_ACTIVE_LOW > &gpio0 23 GPIO_ACTIVE_LOW>; > gpio-fan,speed-map =3D > - < 0 0 > - 1500 15 > - 1700 14 > - 1800 13 > - 2100 12 > - 3100 11 > - 3300 10 > - 4300 9 > - 5500 8>; > + < 0 0>, > + <1500 15>, > + <1700 14>, > + <1800 13>, > + <2100 12>, > + <3100 11>, > + <3300 10>, > + <4300 9>, > + <5500 8>; > alarm-gpios =3D <&gpio0 25 GPIO_ACTIVE_LOW>; > }; > =20 > diff --git a/arch/arm/boot/dts/kirkwood-ns2mini.dts b/arch/arm/boot/dts/k= irkwood-ns2mini.dts > index 5b9fa14b6428..3fbe008f9141 100644 > --- a/arch/arm/boot/dts/kirkwood-ns2mini.dts > +++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts > @@ -30,15 +30,15 @@ &gpio0 7 GPIO_ACTIVE_LOW > &gpio1 1 GPIO_ACTIVE_LOW > &gpio0 23 GPIO_ACTIVE_LOW>; > gpio-fan,speed-map =3D > - < 0 0 > - 3000 15 > - 3180 14 > - 4140 13 > - 4570 12 > - 6760 11 > - 7140 10 > - 7980 9 > - 9200 8>; > + < 0 0>, > + <3000 15>, > + <3180 14>, > + <4140 13>, > + <4570 12>, > + <6760 11>, > + <7140 10>, > + <7980 9>, > + <9200 8>; > alarm-gpios =3D <&gpio0 25 GPIO_ACTIVE_LOW>; > }; > =20 > diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts= /kirkwood-synology.dtsi > index 217bd374e52b..00adca68ae95 100644 > --- a/arch/arm/boot/dts/kirkwood-synology.dtsi > +++ b/arch/arm/boot/dts/kirkwood-synology.dtsi > @@ -286,14 +286,15 @@ gpio-fan-150-32-35 { > gpios =3D <&gpio1 0 GPIO_ACTIVE_HIGH > &gpio1 1 GPIO_ACTIVE_HIGH > &gpio1 2 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 2200 1 > - 2500 2 > - 3000 4 > - 3300 3 > - 3700 5 > - 3800 6 > - 4200 7 >; > + gpio-fan,speed-map =3D > + < 0 0>, > + <2200 1>, > + <2500 2>, > + <3000 4>, > + <3300 3>, > + <3700 5>, > + <3800 6>, > + <4200 7>; > }; > =20 > gpio-fan-150-15-18 { > @@ -306,14 +307,15 @@ gpio-fan-150-15-18 { > &gpio0 16 GPIO_ACTIVE_HIGH > &gpio0 17 GPIO_ACTIVE_HIGH>; > alarm-gpios =3D <&gpio0 18 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 2200 1 > - 2500 2 > - 3000 4 > - 3300 3 > - 3700 5 > - 3800 6 > - 4200 7 >; > + gpio-fan,speed-map =3D > + < 0 0>, > + <2200 1>, > + <2500 2>, > + <3000 4>, > + <3300 3>, > + <3700 5>, > + <3800 6>, > + <4200 7>; > }; > =20 > gpio-fan-100-32-35 { > @@ -326,14 +328,15 @@ gpio-fan-100-32-35 { > &gpio1 1 GPIO_ACTIVE_HIGH > &gpio1 2 GPIO_ACTIVE_HIGH>; > alarm-gpios =3D <&gpio1 3 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 2500 1 > - 3100 2 > - 3800 3 > - 4600 4 > - 4800 5 > - 4900 6 > - 5000 7 >; > + gpio-fan,speed-map =3D > + < 0 0>, > + <2500 1>, > + <3100 2>, > + <3800 3>, > + <4600 4>, > + <4800 5>, > + <4900 6>, > + <5000 7>; > }; > =20 > gpio-fan-100-15-18 { > @@ -346,14 +349,15 @@ gpio-fan-100-15-18 { > &gpio0 16 GPIO_ACTIVE_HIGH > &gpio0 17 GPIO_ACTIVE_HIGH>; > alarm-gpios =3D <&gpio0 18 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 2500 1 > - 3100 2 > - 3800 3 > - 4600 4 > - 4800 5 > - 4900 6 > - 5000 7 >; > + gpio-fan,speed-map =3D > + < 0 0>, > + <2500 1>, > + <3100 2>, > + <3800 3>, > + <4600 4>, > + <4800 5>, > + <4900 6>, > + <5000 7>; > }; > =20 > gpio-fan-100-15-35-1 { > @@ -366,14 +370,15 @@ gpio-fan-100-15-35-1 { > &gpio0 16 GPIO_ACTIVE_HIGH > &gpio0 17 GPIO_ACTIVE_HIGH>; > alarm-gpios =3D <&gpio1 3 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 2500 1 > - 3100 2 > - 3800 3 > - 4600 4 > - 4800 5 > - 4900 6 > - 5000 7 >; > + gpio-fan,speed-map =3D > + < 0 0>, > + <2500 1>, > + <3100 2>, > + <3800 3>, > + <4600 4>, > + <4800 5>, > + <4900 6>, > + <5000 7>; > }; > =20 > gpio-fan-100-15-35-3 { > @@ -388,14 +393,15 @@ &gpio0 16 GPIO_ACTIVE_HIGH > alarm-gpios =3D <&gpio1 3 GPIO_ACTIVE_HIGH > &gpio1 12 GPIO_ACTIVE_HIGH > &gpio1 13 GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D < 0 0 > - 2500 1 > - 3100 2 > - 3800 3 > - 4600 4 > - 4800 5 > - 4900 6 > - 5000 7 >; > + gpio-fan,speed-map =3D > + < 0 0>, > + <2500 1>, > + <3100 2>, > + <3800 3>, > + <4600 4>, > + <4800 5>, > + <4900 6>, > + <5000 7>; > }; > =20 > gpio-leds-alarm-12 { > diff --git a/arch/arm/boot/dts/mvebu-linkstation-fan.dtsi b/arch/arm/boot= /dts/mvebu-linkstation-fan.dtsi > index e172029a0c4d..a260c42dbda3 100644 > --- a/arch/arm/boot/dts/mvebu-linkstation-fan.dtsi > +++ b/arch/arm/boot/dts/mvebu-linkstation-fan.dtsi > @@ -50,10 +50,10 @@ gpio_fan { > pinctrl-names =3D "default"; > =20 > gpio-fan,speed-map =3D > - <0 3 > - 1500 2 > - 3250 1 > - 5000 0>; > + < 0 3>, > + <1500 2>, > + <3250 1>, > + <5000 0>; > }; > }; > =20 > diff --git a/arch/arm/boot/dts/tegra30-ouya.dts b/arch/arm/boot/dts/tegra= 30-ouya.dts > index a93bc452d315..19aa9c2169fd 100644 > --- a/arch/arm/boot/dts/tegra30-ouya.dts > +++ b/arch/arm/boot/dts/tegra30-ouya.dts > @@ -426,8 +426,8 @@ trusted-foundations { > fan: gpio_fan { > compatible =3D "gpio-fan"; > gpios =3D <&gpio TEGRA_GPIO(J, 2) GPIO_ACTIVE_HIGH>; > - gpio-fan,speed-map =3D <0 0 > - 4500 1>; > + gpio-fan,speed-map =3D <0 0>, > + <4500 1>; > #cooling-cells =3D <2>; > }; > =20 > --=20 > 2.33.0 >=20 >=20 > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --3xQkynibq3FKlJyM Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEXW8DgovlR3VS5hA0zyg/RDPmszoFAmGBBSUACgkQzyg/RDPm szrF/A//afDhRKbRfHK+l6dA3pbw5kKycEuxOUo+ZnDjXxf/6IYKzmSYPmtp4V0s qjeXaI0ICJX0Ma4y7JxnHfMLbN6ba9owbi5CLP4SQvhPXeq/OUG0MtedLq84c8ca slHkgjK04Vuyadrl7UvTBdn/m1ve08obBPTSjcUgeIzgSNMq4p/OxHuRRwRum91t n6Uu62BQtPwRTO1PpHfQknkB+dVGkdLA6BA4q31V7fsmsezcrYIUmhwnPFxoYmss R4CemjxTRFe4G+m8KsxJSFfcJXPomwFptCC9bVb+OA2kQ7eYUlcEOGJjVTH7xrAo YoS0bBp8/uYUKVNce/4VCUQou+Eowxx0+uG4ExIY5qKrnipyp7HLygj3Zxr4JVP5 B5cNRMpQ6Bi2h0xm1g8FPcc00n9x/ji/XedGQDMlrPA7GP60kk9LZLTtFIyTqUmH ptiNjugFG2HAK1y7RKvWD8WrQHmVkyFM7gMRFpuhZzrKRWakUNUCmhdfJKWTKgf5 Z0QhPOXEfluKfZ+TfE8rMwQ3ecDXUgdkwq+tV/NKtIX3fRgpZu+ulZgb4EJFD8xc ILzCtbufFr02QENKF6d3ZyxrEivWr26BlTw5mc9fpqaistKrWsNbKIOalqc/V+xe iA0GL+4LpyhrpJMdaR2SaVJR1ThLLekZX7N8AUDRZ7fwmGO6NwU= =YlsE -----END PGP SIGNATURE----- --3xQkynibq3FKlJyM--