diff options
| author | Andrew Victor <linux@maxim.org.za> | 2008-04-02 21:47:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-04 09:52:21 +0100 |
| commit | a3da12229f4f9bee2ed66ac34a54a4e8b74bcbcb (patch) | |
| tree | 7d0e06b560ff8b7dee204f4fb2d8c5e40cded821 /arch/arm/mach-at91/board-sam9260ek.c | |
| parent | d7a2415f7a48ce4fc16cc769f96d0df818648837 (diff) | |
| download | linux-stable-a3da12229f4f9bee2ed66ac34a54a4e8b74bcbcb.tar.gz linux-stable-a3da12229f4f9bee2ed66ac34a54a4e8b74bcbcb.tar.bz2 linux-stable-a3da12229f4f9bee2ed66ac34a54a4e8b74bcbcb.zip | |
[ARM] 4905/1: [AT91] Atmel SAM9 boards updated to new-style UART initialization
Convert the Atmel SAM9260-EK, SAM9261-EK, SAM9263-EK and SAM9RL-EK
boards to use the new-style UART initialization.
Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91/board-sam9260ek.c')
| -rw-r--r-- | arch/arm/mach-at91/board-sam9260ek.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 8c657a9288ee..440553632b53 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c @@ -42,24 +42,24 @@ #include "generic.h" -/* - * Serial port configuration. - * 0 .. 5 = USART0 .. USART5 - * 6 = DBGU - */ -static struct at91_uart_config __initdata ek_uart_config = { - .console_tty = 0, /* ttyS0 */ - .nr_tty = 3, - .tty_map = { 6, 0, 1, -1, -1, -1, -1 } /* ttyS0, ..., ttyS6 */ -}; - static void __init ek_map_io(void) { /* Initialize processor: 18.432 MHz crystal */ at91sam9260_initialize(18432000); - /* Setup the serial ports and console */ - at91_init_serial(&ek_uart_config); + /* DGBU on ttyS0. (Rx & Tx only) */ + at91_register_uart(0, 0, 0); + + /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ + at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS + | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD + | ATMEL_UART_RI); + + /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ + at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); + + /* set serial console to ttyS0 (ie, DBGU) */ + at91_set_serial_console(0); } static void __init ek_init_irq(void) |