Skip to content

L
linux
Commit 01c43422 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper
Browse files
Options

ARM: mvebu: armada-xp: Use pinctrl node alias 

Armada XP pinctrl node gained an alias, make use of it.
Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-By: default avatarBenoit Masson <yahoo@perenite.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 264a05e1
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 165 deletions
arch/arm/boot/dts/armada-xp-axpwifiap.dts
View file @ 01c43422
...@@ -60,40 +60,6 @@ pcie@3,0 { ...@@ -60,40 +60,6 @@ pcie@3,0 {
}; };
internal-regs { internal-regs {
pinctrl: pin-ctrl@18000 {
pinctrl-0 = <&pmx_phy_int>;
pinctrl-names = "default";
pmx_ge0: pmx-ge0 {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp6", "mpp7",
"mpp8", "mpp9", "mpp10", "mpp11";
marvell,function = "ge0";
};
pmx_ge1: pmx-ge1 {
marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15",
"mpp16", "mpp17", "mpp18", "mpp19",
"mpp20", "mpp21", "mpp22", "mpp23";
marvell,function = "ge1";
};
pmx_keys: pmx-keys {
marvell,pins = "mpp33";
marvell,function = "gpio";
};
pmx_spi: pmx-spi {
marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
marvell,function = "spi";
};
pmx_phy_int: pmx-phy-int {
marvell,pins = "mpp32";
marvell,function = "gpio";
};
};
serial@12000 { serial@12000 {
status = "okay"; status = "okay";
}; };
...@@ -162,3 +128,37 @@ button@1 { ...@@ -162,3 +128,37 @@ button@1 {
}; };
}; };
}; };
&pinctrl {
pinctrl-0 = <&pmx_phy_int>;
pinctrl-names = "default";
pmx_ge0: pmx-ge0 {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp6", "mpp7",
"mpp8", "mpp9", "mpp10", "mpp11";
marvell,function = "ge0";
};
pmx_ge1: pmx-ge1 {
marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15",
"mpp16", "mpp17", "mpp18", "mpp19",
"mpp20", "mpp21", "mpp22", "mpp23";
marvell,function = "ge1";
};
pmx_keys: pmx-keys {
marvell,pins = "mpp33";
marvell,function = "gpio";
};
pmx_spi: pmx-spi {
marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
marvell,function = "spi";
};
pmx_phy_int: pmx-phy-int {
marvell,pins = "mpp32";
marvell,function = "gpio";
};
};
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
View file @ 01c43422
...@@ -51,37 +51,6 @@ pcie@5,0 { ...@@ -51,37 +51,6 @@ pcie@5,0 {
}; };
internal-regs { internal-regs {
pinctrl: pin-ctrl@18000 {
poweroff_pin: poweroff-pin {
marvell,pins = "mpp24";
marvell,function = "gpio";
};
power_button_pin: power-button-pin {
marvell,pins = "mpp44";
marvell,function = "gpio";
};
reset_button_pin: reset-button-pin {
marvell,pins = "mpp45";
marvell,function = "gpio";
};
select_button_pin: select-button-pin {
marvell,pins = "mpp41";
marvell,function = "gpio";
};
scroll_button_pin: scroll-button-pin {
marvell,pins = "mpp42";
marvell,function = "gpio";
};
hdd_led_pin: hdd-led-pin {
marvell,pins = "mpp26";
marvell,function = "gpio";
};
};
serial@12000 { serial@12000 {
status = "okay"; status = "okay";
}; };
...@@ -282,3 +251,34 @@ gpio-poweroff { ...@@ -282,3 +251,34 @@ gpio-poweroff {
gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
}; };
}; };
&pinctrl {
poweroff_pin: poweroff-pin {
marvell,pins = "mpp24";
marvell,function = "gpio";
};
power_button_pin: power-button-pin {
marvell,pins = "mpp44";
marvell,function = "gpio";
};
reset_button_pin: reset-button-pin {
marvell,pins = "mpp45";
marvell,function = "gpio";
};
select_button_pin: select-button-pin {
marvell,pins = "mpp41";
marvell,function = "gpio";
};
scroll_button_pin: scroll-button-pin {
marvell,pins = "mpp42";
marvell,function = "gpio";
};
hdd_led_pin: hdd-led-pin {
marvell,pins = "mpp26";
marvell,function = "gpio";
};
};
arch/arm/boot/dts/armada-xp-mv78230.dtsi
View file @ 01c43422
...@@ -167,10 +167,6 @@ pcie@5,0 { ...@@ -167,10 +167,6 @@ pcie@5,0 {
}; };
internal-regs { internal-regs {
pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78230-pinctrl";
};
gpio0: gpio@18100 { gpio0: gpio@18100 {
compatible = "marvell,orion-gpio"; compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>; reg = <0x18100 0x40>;
...@@ -195,3 +191,7 @@ gpio1: gpio@18140 { ...@@ -195,3 +191,7 @@ gpio1: gpio@18140 {
}; };
}; };
}; };
&pinctrl {
compatible = "marvell,mv78230-pinctrl";
};
arch/arm/boot/dts/armada-xp-mv78260.dtsi
View file @ 01c43422
...@@ -251,10 +251,6 @@ pcie@9,0 { ...@@ -251,10 +251,6 @@ pcie@9,0 {
}; };
internal-regs { internal-regs {
pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78260-pinctrl";
};
gpio0: gpio@18100 { gpio0: gpio@18100 {
compatible = "marvell,orion-gpio"; compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>; reg = <0x18100 0x40>;
...@@ -298,3 +294,7 @@ eth3: ethernet@34000 { ...@@ -298,3 +294,7 @@ eth3: ethernet@34000 {
}; };
}; };
}; };
&pinctrl {
compatible = "marvell,mv78260-pinctrl";
};
arch/arm/boot/dts/armada-xp-mv78460.dtsi
View file @ 01c43422
...@@ -289,10 +289,6 @@ pcie@10,0 { ...@@ -289,10 +289,6 @@ pcie@10,0 {
}; };
internal-regs { internal-regs {
pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78460-pinctrl";
};
gpio0: gpio@18100 { gpio0: gpio@18100 {
compatible = "marvell,orion-gpio"; compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>; reg = <0x18100 0x40>;
...@@ -336,3 +332,7 @@ eth3: ethernet@34000 { ...@@ -336,3 +332,7 @@ eth3: ethernet@34000 {
}; };
}; };
}; };
&pinctrl {
compatible = "marvell,mv78460-pinctrl";
};
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
View file @ 01c43422
...@@ -55,88 +55,6 @@ pcie@5,0 { ...@@ -55,88 +55,6 @@ pcie@5,0 {
}; };
internal-regs { internal-regs {
pinctrl: pin-ctrl@18000 {
poweroff: poweroff {
marvell,pins = "mpp42";
marvell,function = "gpio";
};
power_button_pin: power-button-pin {
marvell,pins = "mpp27";
marvell,function = "gpio";
};
reset_button_pin: reset-button-pin {
marvell,pins = "mpp41";
marvell,function = "gpio";
};
sata1_led_pin: sata1-led-pin {
marvell,pins = "mpp31";
marvell,function = "gpio";
};
sata2_led_pin: sata2-led-pin {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
sata3_led_pin: sata3-led-pin {
marvell,pins = "mpp44";
marvell,function = "gpio";
};
sata4_led_pin: sata4-led-pin {
marvell,pins = "mpp47";
marvell,function = "gpio";
};
sata1_power_pin: sata1-power-pin {
marvell,pins = "mpp24";
marvell,function = "gpio";
};
sata2_power_pin: sata2-power-pin {
marvell,pins = "mpp25";
marvell,function = "gpio";
};
sata3_power_pin: sata3-power-pin {
marvell,pins = "mpp26";
marvell,function = "gpio";
};
sata4_power_pin: sata4-power-pin {
marvell,pins = "mpp28";
marvell,function = "gpio";
};
sata1_pres_pin: sata1-pres-pin {
marvell,pins = "mpp32";
marvell,function = "gpio";
};
sata2_pres_pin: sata2-pres-pin {
marvell,pins = "mpp33";
marvell,function = "gpio";
};
sata3_pres_pin: sata3-pres-pin {
marvell,pins = "mpp34";
marvell,function = "gpio";
};
sata4_pres_pin: sata4-pres-pin {
marvell,pins = "mpp35";
marvell,function = "gpio";
};
err_led_pin: err-led-pin {
marvell,pins = "mpp45";
marvell,function = "gpio";
};
};
/* Two rear eSATA ports */ /* Two rear eSATA ports */
sata@a0000 { sata@a0000 {
nr-ports = <2>; nr-ports = <2>;
...@@ -334,3 +252,85 @@ gpio-poweroff { ...@@ -334,3 +252,85 @@ gpio-poweroff {
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
}; };
}; };
&pinctrl {
poweroff: poweroff {
marvell,pins = "mpp42";
marvell,function = "gpio";
};
power_button_pin: power-button-pin {
marvell,pins = "mpp27";
marvell,function = "gpio";
};
reset_button_pin: reset-button-pin {
marvell,pins = "mpp41";
marvell,function = "gpio";
};
sata1_led_pin: sata1-led-pin {
marvell,pins = "mpp31";
marvell,function = "gpio";
};
sata2_led_pin: sata2-led-pin {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
sata3_led_pin: sata3-led-pin {
marvell,pins = "mpp44";
marvell,function = "gpio";
};
sata4_led_pin: sata4-led-pin {
marvell,pins = "mpp47";
marvell,function = "gpio";
};
sata1_power_pin: sata1-power-pin {
marvell,pins = "mpp24";
marvell,function = "gpio";
};
sata2_power_pin: sata2-power-pin {
marvell,pins = "mpp25";
marvell,function = "gpio";
};
sata3_power_pin: sata3-power-pin {
marvell,pins = "mpp26";
marvell,function = "gpio";
};
sata4_power_pin: sata4-power-pin {
marvell,pins = "mpp28";
marvell,function = "gpio";
};
sata1_pres_pin: sata1-pres-pin {
marvell,pins = "mpp32";
marvell,function = "gpio";
};
sata2_pres_pin: sata2-pres-pin {
marvell,pins = "mpp33";
marvell,function = "gpio";
};
sata3_pres_pin: sata3-pres-pin {
marvell,pins = "mpp34";
marvell,function = "gpio";
};
sata4_pres_pin: sata4-pres-pin {
marvell,pins = "mpp35";
marvell,function = "gpio";
};
err_led_pin: err-led-pin {
marvell,pins = "mpp45";
marvell,function = "gpio";
};
};
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
View file @ 01c43422
...@@ -77,12 +77,7 @@ serial@12000 { ...@@ -77,12 +77,7 @@ serial@12000 {
serial@12100 { serial@12100 {
status = "okay"; status = "okay";
}; };
pinctrl: pin-ctrl@18000 {
led_pins: led-pins-0 {
marvell,pins = "mpp49", "mpp51", "mpp53";
marvell,function = "gpio";
};
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -187,3 +182,10 @@ usb@51000 { ...@@ -187,3 +182,10 @@ usb@51000 {
}; };
}; };
}; };
&pinctrl {
led_pins: led-pins-0 {
marvell,pins = "mpp49", "mpp51", "mpp53";
marvell,function = "gpio";
};
};
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