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>

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>
62f34e3e · David Heidelberg · Gregory CLEMENT · 6e75ac5a · 62f34e3e · 62f34e3e
Commit 62f34e3e authored Dec 02, 2023 by David Heidelberg Committed by Gregory CLEMENT Dec 15, 2023
14 changed files
--- a/arch/arm/boot/dts/marvell/armada-370-rd.dts
+++ b/arch/arm/boot/dts/marvell/armada-370-rd.dts
@@ -95,7 +95,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";
 			};

--- 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
+			<   0 3>,
-			  950 2
+			< 950 2>,
-			 1400 1
+			<1400 1>,
-			 1800 0>;
+			<1800 0>;
 	};
 };
--- 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 @@ NS_V2_LED_ON   1 0
 	gpio-fan {
 		gpio-fan,speed-map =
-			<   0 3
+			<   0 3>,
-			  800 2
+			< 800 2>,
-			  1050 1
+			<1050 1>,
-			  1300 0>;
+			<1300 0>;
 	};
 };

--- 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 @@ 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
+		gpio-fan,speed-map = <   0 0>,
-				       1000 1
+				     <1000 1>,
-				       1150 2
+				     <1150 2>,
-				       1350 4
+				     <1350 4>,
-				       1500 3
+				     <1500 3>,
-				       1650 5
+				     <1650 5>,
-				       1750 6
+				     <1750 6>,
-				       1900 7 >;
+				     <1900 7>;
 	};
 	gpio-leds {

--- 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 @@ gpio-fan {
 			gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>,
 				<&gpio1 17 GPIO_ACTIVE_HIGH>,
 				<&gpio1 16 GPIO_ACTIVE_HIGH>;
-			gpio-fan,speed-map = <   0 0
+			gpio-fan,speed-map = <   0 0>,
-					      1500 1
+					     <1500 1>,
-					      2500 2
+					     <2500 2>,
-					      3000 3
+					     <3000 3>,
-					      3400 4
+					     <3400 4>,
-					      3700 5
+					     <3700 5>,
-					      3900 6
+					     <3900 6>,
-					      4000 7>;
+					     <4000 7>;
 			#cooling-cells = <2>;
 		};

--- a/arch/arm/boot/dts/marvell/armada-388-gp.dts
+++ b/arch/arm/boot/dts/marvell/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
+			gpio-fan,speed-map = <	 0 0>,
-					      3000 1>;
+					     <3000 1>;
 		};
 	};

--- a/arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/marvell/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
+		gpio-fan,speed-map = <0    0>,
-				      3000 1
+				     <3000 1>,
-				      6000 2>;
+				     <6000 2>;
 	};
 	gpio_poweroff {

--- a/arch/arm/boot/dts/marvell/kirkwood-linkstation-6282.dtsi
+++ b/arch/arm/boot/dts/marvell/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
+		gpio-fan,speed-map =
-				1500 2
+				<   0 3>,
-				3250 1
+				<1500 2>,
-				5000 0>;
+				<3250 1>,
+				<5000 0>;
 		alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
 	};

--- a/arch/arm/boot/dts/marvell/kirkwood-linkstation-lswxl.dts
+++ b/arch/arm/boot/dts/marvell/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
+		gpio-fan,speed-map =
-				1500 2
+				<   0 3>,
-				3250 1
+				<1500 2>,
-				5000 0>;
+				<3250 1>,
+				<5000 0>;
 		alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
 	};

--- a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
@@ -172,10 +172,11 @@ gpio_fan {
 		pinctrl-names = "default";
 		gpios = <&gpio0 19 GPIO_ACTIVE_LOW
 		         &gpio0 18 GPIO_ACTIVE_LOW>;
-		gpio-fan,speed-map = <0    3
+		gpio-fan,speed-map =
-		                      1500 2
+				<0    3>,
-		                      3250 1
+				<1500 2>,
-		                      5000 0>;
+				<3250 1>,
+				<5000 0>;
 		alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
 	};

