lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

atmel_serial: use existing console options only if BRG is running

Browse Source 
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>
This commit is contained in:
Haavard Skinnemoen
2008-02-08 04:21:03 -08:00
committed by Linus Torvalds
parent 829dd81122
commit 1c0fd82f93
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/serial/atmel_serial.c
View File

@@ -834,13 +834,13 @@ static void __init atmel_console_get_options(struct uart_port *port, int *baud,
{ {
unsigned int mr, quot; unsigned int mr, quot;
// TODO: CR is a write-only register /*
// unsigned int cr; * If the baud rate generator isn't running, the port wasn't
// * initialized by the boot loader.
// cr = UART_GET_CR(port) & (ATMEL_US_RXEN | ATMEL_US_TXEN); */
// if (cr == (ATMEL_US_RXEN | ATMEL_US_TXEN)) { quot = UART_GET_BRGR(port);
// /* ok, the port was enabled */ if (!quot)
// } return;
mr = UART_GET_MR(port) & ATMEL_US_CHRL; mr = UART_GET_MR(port) & ATMEL_US_CHRL;
if (mr == ATMEL_US_CHRL_8) 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 * lower than one of those, as it would make us fall through
* to a much lower baud rate than we really want. * to a much lower baud rate than we really want.
*/ */
quot = UART_GET_BRGR(port);
*baud = port->uartclk / (16 * (quot - 1)); *baud = port->uartclk / (16 * (quot - 1));
} }