Skip to content

Commit 62f34e3

Browse files
okiasgclement
okias
authored and
gclement
committed
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>
1 parent 6e75ac5 commit 62f34e3

14 files changed

Lines changed: 121 additions & 112 deletions

‎arch/arm/boot/dts/marvell/armada-370-rd.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
gpio-fan {
9696
compatible = "gpio-fan";
9797
gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
98-
gpio-fan,speed-map = <0 0 3000 1>;
98+
gpio-fan,speed-map = <0 0>, <3000 1>;
9999
pinctrl-0 = <&fan_pins>;
100100
pinctrl-names = "default";
101101
};

‎arch/arm/boot/dts/marvell/armada-370-seagate-nas-2bay.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
gpio-fan {
2727
gpio-fan,speed-map =
28-
< 0 3
29-
950 2
30-
1400 1
31-
1800 0>;
28+
< 0 3>,
29+
< 950 2>,
30+
<1400 1>,
31+
<1800 0>;
3232
};
3333
};

‎arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@
106106

107107
gpio-fan {
108108
gpio-fan,speed-map =
109-
< 0 3
110-
800 2
111-
1050 1
112-
1300 0>;
109+
< 0 3>,
110+
< 800 2>,
111+
<1050 1>,
112+
<1300 0>;
113113
};
114114
};
115115

‎arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@
113113
&gpio2 0 GPIO_ACTIVE_HIGH
114114
&gpio2 1 GPIO_ACTIVE_HIGH>;
115115
alarm-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
116-
gpio-fan,speed-map = < 0 0
117-
1000 1
118-
1150 2
119-
1350 4
120-
1500 3
121-
1650 5
122-
1750 6
123-
1900 7 >;
116+
gpio-fan,speed-map = < 0 0>,
117+
<1000 1>,
118+
<1150 2>,
119+
<1350 4>,
120+
<1500 3>,
121+
<1650 5>,
122+
<1750 6>,
123+
<1900 7>;
124124
};
125125

126126
gpio-leds {

‎arch/arm/boot/dts/marvell/armada-385-synology-ds116.dts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@
131131
gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>,
132132
<&gpio1 17 GPIO_ACTIVE_HIGH>,
133133
<&gpio1 16 GPIO_ACTIVE_HIGH>;
134-
gpio-fan,speed-map = < 0 0
135-
1500 1
136-
2500 2
137-
3000 3
138-
3400 4
139-
3700 5
140-
3900 6
141-
4000 7>;
134+
gpio-fan,speed-map = < 0 0>,
135+
<1500 1>,
136+
<2500 2>,
137+
<3000 3>,
138+
<3400 4>,
139+
<3700 5>,
140+
<3900 6>,
141+
<4000 7>;
142142
#cooling-cells = <2>;
143143
};
144144

‎arch/arm/boot/dts/marvell/armada-388-gp.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@
237237
gpio-fan {
238238
compatible = "gpio-fan";
239239
gpios = <&expander1 3 GPIO_ACTIVE_HIGH>;
240-
gpio-fan,speed-map = < 0 0
241-
3000 1>;
240+
gpio-fan,speed-map = < 0 0>,
241+
<3000 1>;
242242
};
243243
};
244244

‎arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
pinctrl-names = "default";
3939
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH
4040
&gpio1 13 GPIO_ACTIVE_HIGH>;
41-
gpio-fan,speed-map = <0 0
42-
3000 1
43-
6000 2>;
41+
gpio-fan,speed-map = <0 0>,
42+
<3000 1>,
43+
<6000 2>;
4444
};
4545

4646
gpio_poweroff {

‎arch/arm/boot/dts/marvell/kirkwood-linkstation-6282.dtsi‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,11 @@
118118
gpios = <&gpio0 17 GPIO_ACTIVE_LOW
119119
&gpio0 16 GPIO_ACTIVE_LOW>;
120120

121-
gpio-fan,speed-map = <0 3
122-
1500 2
123-
3250 1
124-
5000 0>;
121+
gpio-fan,speed-map =
122+
< 0 3>,
123+
<1500 2>,
124+
<3250 1>,
125+
<5000 0>;
125126

126127
alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
127128
};

‎arch/arm/boot/dts/marvell/kirkwood-linkstation-lswxl.dts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@
6969
gpios = <&gpio1 16 GPIO_ACTIVE_LOW
7070
&gpio1 15 GPIO_ACTIVE_LOW>;
7171

72-
gpio-fan,speed-map = <0 3
73-
1500 2
74-
3250 1
75-
5000 0>;
72+
gpio-fan,speed-map =
73+
< 0 3>,
74+
<1500 2>,
75+
<3250 1>,
76+
<5000 0>;
7677

7778
alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
7879
};

‎arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,11 @@
172172
pinctrl-names = "default";
173173
gpios = <&gpio0 19 GPIO_ACTIVE_LOW
174174
&gpio0 18 GPIO_ACTIVE_LOW>;
175-
gpio-fan,speed-map = <0 3
176-
1500 2
177-
3250 1
178-
5000 0>;
175+
gpio-fan,speed-map =
176+
<0 3>,
177+
<1500 2>,
178+
<3250 1>,
179+
<5000 0>;
179180
alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
180181
};
181182

0 commit comments

Comments
 (0)