serial: imx: set_termios(): preserve RTS state (011bd05d) · Commits · 戴 / test

drivers/tty/serial/imx.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -1562,7 +1562,14 @@ imx_uart_set_termios(struct uart_port port, struct ktermios termios,

		spin_lock_irqsave(&sport->port.lock, flags);

		ucr2 = UCR2_SRST \| UCR2_IRTS;
		/*
		* Read current UCR2 and save it for future use, then clear all the bits
		* except those we will or may need to preserve.
		*/
		old_ucr2 = imx_uart_readl(sport, UCR2);
		ucr2 = old_ucr2 & (UCR2_TXEN \| UCR2_RXEN \| UCR2_ATEN \| UCR2_CTS);

		ucr2 \|= UCR2_SRST \| UCR2_IRTS;
		if ((termios->c_cflag & CSIZE) == CS8)
		ucr2 \|= UCR2_WS;

		@@ -1631,7 +1638,6 @@ imx_uart_set_termios(struct uart_port port, struct ktermios termios,
		imx_uart_writel(sport,
		old_ucr1 & ~(UCR1_TXMPTYEN \| UCR1_RRDYEN \| UCR1_RTSDEN),
		UCR1);
		old_ucr2 = imx_uart_readl(sport, UCR2);
		imx_uart_writel(sport, old_ucr2 & ~UCR2_ATEN, UCR2);

		while (!(imx_uart_readl(sport, USR2) & USR2_TXDC))
		@@ -1639,7 +1645,6 @@ imx_uart_set_termios(struct uart_port port, struct ktermios termios,

		/* then, disable everything */
		imx_uart_writel(sport, old_ucr2 & ~(UCR2_TXEN \| UCR2_RXEN \| UCR2_ATEN), UCR2);
		old_ucr2 &= (UCR2_TXEN \| UCR2_RXEN \| UCR2_ATEN);

		/* custom-baudrate handling */
		div = sport->port.uartclk / (baud * 16);
		@@ -1677,8 +1682,7 @@ imx_uart_set_termios(struct uart_port port, struct ktermios termios,

		imx_uart_writel(sport, old_ucr1, UCR1);

		/* set the parity, stop bits and data size */
		imx_uart_writel(sport, ucr2 \| old_ucr2, UCR2);
		imx_uart_writel(sport, ucr2, UCR2);

		if (UART_ENABLE_MS(&sport->port, termios->c_cflag))
		imx_uart_enable_ms(&sport->port);