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

Commit 4b75f800 authored by Sascha Hauer's avatar Sascha Hauer Committed by Greg Kroah-Hartman
Browse files

serial: imx: Fix DCD reading 



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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Fixes: 90ebc483 ("serial: imx: repair and complete handshaking")
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: <stable@vger.kernel.org> # 4.5+
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b97055bc

drivers/tty/serial/imx.c

+2 −1
Original line number Diff line number Diff line
@@ -763,12 +763,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)