diff options
Diffstat (limited to 'arch/arm/mach-at91/board-yl-9200.c')
-rw-r--r-- | arch/arm/mach-at91/board-yl-9200.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c index 516d340549d8..f162fdfd66eb 100644 --- a/arch/arm/mach-at91/board-yl-9200.c +++ b/arch/arm/mach-at91/board-yl-9200.c | |||
@@ -119,11 +119,12 @@ static struct at91_udc_data __initdata yl9200_udc_data = { | |||
119 | /* | 119 | /* |
120 | * MMC | 120 | * MMC |
121 | */ | 121 | */ |
122 | static struct at91_mmc_data __initdata yl9200_mmc_data = { | 122 | static struct mci_platform_data __initdata yl9200_mci0_data = { |
123 | .det_pin = AT91_PIN_PB9, | 123 | .slot[0] = { |
124 | .wire4 = 1, | 124 | .bus_width = 4, |
125 | .wp_pin = -EINVAL, | 125 | .detect_pin = AT91_PIN_PB9, |
126 | .vcc_pin = -EINVAL, | 126 | .wp_pin = -EINVAL, |
127 | }, | ||
127 | }; | 128 | }; |
128 | 129 | ||
129 | /* | 130 | /* |
@@ -541,9 +542,6 @@ void __init yl9200_add_device_video(void) {} | |||
541 | 542 | ||
542 | static void __init yl9200_board_init(void) | 543 | static void __init yl9200_board_init(void) |
543 | { | 544 | { |
544 | /* Setup the LEDs D2=PB17 (timer), D3=PB16 (cpu) */ | ||
545 | at91_init_leds(AT91_PIN_PB16, AT91_PIN_PB17); | ||
546 | |||
547 | /* Serial */ | 545 | /* Serial */ |
548 | /* DBGU on ttyS0. (Rx & Tx only) */ | 546 | /* DBGU on ttyS0. (Rx & Tx only) */ |
549 | at91_register_uart(0, 0, 0); | 547 | at91_register_uart(0, 0, 0); |
@@ -568,7 +566,7 @@ static void __init yl9200_board_init(void) | |||
568 | /* I2C */ | 566 | /* I2C */ |
569 | at91_add_device_i2c(yl9200_i2c_devices, ARRAY_SIZE(yl9200_i2c_devices)); | 567 | at91_add_device_i2c(yl9200_i2c_devices, ARRAY_SIZE(yl9200_i2c_devices)); |
570 | /* MMC */ | 568 | /* MMC */ |
571 | at91_add_device_mmc(0, &yl9200_mmc_data); | 569 | at91_add_device_mci(0, &yl9200_mci0_data); |
572 | /* NAND */ | 570 | /* NAND */ |
573 | at91_add_device_nand(&yl9200_nand_data); | 571 | at91_add_device_nand(&yl9200_nand_data); |
574 | /* NOR Flash */ | 572 | /* NOR Flash */ |