aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/kirkwood-topkick.dts7
-rw-r--r--arch/arm/mach-kirkwood/board-usi_topkick.c6
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 @@
149 i2c@11000 { 149 i2c@11000 {
150 status = "ok"; 150 status = "ok";
151 }; 151 };
152
153 mvsdio@90000 {
154 pinctrl-0 = <&pmx_sdio>;
155 pinctrl-names = "default";
156 status = "okay";
157 /* No CD or WP GPIOs */
158 };
152 }; 159 };
153 160
154 gpio-leds { 161 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 @@
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/mv643xx_eth.h> 15#include <linux/mv643xx_eth.h>
16#include <linux/gpio.h> 16#include <linux/gpio.h>
17#include <linux/platform_data/mmc-mvsdio.h>
18#include "common.h" 17#include "common.h"
19 18
20static struct mv643xx_eth_platform_data topkick_ge00_data = { 19static struct mv643xx_eth_platform_data topkick_ge00_data = {
21 .phy_addr = MV643XX_ETH_PHY_ADDR(0), 20 .phy_addr = MV643XX_ETH_PHY_ADDR(0),
22}; 21};
23 22
24static struct mvsdio_platform_data topkick_mvsdio_data = {
25 /* unfortunately the CD signal has not been connected */
26};
27
28void __init usi_topkick_init(void) 23void __init usi_topkick_init(void)
29{ 24{
30 /* 25 /*
31 * Basic setup. Needs to be called early. 26 * Basic setup. Needs to be called early.
32 */ 27 */
33 kirkwood_ge00_init(&topkick_ge00_data); 28 kirkwood_ge00_init(&topkick_ge00_data);
34 kirkwood_sdio_init(&topkick_mvsdio_data);
35} 29}