1 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index cdd21f2595d2..0af92e6cce64 100644
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -72,7 +72,7 @@ static struct at91_udc_data __initdata ek_udc_data = {
  * SPI devices.
  */
 static struct spi_board_info ek_spi_devices[] = {
-#if !defined(CONFIG_MMC_AT91)
+#if !IS_ENABLED(CONFIG_MMC_ATMELMCI)
         {       /* DataFlash chip */
                 .modalias       = "mtd_dataflash",
                 .chip_select    = 1,
@@ -157,12 +157,12 @@ static void __init ek_add_device_nand(void)
 /*
  * MCI (SD/MMC)
  */
-static struct at91_mmc_data __initdata ek_mmc_data = {
-        .slot_b         = 1,
-        .wire4          = 1,
-        .det_pin        = AT91_PIN_PC8,
-        .wp_pin         = AT91_PIN_PC4,
-        .vcc_pin        = -EINVAL,
+static struct mci_platform_data __initdata ek_mci0_data = {
+        .slot[1] = {
+                .bus_width      = 4,
+                .detect_pin     = AT91_PIN_PC8,
+                .wp_pin         = AT91_PIN_PC4,
+        },
 };
 
 static void __init ek_board_init(void)
@@ -193,7 +193,7 @@ static void __init ek_board_init(void)
         /* Ethernet */
         at91_add_device_eth(&ek_macb_data);
         /* MMC */
-        at91_add_device_mmc(0, &ek_mmc_data);
+        at91_add_device_mci(0, &ek_mci0_data);
         /* I2C */
         at91_add_device_i2c(NULL, 0);
 }