Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci

[~andy/linux] / arch / arm / mach-at91 / board-rm9200dk.c

diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
index cc2bf9796073bcb096883059c7cced4153287a91..66338e7ebfba69b1ce5f6b3b1fe669cbffb7c8fe 100644 (file)
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -77,12 +77,12 @@ static struct at91_cf_data __initdata dk_cf_data = {
 };
 
 #ifndef CONFIG_MTD_AT91_DATAFLASH_CARD
-static struct at91_mmc_data __initdata dk_mmc_data = {
-       .slot_b         = 0,
-       .wire4          = 1,
-       .det_pin        = -EINVAL,
-       .wp_pin         = -EINVAL,
-       .vcc_pin        = -EINVAL,
+static struct mci_platform_data __initdata dk_mci0_data = {
+       .slot[0] = {
+               .bus_width      = 4,
+               .detect_pin     = -EINVAL,
+               .wp_pin         = -EINVAL,
+       },
 };
 #endif
 
@@ -177,9 +177,6 @@ static struct gpio_led dk_leds[] = {
 
 static void __init dk_board_init(void)
 {
-       /* Setup the LEDs */
-       at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
-
        /* Serial */
        /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
@@ -208,7 +205,7 @@ static void __init dk_board_init(void)
 #else
        /* MMC */
        at91_set_gpio_output(AT91_PIN_PB7, 1);  /* this MMC card slot can optionally use SPI signaling (CS3). */
-       at91_add_device_mmc(0, &dk_mmc_data);
+       at91_add_device_mci(0, &dk_mci0_data);
 #endif
        /* NAND */
        at91_add_device_nand(&dk_nand_data);