ARM: dts: marvell: make dts use gpio-fan matrix instead of array

No functional changes.

Adjust to comply with dt-schema requirements
and make possible to validate values.

Acked-by: Simon Guinot <simon.guinot@sequanux.org>
Signed-off-by: David Heidelberg <david@ixit.cz>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/marvell/armada-370-rd.dts b/arch/arm/boot/dts/marvell/armada-370-rd.dts
index 1b241da11e942c8f67f2568a188bae5146fefe64..f23f6b3fc8f3ba5a0df528c3daae191078d6fddd 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-rd.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-rd.dts
@@ -95,7 +95,7 @@
                        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/marvell/armada-370-seagate-nas-2bay.dts b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-2bay.dts
index 8dd242e668e652ccc5a7dbf4ff6216f78fbf15ef..6ec3dd3337f4234c0c0f9932c25fb56385fee018 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-2bay.dts
+++ b/arch/arm/boot/dts/marvell/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/marvell/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
index 370ca9c432479f40cb16f2e6e178a51c428c2940..3011578a31244e4449c7af4f85664dde9f9ff288 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
@@ -106,10 +106,10 @@
 
        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/marvell/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
index b07d11d1f124957ab0b6b843a9e76809d15ceee6..02599a3e9816a365cf01b94e1913bff2345e8b61 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
@@ -113,14 +113,14 @@
                         &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/marvell/armada-385-synology-ds116.dts b/arch/arm/boot/dts/marvell/armada-385-synology-ds116.dts
index ea91ff964d94ec3dbdfc4088b7ca96dcbbf60010..6caa5c50175a2266dc356196264cea39c8d3df33 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-385-synology-ds116.dts
+++ b/arch/arm/boot/dts/marvell/armada-385-synology-ds116.dts
@@ -131,14 +131,14 @@
                        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/marvell/armada-388-gp.dts b/arch/arm/boot/dts/marvell/armada-388-gp.dts
index e2ba50520b6b0ba89e209886e29ea5aa31ddbb83..1de0a172aa5f18cab18503ee6c6503d78be3f235 100644 (file)
--- a/arch/arm/boot/dts/marvell/armada-388-gp.dts
+++ b/arch/arm/boot/dts/marvell/armada-388-gp.dts
@@ -237,8 +237,8 @@
                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/marvell/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
index eb917462b219b996ba7ca3a7680a8f36347d225a..0738eb679fcd7af8483b6a486237eb0f115e0396 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
@@ -38,9 +38,9 @@
                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/marvell/kirkwood-linkstation-6282.dtsi b/arch/arm/boot/dts/marvell/kirkwood-linkstation-6282.dtsi
index 377b6e970259fdf57ba36899bf6add14f9ee60fe..dfac2045a1ebbbd2a58e1a58ddd5bc36f5f90b8e 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-linkstation-6282.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-linkstation-6282.dtsi
@@ -118,10 +118,11 @@
                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/marvell/kirkwood-linkstation-lswxl.dts b/arch/arm/boot/dts/marvell/kirkwood-linkstation-lswxl.dts
index c6024b569423ab1a8d6f64eb012e4e21738f8620..0425df8cb91cc1483b1edcf68de9e8609faa6c21 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-linkstation-lswxl.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-linkstation-lswxl.dts
@@ -69,10 +69,11 @@
                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/marvell/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
index 88b70ba1c8feec67b670335c60235aa21342687e..f80af24b9e9008a59460276642627553b1cf46a8 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
@@ -172,10 +172,11 @@
                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/marvell/kirkwood-ns2max.dts b/arch/arm/boot/dts/marvell/kirkwood-ns2max.dts
index c0a087e774084869e239d00a220778076b1a320c..044958bc55da16864495414eb88816c386d3a789 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ns2max.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-ns2max.dts
@@ -29,15 +29,15 @@
                         &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/marvell/kirkwood-ns2mini.dts b/arch/arm/boot/dts/marvell/kirkwood-ns2mini.dts
index 5b9fa14b642861f89d38a3602a5eb71dddb6ba55..3fbe008f914117152ba7dc33f9263a6641fbebb0 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ns2mini.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-ns2mini.dts
@@ -30,15 +30,15 @@
                         &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/marvell/kirkwood-synology.dtsi b/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
index 9b6666020cddfe0196f5fe4b8ad77aa0cec03cb9..20964eb48fd75a51640a30806e6a0c24abbda3c4 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
@@ -286,14 +286,15 @@
                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 @@
                         &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 @@
                         &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 @@
                         &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 @@
                         &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 @@
                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/marvell/mvebu-linkstation-fan.dtsi b/arch/arm/boot/dts/marvell/mvebu-linkstation-fan.dtsi
index e172029a0c4de6b4c16f014f57fe347ee57b281d..a260c42dbda33b2d8be2649c7eae698025f0bf6c 100644 (file)
--- a/arch/arm/boot/dts/marvell/mvebu-linkstation-fan.dtsi
+++ b/arch/arm/boot/dts/marvell/mvebu-linkstation-fan.dtsi
@@ -50,10 +50,10 @@
                pinctrl-names = "default";
 
                gpio-fan,speed-map =
-                       <0              3
-                       1500    2
-                       3250    1
-                       5000    0>;
+                       <   0 3>,
+                       <1500 2>,
+                       <3250 1>,
+                       <5000 0>;
        };
 };