Merge branch 'fortglx/3.19-stable/time' of https://git.linaro.org/people/john.stultz...

[pandora-kernel.git] / arch / arm / boot / dts / armada-xp-mv78260.dtsi

diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 480e237..d7a8d0b 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -251,17 +251,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 {
                                compatible = "marvell,orion-gpio";
                                reg = <0x18100 0x40>;
@@ -305,3 +294,7 @@
                };
        };
 };
+
+&pinctrl {
+       compatible = "marvell,mv78260-pinctrl";
+};