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: 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>

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 2592e1c..b5933aa 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -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 {

diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 480e237..5954b36 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -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 {

diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 2c7b1fe..735924d 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -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 {

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index e170713..4010eee 100644 (file)
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -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>;