korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

tty: serial: meson: enable console as module

Browse Source 
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>
This commit is contained in:
Kevin Hilman 2020-12-10 16:57:44 -08:00 committed by Greg Kroah-Hartman
parent d96f04d347
commit 87a0b9f98a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/serial/Kconfig
View File

@ -206,7 +206,7 @@ config SERIAL_MESON
config SERIAL_MESON_CONSOLE config SERIAL_MESON_CONSOLE
bool "Support for console on meson" bool "Support for console on meson"
depends on SERIAL_MESON=y depends on SERIAL_MESON
select SERIAL_CORE_CONSOLE select SERIAL_CORE_CONSOLE
select SERIAL_EARLYCON select SERIAL_EARLYCON
help help

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

@ -604,7 +604,6 @@ static int __init meson_serial_console_init(void)
register_console(&meson_serial_console); register_console(&meson_serial_console);
return 0; return 0;
} }
console_initcall(meson_serial_console_init);
static void meson_serial_early_console_write(struct console *co, static void meson_serial_early_console_write(struct console *co,
const char *s, const char *s,
@ -634,6 +633,9 @@ OF_EARLYCON_DECLARE(meson, "amlogic,meson-ao-uart",
#define MESON_SERIAL_CONSOLE (&meson_serial_console) #define MESON_SERIAL_CONSOLE (&meson_serial_console)
#else #else
static int __init meson_serial_console_init(void) {
return 0;
}
#define MESON_SERIAL_CONSOLE NULL #define MESON_SERIAL_CONSOLE NULL
#endif #endif
@ -824,6 +826,10 @@ static int __init meson_uart_init(void)
{ {
int ret; int ret;
ret = meson_serial_console_init();
if (ret)
return ret;
ret = uart_register_driver(&meson_uart_driver); ret = uart_register_driver(&meson_uart_driver);
if (ret) if (ret)
return ret; return ret;