ARM: ux500: move MMC/SD/SDIO pin control to the device tree

This moves the static, device-tied pin control configuration
out of the board file board-mop500-pins.c and into the device
tree. Add entries for SDI1 and SDI2 on the Snowball so that the
WLAN pins on SDI1 can be used further on, and the unused pins
on SDI2 can be put to sleep.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 43 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index f8df43e0791d..c2cb3ea637dc 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -137,6 +137,9 @@
                         mmc-cap-mmc-highspeed;
                         vmmc-supply = <&ab8500_ldo_aux3_reg>;
                         vqmmc-supply = <&vmmci>;
+                        pinctrl-names = "default", "sleep";
+                        pinctrl-0 = <&sdi0_default_mode>;
+                        pinctrl-1 = <&sdi0_sleep_mode>;
 
                         cd-gpios  = <&gpio6 26 0x4>; // 218
                         cd-inverted;
@@ -144,6 +147,27 @@
                         status = "okay";
                 };
 
+                // WLAN SDIO channel
+                sdi1_per2@80118000 {
+                        arm,primecell-periphid = <0x10480180>;
+                        max-frequency = <100000000>;
+                        bus-width = <4>;
+                        pinctrl-names = "default", "sleep";
+                        pinctrl-0 = <&sdi1_default_mode>;
+                        pinctrl-1 = <&sdi1_sleep_mode>;
+
+                        status = "okay";
+                };
+
+                // Unused PoP eMMC - register and put it to sleep by default */
+                sdi2_per3@80005000 {
+                        arm,primecell-periphid = <0x10480180>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&sdi2_sleep_mode>;
+
+                        status = "okay";
+                };
+
                 // On-board eMMC
                 sdi4_per2@80114000 {
                         arm,primecell-periphid = <0x10480180>;
@@ -151,6 +175,9 @@
                         bus-width = <8>;
                         mmc-cap-mmc-highspeed;
                         vmmc-supply = <&ab8500_ldo_aux2_reg>;
+                        pinctrl-names = "default", "sleep";
+                        pinctrl-0 = <&sdi4_default_mode>;
+                        pinctrl-1 = <&sdi4_sleep_mode>;
 
                         status = "okay";
                 };
@@ -300,5 +327,21 @@
                                 };
                         };
                 };
+
+                pinctrl {
+                        sdi0 {
+                                sdi0_default_mode: sdi0_default {
+                                        snowball_mux {
+                                                ste,function = "mc0";
+                                                ste,pins = "mc0dat31dir_a_1";
+                                        };
+                                        snowball_cfg1 {
+                                                ste,pins = "GPIO21_AB3"; /* DAT31DIR */
+                                                ste,config = <&out_hi>;
+                                        };
+
+                                };
+                        };
+                };
         };
 };