On 12/14/2012 03:27 AM, Huang Shijie wrote: > 于 2012年12月13日 21:27, Steffen Trumtrar 写道: >> 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@xxxxxxxxxxxxxx> >> --- >> drivers/tty/serial/mxs-auart.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c >> index 6db23b0..9f63f88 100644 >> --- a/drivers/tty/serial/mxs-auart.c >> +++ b/drivers/tty/serial/mxs-auart.c >> @@ -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; > Reviewed-by: Huang Shijie <b32955@xxxxxxxxxxxxx> This patch is not not in today's next. What's the current status? Who will take it? Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature