Skip to content

L
linux
Commit 37782cc1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'mvebu-dt-6.8-1' of... 

Merge tag 'mvebu-dt-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

mvebu dt for 6.8 (part 1)

Fix dt for gpio and switch nodes

* tag 'mvebu-dt-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dts: marvell: make dts use gpio-fan matrix instead of array
  ARM: dts: marvell: Fix some common switch mistakes

Link: https://lore.kernel.org/r/87o7ekbyv2.fsf@BL-laptopSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 45038884 62f34e3e
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 220 deletions
arch/arm/boot/dts/marvell/armada-370-rd.dts
View file @ 37782cc1
......@@ -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";
};
......@@ -149,39 +149,37 @@ led@0 {
};
};
switch: switch@10 {
switch: ethernet-switch@10 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x10>;
interrupt-controller;
#interrupt-cells = <2>;
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
ethernet-port@0 {
reg = <0>;
label = "lan0";
};
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan1";
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan3";
};
port@5 {
ethernet-port@5 {
reg = <5>;
ethernet = <&eth1>;
phy-mode = "rgmii-id";
......@@ -196,25 +194,25 @@ mdio {
#address-cells = <1>;
#size-cells = <0>;
switchphy0: switchphy@0 {
switchphy0: ethernet-phy@0 {
reg = <0>;
interrupt-parent = <&switch>;
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
};
switchphy1: switchphy@1 {
switchphy1: ethernet-phy@1 {
reg = <1>;
interrupt-parent = <&switch>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
};
switchphy2: switchphy@2 {
switchphy2: ethernet-phy@2 {
reg = <2>;
interrupt-parent = <&switch>;
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
};
switchphy3: switchphy@3 {
switchphy3: ethernet-phy@3 {
reg = <3>;
interrupt-parent = <&switch>;
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/marvell/armada-370-seagate-nas-2bay.dts
View file @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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-381-netgear-gs110emx.dts
View file @ 37782cc1
......@@ -77,51 +77,49 @@ &mdio {
pinctrl-0 = <&mdio_pins>;
status = "okay";
switch@0 {
ethernet-switch@0 {
compatible = "marvell,mv88e6190";
#address-cells = <1>;
#interrupt-cells = <2>;
interrupt-controller;
interrupt-parent = <&gpio1>;
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
pinctrl-0 = <&switch_interrupt_pins>;
pinctrl-names = "default";
#size-cells = <0>;
reg = <0>;
mdio {
#address-cells = <1>;
#size-cells = <0>;
switch0phy1: switch0phy1@1 {
switch0phy1: ethernet-phy@1 {
reg = <0x1>;
};
switch0phy2: switch0phy2@2 {
switch0phy2: ethernet-phy@2 {
reg = <0x2>;
};
switch0phy3: switch0phy3@3 {
switch0phy3: ethernet-phy@3 {
reg = <0x3>;
};
switch0phy4: switch0phy4@4 {
switch0phy4: ethernet-phy@4 {
reg = <0x4>;
};
switch0phy5: switch0phy5@5 {
switch0phy5: ethernet-phy@5 {
reg = <0x5>;
};
switch0phy6: switch0phy6@6 {
switch0phy6: ethernet-phy@6 {
reg = <0x6>;
};
switch0phy7: switch0phy7@7 {
switch0phy7: ethernet-phy@7 {
reg = <0x7>;
};
switch0phy8: switch0phy8@8 {
switch0phy8: ethernet-phy@8 {
reg = <0x8>;
};
};
......@@ -142,11 +140,11 @@ phy2: ethernet-phy@c {
};
};
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
ethernet-port@0 {
ethernet = <&eth0>;
phy-mode = "rgmii";
reg = <0>;
......@@ -158,55 +156,55 @@ fixed-link {
};
};
port@1 {
ethernet-port@1 {
label = "lan1";
phy-handle = <&switch0phy1>;
reg = <1>;
};
port@2 {
ethernet-port@2 {
label = "lan2";
phy-handle = <&switch0phy2>;
reg = <2>;
};
port@3 {
ethernet-port@3 {
label = "lan3";
phy-handle = <&switch0phy3>;
reg = <3>;
};
port@4 {
ethernet-port@4 {
label = "lan4";
phy-handle = <&switch0phy4>;
reg = <4>;
};
port@5 {
ethernet-port@5 {
label = "lan5";
phy-handle = <&switch0phy5>;
reg = <5>;
};
port@6 {
ethernet-port@6 {
label = "lan6";
phy-handle = <&switch0phy6>;
reg = <6>;
};
port@7 {
ethernet-port@7 {
label = "lan7";
phy-handle = <&switch0phy7>;
reg = <7>;
};
port@8 {
ethernet-port@8 {
label = "lan8";
phy-handle = <&switch0phy8>;
reg = <8>;
};
port@9 {
ethernet-port@9 {
/* 88X3310P external phy */
label = "lan9";
phy-handle = <&phy1>;
......@@ -214,7 +212,7 @@ port@9 {
reg = <9>;
};
port@a {
ethernet-port@a {
/* 88X3310P external phy */
label = "lan10";
phy-handle = <&phy2>;
......
arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
View file @ 37782cc1
......@@ -7,66 +7,66 @@ / {
};
&mdio {
switch0: switch0@4 {
switch0: ethernet-switch@4 {
compatible = "marvell,mv88e6190";
reg = <4>;
pinctrl-names = "default";
pinctrl-0 = <&cf_gtr_switch_reset_pins>;
reset-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan8";
phy-handle = <&switch0phy0>;
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan7";
phy-handle = <&switch0phy1>;
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan6";
phy-handle = <&switch0phy2>;
};
port@4 {
ethernet-port@4 {
reg = <4>;
label = "lan5";
phy-handle = <&switch0phy3>;
};
port@5 {
ethernet-port@5 {
reg = <5>;
label = "lan4";
phy-handle = <&switch0phy4>;
};
port@6 {
ethernet-port@6 {
reg = <6>;
label = "lan3";
phy-handle = <&switch0phy5>;
};
port@7 {
ethernet-port@7 {
reg = <7>;
label = "lan2";
phy-handle = <&switch0phy6>;
};
port@8 {
ethernet-port@8 {
reg = <8>;
label = "lan1";
phy-handle = <&switch0phy7>;
};
port@10 {
ethernet-port@10 {
reg = <10>;
phy-mode = "2500base-x";
......@@ -83,35 +83,35 @@ mdio {
#address-cells = <1>;
#size-cells = <0>;
switch0phy0: switch0phy0@1 {
switch0phy0: ethernet-phy@1 {
reg = <0x1>;
};
switch0phy1: switch0phy1@2 {
switch0phy1: ethernet-phy@2 {
reg = <0x2>;
};
switch0phy2: switch0phy2@3 {
switch0phy2: ethernet-phy@3 {
reg = <0x3>;
};
switch0phy3: switch0phy3@4 {
switch0phy3: ethernet-phy@4 {
reg = <0x4>;
};
switch0phy4: switch0phy4@5 {
switch0phy4: ethernet-phy@5 {
reg = <0x5>;
};
switch0phy5: switch0phy5@6 {
switch0phy5: ethernet-phy@6 {
reg = <0x6>;
};
switch0phy6: switch0phy6@7 {
switch0phy6: ethernet-phy@7 {
reg = <0x7>;
};
switch0phy7: switch0phy7@8 {
switch0phy7: ethernet-phy@8 {
reg = <0x8>;
};
};
......
arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
View file @ 37782cc1
......@@ -11,42 +11,42 @@ &sfp0 {
};
&mdio {
switch0: switch0@4 {
switch0: ethernet-switch@4 {
compatible = "marvell,mv88e6085";
reg = <4>;
pinctrl-names = "default";
pinctrl-0 = <&cf_gtr_switch_reset_pins>;
reset-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan2";
phy-handle = <&switch0phy0>;
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan1";
phy-handle = <&switch0phy1>;
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan4";
phy-handle = <&switch0phy2>;
};
port@4 {
ethernet-port@4 {
reg = <4>;
label = "lan3";
phy-handle = <&switch0phy3>;
};
port@5 {
ethernet-port@5 {
reg = <5>;
phy-mode = "2500base-x";
ethernet = <&eth1>;
......@@ -63,19 +63,19 @@ mdio {
#address-cells = <1>;
#size-cells = <0>;
switch0phy0: switch0phy0@11 {
switch0phy0: ethernet-phy@11 {
reg = <0x11>;
};
switch0phy1: switch0phy1@12 {
switch0phy1: ethernet-phy@12 {
reg = <0x12>;
};
switch0phy2: switch0phy2@13 {
switch0phy2: ethernet-phy@13 {
reg = <0x13>;
};
switch0phy3: switch0phy3@14 {
switch0phy3: ethernet-phy@14 {
reg = <0x14>;
};
};
......
arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
View file @ 37782cc1
......@@ -158,42 +158,40 @@ nand: nand@0 {
&mdio {
status = "okay";
switch@0 {
ethernet-switch@0 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
ethernet-port@0 {
reg = <0>;
label = "lan4";
};
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan3";
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan1";
};
port@4 {
ethernet-port@4 {
reg = <4>;
label = "wan";
};
port@5 {
ethernet-port@5 {
reg = <5>;
phy-mode = "sgmii";
ethernet = <&eth2>;
......
arch/arm/boot/dts/marvell/armada-385-synology-ds116.dts
View file @ 37782cc1
......@@ -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-385-turris-omnia.dts
View file @ 37782cc1
......@@ -435,12 +435,10 @@ phy1: ethernet-phy@1 {
};
/* Switch MV88E6176 at address 0x10 */
switch@10 {
ethernet-switch@10 {
pinctrl-names = "default";
pinctrl-0 = <&swint_pins>;
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
dsa,member = <0 0>;
reg = <0x10>;
......@@ -448,36 +446,36 @@ switch@10 {
interrupt-parent = <&gpio1>;
interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
ports@0 {
ethernet-port@0 {
reg = <0>;
label = "lan0";
};
ports@1 {
ethernet-port@1 {
reg = <1>;
label = "lan1";
};
ports@2 {
ethernet-port@2 {
reg = <2>;
label = "lan2";
};
ports@3 {
ethernet-port@3 {
reg = <3>;
label = "lan3";
};
ports@4 {
ethernet-port@4 {
reg = <4>;
label = "lan4";
};
ports@5 {
ethernet-port@5 {
reg = <5>;
ethernet = <&eth1>;
phy-mode = "rgmii-id";
......@@ -488,7 +486,7 @@ fixed-link {
};
};
ports@6 {
ethernet-port@6 {
reg = <6>;
ethernet = <&eth0>;
phy-mode = "rgmii-id";
......
arch/arm/boot/dts/marvell/armada-388-clearfog.dts
View file @ 37782cc1
......@@ -92,44 +92,42 @@ pcie2-0-w-disable-hog {
&mdio {
status = "okay";
switch@4 {
ethernet-switch@4 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <4>;
pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>;
pinctrl-names = "default";
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
ethernet-port@0 {
reg = <0>;
label = "lan5";
};
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan4";
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan3";
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan2";
};
port@4 {
ethernet-port@4 {
reg = <4>;
label = "lan1";
};
port@5 {
ethernet-port@5 {
reg = <5>;
ethernet = <&eth1>;
phy-mode = "1000base-x";
......@@ -140,7 +138,7 @@ fixed-link {
};
};
port@6 {
ethernet-port@6 {
/* 88E1512 external phy */
reg = <6>;
label = "lan6";
......
arch/arm/boot/dts/marvell/armada-388-gp.dts
View file @ 37782cc1
......@@ -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/armada-xp-linksys-mamba.dts
View file @ 37782cc1
......@@ -265,42 +265,40 @@ flash@0 {
&mdio {
status = "okay";
switch@0 {
ethernet-switch@0 {
compatible = "marvell,mv88e6085";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
ethernet-port@0 {
reg = <0>;
label = "lan4";
};
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan3";
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan1";
};
port@4 {
ethernet-port@4 {
reg = <4>;
label = "internet";
};
port@5 {
ethernet-port@5 {
reg = <5>;
phy-mode = "rgmii-id";
ethernet = <&eth0>;
......
arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
View file @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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 @ 37782cc1
......@@ -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