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

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mach-at91 / board-carmeva.c

diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index a5b002f..71d8f36 100644 (file)
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -71,12 +71,12 @@ static struct at91_udc_data __initdata carmeva_udc_data = {
        // .vcc_pin     = -EINVAL,
 // };
 
-static struct at91_mmc_data __initdata carmeva_mmc_data = {
-       .slot_b         = 0,
-       .wire4          = 1,
-       .det_pin        = AT91_PIN_PB10,
-       .wp_pin         = AT91_PIN_PC14,
-       .vcc_pin        = -EINVAL,
+static struct mci_platform_data __initdata carmeva_mci0_data = {
+       .slot[0] = {
+               .bus_width      = 4,
+               .detect_pin     = AT91_PIN_PB10,
+               .wp_pin         = AT91_PIN_PC14,
+       },
 };
 
 static struct spi_board_info carmeva_spi_devices[] = {
@@ -150,7 +150,7 @@ static void __init carmeva_board_init(void)
        /* Compact Flash */
 //     at91_add_device_cf(&carmeva_cf_data);
        /* MMC */
-       at91_add_device_mmc(0, &carmeva_mmc_data);
+       at91_add_device_mci(0, &carmeva_mci0_data);
        /* LEDs */
        at91_gpio_leds(carmeva_leds, ARRAY_SIZE(carmeva_leds));
 }