Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c0fd82f authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Linus Torvalds
Browse files

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: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Tested-by: default avatarMarc Pignat <marc.pignat@hevs.ch>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 829dd811

drivers/serial/atmel_serial.c

+7 −8
Original line number Diff line number Diff line
@@ -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));

}