Commit 41788f05 authored by Ben Dooks's avatar Ben Dooks Committed by Greg Kroah-Hartman

ARM: meson: serial: ensure console port uart enabled

Ensure the UART's transmitter is enabled when meson_console_putchar is
called. If not, then the console output is corrupt (the hardware seems
to try and send /something/ even if the TX is disabled).

This fixes corrupt console output on events such as trying to reboot the
system since the console tx may be called after drivers shutdown method has
been called.
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Reported-by: default avatarEdward Cragg <edward.cragg@codethink.co.uk>
Tested-by: default avatarCarlo Caione <carlo@endlessm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88679739
......@@ -472,6 +472,7 @@ static void meson_serial_console_write(struct console *co, const char *s,
struct uart_port *port;
unsigned long flags;
int locked;
u32 val;
port = meson_ports[co->index];
if (!port)
......@@ -487,6 +488,9 @@ static void meson_serial_console_write(struct console *co, const char *s,
locked = 1;
}
val = readl(port->membase + AML_UART_CONTROL);
writel(val | AML_UART_TX_EN, port->membase + AML_UART_CONTROL);
uart_console_write(port, s, count, meson_console_putchar);
if (locked)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment