2016-04-24 11:03:39 +00:00
|
|
|
From d06dacf300fbd1eee8c8b1e9c916f4856622b9c2 Mon Sep 17 00:00:00 2001
|
2016-03-08 18:11:49 +00:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
Date: Tue, 23 Feb 2016 17:26:48 +0000
|
2016-04-24 11:03:39 +00:00
|
|
|
Subject: [PATCH 153/304] amba_pl011: Don't use DT aliases for numbering
|
2016-03-08 18:11:49 +00:00
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
---
|
|
|
|
|
drivers/tty/serial/amba-pl011.c | 5 +++++
|
|
|
|
|
1 file changed, 5 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/tty/serial/amba-pl011.c
|
|
|
|
|
+++ b/drivers/tty/serial/amba-pl011.c
|
|
|
|
|
@@ -2313,7 +2313,12 @@ static int pl011_setup_port(struct devic
|
|
|
|
|
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;
|
