leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: meson: remove unneeded variable assignment in meson_serial_port_write

Browse Source 
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:
Heiner Kallweit 2017-04-19 22:17:44 +02:00 committed by Greg Kroah-Hartman
parent 88f37d7071
commit ba50f1df13
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/tty/serial/meson_uart.c
View File

@ -124,6 +124,15 @@ static void meson_uart_stop_rx(struct uart_port *port)
writel(val, port->membase + AML_UART_CONTROL); 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) static void meson_uart_shutdown(struct uart_port *port)
{ {
unsigned long flags; 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 = readl(port->membase + AML_UART_CONTROL);
val |= AML_UART_TX_EN;
tmp = val & ~(AML_UART_TX_INT_EN | AML_UART_RX_INT_EN); tmp = val & ~(AML_UART_TX_INT_EN | AML_UART_RX_INT_EN);
writel(tmp, port->membase + AML_UART_CONTROL); 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) if (!port || !port->membase)
return -ENODEV; return -ENODEV;
meson_uart_enable_tx_engine(port);
if (options) if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow); 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) if (!device->port.membase)
return -ENODEV; return -ENODEV;
meson_uart_enable_tx_engine(&device->port);
device->con->write = meson_serial_early_console_write; device->con->write = meson_serial_early_console_write;
return 0; return 0;
} }