Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[cascardo/linux.git] / arch / arm / mach-at91 / board-cpu9krea.c

diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c
index ecbc13b..e71c473 100644 (file)
--- a/arch/arm/mach-at91/board-cpu9krea.c
+++ b/arch/arm/mach-at91/board-cpu9krea.c
@@ -254,8 +254,7 @@ static struct gpio_led cpu9krea_leds[] = {
 
 static struct i2c_board_info __initdata cpu9krea_i2c_devices[] = {
        {
-               I2C_BOARD_INFO("rtc-ds1307", 0x68),
-               .type   = "ds1339",
+               I2C_BOARD_INFO("ds1339", 0x68),
        },
 };
 
@@ -312,12 +311,12 @@ static void __init cpu9krea_add_device_buttons(void)
 /*
  * MCI (SD/MMC)
  */
-static struct at91_mmc_data __initdata cpu9krea_mmc_data = {
-       .slot_b         = 0,
-       .wire4          = 1,
-       .det_pin        = AT91_PIN_PA29,
-       .wp_pin         = -EINVAL,
-       .vcc_pin        = -EINVAL,
+static struct mci_platform_data __initdata cpu9krea_mci0_data = {
+       .slot[0] = {
+               .bus_width      = 4,
+               .detect_pin     = AT91_PIN_PA29,
+               .wp_pin         = -EINVAL,
+       },
 };
 
 static void __init cpu9krea_board_init(void)
@@ -359,7 +358,7 @@ static void __init cpu9krea_board_init(void)
        /* Ethernet */
        at91_add_device_eth(&cpu9krea_macb_data);
        /* MMC */
-       at91_add_device_mmc(0, &cpu9krea_mmc_data);
+       at91_add_device_mci(0, &cpu9krea_mci0_data);
        /* I2C */
        at91_add_device_i2c(cpu9krea_i2c_devices,
                ARRAY_SIZE(cpu9krea_i2c_devices));