Re: [PATCH v2 1/3] ARM: dts: make dts use gpio-fan matrix instead of array

From: Simon Guinot
Date: Tue Nov 02 2021 - 09:00:24 EST

Next message: Paul Moore: "Re: [PATCH v2 RESEND] powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC"
Previous message: Rob Herring: "Re: [PATCH V5 1/3] dt-bindings: vendor-prefixes: add T-Head Semiconductor"
In reply to: David Heidelberg: "Re: [PATCH v2 1/3] ARM: dts: make dts use gpio-fan matrix instead of array"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Tue, Nov 02, 2021 at 11:54:51AM +0100, David Heidelberg wrote:
>
>
>
> On Tue, Nov 2 2021 at 10:30:14 +0100, Simon Guinot
> <simon.guinot@xxxxxxxxxxxx> wrote:
> > Hi David,
> >
> > For the LaCie and Seagate boards:
> >
> > Acked-by: Simon Guinot <simon.guinot@xxxxxxxxxxxx>
> >
> > In addition, can you ensure that the example in
> > Documentation/devicetree/bindings/hwmon/gpio-fan.txt is updated as well
> > ?
>
> Hello Simon,
>
> third patch in this series takes care of it, together with conversion to the
> YAML format.

Thanks for confirming. For some reason I only received the first two
patches.

Simon

