diff options
| author | Bill Gatliff <bgat@billgatliff.com> | 2008-04-07 22:03:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-10 14:59:56 +0100 |
| commit | c8fc19165694a9d4bd0f80c9f167e4b41d0db1a0 (patch) | |
| tree | 1039fb3419d2ddb64b78cee1acc4d699bf84a296 /arch/arm/mach-at91/board-csb337.c | |
| parent | 1af89cb6532dff0ad26f33fe6bd548c307a92f2b (diff) | |
[ARM] 4936/1: [CSB337] Converts to new-style UART initialization
Converts the CSB337 target to the new 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/mach-at91/board-csb337.c')
| -rw-r--r-- | arch/arm/mach-at91/board-csb337.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c index 0e2a11fc5bb..26fea4dcc3a 100644 --- a/arch/arm/mach-at91/board-csb337.c +++ b/arch/arm/mach-at91/board-csb337.c @@ -43,17 +43,6 @@ #include "generic.h" -/* - * Serial port configuration. - * 0 .. 3 = USART0 .. USART3 - * 4 = DBGU - */ -static struct at91_uart_config __initdata csb337_uart_config = { - .console_tty = 0, /* ttyS0 */ - .nr_tty = 2, - .tty_map = { 4, 1, -1, -1, -1 } /* ttyS0, ..., ttyS4 */ -}; - static void __init csb337_map_io(void) { /* Initialize processor: 3.6864 MHz crystal */ @@ -62,8 +51,11 @@ static void __init csb337_map_io(void) /* Setup the LEDs */ at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1); - /* Setup the serial ports and console */ - at91_init_serial(&csb337_uart_config); + /* DBGU on ttyS0 */ + at91_register_uart(0, 0, 0); + + /* make console=ttyS0 the default */ + at91_set_serial_console(0); } static void __init csb337_init_irq(void) |