mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
serial: meson: remove unneeded variable assignment in meson_serial_port_write
There's no need to set AML_UART_TX_EN in each call to meson_serial_port_write. In addition to meson_uart_startup set this flag in meson_serial_console_setup and meson_serial_early_console_setup. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
88f37d7071
commit
ba50f1df13
1 changed files with 12 additions and 1 deletions
|
@ -124,6 +124,15 @@ static void meson_uart_stop_rx(struct uart_port *port)
|
|||
writel(val, port->membase + AML_UART_CONTROL);
|
||||
}
|
||||
|
||||
static void meson_uart_enable_tx_engine(struct uart_port *port)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
val = readl(port->membase + AML_UART_CONTROL);
|
||||
val |= AML_UART_TX_EN;
|
||||
writel(val, port->membase + AML_UART_CONTROL);
|
||||
}
|
||||
|
||||
static void meson_uart_shutdown(struct uart_port *port)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
@ -499,7 +508,6 @@ static void meson_serial_port_write(struct uart_port *port, const char *s,
|
|||
}
|
||||
|
||||
val = readl(port->membase + AML_UART_CONTROL);
|
||||
val |= AML_UART_TX_EN;
|
||||
tmp = val & ~(AML_UART_TX_INT_EN | AML_UART_RX_INT_EN);
|
||||
writel(tmp, port->membase + AML_UART_CONTROL);
|
||||
|
||||
|
@ -538,6 +546,8 @@ static int meson_serial_console_setup(struct console *co, char *options)
|
|||
if (!port || !port->membase)
|
||||
return -ENODEV;
|
||||
|
||||
meson_uart_enable_tx_engine(port);
|
||||
|
||||
if (options)
|
||||
uart_parse_options(options, &baud, &parity, &bits, &flow);
|
||||
|
||||
|
@ -576,6 +586,7 @@ meson_serial_early_console_setup(struct earlycon_device *device, const char *opt
|
|||
if (!device->port.membase)
|
||||
return -ENODEV;
|
||||
|
||||
meson_uart_enable_tx_engine(&device->port);
|
||||
device->con->write = meson_serial_early_console_write;
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue