Message ID | 20220110082616.13474-4-yu.tu@amlogic.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | tty: serial: meson: meson_uart_shutdown omit clear AML_UART_TX_EN bit | expand |
Hi All, I'm really sorry for sending the wrong specified file. Please ignore the email. I will resend V4. On 2022/1/10 16:26, Yu Tu wrote: > This change is an improvement. The meson_uart_shutdown function > should have the opposite operation to the meson_uart_startup > function, but the meson_uart_shutdown of AML_UART_TX_EN is logically > missing. > > Signed-off-by: Yu Tu <yu.tu@amlogic.com> > --- > drivers/tty/serial/meson_uart.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c > index 9b07e3534969..c17109d6d441 100644 > --- a/drivers/tty/serial/meson_uart.c > +++ b/drivers/tty/serial/meson_uart.c > @@ -140,7 +140,7 @@ static void meson_uart_shutdown(struct uart_port *port) > spin_lock_irqsave(&port->lock, flags); > > val = readl(port->membase + AML_UART_CONTROL); > - val &= ~AML_UART_RX_EN; > + val &= ~(AML_UART_RX_EN | AML_UART_TX_EN); > val &= ~(AML_UART_RX_INT_EN | AML_UART_TX_INT_EN); > writel(val, port->membase + AML_UART_CONTROL); > > > base-commit: b3a9e3b9622ae10064826dccb4f7a52bd88c7407 > prerequisite-patch-id: 97a514f3447511cb204179ce03ae99dc1d5902d9 > prerequisite-patch-id: a2e4756ff85f0df0efe111d7e2cb51b8e26e226f > prerequisite-patch-id: af9e3acc8f6ff7602d3a68a57c008e5ec362b353 > prerequisite-patch-id: a44e5da7009d9b815eb87395cbd7d14e7d953a09
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index 9b07e3534969..c17109d6d441 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -140,7 +140,7 @@ static void meson_uart_shutdown(struct uart_port *port) spin_lock_irqsave(&port->lock, flags); val = readl(port->membase + AML_UART_CONTROL); - val &= ~AML_UART_RX_EN; + val &= ~(AML_UART_RX_EN | AML_UART_TX_EN); val &= ~(AML_UART_RX_INT_EN | AML_UART_TX_INT_EN); writel(val, port->membase + AML_UART_CONTROL);
This change is an improvement. The meson_uart_shutdown function should have the opposite operation to the meson_uart_startup function, but the meson_uart_shutdown of AML_UART_TX_EN is logically missing. Signed-off-by: Yu Tu <yu.tu@amlogic.com> --- drivers/tty/serial/meson_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: b3a9e3b9622ae10064826dccb4f7a52bd88c7407 prerequisite-patch-id: 97a514f3447511cb204179ce03ae99dc1d5902d9 prerequisite-patch-id: a2e4756ff85f0df0efe111d7e2cb51b8e26e226f prerequisite-patch-id: af9e3acc8f6ff7602d3a68a57c008e5ec362b353 prerequisite-patch-id: a44e5da7009d9b815eb87395cbd7d14e7d953a09