--- a/arch/arm/boot/dts/marvell/kirkwood-ns2max.dts
+++ b/arch/arm/boot/dts/marvell/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
+			<   0  0>,
-			 1500 15
+			<1500 15>,
-			 1700 14
+			<1700 14>,
-			 1800 13
+			<1800 13>,
-			 2100 12
+			<2100 12>,
-			 3100 11
+			<3100 11>,
-			 3300 10
+			<3300 10>,
-			 4300  9
+			<4300  9>,
-			 5500  8>;
+			<5500  8>;
 		alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
 	};

--- a/arch/arm/boot/dts/marvell/kirkwood-ns2mini.dts
+++ b/arch/arm/boot/dts/marvell/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
+			<   0  0>,
-			 3000 15
+			<3000 15>,
-			 3180 14
+			<3180 14>,
-			 4140 13
+			<4140 13>,
-			 4570 12
+			<4570 12>,
-			 6760 11
+			<6760 11>,
-			 7140 10
+			<7140 10>,
-			 7980  9
+			<7980  9>,
-			 9200  8>;
+			<9200  8>;
 		alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
 	};

--- a/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/marvell/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
+		gpio-fan,speed-map =
-				       2200 1
+				<   0 0>,
-				       2500 2
+				<2200 1>,
-				       3000 4
+				<2500 2>,
-				       3300 3
+				<3000 4>,
-				       3700 5
+				<3300 3>,
-				       3800 6
+				<3700 5>,
-				       4200 7 >;
+				<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
+		gpio-fan,speed-map =
-				       2200 1
+				<   0 0>,
-				       2500 2
+				<2200 1>,
-				       3000 4
+				<2500 2>,
-				       3300 3
+				<3000 4>,
-				       3700 5
+				<3300 3>,
-				       3800 6
+				<3700 5>,
-				       4200 7 >;
+				<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
+		gpio-fan,speed-map =
-				       2500 1
+				<   0 0>,
-				       3100 2
+				<2500 1>,
-				       3800 3
+				<3100 2>,
-				       4600 4
+				<3800 3>,
-				       4800 5
+				<4600 4>,
-				       4900 6
+				<4800 5>,
-				       5000 7 >;
+				<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
+		gpio-fan,speed-map =
-				       2500 1
+				<   0 0>,
-				       3100 2
+				<2500 1>,
-				       3800 3
+				<3100 2>,
-				       4600 4
+				<3800 3>,
-				       4800 5
+				<4600 4>,
-				       4900 6
+				<4800 5>,
-				       5000 7 >;
+				<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
+		gpio-fan,speed-map =
-				       2500 1
+				<   0 0>,
-				       3100 2
+				<2500 1>,
-				       3800 3
+				<3100 2>,
-				       4600 4
+				<3800 3>,
-				       4800 5
+				<4600 4>,
-				       4900 6
+				<4800 5>,
-				       5000 7 >;
+				<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
+		gpio-fan,speed-map =
-				       2500 1
+				<   0 0>,
-				       3100 2
+				<2500 1>,
-				       3800 3
+				<3100 2>,
-				       4600 4
+				<3800 3>,
-				       4800 5
+				<4600 4>,
-				       4900 6
+				<4800 5>,
-				       5000 7 >;
+				<4900 6>,
+				<5000 7>;
 	};
 	gpio-leds-alarm-12 {

--- a/arch/arm/boot/dts/marvell/mvebu-linkstation-fan.dtsi
+++ b/arch/arm/boot/dts/marvell/mvebu-linkstation-fan.dtsi
@@ -50,10 +50,10 @@ gpio_fan {
 		pinctrl-names = "default";
 		gpio-fan,speed-map =
-			<0		3
+			<   0 3>,
-			1500	2
+			<1500 2>,
-			3250	1
+			<3250 1>,
-			5000	0>;
+			<5000 0>;
 	};
 };