ARM: kirkwood: make use of DT mvsdio on guruplug board

Device tree based guruplug boards still use mvsdio platform_data and
kirkwood_sdio_init to enable sdio. DT support for sdio is already there,
so make use of it.

This also fixes mvsdio accidentially breaking nand by configuring mpp0
to gpio, while used also by nand (nand_io2 on mpp0).

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Soeren Moch <smoch@web.de>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index 9555a86297c284366a54affc68feec11b6bcd6a7..44fd97dfc1f36b58205e5976e33d1f160ddba95e 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -69,6 +69,10 @@
                        status = "okay";
                        nr-ports = <1>;
                };
+
+               mvsdio@90000 {
+                       status = "okay";
+               };
        };
 
        gpio-leds {

diff --git a/arch/arm/mach-kirkwood/board-guruplug.c b/arch/arm/mach-kirkwood/board-guruplug.c
index 0a0df4554d8b2fd9b71c07266e186d2426d35150..a857163954a58add37c176636992d44c21727a31 100644 (file)
--- a/arch/arm/mach-kirkwood/board-guruplug.c
+++ b/arch/arm/mach-kirkwood/board-guruplug.c
@@ -13,7 +13,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 guruplug_ge00_data = {
@@ -24,10 +23,6 @@ static struct mv643xx_eth_platform_data guruplug_ge01_data = {
        .phy_addr       = MV643XX_ETH_PHY_ADDR(1),
 };
 
-static struct mvsdio_platform_data guruplug_mvsdio_data = {
-       /* unfortunately the CD signal has not been connected */
-};
-
 void __init guruplug_dt_init(void)
 {
        /*
@@ -35,5 +30,4 @@ void __init guruplug_dt_init(void)
         */
        kirkwood_ge00_init(&guruplug_ge00_data);
        kirkwood_ge01_init(&guruplug_ge01_data);
-       kirkwood_sdio_init(&guruplug_mvsdio_data);
 }