The patch titled
atmel_serial: use existing console options only if BRG is running
has been removed from the -mm tree. Its filename was
atmel_serial-use-existing-console-options-only-if-brg-is-running.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: atmel_serial: use existing console options only if BRG is running
From: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
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@xxxxxxxxx>
Acked-by: Andrew Victor <linux@xxxxxxxxxxxx>
Tested-by: Marc Pignat <marc.pignat@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/atmel_serial.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff -puN drivers/serial/atmel_serial.c~atmel_serial-use-existing-console-options-only-if-brg-is-running drivers/serial/atmel_serial.c
--- a/drivers/serial/atmel_serial.c~atmel_serial-use-existing-console-options-only-if-brg-is-running
+++ a/drivers/serial/atmel_serial.c
@@ -834,13 +834,13 @@ static void __init atmel_console_get_opt
{
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_opt
* 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));
}
_
Patches currently in -mm which might be from hskinnemoen@xxxxxxxxx are
origin.patch
git-avr32.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
