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

Commit 68d12bb2 authored by Helmut Grohne's avatar Helmut Grohne Committed by Greg Kroah-Hartman
Browse files

serial: xuartps: fix typo in cdns_uart_startup 

The bit mask changes in commit 6e14f7c1 ("tty: xuartps: Improve
startup function") doesn't do what the commit message advertises. The
original behaviour was clearing the RX_DIS bit, but due to missing ~,
that bit is now the only bit kept.

Currently, the regression is harmless, because the previous write to the
control register sets it to TXRST | RXRST. Thus the RX_DIS bit is
previously cleared. The *RST bits are cleared by the hardware, so this
commit does not currently change behaviour, but makes future changes
less risky.

Link: https://www.spinics.net/lists/linux-serial/msg23157.html


Signed-off-by: default avatarHelmut Grohne <h.grohne@intenta.de>
Fixes: 6e14f7c1 ("tty: xuartps: Improve startup function")
Reviewed-by: default avatarSören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85c634e9

drivers/tty/serial/xilinx_uartps.c

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ static int cdns_uart_startup(struct uart_port *port) 
	 * the receiver.

	 */

	status = readl(port->membase + CDNS_UART_CR);

	status &= CDNS_UART_CR_RX_DIS;

	status &= ~CDNS_UART_CR_RX_DIS;

	status |= CDNS_UART_CR_RX_EN;

	writel(status, port->membase + CDNS_UART_CR);