diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2008-02-08 13:21:03 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 18:22:37 +0100 |
| commit | 1c0fd82f9375b41f880dc9d7fe32920f33dc945b (patch) | |
| tree | 3616217d3a131035527836707e7bcac92474f884 /drivers/serial/atmel_serial.c | |
| parent | atmel_serial: use cpu_relax() when busy-waiting (diff) | |
| download | linux-1c0fd82f9375b41f880dc9d7fe32920f33dc945b.tar.xz linux-1c0fd82f9375b41f880dc9d7fe32920f33dc945b.zip | |
atmel_serial: use existing console options only if BRG is running
If BRGR is zero, the baud rate generator isn't running, so the boot loader
can't have initialized the port.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Tested-by: Marc Pignat <marc.pignat@hevs.ch>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/serial/atmel_serial.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 4d1ccc2b762d..0b7b2743b996 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -834,13 +834,13 @@ static void __init atmel_console_get_options(struct uart_port *port, int *baud, { unsigned int mr, quot; -// TODO: CR is a write-only register -// unsigned int cr; -// -// cr = UART_GET_CR(port) & (ATMEL_US_RXEN | ATMEL_US_TXEN); -// if (cr == (ATMEL_US_RXEN | ATMEL_US_TXEN)) { -// /* ok, the port was enabled */ -// } + /* + * If the baud rate generator isn't running, the port wasn't + * initialized by the boot loader. + */ + quot = UART_GET_BRGR(port); + if (!quot) + return; mr = UART_GET_MR(port) & ATMEL_US_CHRL; if (mr == ATMEL_US_CHRL_8) @@ -860,7 +860,6 @@ static void __init atmel_console_get_options(struct uart_port *port, int *baud, * lower than one of those, as it would make us fall through * to a much lower baud rate than we really want. */ - quot = UART_GET_BRGR(port); *baud = port->uartclk / (16 * (quot - 1)); } |