Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "serial: omap: fix software flow control"
parents 490916d6 a4f74385

arch/arm/plat-omap/include/plat/omap-serial.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -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

drivers/tty/serial/omap-serial.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -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);