| From 4b75f80003617fe35771a9e27022e8fbd6a41875 Mon Sep 17 00:00:00 2001 |
| From: Sascha Hauer <s.hauer@pengutronix.de> |
| Date: Mon, 26 Sep 2016 15:55:31 +0200 |
| Subject: serial: imx: Fix DCD reading |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Sascha Hauer <s.hauer@pengutronix.de> |
| |
| commit 4b75f80003617fe35771a9e27022e8fbd6a41875 upstream. |
| |
| The USR2_DCDIN bit is tested for in register usr1. As the name |
| suggests the usr2 register should be used instead. This fixes |
| reading the Carrier detect status. |
| |
| Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> |
| Fixes: 90ebc4838666 ("serial: imx: repair and complete handshaking") |
| Acked-by: Uwe Kleine-Kรถnig <u.kleine-koenig@pengutronix.de> |
| Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/tty/serial/imx.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/tty/serial/imx.c |
| +++ b/drivers/tty/serial/imx.c |
| @@ -740,12 +740,13 @@ static unsigned int imx_get_hwmctrl(stru |
| { |
| unsigned int tmp = TIOCM_DSR; |
| unsigned usr1 = readl(sport->port.membase + USR1); |
| + unsigned usr2 = readl(sport->port.membase + USR2); |
| |
| if (usr1 & USR1_RTSS) |
| tmp |= TIOCM_CTS; |
| |
| /* in DCE mode DCDIN is always 0 */ |
| - if (!(usr1 & USR2_DCDIN)) |
| + if (!(usr2 & USR2_DCDIN)) |
| tmp |= TIOCM_CAR; |
| |
| if (sport->dte_mode) |
