ARM: dts: armada388-clearfog: move sdhci pinctrl node to microsom

Move the SDHCI pinctrl node to the microsom file - the microsom can have
optional eMMC support which uses these same pinctrl settings, so it is
sensible to have these here.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index 00618d8f44847fccde699e60e3d7e31cc4a19811..7a30332ae42c3fff05470a6cd90665914130317b 100644 (file)
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -257,12 +257,6 @@
                                        marvell,pins = "mpp20";
                                        marvell,function = "gpio";
                                };
-                               clearfog_sdhci_pins: clearfog-sdhci-pins {
-                                       marvell,pins = "mpp21", "mpp28",
-                                                      "mpp37", "mpp38",
-                                                      "mpp39", "mpp40";
-                                       marvell,function = "sd0";
-                               };
                                clearfog_spi1_cs_pins: spi1-cs-pins {
                                        marvell,pins = "mpp55";
                                        marvell,function = "spi1";
@@ -300,7 +294,7 @@
                                bus-width = <4>;
                                cd-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                                no-1-8-v;
-                               pinctrl-0 = <&clearfog_sdhci_pins
+                               pinctrl-0 = <&microsom_sdhci_pins
                                             &clearfog_sdhci_cd_pins>;
                                pinctrl-names = "default";
                                status = "okay";

diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
index c67e6173e87937d7481c796b47c2503badb0b90c..44e40a1609396f13674b0bc93efe325be2eb642c 100644 (file)
--- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
+++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
@@ -99,6 +99,13 @@
                                        marvell,pins = "mpp45";
                                        marvell,function = "ref";
                                };
+                               /* Optional eMMC */
+                               microsom_sdhci_pins: microsom-sdhci-pins {
+                                       marvell,pins = "mpp21", "mpp28",
+                                                      "mpp37", "mpp38",
+                                                      "mpp39", "mpp40";
+                                       marvell,function = "sd0";
+                               };
                        };
 
                        rtc@a3800 {