Merge tag 'rtc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[karo-tx-linux.git] / drivers / tty / serial / meson_uart.c

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index 024445aa0521b36c3a75695a87065f631c301b0a..60f16795d16bd2f1012df899b1f01585dab74c9e 100644 (file)
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -364,7 +364,7 @@ static void meson_uart_set_termios(struct uart_port *port,
 
        writel(val, port->membase + AML_UART_CONTROL);
 
-       baud = uart_get_baud_rate(port, termios, old, 9600, 115200);
+       baud = uart_get_baud_rate(port, termios, old, 9600, 4000000);
        meson_uart_change_speed(port, baud);
 
        port->read_status_mask = AML_UART_TX_FIFO_WERR;
@@ -481,18 +481,13 @@ static void meson_console_putchar(struct uart_port *port, int ch)
        writel(ch, port->membase + AML_UART_WFIFO);
 }
 
-static void meson_serial_console_write(struct console *co, const char *s,
-                                      u_int count)
+static void meson_serial_port_write(struct uart_port *port, const char *s,
+                                   u_int count)
 {
-       struct uart_port *port;
        unsigned long flags;
        int locked;
        u32 val, tmp;
 
-       port = meson_ports[co->index];
-       if (!port)
-               return;
-
        local_irq_save(flags);
        if (port->sysrq) {
                locked = 0;
@@ -516,6 +511,18 @@ static void meson_serial_console_write(struct console *co, const char *s,
        local_irq_restore(flags);
 }
 
+static void meson_serial_console_write(struct console *co, const char *s,
+                                      u_int count)
+{
+       struct uart_port *port;
+
+       port = meson_ports[co->index];
+       if (!port)
+               return;
+
+       meson_serial_port_write(port, s, count);
+}
+
 static int meson_serial_console_setup(struct console *co, char *options)
 {
        struct uart_port *port;
@@ -554,6 +561,27 @@ static int __init meson_serial_console_init(void)
 }
 console_initcall(meson_serial_console_init);
 
+static void meson_serial_early_console_write(struct console *co,
+                                            const char *s,
+                                            u_int count)
+{
+       struct earlycon_device *dev = co->data;
+
+       meson_serial_port_write(&dev->port, s, count);
+}
+
+static int __init
+meson_serial_early_console_setup(struct earlycon_device *device, const char *opt)
+{
+       if (!device->port.membase)
+               return -ENODEV;
+
+       device->con->write = meson_serial_early_console_write;
+       return 0;
+}
+OF_EARLYCON_DECLARE(meson, "amlogic,meson-uart",
+                   meson_serial_early_console_setup);
+
 #define MESON_SERIAL_CONSOLE   (&meson_serial_console)
 #else
 #define MESON_SERIAL_CONSOLE   NULL