diff options
Diffstat (limited to 'arch/arm/mach-at91/board-sam9261ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9261ek.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index 2736453821b..f3b2fe24fc5 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c | |||
@@ -339,11 +339,12 @@ static struct spi_board_info ek_spi_devices[] = { | |||
339 | * MCI (SD/MMC) | 339 | * MCI (SD/MMC) |
340 | * det_pin, wp_pin and vcc_pin are not connected | 340 | * det_pin, wp_pin and vcc_pin are not connected |
341 | */ | 341 | */ |
342 | static struct at91_mmc_data __initdata ek_mmc_data = { | 342 | static struct mci_platform_data __initdata mci0_data = { |
343 | .wire4 = 1, | 343 | .slot[0] = { |
344 | .det_pin = -EINVAL, | 344 | .bus_width = 4, |
345 | .wp_pin = -EINVAL, | 345 | .detect_pin = -EINVAL, |
346 | .vcc_pin = -EINVAL, | 346 | .wp_pin = -EINVAL, |
347 | }, | ||
347 | }; | 348 | }; |
348 | 349 | ||
349 | #endif /* CONFIG_SPI_ATMEL_* */ | 350 | #endif /* CONFIG_SPI_ATMEL_* */ |
@@ -597,7 +598,7 @@ static void __init ek_board_init(void) | |||
597 | at91_add_device_ssc(AT91SAM9261_ID_SSC1, ATMEL_SSC_TX); | 598 | at91_add_device_ssc(AT91SAM9261_ID_SSC1, ATMEL_SSC_TX); |
598 | #else | 599 | #else |
599 | /* MMC */ | 600 | /* MMC */ |
600 | at91_add_device_mmc(0, &ek_mmc_data); | 601 | at91_add_device_mci(0, &mci0_data); |
601 | #endif | 602 | #endif |
602 | /* LCD Controller */ | 603 | /* LCD Controller */ |
603 | at91_add_device_lcdc(&ek_lcdc_data); | 604 | at91_add_device_lcdc(&ek_lcdc_data); |