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-rsi-ews.c

diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c
index 93b8e3a..a0ecf04 100644 (file)
--- a/arch/arm/mach-at91/board-rsi-ews.c
+++ b/arch/arm/mach-at91/board-rsi-ews.c
@@ -58,11 +58,12 @@ static struct at91_usbh_data rsi_ews_usbh_data __initdata = {
 /*
  * SD/MC
  */
-static struct at91_mmc_data rsi_ews_mmc_data __initdata = {
-       .slot_b         = 0,
-       .wire4          = 1,
-       .det_pin        = AT91_PIN_PB27,
-       .wp_pin         = AT91_PIN_PB29,
+static struct mci_platform_data __initdata rsi_ews_mci0_data = {
+       .slot[0] = {
+               .bus_width      = 4,
+               .detect_pin     = AT91_PIN_PB27,
+               .wp_pin         = AT91_PIN_PB29,
+       },
 };
 
 /*
@@ -212,7 +213,7 @@ static void __init rsi_ews_board_init(void)
        at91_add_device_spi(rsi_ews_spi_devices,
                        ARRAY_SIZE(rsi_ews_spi_devices));
        /* MMC */
-       at91_add_device_mmc(0, &rsi_ews_mmc_data);
+       at91_add_device_mci(0, &rsi_ews_mci0_data);
        /* NOR Flash */
        platform_device_register(&rsiews_nor_flash);
        /* LEDs */