From f7382476af9d5e3d94bacc769bbf23d5fafd5cdb Mon Sep 17 00:00:00 2001 From: Huibin Hong Date: Mon, 5 Nov 2018 15:56:03 +0800 Subject: [PATCH] serial: 8250: add /dev/ttySx when uart is enable before the patch: ls /dev/ttyS ttyS0 ttyS1 ttyS2 ttyS3 ttyS4 ttyS5 ttyS6 ttyS7 after the patch: ls /dev/ttyS ttyS3 ttyS4 ttyS6 Change-Id: I844523408751cb579bbfb50fafb7923d5c2cafdf Signed-off-by: Huibin Hong --- drivers/tty/serial/8250/8250_core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index cae61d1ebec5..26ca6b94dc3f 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -558,6 +558,7 @@ static void __init serial8250_isa_init_ports(void) static void __init serial8250_register_ports(struct uart_driver *drv, struct device *dev) { +#ifndef CONFIG_ARCH_ROCKCHIP int i; for (i = 0; i < nr_uarts; i++) { @@ -574,6 +575,7 @@ serial8250_register_ports(struct uart_driver *drv, struct device *dev) serial8250_apply_quirks(up); uart_add_one_port(drv, &up->port); } +#endif } #ifdef CONFIG_SERIAL_8250_CONSOLE @@ -1019,7 +1021,9 @@ int serial8250_register_8250_port(struct uart_8250_port *up) uart->rs485_start_tx = up->rs485_start_tx; uart->rs485_stop_tx = up->rs485_stop_tx; uart->dma = up->dma; - +#ifdef CONFIG_ARCH_ROCKCHIP + uart->port.line = up->port.line; +#endif /* Take tx_loadsz from fifosize if it wasn't set separately */ if (uart->port.fifosize && !uart->tx_loadsz) uart->tx_loadsz = uart->port.fifosize;