mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-28 07:03:56 +00:00
67d998e25d
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145 No patches needed a rebase. 23.05 backport: Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to changes introduced in commit e37aa926447f ("arm64: dts: mediatek: mt7622: fix memory node warning check") in version v5.15.143 and we jumped over from v5.15.139 directly to v5.15.145. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 23.05 backport: Stijn: Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64. Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3). Petr: Compile-tested: ipq807x, mvebu/cortexa9 Run-tested: turris-omnia, prpl-haze Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing] Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh] (cherry picked from commit 8de4cc77a6d5c25e48566d0203f159287ac7f3fe)
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
|
|
@@ -2752,7 +2752,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;
|