Commit b324fa60 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper

ARM: mvebu: armada-xp: Consolidate pinctrl node

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: 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 dd5dc02e
...@@ -169,13 +169,6 @@ pcie@5,0 { ...@@ -169,13 +169,6 @@ pcie@5,0 {
internal-regs { internal-regs {
pinctrl { pinctrl {
compatible = "marvell,mv78230-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 { gpio0: gpio@18100 {
......
...@@ -253,13 +253,6 @@ pcie@9,0 { ...@@ -253,13 +253,6 @@ pcie@9,0 {
internal-regs { internal-regs {
pinctrl { pinctrl {
compatible = "marvell,mv78260-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 { gpio0: gpio@18100 {
......
...@@ -291,13 +291,6 @@ pcie@10,0 { ...@@ -291,13 +291,6 @@ pcie@10,0 {
internal-regs { internal-regs {
pinctrl { pinctrl {
compatible = "marvell,mv78460-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 { gpio0: gpio@18100 {
......
...@@ -72,6 +72,16 @@ serial@12300 { ...@@ -72,6 +72,16 @@ serial@12300 {
status = "disabled"; status = "disabled";
}; };
pinctrl {
reg = <0x18000 0x38>;
sdio_pins: sdio-pins {
marvell,pins = "mpp30", "mpp31", "mpp32",
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};
};
system-controller@18200 { system-controller@18200 {
compatible = "marvell,armada-370-xp-system-controller"; compatible = "marvell,armada-370-xp-system-controller";
reg = <0x18200 0x500>; reg = <0x18200 0x500>;
......
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