diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-10 12:34:18 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-13 17:09:38 +0200 |
commit | e05dd97c5c345bd1f6ce9f6fc242326a64191239 (patch) | |
tree | a3d700746bc2b5f809876bd7aa8c7c0ac93166ac /arch/arm/mach-at91/board-ecbat91.c | |
parent | 19e4ab54e7f5fe46a3c931afa7e786f11d57b558 (diff) | |
parent | 4cf3326ab5f34a333a46c59d0d3783db9cef13bf (diff) | |
download | linux-rt-e05dd97c5c345bd1f6ce9f6fc242326a64191239.tar.gz |
Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci
AT91 SoC related code modifications: a cleanup in defconfigs and
a one liner in a board file.
The most important is the move to atmel-mci driver in AT91 SoC & boards.
The old at91_mci (marked as deprecated) will be removed in 3.7. So all
platform data for this old driver are erased and replace by information
needed by atmel-mci driver.
* tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91:
ARM: at91: add atmel-mci support for chips and boards which can use it
ARM: at91/defconfig: change the MCI driver to use in defconfigs
ARM: at91: set i2c_board_info.type to "ds1339" directly
ARM: at91/defconfig: Remove unaffected config option
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/board-ecbat91.c')
-rw-r--r-- | arch/arm/mach-at91/board-ecbat91.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c index 192ec76579c4..3d931ffac4bf 100644 --- a/arch/arm/mach-at91/board-ecbat91.c +++ b/arch/arm/mach-at91/board-ecbat91.c @@ -64,12 +64,12 @@ static struct at91_usbh_data __initdata ecb_at91usbh_data = { .overcurrent_pin= {-EINVAL, -EINVAL}, }; -static struct at91_mmc_data __initdata ecb_at91mmc_data = { - .slot_b = 0, - .wire4 = 1, - .det_pin = -EINVAL, - .wp_pin = -EINVAL, - .vcc_pin = -EINVAL, +static struct mci_platform_data __initdata ecbat91_mci0_data = { + .slot[0] = { + .bus_width = 4, + .detect_pin = -EINVAL, + .wp_pin = -EINVAL, + }, }; @@ -170,7 +170,7 @@ static void __init ecb_at91board_init(void) at91_add_device_i2c(NULL, 0); /* MMC */ - at91_add_device_mmc(0, &ecb_at91mmc_data); + at91_add_device_mci(0, &ecbat91_mci0_data); /* SPI */ at91_add_device_spi(ecb_at91spi_devices, ARRAY_SIZE(ecb_at91spi_devices)); |