diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-26 15:55:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-22 12:06:46 +0200 |
| commit | 2229308774bf777bef0288a24cc0ebd43e6e8aa5 (patch) | |
| tree | a7ae98b18487e7cc6c247454281f93117f10ade8 | |
| parent | 452063d755094e7604c39acab88083cc188c2c03 (diff) | |
| download | linux-stable-2229308774bf777bef0288a24cc0ebd43e6e8aa5.tar.gz linux-stable-2229308774bf777bef0288a24cc0ebd43e6e8aa5.tar.bz2 linux-stable-2229308774bf777bef0288a24cc0ebd43e6e8aa5.zip | |
serial: imx: Fix DCD reading
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>
| -rw-r--r-- | drivers/tty/serial/imx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 0df2b1c091ae..615c0279a1a6 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -740,12 +740,13 @@ static unsigned int imx_get_hwmctrl(struct imx_port *sport) { 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) |