From a1e943fea585fa3e57a2c2933525f674428091f1 Mon Sep 17 00:00:00 2001 From: Bill Gatliff Date: Mon, 7 Apr 2008 22:05:38 +0100 Subject: [PATCH] --- yaml --- r: 91145 b: refs/heads/master c: 952c855fc7a88610940d2438072884d64dc9cefb h: refs/heads/master i: 91143: 424f1692ca44001270958d5d6db4280d663100bb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/board-csb637.c | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 00ef53acf68d..7fce18ea4443 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8fc19165694a9d4bd0f80c9f167e4b41d0db1a0 +refs/heads/master: 952c855fc7a88610940d2438072884d64dc9cefb diff --git a/trunk/arch/arm/mach-at91/board-csb637.c b/trunk/arch/arm/mach-at91/board-csb637.c index c5c721d27f42..26cda4301674 100644 --- a/trunk/arch/arm/mach-at91/board-csb637.c +++ b/trunk/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)