diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 87dc3fc15694a73e83ecd971368c7e621b744c21..fe48193de094a6ff441d62a34a4afde2e3bb8392 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2599,7 +2599,12 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, if (IS_ERR(base)) return PTR_ERR(base); + /* Don't use DT serial aliases - it causes the device to + be renumbered to ttyAMA1 if it is the second serial port in the + system, even though the other one is ttyS0. The 8250 driver + doesn't use this logic, so always remains ttyS0. index = pl011_probe_dt_alias(index, dev); + */ uap->old_cr = 0; uap->port.dev = dev;