Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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"
+8
-8
+2
-2
arch/arm/plat-omap/include/plat/omap-serial.h
+2
-2
arch/arm/plat-omap/include/plat/omap-serial.h
···
40
40
#define OMAP_UART_WER_MOD_WKUP 0X7F
41
41
42
42
/* Enable XON/XOFF flow control on output */
43
-
#define OMAP_UART_SW_TX 0x8
43
+
#define OMAP_UART_SW_TX 0x04
44
44
45
45
/* Enable XON/XOFF flow control on input */
46
-
#define OMAP_UART_SW_RX 0x2
46
+
#define OMAP_UART_SW_RX 0x04
47
47
48
48
#define OMAP_UART_SYSC_RESET 0X07
49
49
#define OMAP_UART_TCR_TRIG 0X0F
+6
-6
drivers/tty/serial/omap-serial.c
+6
-6
drivers/tty/serial/omap-serial.c
···
671
671
672
672
/*
673
673
* IXON Flag:
674
-
* Flow control for OMAP.TX
675
-
* OMAP.RX should listen for XON/XOFF
674
+
* Enable XON/XOFF flow control on output.
675
+
* Transmit XON1, XOFF1
676
676
*/
677
677
if (termios->c_iflag & IXON)
678
-
up->efr |= OMAP_UART_SW_RX;
678
+
up->efr |= OMAP_UART_SW_TX;
679
679
680
680
/*
681
681
* IXOFF Flag:
682
-
* Flow control for OMAP.RX
683
-
* OMAP.TX should send XON/XOFF
682
+
* Enable XON/XOFF flow control on input.
683
+
* Receiver compares XON1, XOFF1.
684
684
*/
685
685
if (termios->c_iflag & IXOFF)
686
-
up->efr |= OMAP_UART_SW_TX;
686
+
up->efr |= OMAP_UART_SW_RX;
687
687
688
688
serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
689
689
serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);