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

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

diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c
index d1e1f3fc0a47a06d912eddc622048b0663c8be8d..0cfac16ee9d5e75392ebd025e21521c34f33d3ab 100644 (file)
--- a/arch/arm/mach-at91/board-eb9200.c
+++ b/arch/arm/mach-at91/board-eb9200.c
@@ -70,12 +70,12 @@ static struct at91_cf_data __initdata eb9200_cf_data = {
        .rst_pin        = AT91_PIN_PC5,
 };
 
-static struct at91_mmc_data __initdata eb9200_mmc_data = {
-       .slot_b         = 0,
-       .wire4          = 1,
-       .det_pin        = -EINVAL,
-       .wp_pin         = -EINVAL,
-       .vcc_pin        = -EINVAL,
+static struct mci_platform_data __initdata eb9200_mci0_data = {
+       .slot[0] = {
+               .bus_width      = 4,
+               .detect_pin     = -EINVAL,
+               .wp_pin         = -EINVAL,
+       },
 };
 
 static struct i2c_board_info __initdata eb9200_i2c_devices[] = {
@@ -113,7 +113,7 @@ static void __init eb9200_board_init(void)
        at91_add_device_spi(NULL, 0);
        /* MMC */
        /* only supports 1 or 4 bit interface, not wired through to SPI */
-       at91_add_device_mmc(0, &eb9200_mmc_data);
+       at91_add_device_mci(0, &eb9200_mci0_data);
 }
 
 MACHINE_START(ATEB9200, "Embest ATEB9200")