diff options
| author | Ludovic Desroches | 2012-05-21 12:23:27 +0200 |
|---|---|---|
| committer | Nicolas Ferre | 2012-07-02 18:03:01 +0200 |
| commit | 4cf3326ab5f34a333a46c59d0d3783db9cef13bf (patch) | |
| tree | 4d8b5f494f0c99b2f261b6145c91cbc97f492795 /arch/arm/mach-at91/board-flexibity.c | |
| parent | ARM: at91/defconfig: change the MCI driver to use in defconfigs (diff) | |
| download | kernel-qcow2-linux-4cf3326ab5f34a333a46c59d0d3783db9cef13bf.tar.gz kernel-qcow2-linux-4cf3326ab5f34a333a46c59d0d3783db9cef13bf.tar.xz kernel-qcow2-linux-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-flexibity.c')
| -rw-r--r-- | arch/arm/mach-at91/board-flexibity.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c index 47658f78105d..23ad652edad4 100644 --- a/arch/arm/mach-at91/board-flexibity.c +++ b/arch/arm/mach-at91/board-flexibity.c @@ -74,12 +74,12 @@ static struct spi_board_info flexibity_spi_devices[] = { }; /* MCI (SD/MMC) */ -static struct at91_mmc_data __initdata flexibity_mmc_data = { - .slot_b = 0, - .wire4 = 1, - .det_pin = AT91_PIN_PC9, - .wp_pin = AT91_PIN_PC4, - .vcc_pin = -EINVAL, +static struct mci_platform_data __initdata flexibity_mci0_data = { + .slot[0] = { + .bus_width = 4, + .detect_pin = AT91_PIN_PC9, + .wp_pin = AT91_PIN_PC4, + }, }; /* LEDs */ @@ -151,7 +151,7 @@ static void __init flexibity_board_init(void) at91_add_device_spi(flexibity_spi_devices, ARRAY_SIZE(flexibity_spi_devices)); /* MMC */ - at91_add_device_mmc(0, &flexibity_mmc_data); + at91_add_device_mci(0, &flexibity_mci0_data); /* LEDs */ at91_gpio_leds(flexibity_leds, ARRAY_SIZE(flexibity_leds)); } |