From c10c03394b69e627ff3a31e94b2d8639f0f29ad6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Fri, 21 Dec 2012 15:49:11 +0100
Subject: [PATCH] --- yaml --- r: 359931 b: refs/heads/master c:
 a49da46c5274228334393083a6635d04eee04363 h: refs/heads/master i:   359929:
 e06f112028e4a28beca80954484151a76fb677ff   359927:
 89d4325691ddf160c316cca8c780f076297514b9 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +++++++
 trunk/arch/arm/mach-kirkwood/board-dreamplug.c | 6 ------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 98cfa074c9aa..c7ed6e465ccd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec05fcf679fe97994b5355ebf1d7d8cb0020eacf
+refs/heads/master: a49da46c5274228334393083a6635d04eee04363
diff --git a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
index f2d386c95b07..ef2d8c705709 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -74,6 +74,13 @@
 			status = "okay";
 			nr-ports = <1>;
 		};
+
+		mvsdio@90000 {
+			pinctrl-0 = <&pmx_sdio>;
+			pinctrl-names = "default";
+			status = "okay";
+			/* No CD or WP GPIOs */
+		};
 	};
 
 	gpio-leds {
diff --git a/trunk/arch/arm/mach-kirkwood/board-dreamplug.c b/trunk/arch/arm/mach-kirkwood/board-dreamplug.c
index 08248e24ffcd..0903242c00dc 100644
--- a/trunk/arch/arm/mach-kirkwood/board-dreamplug.c
+++ b/trunk/arch/arm/mach-kirkwood/board-dreamplug.c
@@ -15,7 +15,6 @@
 #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 dreamplug_ge00_data = {
@@ -26,10 +25,6 @@ static struct mv643xx_eth_platform_data dreamplug_ge01_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(1),
 };
 
-static struct mvsdio_platform_data dreamplug_mvsdio_data = {
-	/* unfortunately the CD signal has not been connected */
-};
-
 void __init dreamplug_init(void)
 {
 	/*
@@ -37,5 +32,4 @@ void __init dreamplug_init(void)
 	 */
 	kirkwood_ge00_init(&dreamplug_ge00_data);
 	kirkwood_ge01_init(&dreamplug_ge01_data);
-	kirkwood_sdio_init(&dreamplug_mvsdio_data);
 }