Skip to content

Commit

Permalink
ARM: mvebu: armada-xp: Consolidate pinctrl node
Browse files Browse the repository at this point in the history
All current Armada XP SoCs have their pin controller at 0x18000/0x38.
Move the common properties of pinctrl nodes to armada-xp.dtsi to allow
to share pinctrl settings later.

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 dd5dc02 commit b324fa6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 21 deletions.
7 changes: 0 additions & 7 deletions arch/arm/boot/dts/armada-xp-mv78230.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,6 @@
internal-regs {
pinctrl {
compatible = "marvell,mv78230-pinctrl";
reg = <0x18000 0x38>;

sdio_pins: sdio-pins {
marvell,pins = "mpp30", "mpp31", "mpp32",
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};
};

gpio0: gpio@18100 {
Expand Down
7 changes: 0 additions & 7 deletions arch/arm/boot/dts/armada-xp-mv78260.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,6 @@
internal-regs {
pinctrl {
compatible = "marvell,mv78260-pinctrl";
reg = <0x18000 0x38>;

sdio_pins: sdio-pins {
marvell,pins = "mpp30", "mpp31", "mpp32",
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};
};

gpio0: gpio@18100 {
Expand Down
7 changes: 0 additions & 7 deletions arch/arm/boot/dts/armada-xp-mv78460.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -291,13 +291,6 @@
internal-regs {
pinctrl {
compatible = "marvell,mv78460-pinctrl";
reg = <0x18000 0x38>;

sdio_pins: sdio-pins {
marvell,pins = "mpp30", "mpp31", "mpp32",
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};
};

gpio0: gpio@18100 {
Expand Down
10 changes: 10 additions & 0 deletions arch/arm/boot/dts/armada-xp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@
status = "disabled";
};

pinctrl {
reg = <0x18000 0x38>;

sdio_pins: sdio-pins {
marvell,pins = "mpp30", "mpp31", "mpp32",
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};
};

system-controller@18200 {
compatible = "marvell,armada-370-xp-system-controller";
reg = <0x18200 0x500>;
Expand Down

0 comments on commit b324fa6

Please sign in to comment.