diff options
| author | Bill Gatliff <bgat@billgatliff.com> | 2008-04-07 22:05:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-10 14:59:57 +0100 |
| commit | 952c855fc7a88610940d2438072884d64dc9cefb (patch) | |
| tree | 4e5174744950578d4dc2ecbfd36aae82fd6dbe45 /arch/arm | |
| parent | c8fc19165694a9d4bd0f80c9f167e4b41d0db1a0 (diff) | |
| download | talos-obmc-linux-952c855fc7a88610940d2438072884d64dc9cefb.tar.gz talos-obmc-linux-952c855fc7a88610940d2438072884d64dc9cefb.zip | |
[ARM] 4937/1: [CSB637] Convert to new-style UART initialization
Converts the CSB637 to the new-style UART initialization API.
Signed-off-by: Bill Gatliff <bgat@billgatliff.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/board-csb637.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c index c5c721d27f42..26cda4301674 100644 --- a/arch/arm/mach-at91/board-csb637.c +++ b/arch/arm/mach-at91/board-csb637.c @@ -40,17 +40,6 @@ #include "generic.h" -/* - * Serial port configuration. - * 0 .. 3 = USART0 .. USART3 - * 4 = DBGU - */ -static struct at91_uart_config __initdata csb637_uart_config = { - .console_tty = 0, /* ttyS0 */ - .nr_tty = 2, - .tty_map = { 4, 1, -1, -1, -1 } /* ttyS0, ..., ttyS4 */ -}; - static void __init csb637_map_io(void) { /* Initialize processor: 3.6864 MHz crystal */ @@ -59,8 +48,11 @@ static void __init csb637_map_io(void) /* Setup the LEDs */ at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2); - /* Setup the serial ports and console */ - at91_init_serial(&csb637_uart_config); + /* DBGU on ttyS0 */ + at91_register_uart(0, 0, 0); + + /* make console=ttyS0 the default */ + at91_set_serial_console(0); } static void __init csb637_init_irq(void) |
