4 files changed, 10 insertions, 21 deletions

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 2592e1c13560..b5933aa9ab50 100644
--- 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 480e237a870f..5954b362180c 100644
--- 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 2c7b1fef4703..735924d62e12 100644
--- 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 e1707133ee18..4010eee93df7 100644
--- 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>;