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

[mirror_ubuntu-zesty-kernel.git] / arch / arm / mach-at91 / board-afeb-9260v1.c

diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
index de7be193181795cb210e5865df30e6fb8babb0d8..93a832f7023230a8fba9f9ed8eb740fc89736c1b 100644 (file)
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@ -133,12 +133,12 @@ static struct atmel_nand_data __initdata afeb9260_nand_data = {
 /*
  * MCI (SD/MMC)
  */
-static struct at91_mmc_data __initdata afeb9260_mmc_data = {
-       .det_pin        = AT91_PIN_PC9,
-       .wp_pin         = AT91_PIN_PC4,
-       .slot_b         = 1,
-       .wire4          = 1,
-       .vcc_pin        = -EINVAL,
+static struct mci_platform_data __initdata afeb9260_mci0_data = {
+       .slot[1] = {
+               .bus_width      = 4,
+               .detect_pin     = AT91_PIN_PC9,
+               .wp_pin         = AT91_PIN_PC4,
+       },
 };
 
 
@@ -199,7 +199,7 @@ static void __init afeb9260_board_init(void)
        at91_set_B_periph(AT91_PIN_PA10, 0);    /* ETX2 */
        at91_set_B_periph(AT91_PIN_PA11, 0);    /* ETX3 */
        /* MMC */
-       at91_add_device_mmc(0, &afeb9260_mmc_data);
+       at91_add_device_mci(0, &afeb9260_mci0_data);
        /* I2C */
        at91_add_device_i2c(afeb9260_i2c_devices,
                        ARRAY_SIZE(afeb9260_i2c_devices));