tty: serial: meson: enable console as module

Enable serial driver to be built as a module.  To do so, init the
console support on driver/module load instead of using
console_initcall().

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20201211005744.12855-1-khilman@baylibre.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2d73b823e91c0707ee2899a7b437ad2f29edcba1..12d71d5eb6caf9bc4bc2ddc6dc0be914f0a840b2 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -206,7 +206,7 @@ config SERIAL_MESON
 
 config SERIAL_MESON_CONSOLE
        bool "Support for console on meson"
-       depends on SERIAL_MESON=y
+       depends on SERIAL_MESON
        select SERIAL_CORE_CONSOLE
        select SERIAL_EARLYCON
        help

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index d2c08b760f8300f37174982b593e2670f9a94d35..69eeef9edfa509729e6efb4edac2a446098fe93a 100644 (file)
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -604,7 +604,6 @@ static int __init meson_serial_console_init(void)
        register_console(&meson_serial_console);
        return 0;
 }
-console_initcall(meson_serial_console_init);
 
 static void meson_serial_early_console_write(struct console *co,
                                             const char *s,
@@ -634,6 +633,9 @@ OF_EARLYCON_DECLARE(meson, "amlogic,meson-ao-uart",
 
 #define MESON_SERIAL_CONSOLE   (&meson_serial_console)
 #else
+static int __init meson_serial_console_init(void) {
+       return 0;
+}
 #define MESON_SERIAL_CONSOLE   NULL
 #endif
 
@@ -824,6 +826,10 @@ static int __init meson_uart_init(void)
 {
        int ret;
 
+       ret = meson_serial_console_init();
+       if (ret)
+               return ret;
+       
        ret = uart_register_driver(&meson_uart_driver);
        if (ret)
                return ret;