aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-06 04:36:47 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-11-04 07:29:35 -0500
commit2405464083e152f88bb58b7108a9e50ca362178c (patch)
treeb63a19a417c0a048153af8c351f4b3d466d23e7b /drivers/tty
parentc533e51b228020142cd2c4d5f21e8db4683ce457 (diff)
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')
-rw-r--r--drivers/tty/serial/omap-serial.c9
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,
924 } 924 }
925 925
926 if (up->port.flags & UPF_SOFT_FLOW) { 926 if (up->port.flags & UPF_SOFT_FLOW) {
927 /* Disable access to TCR/TLR */
928 serial_out(up, UART_MCR, up->mcr);
929 serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
930 serial_out(up, UART_EFR, up->efr);
931
932 /* clear SW control mode bits */ 927 /* clear SW control mode bits */
933 up->efr &= OMAP_UART_SW_CLR; 928 up->efr &= OMAP_UART_SW_CLR;
934 929
@@ -948,9 +943,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
948 if (termios->c_iflag & IXOFF) 943 if (termios->c_iflag & IXOFF)
949 up->efr |= OMAP_UART_SW_RX; 944 up->efr |= OMAP_UART_SW_RX;
950 945
951 serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
952 serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
953
954 /* 946 /*
955 * IXANY Flag: 947 * IXANY Flag:
956 * Enable any character to restart output. 948 * Enable any character to restart output.
@@ -962,7 +954,6 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
962 else 954 else
963 up->mcr &= ~UART_MCR_XONANY; 955 up->mcr &= ~UART_MCR_XONANY;
964 } 956 }
965
966 serial_out(up, UART_MCR, up->mcr); 957 serial_out(up, UART_MCR, up->mcr);
967 serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); 958 serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
968 serial_out(up, UART_EFR, up->efr); 959 serial_out(up, UART_EFR, up->efr);