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

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-at91 / board-cpuat91.c

diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c
index 2e6d043c82f202e352b426e0ac699a74b15fbdcd..2cbd1a2b6c35d33bed32f776f52e640742611fc8 100644 (file)
--- a/arch/arm/mach-at91/board-cpuat91.c
+++ b/arch/arm/mach-at91/board-cpuat91.c
@@ -78,11 +78,12 @@ static struct at91_udc_data __initdata cpuat91_udc_data = {
        .pullup_pin     = AT91_PIN_PC14,
 };
 
-static struct at91_mmc_data __initdata cpuat91_mmc_data = {
-       .det_pin        = AT91_PIN_PC2,
-       .wire4          = 1,
-       .wp_pin         = -EINVAL,
-       .vcc_pin        = -EINVAL,
+static struct mci_platform_data __initdata cpuat91_mci0_data = {
+       .slot[0] = {
+               .bus_width      = 4,
+               .detect_pin     = AT91_PIN_PC2,
+               .wp_pin         = -EINVAL,
+       },
 };
 
 static struct physmap_flash_data cpuat91_flash_data = {
@@ -168,7 +169,7 @@ static void __init cpuat91_board_init(void)
        /* USB Device */
        at91_add_device_udc(&cpuat91_udc_data);
        /* MMC */
-       at91_add_device_mmc(0, &cpuat91_mmc_data);
+       at91_add_device_mci(0, &cpuat91_mci0_data);
        /* I2C */
        at91_add_device_i2c(NULL, 0);
        /* Platform devices */