arm: kirkwood: mplcec4: use Device Tree to probe SDIO

Now that the mvsdio driver has a Device Tree binding, and the SDIO
controller is declared in kirkwood.dtsi, migrate the mplcec4 board to
use the Device Tree to probe the SDIO controller and to mux the pins
of the SDIO interface correctly.

This patch has not been tested, it remains to be tested by a person
having access to the hardware.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Stefan Peter <s.peter@mpl.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

1 files changed, 9 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index 262c65403760..662dfd81b1ce 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -20,12 +20,11 @@
                 pinctrl: pinctrl@10000 {
 
                         pinctrl-0 = < &pmx_nand &pmx_uart0
-                                      &pmx_led_health &pmx_sdio
+                                      &pmx_led_health
                                       &pmx_sata0 &pmx_sata1
                                       &pmx_led_user1o
                                       &pmx_led_user1g &pmx_led_user0o
                                       &pmx_led_user0g &pmx_led_misc
-                                      &pmx_sdio_cd
                                     >;
                         pinctrl-names = "default";
 
@@ -133,6 +132,14 @@
                         status = "okay";
 
                 };
+
+                mvsdio@90000 {
+                        pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
+                        pinctrl-names = "default";
+                        status = "okay";
+                        cd-gpios = <&gpio1 15 0>;
+                        /* No WP GPIO */
+                };
         };
 
         gpio-leds {