Skip to content

Commit

Permalink
ARM: mvebu: armada-xp: Use pinctrl node alias
Browse files Browse the repository at this point in the history 
Armada XP pinctrl node gained an alias, make use of it.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Sebastian Hesselbarth authored and Jason Cooper committed Nov 2, 2014
1 parent 264a05e commit 01c4342
Show file tree
Hide file tree
Showing 7 changed files with 167 additions and 165 deletions.
68 changes: 34 additions & 34 deletions arch/arm/boot/dts/armada-xp-axpwifiap.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,40 +60,6 @@
};

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 {
status = "okay";
};
Expand Down Expand Up @@ -162,3 +128,37 @@
};
};
};

&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";
};
};
62 changes: 31 additions & 31 deletions arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,37 +51,6 @@
};

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 {
status = "okay";
};
Expand Down Expand Up @@ -282,3 +251,34 @@
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";
};
};
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/armada-xp-mv78230.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,6 @@
};

internal-regs {
pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78230-pinctrl";
};

gpio0: gpio@18100 {
compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>;
Expand All @@ -195,3 +191,7 @@
};
};
};

&pinctrl {
compatible = "marvell,mv78230-pinctrl";
};
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/armada-xp-mv78260.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,6 @@
};

internal-regs {
pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78260-pinctrl";
};

gpio0: gpio@18100 {
compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>;
Expand Down Expand Up @@ -298,3 +294,7 @@
};
};
};

&pinctrl {
compatible = "marvell,mv78260-pinctrl";
};
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/armada-xp-mv78460.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,6 @@
};

internal-regs {
pinctrl: pin-ctrl@18000 {
compatible = "marvell,mv78460-pinctrl";
};

gpio0: gpio@18100 {
compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>;
Expand Down Expand Up @@ -336,3 +332,7 @@
};
};
};

&pinctrl {
compatible = "marvell,mv78460-pinctrl";
};
164 changes: 82 additions & 82 deletions arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,88 +55,6 @@
};

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 */
sata@a0000 {
nr-ports = <2>;
Expand Down Expand Up @@ -334,3 +252,85 @@
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";
};
};
Loading

0 comments on commit 01c4342

Please sign in to comment.