mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-22 22:54:06 +00:00
4921ab0be4
Manually rebased: bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch Remove upstreamed: bcm27xx/patches-5.15/950-0060-tty-amba-pl011-Add-un-throttle-support.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.56&id=2db3b95166f72e6481a79b82b1d6f94f4b18fcc1 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From da6e94edb85fc948357b4163b6ddaa9e75f5e0df 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
|
|
@@ -2744,7 +2744,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;
|