[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1201178511-12133-5-git-send-email-hskinnemoen@atmel.com>
Date: Thu, 24 Jan 2008 13:41:46 +0100
From: Haavard Skinnemoen <hskinnemoen@...el.com>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Andrew Victor <linux@...im.org.za>, Remy Bohmer <linux@...mer.net>,
Chip Coldwell <coldwell@...hat.com>,
Marc Pignat <marc.pignat@...s.ch>,
David Brownell <david-b@...bell.net>,
linux-kernel@...r.kernel.org, Alan Cox <alan@...rguk.ukuu.org.uk>,
Haavard Skinnemoen <hskinnemoen@...el.com>
Subject: [PATCH -mm v4 4/9] 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@...el.com>
Acked-by: Andrew Victor <linux@...im.org.za>
---
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 4b5c6ff..746aea0 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -835,13 +835,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)
@@ -861,7 +861,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));
}
--
1.5.3.8
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists