aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2008-02-08 07:21:03 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:37 -0500
commit1c0fd82f9375b41f880dc9d7fe32920f33dc945b (patch)
tree3616217d3a131035527836707e7bcac92474f884
parent829dd8112274d46c5ed82d46be506762e2c8fcd8 (diff)
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>
-rw-r--r--drivers/serial/atmel_serial.c15
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,
834{ 834{
835 unsigned int mr, quot; 835 unsigned int mr, quot;
836 836
837// TODO: CR is a write-only register 837 /*
838// unsigned int cr; 838 * If the baud rate generator isn't running, the port wasn't
839// 839 * initialized by the boot loader.
840// cr = UART_GET_CR(port) & (ATMEL_US_RXEN | ATMEL_US_TXEN); 840 */
841// if (cr == (ATMEL_US_RXEN | ATMEL_US_TXEN)) { 841 quot = UART_GET_BRGR(port);
842// /* ok, the port was enabled */ 842 if (!quot)
843// } 843 return;
844 844
845 mr = UART_GET_MR(port) & ATMEL_US_CHRL; 845 mr = UART_GET_MR(port) & ATMEL_US_CHRL;
846 if (mr == ATMEL_US_CHRL_8) 846 if (mr == ATMEL_US_CHRL_8)
@@ -860,7 +860,6 @@ static void __init atmel_console_get_options(struct uart_port *port, int *baud,
860 * lower than one of those, as it would make us fall through 860 * lower than one of those, as it would make us fall through
861 * to a much lower baud rate than we really want. 861 * to a much lower baud rate than we really want.
862 */ 862 */
863 quot = UART_GET_BRGR(port);
864 *baud = port->uartclk / (16 * (quot - 1)); 863 *baud = port->uartclk / (16 * (quot - 1));
865} 864}
866 865