Commit a4f74385 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman

Revert "serial: omap: fix software flow control"

This reverts commit 957ee727
(serial: omap: fix software flow control).

As Russell has pointed out, that commit isn't fixing
Software Flow Control at all, and it actually makes
it even more broken.

It was agreed to revert this commit and use Russell's
latest UART patches instead.

Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f0c0580
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
#define OMAP_UART_WER_MOD_WKUP 0X7F #define OMAP_UART_WER_MOD_WKUP 0X7F
/* Enable XON/XOFF flow control on output */ /* Enable XON/XOFF flow control on output */
#define OMAP_UART_SW_TX 0x8 #define OMAP_UART_SW_TX 0x04
/* Enable XON/XOFF flow control on input */ /* Enable XON/XOFF flow control on input */
#define OMAP_UART_SW_RX 0x2 #define OMAP_UART_SW_RX 0x04
#define OMAP_UART_SYSC_RESET 0X07 #define OMAP_UART_SYSC_RESET 0X07
#define OMAP_UART_TCR_TRIG 0X0F #define OMAP_UART_TCR_TRIG 0X0F
......
...@@ -671,19 +671,19 @@ serial_omap_configure_xonxoff ...@@ -671,19 +671,19 @@ serial_omap_configure_xonxoff
/* /*
* IXON Flag: * IXON Flag:
* Flow control for OMAP.TX * Enable XON/XOFF flow control on output.
* OMAP.RX should listen for XON/XOFF * Transmit XON1, XOFF1
*/ */
if (termios->c_iflag & IXON) if (termios->c_iflag & IXON)
up->efr |= OMAP_UART_SW_RX; up->efr |= OMAP_UART_SW_TX;
/* /*
* IXOFF Flag: * IXOFF Flag:
* Flow control for OMAP.RX * Enable XON/XOFF flow control on input.
* OMAP.TX should send XON/XOFF * Receiver compares XON1, XOFF1.
*/ */
if (termios->c_iflag & IXOFF) if (termios->c_iflag & IXOFF)
up->efr |= OMAP_UART_SW_TX; up->efr |= OMAP_UART_SW_RX;
serial_out(up, UART_EFR, up->efr | UART_EFR_ECB); serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment