summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-eco920.c
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2012-05-21 12:23:27 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-07-02 18:03:01 +0200
commit4cf3326ab5f34a333a46c59d0d3783db9cef13bf (patch)
tree4d8b5f494f0c99b2f261b6145c91cbc97f492795 /arch/arm/mach-at91/board-eco920.c
parent24f5c4b6e6f2933eb22979283db6174f378d9b36 (diff)
downloadop-kernel-dev-4cf3326ab5f34a333a46c59d0d3783db9cef13bf.zip
op-kernel-dev-4cf3326ab5f34a333a46c59d0d3783db9cef13bf.tar.gz
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-eco920.c')
-rw-r--r--arch/arm/mach-at91/board-eco920.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c
index 558546c..40e957d 100644
--- a/arch/arm/mach-at91/board-eco920.c
+++ b/arch/arm/mach-at91/board-eco920.c
@@ -55,12 +55,12 @@ static struct at91_udc_data __initdata eco920_udc_data = {
.pullup_pin = AT91_PIN_PB13,
};
-static struct at91_mmc_data __initdata eco920_mmc_data = {
- .slot_b = 0,
- .wire4 = 0,
- .det_pin = -EINVAL,
- .wp_pin = -EINVAL,
- .vcc_pin = -EINVAL,
+static struct mci_platform_data __initdata eco920_mci0_data = {
+ .slot[0] = {
+ .bus_width = 1,
+ .detect_pin = -EINVAL,
+ .wp_pin = -EINVAL,
+ },
};
static struct physmap_flash_data eco920_flash_data = {
@@ -103,7 +103,7 @@ static void __init eco920_board_init(void)
at91_add_device_usbh(&eco920_usbh_data);
at91_add_device_udc(&eco920_udc_data);
- at91_add_device_mmc(0, &eco920_mmc_data);
+ at91_add_device_mci(0, &eco920_mci0_data);
platform_device_register(&eco920_flash);
at91_ramc_write(0, AT91_SMC_CSR(7), AT91_SMC_RWHOLD_(1)
OpenPOWER on IntegriCloud