Commit 6dbd54e4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "tty/serial: atmel: fix out of range clock divider handling" 



This reverts commit 751d0017.

The wrong commit got added to the tty-next tree, the correct one is in
the tty-linus branch.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: David Engraf <david.engraf@sysgo.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9b614afe

drivers/tty/serial/atmel_serial.c

+3 −3
Original line number Diff line number Diff line
@@ -2270,6 +2270,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, 
		mode |= ATMEL_US_USMODE_NORMAL;

	}



	/* set the mode, clock divisor, parity, stop bits and data size */

	atmel_uart_writel(port, ATMEL_US_MR, mode);



	/*

	 * when switching the mode, set the RTS line state according to the

	 * new mode, otherwise keep the former state
@@ -2312,9 +2315,6 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, 
	}

	quot = cd | fp << ATMEL_US_FP_OFFSET;



	/* set the mode, clock divisor, parity, stop bits and data size */

	atmel_uart_writel(port, ATMEL_US_MR, mode);



	if (!(port->iso7816.flags & SER_ISO7816_ENABLED))

		atmel_uart_writel(port, ATMEL_US_BRGR, quot);

	atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);