diff options
Diffstat (limited to 'arch/arm/mach-at91/board-rm9200ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-rm9200ek.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c index 32d35cb158f..b68726140b6 100644 --- a/arch/arm/mach-at91/board-rm9200ek.c +++ b/arch/arm/mach-at91/board-rm9200ek.c | |||
@@ -53,14 +53,6 @@ static void __init ek_init_early(void) | |||
53 | 53 | ||
54 | /* Setup the LEDs */ | 54 | /* Setup the LEDs */ |
55 | at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2); | 55 | at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2); |
56 | |||
57 | /* DBGU on ttyS0. (Rx & Tx only) */ | ||
58 | at91_register_uart(0, 0, 0); | ||
59 | |||
60 | /* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | ||
61 | at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS | ||
62 | | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ||
63 | | ATMEL_UART_RI); | ||
64 | } | 56 | } |
65 | 57 | ||
66 | static struct macb_platform_data __initdata ek_eth_data = { | 58 | static struct macb_platform_data __initdata ek_eth_data = { |
@@ -159,6 +151,13 @@ static struct gpio_led ek_leds[] = { | |||
159 | static void __init ek_board_init(void) | 151 | static void __init ek_board_init(void) |
160 | { | 152 | { |
161 | /* Serial */ | 153 | /* Serial */ |
154 | /* DBGU on ttyS0. (Rx & Tx only) */ | ||
155 | at91_register_uart(0, 0, 0); | ||
156 | |||
157 | /* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | ||
158 | at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS | ||
159 | | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ||
160 | | ATMEL_UART_RI); | ||
162 | at91_add_device_serial(); | 161 | at91_add_device_serial(); |
163 | /* Ethernet */ | 162 | /* Ethernet */ |
164 | at91_add_device_eth(&ek_eth_data); | 163 | at91_add_device_eth(&ek_eth_data); |