>
> David
>
> >
> > Thanks.
> >
> > Simon
> >
> > On Fri, Oct 29, 2021 at 01:49:44PM +0200, David Heidelberg wrote:
> > > No functional changes.
> > >
> > > Adjust to comply with dt-schema requirements
> > > and make possible to validate values.
> > >
> > > Signed-off-by: David Heidelberg <david@xxxxxxx>
> > > ---
> > > 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(-)
> > >
> > > diff --git a/arch/arm/boot/dts/armada-370-rd.dts
> > > b/arch/arm/boot/dts/armada-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 = "gpio-fan";
> > > gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = <0 0 3000 1>;
> > > + gpio-fan,speed-map = <0 0>, <3000 1>;
> > > pinctrl-0 = <&fan_pins>;
> > > pinctrl-names = "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 @@ / {
> > >
> > > gpio-fan {
> > > gpio-fan,speed-map =
> > > - < 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
> > >
> > > gpio-fan {
> > > gpio-fan,speed-map =
> > > - < 0 3
> > > - 800 2
> > > - 1050 1
> > > - 1300 0>;
> > > + < 0 3>,
> > > + < 800 2>,
> > > + <1050 1>,
> > > + <1300 0>;
> > > };
> > > };
> > >
> > > 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 = <&gpio1 6 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 1000 1
> > > - 1150 2
> > > - 1350 4
> > > - 1500 3
> > > - 1650 5
> > > - 1750 6
> > > - 1900 7 >;
> > > + gpio-fan,speed-map = < 0 0>,
> > > + <1000 1>,
> > > + <1150 2>,
> > > + <1350 4>,
> > > + <1500 3>,
> > > + <1650 5>,
> > > + <1750 6>,
> > > + <1900 7>;
> > > };
> > >
> > > gpio-leds {
> > > diff --git a/arch/arm/boot/dts/armada-385-synology-ds116.dts
> > > b/arch/arm/boot/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 = <&gpio1 18 GPIO_ACTIVE_HIGH>,
> > > <&gpio1 17 GPIO_ACTIVE_HIGH>,
> > > <&gpio1 16 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 1500 1
> > > - 2500 2
> > > - 3000 3
> > > - 3400 4
> > > - 3700 5
> > > - 3900 6
> > > - 4000 7>;
> > > + gpio-fan,speed-map = < 0 0>,
> > > + <1500 1>,
> > > + <2500 2>,
> > > + <3000 3>,
> > > + <3400 4>,
> > > + <3700 5>,
> > > + <3900 6>,
> > > + <4000 7>;
> > > #cooling-cells = <2>;
> > > };
> > >
> > > diff --git a/arch/arm/boot/dts/armada-388-gp.dts
> > > b/arch/arm/boot/dts/armada-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 = "gpio-fan";
> > > gpios = <&expander1 3 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 3000 1>;
> > > + gpio-fan,speed-map = < 0 0>,
> > > + <3000 1>;
> > > };
> > > };
> > >
> > > diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
> > > b/arch/arm/boot/dts/kirkwood-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 = "default";
> > > gpios = <&gpio1 14 GPIO_ACTIVE_HIGH
> > > &gpio1 13 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = <0 0
> > > - 3000 1
> > > - 6000 2>;
> > > + gpio-fan,speed-map = <0 0>,
> > > + <3000 1>,
> > > + <6000 2>;
> > > };
> > >
> > > 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 = <&gpio0 17 GPIO_ACTIVE_LOW
> > > &gpio0 16 GPIO_ACTIVE_LOW>;
> > >
> > > - gpio-fan,speed-map = <0 3
> > > - 1500 2
> > > - 3250 1
> > > - 5000 0>;
> > > + gpio-fan,speed-map =
> > > + < 0 3>,
> > > + <1500 2>,
> > > + <3250 1>,
> > > + <5000 0>;
> > >
> > > alarm-gpios = <&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 = <&gpio1 16 GPIO_ACTIVE_LOW
> > > &gpio1 15 GPIO_ACTIVE_LOW>;
> > >
> > > - gpio-fan,speed-map = <0 3
> > > - 1500 2
> > > - 3250 1
> > > - 5000 0>;
> > > + gpio-fan,speed-map =
> > > + < 0 3>,
> > > + <1500 2>,
> > > + <3250 1>,
> > > + <5000 0>;
> > >
> > > alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
> > > };
> > > diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> > > b/arch/arm/boot/dts/kirkwood-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 = "default";
> > > gpios = <&gpio0 19 GPIO_ACTIVE_LOW
> > > &gpio0 18 GPIO_ACTIVE_LOW>;
> > > - gpio-fan,speed-map = <0 3
> > > - 1500 2
> > > - 3250 1
> > > - 5000 0>;
> > > + gpio-fan,speed-map =
> > > + <0 3>,
> > > + <1500 2>,
> > > + <3250 1>,
> > > + <5000 0>;
> > > alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
> > > };
> > >
> > > diff --git a/arch/arm/boot/dts/kirkwood-ns2max.dts
> > > b/arch/arm/boot/dts/kirkwood-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 =
> > > - < 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 = <&gpio0 25 GPIO_ACTIVE_LOW>;
> > > };
> > >
> > > diff --git a/arch/arm/boot/dts/kirkwood-ns2mini.dts
> > > b/arch/arm/boot/dts/kirkwood-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 =
> > > - < 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 = <&gpio0 25 GPIO_ACTIVE_LOW>;
> > > };
> > >
> > > 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 = <&gpio1 0 GPIO_ACTIVE_HIGH
> > > &gpio1 1 GPIO_ACTIVE_HIGH
> > > &gpio1 2 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 2200 1
> > > - 2500 2
> > > - 3000 4
> > > - 3300 3
> > > - 3700 5
> > > - 3800 6
> > > - 4200 7 >;
> > > + gpio-fan,speed-map =
> > > + < 0 0>,
> > > + <2200 1>,
> > > + <2500 2>,
> > > + <3000 4>,
> > > + <3300 3>,
> > > + <3700 5>,
> > > + <3800 6>,
> > > + <4200 7>;
> > > };
> > >
> > > 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 = <&gpio0 18 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 2200 1
> > > - 2500 2
> > > - 3000 4
> > > - 3300 3
> > > - 3700 5
> > > - 3800 6
> > > - 4200 7 >;
> > > + gpio-fan,speed-map =
> > > + < 0 0>,
> > > + <2200 1>,
> > > + <2500 2>,
> > > + <3000 4>,
> > > + <3300 3>,
> > > + <3700 5>,
> > > + <3800 6>,
> > > + <4200 7>;
> > > };
> > >
> > > 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 = <&gpio1 3 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 2500 1
> > > - 3100 2
> > > - 3800 3
> > > - 4600 4
> > > - 4800 5
> > > - 4900 6
> > > - 5000 7 >;
> > > + gpio-fan,speed-map =
> > > + < 0 0>,
> > > + <2500 1>,
> > > + <3100 2>,
> > > + <3800 3>,
> > > + <4600 4>,
> > > + <4800 5>,
> > > + <4900 6>,
> > > + <5000 7>;
> > > };
> > >
> > > 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 = <&gpio0 18 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 2500 1
> > > - 3100 2
> > > - 3800 3
> > > - 4600 4
> > > - 4800 5
> > > - 4900 6
> > > - 5000 7 >;
> > > + gpio-fan,speed-map =
> > > + < 0 0>,
> > > + <2500 1>,
> > > + <3100 2>,
> > > + <3800 3>,
> > > + <4600 4>,
> > > + <4800 5>,
> > > + <4900 6>,
> > > + <5000 7>;
> > > };
> > >
> > > 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 = <&gpio1 3 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 2500 1
> > > - 3100 2
> > > - 3800 3
> > > - 4600 4
> > > - 4800 5
> > > - 4900 6
> > > - 5000 7 >;
> > > + gpio-fan,speed-map =
> > > + < 0 0>,
> > > + <2500 1>,
> > > + <3100 2>,
> > > + <3800 3>,
> > > + <4600 4>,
> > > + <4800 5>,
> > > + <4900 6>,
> > > + <5000 7>;
> > > };
> > >
> > > gpio-fan-100-15-35-3 {
> > > @@ -388,14 +393,15 @@ &gpio0 16 GPIO_ACTIVE_HIGH
> > > alarm-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH
> > > &gpio1 12 GPIO_ACTIVE_HIGH
> > > &gpio1 13 GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = < 0 0
> > > - 2500 1
> > > - 3100 2
> > > - 3800 3
> > > - 4600 4
> > > - 4800 5
> > > - 4900 6
> > > - 5000 7 >;
> > > + gpio-fan,speed-map =
> > > + < 0 0>,
> > > + <2500 1>,
> > > + <3100 2>,
> > > + <3800 3>,
> > > + <4600 4>,
> > > + <4800 5>,
> > > + <4900 6>,
> > > + <5000 7>;
> > > };
> > >
> > > 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 = "default";
> > >
> > > gpio-fan,speed-map =
> > > - <0 3
> > > - 1500 2
> > > - 3250 1
> > > - 5000 0>;
> > > + < 0 3>,
> > > + <1500 2>,
> > > + <3250 1>,
> > > + <5000 0>;
> > > };
> > > };
> > >
> > > diff --git a/arch/arm/boot/dts/tegra30-ouya.dts
> > > b/arch/arm/boot/dts/tegra30-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 = "gpio-fan";
> > > gpios = <&gpio TEGRA_GPIO(J, 2) GPIO_ACTIVE_HIGH>;
> > > - gpio-fan,speed-map = <0 0
> > > - 4500 1>;
> > > + gpio-fan,speed-map = <0 0>,
> > > + <4500 1>;
> > > #cooling-cells = <2>;
> > > };
> > >
> > > --
> > > 2.33.0
> > >
> > >
> > > _______________________________________________
> > > linux-arm-kernel mailing list
> > > linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Attachment: signature.asc
Description: PGP signature

Next message: Paul Moore: "Re: [PATCH v2 RESEND] powerpc/audit: Convert powerpc to AUDIT_ARCH_COMPAT_GENERIC"
Previous message: Rob Herring: "Re: [PATCH V5 1/3] dt-bindings: vendor-prefixes: add T-Head Semiconductor"
In reply to: David Heidelberg: "Re: [PATCH v2 1/3] ARM: dts: make dts use gpio-fan matrix instead of array"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]