Commit a6833214 authored Dec 13, 2012 by Steffen Trumtrar Committed by Greg Kroah-Hartman Jan 15, 2013

mxs: uart: fix setting RTS from software

With the patch "serial: mxs-auart: fix the wrong RTS hardware flow control" the
mainline mxs-uart driver now sets RTSEN only when hardware flow control is
enabled via software. It is not possible any longer to set RTS manually via
software. However, the manual modification is a valid operation.
Regain the possibility to set RTS via software and only set RTSEN when hardware
flow control is explicitly enabled via settermios cflag CRTSCTS.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: stable <stable@vger.kernel.org>
Reviewed-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9931faca

drivers/tty/serial/mxs-auart.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -412,10 +412,12 @@ static void mxs_auart_set_mctrl(struct uart_port *u, unsigned mctrl)

		u32 ctrl = readl(u->membase + AUART_CTRL2);

		ctrl &= ~AUART_CTRL2_RTSEN;
		ctrl &= ~(AUART_CTRL2_RTSEN \| AUART_CTRL2_RTS);
		if (mctrl & TIOCM_RTS) {
		if (tty_port_cts_enabled(&u->state->port))
		ctrl \|= AUART_CTRL2_RTSEN;
		else
		ctrl \|= AUART_CTRL2_RTS;
		}

		s->ctrl = mctrl;