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

Commit d96fc14e authored by Jiada Wang's avatar Jiada Wang Committed by Sasha Levin
Browse files

serial: imx: Enable UCR4_OREN in startup interface 



[ Upstream commit 6f026d6b7cb6e019b6352ed7fb71497c787fd6d7 ]

Other than enable Receiver Overrun Interrupt Enable (UCR4_OREN)
in start_tx interface, UCR4_OREN should be enabled before enable
of Receiver.

Signed-off-by: default avatarJiada Wang <jiada_wang@mentor.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 3d96a48a

drivers/tty/serial/imx.c

+8 −7
Original line number Diff line number Diff line
@@ -590,13 +590,6 @@ static void imx_start_tx(struct uart_port *port) 
		temp &= ~(UCR1_RRDYEN);

		writel(temp, sport->port.membase + UCR1);

	}

	/* Clear any pending ORE flag before enabling interrupt */

	temp = readl(sport->port.membase + USR2);

	writel(temp | USR2_ORE, sport->port.membase + USR2);



	temp = readl(sport->port.membase + UCR4);

	temp |= UCR4_OREN;

	writel(temp, sport->port.membase + UCR4);



	if (!sport->dma_is_enabled) {

		temp = readl(sport->port.membase + UCR1);
@@ -1156,6 +1149,14 @@ static int imx_startup(struct uart_port *port) 


	writel(temp, sport->port.membase + UCR1);



	/* Clear any pending ORE flag before enabling interrupt */

	temp = readl(sport->port.membase + USR2);

	writel(temp | USR2_ORE, sport->port.membase + USR2);



	temp = readl(sport->port.membase + UCR4);

	temp |= UCR4_OREN;

	writel(temp, sport->port.membase + UCR4);



	temp = readl(sport->port.membase + UCR2);

	temp |= (UCR2_RXEN | UCR2_TXEN);

	if (!sport->have_rtscts)