ARM: kirkwood: topkick: init mvsdio via DT

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Tested-by: Andrew Lunn <andrew@lunn.ch>

2 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 754f7efc0eec..842ff95d60df 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -149,6 +149,13 @@
                 i2c@11000 {
                         status = "ok";
                 };
+
+                mvsdio@90000 {
+                        pinctrl-0 = <&pmx_sdio>;
+                        pinctrl-names = "default";
+                        status = "okay";
+                        /* No CD or WP GPIOs */
+                };
         };
 
         gpio-leds {
diff --git a/arch/arm/mach-kirkwood/board-usi_topkick.c b/arch/arm/mach-kirkwood/board-usi_topkick.c
index 3fce1d018966..1cc04ec33f0b 100644
--- a/arch/arm/mach-kirkwood/board-usi_topkick.c
+++ b/arch/arm/mach-kirkwood/board-usi_topkick.c
@@ -14,22 +14,16 @@
 #include <linux/init.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio.h>
-#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 
 static struct mv643xx_eth_platform_data topkick_ge00_data = {
         .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
 };
 
-static struct mvsdio_platform_data topkick_mvsdio_data = {
-        /* unfortunately the CD signal has not been connected */
-};
-
 void __init usi_topkick_init(void)
 {
         /*
          * Basic setup. Needs to be called early.
          */
         kirkwood_ge00_init(&topkick_ge00_data);
-        kirkwood_sdio_init(&topkick_mvsdio_data);
 }