amba_pl011: Don't use DT aliases for numbering

The pl011 driver looks for DT aliases of the form "serial<n>",
and if found uses <n> as the device ID. This can cause
/dev/ttyAMA0 to become /dev/ttyAMA1, which is confusing if the
other serial port is provided by the 8250 driver which doesn't
use the same logic.

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 1888d168a41c87c605962da2605df8ab1c02bd20..e22b9e79836a6aeef4c8f9fb618b9595c551500f 100644 (file)
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2582,7 +2582,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<n> 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;