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

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

diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
index e7dc3ead7045f3f938c65729263a71be5050dafb..fb89ea92e3f24bc0f52934c18aec7528b43c643d 100644 (file)
--- a/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@ -56,11 +56,12 @@ static struct usba_platform_data __initdata ek_usba_udc_data = {
 /*
  * MCI (SD/MMC)
  */
-static struct at91_mmc_data __initdata ek_mmc_data = {
-       .wire4          = 1,
-       .det_pin        = AT91_PIN_PA15,
-       .wp_pin         = -EINVAL,
-       .vcc_pin        = -EINVAL,
+static struct mci_platform_data __initdata mci0_data = {
+       .slot[0] = {
+               .bus_width      = 4,
+               .detect_pin     = AT91_PIN_PA15,
+               .wp_pin         = -EINVAL,
+       },
 };
 
 
@@ -303,7 +304,7 @@ static void __init ek_board_init(void)
        /* SPI */
        at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
        /* MMC */
-       at91_add_device_mmc(0, &ek_mmc_data);
+       at91_add_device_mci(0, &mci0_data);
        /* LCD Controller */
        at91_add_device_lcdc(&ek_lcdc_data);
        /* AC97 */