summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/board-ecbat91.c
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2012-05-21 14:23:27 +0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-07-02 20:03:01 +0400
commit4cf3326ab5f34a333a46c59d0d3783db9cef13bf (patch)
tree4d8b5f494f0c99b2f261b6145c91cbc97f492795 /arch/arm/mach-at91/board-ecbat91.c
parent24f5c4b6e6f2933eb22979283db6174f378d9b36 (diff)
downloadlinux-4cf3326ab5f34a333a46c59d0d3783db9cef13bf.tar.xz
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-ecbat91.c')
-rw-r--r--arch/arm/mach-at91/board-ecbat91.c14
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 89cc3726a9ce..086ec5b3ebe8 100644
--- a/arch/arm/mach-at91/board-ecbat91.c
+++ b/arch/arm/mach-at91/board-ecbat91.c
@@ -63,12 +63,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,
+ },
};
@@ -160,7 +160,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));