SERIAL: omap: remove setting of EFR SCD bit

The SCD (special character detect) bit enables comparisons with XOFF2,
which we do not program.  As the XOFF2 character remains unprogrammed,
there's little point enabling this feature along with its associated
interrupt.  Remove this, and ensure that the SCD bit is cleared.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index f5b2f395af2..71f968b5504 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -704,13 +704,8 @@ serial_omap_configure_xonxoff
         serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         serial_out(up, UART_TI752_TCR, OMAP_UART_TCR_TRIG);
-        /* Enable special char function UARTi.EFR_REG[5] and
-         * load the new software flow control mode IXON or IXOFF
-         * and restore the UARTi.EFR_REG[4] ENHANCED_EN value.
-         */
-        serial_out(up, UART_EFR, up->efr | UART_EFR_SCD);
+        serial_out(up, UART_EFR, up->efr);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-
         serial_out(up, UART_MCR, up->mcr & ~UART_MCR_TCRTLR);
         serial_out(up, UART_LCR, up->lcr);
 }
@@ -843,6 +838,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
         up->efr = serial_in(up, UART_EFR);
+        up->efr &= ~UART_EFR_SCD;
         serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
 
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);