From 2664a74e4a223faf99e292e250c08bee60135818 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 23 Feb 2016 17:26:48 +0000 Subject: [PATCH] amba_pl011: Don't use DT aliases for numbering raspberrypi inclusion category: feature bugzilla: 50432 -------------------------------- The pl011 driver looks for DT aliases of the form "serial", and if found uses 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. Signed-off-by: Fang Yafen Signed-off-by: Zheng Zengkai --- drivers/tty/serial/amba-pl011.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 87dc3fc15694..fe48193de094 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; -- GitLab