raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

amba_pl011: Don't use DT aliases for numbering

Browse Source 
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.
This commit is contained in:
Phil Elwell
2016-02-23 17:26:48 +00:00
committed by popcornmix
parent c0e68a6067
commit 71393e7f69
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/serial/amba-pl011.c
View File

@@ -2599,7 +2599,12 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap,
if (IS_ERR(base)) if (IS_ERR(base))
return PTR_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); index = pl011_probe_dt_alias(index, dev);
*/
uap->old_cr = 0; uap->old_cr = 0;
uap->port.dev = dev; uap->port.dev = dev;