SERIAL: omap: simplify (2)

Simplify:
	- set ECB
	...
	- LCR mode A
	- clear TCRTLR
	- LCR mode B
	- clear ECB
	- set ECB and update other bits
	- LCR mode A
	- update XONANY

to:
	- set ECB
	...
	- LCR mode B
	- set ECB and update other bits
	- LCR mode A
	- update XONANY and clear TCRTLR

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2012-10-06 09:36:47 +01:00
parent c533e51b22
commit 2405464083

View File

@ -924,11 +924,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
} }
if (up->port.flags & UPF_SOFT_FLOW) { if (up->port.flags & UPF_SOFT_FLOW) {
/* Disable access to TCR/TLR */
serial_out(up, UART_MCR, up->mcr);
serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
serial_out(up, UART_EFR, up->efr);
/* clear SW control mode bits */ /* clear SW control mode bits */
up->efr &= OMAP_UART_SW_CLR; up->efr &= OMAP_UART_SW_CLR;
@ -948,9 +943,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
if (termios->c_iflag & IXOFF) if (termios->c_iflag & IXOFF)
up->efr |= OMAP_UART_SW_RX; up->efr |= OMAP_UART_SW_RX;
serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
/* /*
* IXANY Flag: * IXANY Flag:
* Enable any character to restart output. * Enable any character to restart output.
@ -962,7 +954,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
else else
up->mcr &= ~UART_MCR_XONANY; up->mcr &= ~UART_MCR_XONANY;
} }
serial_out(up, UART_MCR, up->mcr); serial_out(up, UART_MCR, up->mcr);
serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
serial_out(up, UART_EFR, up->efr); serial_out(up, UART_EFR, up->efr);