diff options
author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2012-05-21 06:23:27 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-07-02 12:03:01 -0400 |
commit | 4cf3326ab5f34a333a46c59d0d3783db9cef13bf (patch) | |
tree | 4d8b5f494f0c99b2f261b6145c91cbc97f492795 /arch/arm/mach-at91/board-cpuat91.c | |
parent | 24f5c4b6e6f2933eb22979283db6174f378d9b36 (diff) |
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-cpuat91.c')
-rw-r--r-- | arch/arm/mach-at91/board-cpuat91.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c index 895cf2dba612..7f64920a41c0 100644 --- a/arch/arm/mach-at91/board-cpuat91.c +++ b/arch/arm/mach-at91/board-cpuat91.c | |||
@@ -77,11 +77,12 @@ static struct at91_udc_data __initdata cpuat91_udc_data = { | |||
77 | .pullup_pin = AT91_PIN_PC14, | 77 | .pullup_pin = AT91_PIN_PC14, |
78 | }; | 78 | }; |
79 | 79 | ||
80 | static struct at91_mmc_data __initdata cpuat91_mmc_data = { | 80 | static struct mci_platform_data __initdata cpuat91_mci0_data = { |
81 | .det_pin = AT91_PIN_PC2, | 81 | .slot[0] = { |
82 | .wire4 = 1, | 82 | .bus_width = 4, |
83 | .wp_pin = -EINVAL, | 83 | .detect_pin = AT91_PIN_PC2, |
84 | .vcc_pin = -EINVAL, | 84 | .wp_pin = -EINVAL, |
85 | }, | ||
85 | }; | 86 | }; |
86 | 87 | ||
87 | static struct physmap_flash_data cpuat91_flash_data = { | 88 | static struct physmap_flash_data cpuat91_flash_data = { |
@@ -167,7 +168,7 @@ static void __init cpuat91_board_init(void) | |||
167 | /* USB Device */ | 168 | /* USB Device */ |
168 | at91_add_device_udc(&cpuat91_udc_data); | 169 | at91_add_device_udc(&cpuat91_udc_data); |
169 | /* MMC */ | 170 | /* MMC */ |
170 | at91_add_device_mmc(0, &cpuat91_mmc_data); | 171 | at91_add_device_mci(0, &cpuat91_mci0_data); |
171 | /* I2C */ | 172 | /* I2C */ |
172 | at91_add_device_i2c(NULL, 0); | 173 | at91_add_device_i2c(NULL, 0); |
173 | /* Platform devices */ | 174 | /* Platform devices */ |