Blackfin: check for anomaly 05000475
[linux-2.6.git] / arch / avr32 / boards / merisc / setup.c
index 58acdb4..623b077 100644 (file)
@@ -94,9 +94,10 @@ static struct spi_board_info __initdata spi0_board_info[] = {
 
 static struct mci_platform_data __initdata mci0_data = {
        .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = GPIO_PIN_PE(19),
-               .wp_pin         = GPIO_PIN_PE(20),
+               .bus_width              = 4,
+               .detect_pin             = GPIO_PIN_PE(19),
+               .wp_pin                 = GPIO_PIN_PE(20),
+               .detect_is_active_high  = true,
        },
 };
 
@@ -231,9 +232,9 @@ static void detect_merisc_board_id(void)
 
 void __init setup_board(void)
 {
-       at32_map_usart(0, 0);
-       at32_map_usart(1, 1);
-       at32_map_usart(3, 3);
+       at32_map_usart(0, 0, 0);
+       at32_map_usart(1, 1, 0);
+       at32_map_usart(3, 3, 0);
        at32_setup_serial_console(1);
 }
 
@@ -248,7 +249,7 @@ static int __init merisc_init(void)
        at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26));
 
        if (merisc_board_id >= 1)
-               at32_map_usart(2, 2);
+               at32_map_usart(2, 2, 0);
 
        at32_add_device_usart(0);
        at32_add_device_usart(1);