lede/target/linux/bcm27xx/patches-5.4/950-0031-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
AmadeusGhost 5d98c4178e
kernel: bump 5.4 to 5.4.75 (#5780)
[mac80211]
 5b29614 mac80211: another fix for the sta connection monitor
 1ed6eb1 mac80211: backport sched_set_fifo_low
 cba4120 mac80211: add support for specifying a per-device scan list
 e0d482f rt2x00: mt7620: differentiate based on SoC's CHIP_VER

[package]
 amd64-microcode/intel-microcode/linux-firmware: update version
2020-11-14 00:52:35 +08:00

30 lines
1.1 KiB
Diff

From 803eba9a3e9a343903ebe0f6bf2ad80475736200 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 23 Feb 2016 17:26:48 +0000
Subject: [PATCH] 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.
---
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
@@ -2578,7 +2578,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;