diff options
-rw-r--r-- | arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/board-dreamplug.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index f2d386c95b07..ef2d8c705709 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts | |||
@@ -74,6 +74,13 @@ | |||
74 | status = "okay"; | 74 | status = "okay"; |
75 | nr-ports = <1>; | 75 | nr-ports = <1>; |
76 | }; | 76 | }; |
77 | |||
78 | mvsdio@90000 { | ||
79 | pinctrl-0 = <&pmx_sdio>; | ||
80 | pinctrl-names = "default"; | ||
81 | status = "okay"; | ||
82 | /* No CD or WP GPIOs */ | ||
83 | }; | ||
77 | }; | 84 | }; |
78 | 85 | ||
79 | gpio-leds { | 86 | gpio-leds { |
diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c index 08248e24ffcd..0903242c00dc 100644 --- a/arch/arm/mach-kirkwood/board-dreamplug.c +++ b/arch/arm/mach-kirkwood/board-dreamplug.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/mv643xx_eth.h> | 16 | #include <linux/mv643xx_eth.h> |
17 | #include <linux/gpio.h> | 17 | #include <linux/gpio.h> |
18 | #include <linux/platform_data/mmc-mvsdio.h> | ||
19 | #include "common.h" | 18 | #include "common.h" |
20 | 19 | ||
21 | static struct mv643xx_eth_platform_data dreamplug_ge00_data = { | 20 | static struct mv643xx_eth_platform_data dreamplug_ge00_data = { |
@@ -26,10 +25,6 @@ static struct mv643xx_eth_platform_data dreamplug_ge01_data = { | |||
26 | .phy_addr = MV643XX_ETH_PHY_ADDR(1), | 25 | .phy_addr = MV643XX_ETH_PHY_ADDR(1), |
27 | }; | 26 | }; |
28 | 27 | ||
29 | static struct mvsdio_platform_data dreamplug_mvsdio_data = { | ||
30 | /* unfortunately the CD signal has not been connected */ | ||
31 | }; | ||
32 | |||
33 | void __init dreamplug_init(void) | 28 | void __init dreamplug_init(void) |
34 | { | 29 | { |
35 | /* | 30 | /* |
@@ -37,5 +32,4 @@ void __init dreamplug_init(void) | |||
37 | */ | 32 | */ |
38 | kirkwood_ge00_init(&dreamplug_ge00_data); | 33 | kirkwood_ge00_init(&dreamplug_ge00_data); |
39 | kirkwood_ge01_init(&dreamplug_ge01_data); | 34 | kirkwood_ge01_init(&dreamplug_ge01_data); |
40 | kirkwood_sdio_init(&dreamplug_mvsdio_data); | ||
41 | } | 35 | } |