Commit 87a0b9f9 authored by Kevin Hilman's avatar Kevin Hilman Committed by Greg Kroah-Hartman
Browse files

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: default avatarKevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20201211005744.12855-1-khilman@baylibre.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d96f04d3

drivers/tty/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/tty/serial/meson_uart.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE