Skip to content

L
linux
Commit 62f34e3e authored by David Heidelberg's avatar David Heidelberg Committed by Gregory CLEMENT
Browse files
Options

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: default avatarSimon Guinot <simon.guinot@sequanux.org>
Signed-off-by: default avatarDavid Heidelberg <david@ixit.cz>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
parent 6e75ac5a
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 112 deletions
arch/arm/boot/dts/marvell/armada-370-rd.dts
View file @ 62f34e3e
......@@ -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";
};
......
arch/arm/boot/dts/marvell/armada-370-seagate-nas-2bay.dts
View file @ 62f34e3e
......@@ -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>;
};
};
arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
View file @ 62f34e3e
......@@ -106,10 +106,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>;
};
};
......
arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
View file @ 62f34e3e
......@@ -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 {
......
arch/arm/boot/dts/marvell/armada-385-synology-ds116.dts
View file @ 62f34e3e
......@@ -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>;
};
......
arch/arm/boot/dts/marvell/armada-388-gp.dts
View file @ 62f34e3e
......@@ -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>;
};
};
......
arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
View file @ 62f34e3e
......@@ -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 {
......
arch/arm/boot/dts/marvell/kirkwood-linkstation-6282.dtsi
View file @ 62f34e3e
......@@ -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>;
};
......
arch/arm/boot/dts/marvell/kirkwood-linkstation-lswxl.dts
View file @ 62f34e3e
......@@ -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>;
};
......
arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
View file @ 62f34e3e
......@@ -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
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>;
};
......
arch/arm/boot/dts/marvell/kirkwood-ns2max.dts
View file @ 62f34e3e
......@@ -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>;
};
......
arch/arm/boot/dts/marvell/kirkwood-ns2mini.dts
View file @ 62f34e3e
......@@ -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>;
};
......
arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
View file @ 62f34e3e
......@@ -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 {
......
arch/arm/boot/dts/marvell/mvebu-linkstation-fan.dtsi
View file @ 62f34e3e
......@@ -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>;
};
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7