diff options
Diffstat (limited to 'arch/arm/mach-at91/board-sam9260ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9260ek.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 6da17b5e1e2f..7b3c3913551a 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c | |||
@@ -54,17 +54,6 @@ static void __init ek_init_early(void) | |||
54 | { | 54 | { |
55 | /* Initialize processor: 18.432 MHz crystal */ | 55 | /* Initialize processor: 18.432 MHz crystal */ |
56 | at91_initialize(18432000); | 56 | at91_initialize(18432000); |
57 | |||
58 | /* DBGU on ttyS0. (Rx & Tx only) */ | ||
59 | at91_register_uart(0, 0, 0); | ||
60 | |||
61 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | ||
62 | at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS | ||
63 | | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ||
64 | | ATMEL_UART_RI); | ||
65 | |||
66 | /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ | ||
67 | at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
68 | } | 57 | } |
69 | 58 | ||
70 | /* | 59 | /* |
@@ -317,6 +306,16 @@ static void __init ek_add_device_buttons(void) {} | |||
317 | static void __init ek_board_init(void) | 306 | static void __init ek_board_init(void) |
318 | { | 307 | { |
319 | /* Serial */ | 308 | /* Serial */ |
309 | /* DBGU on ttyS0. (Rx & Tx only) */ | ||
310 | at91_register_uart(0, 0, 0); | ||
311 | |||
312 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | ||
313 | at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS | ||
314 | | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ||
315 | | ATMEL_UART_RI); | ||
316 | |||
317 | /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ | ||
318 | at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
320 | at91_add_device_serial(); | 319 | at91_add_device_serial(); |
321 | /* USB Host */ | 320 | /* USB Host */ |
322 | at91_add_device_usbh(&ek_usbh_data); | 321 | at91_add_device_usbh(&ek_usbh_data); |