aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-carmeva.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-at91/board-carmeva.c')
-rw-r--r--arch/arm/mach-at91/board-carmeva.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index 44328a6d4609..99e2de74429b 100644
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -70,12 +70,12 @@ static struct at91_udc_data __initdata carmeva_udc_data = {
70 // .vcc_pin = -EINVAL, 70 // .vcc_pin = -EINVAL,
71// }; 71// };
72 72
73static struct at91_mmc_data __initdata carmeva_mmc_data = { 73static struct mci_platform_data __initdata carmeva_mci0_data = {
74 .slot_b = 0, 74 .slot[0] = {
75 .wire4 = 1, 75 .bus_width = 4,
76 .det_pin = AT91_PIN_PB10, 76 .detect_pin = AT91_PIN_PB10,
77 .wp_pin = AT91_PIN_PC14, 77 .wp_pin = AT91_PIN_PC14,
78 .vcc_pin = -EINVAL, 78 },
79}; 79};
80 80
81static struct spi_board_info carmeva_spi_devices[] = { 81static struct spi_board_info carmeva_spi_devices[] = {
@@ -149,7 +149,7 @@ static void __init carmeva_board_init(void)
149 /* Compact Flash */ 149 /* Compact Flash */
150// at91_add_device_cf(&carmeva_cf_data); 150// at91_add_device_cf(&carmeva_cf_data);
151 /* MMC */ 151 /* MMC */
152 at91_add_device_mmc(0, &carmeva_mmc_data); 152 at91_add_device_mci(0, &carmeva_mci0_data);
153 /* LEDs */ 153 /* LEDs */
154 at91_gpio_leds(carmeva_leds, ARRAY_SIZE(carmeva_leds)); 154 at91_gpio_leds(carmeva_leds, ARRAY_SIZE(carmeva_leds));
155} 155}