diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-06 09:36:47 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-04 12:29:35 +0000 |
commit | 2405464083e152f88bb58b7108a9e50ca362178c (patch) | |
tree | b63a19a417c0a048153af8c351f4b3d466d23e7b /drivers/tty/serial | |
parent | c533e51b228020142cd2c4d5f21e8db4683ce457 (diff) | |
download | blackbird-op-linux-2405464083e152f88bb58b7108a9e50ca362178c.tar.gz blackbird-op-linux-2405464083e152f88bb58b7108a9e50ca362178c.zip |
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>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r-- | drivers/tty/serial/omap-serial.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 0d2671e66da4..156a85438558 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -924,11 +924,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, } 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 */ 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) 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: * Enable any character to restart output. @@ -962,7 +954,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, else up->mcr &= ~UART_MCR_XONANY; } - serial_out(up, UART_MCR, up->mcr); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); serial_out(up, UART_EFR, up->efr); |