diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index 39126460c1f5..1b11a0e734dc 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -564,6 +564,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++) { @@ -582,6 +583,7 @@ serial8250_register_ports(struct uart_driver *drv, struct device *dev) uart_add_one_port(drv, &up->port); } +#endif } #ifdef CONFIG_SERIAL_8250_CONSOLE @@ -989,7 +991,9 @@ int serial8250_register_8250_port(struct uart_8250_port *up) uart->port.rs485_config = up->port.rs485_config; uart->port.rs485 = up->port.rs485; 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;