Serial fix for 3.7-rc3
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 <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlCKwvoACgkQMUfUDdst+ymoNACeKWk+71cE4eNIDm72ZXI1W+Vr IKwAn1ucM5516OgesMlNrQ6tiKQFWo6M =4ou2 -----END PGP SIGNATURE----- Merge tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 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 <gregkh@linuxfoundation.org>" * tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "serial: omap: fix software flow control"
This commit is contained in:
commit
6ad2c73d11
|
@ -40,10 +40,10 @@
|
|||
#define OMAP_UART_WER_MOD_WKUP 0X7F
|
||||
|
||||
/* 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
|
||||
|
||||
#define OMAP_UART_SYSC_RESET 0X07
|
||||
#define OMAP_UART_TCR_TRIG 0X0F
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue