diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-10-23 13:31:16 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-14 03:59:48 (GMT) |
| commit | 4828d5c30a2e1d300f7ca7c15868cead2ef7fb29 (patch) | |
| tree | 6b8d8e5ef0fcb1bb11e259a3892cfd507e5518ec /drivers/tty/serial | |
| parent | fbccaca9bd099e3b8bc6dfabb8dc6f57ad83d1a8 (diff) | |
| download | linux-4828d5c30a2e1d300f7ca7c15868cead2ef7fb29.tar.xz | |
serial: 8250_ingenic: allow to be independent of SERIAL_8250_CONSOLE
This UART driver should not depend on the console. They should be
orthogonal.
Surround the earlycon code with CONFIG_SERIAL_EARLYCON conditional
and rip off "depends on SERIAL_8250_CONSOLE".
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/8250/8250_ingenic.c | 2 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/Kconfig | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c index 49394b4..d6e1ec9 100644 --- a/drivers/tty/serial/8250/8250_ingenic.c +++ b/drivers/tty/serial/8250/8250_ingenic.c @@ -48,6 +48,7 @@ static const struct of_device_id of_match[]; #define UART_MCR_MDCE BIT(7) #define UART_MCR_FCM BIT(6) +#ifdef CONFIG_SERIAL_EARLYCON static struct earlycon_device *early_device; static uint8_t __init early_in(struct uart_port *port, int offset) @@ -140,6 +141,7 @@ OF_EARLYCON_DECLARE(jz4775_uart, "ingenic,jz4775-uart", EARLYCON_DECLARE(jz4780_uart, ingenic_early_console_setup); OF_EARLYCON_DECLARE(jz4780_uart, "ingenic,jz4780-uart", ingenic_early_console_setup); +#endif /* CONFIG_SERIAL_EARLYCON */ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value) { diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 5d6808c..25da430 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -361,7 +361,7 @@ config SERIAL_8250_UNIPHIER config SERIAL_8250_INGENIC bool "Support for Ingenic SoC serial ports" - depends on SERIAL_8250_CONSOLE && OF_FLATTREE + depends on OF_FLATTREE select LIBFDT help If you have a system using an Ingenic SoC and wish to make use of |