diff options
| author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2012-05-21 12:23:27 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-07-02 18:03:01 +0200 |
| commit | 4cf3326ab5f34a333a46c59d0d3783db9cef13bf (patch) | |
| tree | 4d8b5f494f0c99b2f261b6145c91cbc97f492795 /arch/arm/mach-at91/board-carmeva.c | |
| parent | 24f5c4b6e6f2933eb22979283db6174f378d9b36 (diff) | |
| download | linux-3.10-4cf3326ab5f34a333a46c59d0d3783db9cef13bf.tar.gz linux-3.10-4cf3326ab5f34a333a46c59d0d3783db9cef13bf.tar.bz2 linux-3.10-4cf3326ab5f34a333a46c59d0d3783db9cef13bf.zip | |
ARM: at91: add atmel-mci support for chips and boards which can use it
Since atmel-mci driver supports all atmel mci versions,
use it instead of the deprecated at91_mci driver.
Platform data and all related configuration are removed.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
[nicolas.ferre@atmel.com: remove at91_mci platform data]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/board-carmeva.c')
| -rw-r--r-- | arch/arm/mach-at91/board-carmeva.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c index 44328a6d460..99e2de74429 100644 --- a/arch/arm/mach-at91/board-carmeva.c +++ b/arch/arm/mach-at91/board-carmeva.c @@ -70,12 +70,12 @@ static struct at91_udc_data __initdata carmeva_udc_data = { // .vcc_pin = -EINVAL, // }; -static struct at91_mmc_data __initdata carmeva_mmc_data = { - .slot_b = 0, - .wire4 = 1, - .det_pin = AT91_PIN_PB10, - .wp_pin = AT91_PIN_PC14, - .vcc_pin = -EINVAL, +static struct mci_platform_data __initdata carmeva_mci0_data = { + .slot[0] = { + .bus_width = 4, + .detect_pin = AT91_PIN_PB10, + .wp_pin = AT91_PIN_PC14, + }, }; static struct spi_board_info carmeva_spi_devices[] = { @@ -149,7 +149,7 @@ static void __init carmeva_board_init(void) /* Compact Flash */ // at91_add_device_cf(&carmeva_cf_data); /* MMC */ - at91_add_device_mmc(0, &carmeva_mmc_data); + at91_add_device_mci(0, &carmeva_mci0_data); /* LEDs */ at91_gpio_leds(carmeva_leds, ARRAY_SIZE(carmeva_leds)); } |