Commit 6ad2c73d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-3.7-rc3' of git://

Pull serial fix from Greg Kroah-Hartman:
 "Here is one patch, a revert of a omap serial driver patch that was
  causing problems, for your 3.7-rc tree.

  Signed-off-by: Greg Kroah-Hartman <>"

* tag 'tty-3.7-rc3' of git://
  Revert "serial: omap: fix software flow control"
parents 490916d6 a4f74385
......@@ -40,10 +40,10 @@
/* 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 */
#define OMAP_UART_SW_RX 0x2
#define OMAP_UART_SW_RX 0x04
......@@ -671,19 +671,19 @@ serial_omap_configure_xonxoff
* IXON Flag:
* Flow control for OMAP.TX
* OMAP.RX should listen for XON/XOFF
* Enable XON/XOFF flow control on output.
* Transmit XON1, XOFF1
if (termios->c_iflag & IXON)
up->efr |= OMAP_UART_SW_RX;
up->efr |= OMAP_UART_SW_TX;
* IXOFF Flag:
* Flow control for OMAP.RX
* OMAP.TX should send XON/XOFF
* Enable XON/XOFF flow control on input.
* Receiver compares XON1, XOFF1.
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_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