mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From c6afa6ec5a500ec8cbabe2f0f2c2ce6635fbd862 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Thu, 23 Feb 2023 09:34:12 +0000
|
|
Subject: [PATCH] Revert "amba_pl011: Don't use DT aliases for numbering"
|
|
|
|
This reverts commit c2fa32a8dae4c4b2638c9f4de5e398e98460e693.
|
|
|
|
Consistent, logical UART numbering is desirable, so remove the
|
|
effective revert.
|
|
|
|
See: https://forums.raspberrypi.com/viewtopic.php?t=347868
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/tty/serial/amba-pl011.c | 7 -------
|
|
1 file changed, 7 deletions(-)
|
|
|
|
--- a/drivers/tty/serial/amba-pl011.c
|
|
+++ b/drivers/tty/serial/amba-pl011.c
|
|
@@ -2654,7 +2654,6 @@ static struct uart_driver amba_reg = {
|
|
.cons = AMBA_CONSOLE,
|
|
};
|
|
|
|
-#if 0
|
|
static int pl011_probe_dt_alias(int index, struct device *dev)
|
|
{
|
|
struct device_node *np;
|
|
@@ -2686,7 +2685,6 @@ static int pl011_probe_dt_alias(int inde
|
|
|
|
return ret;
|
|
}
|
|
-#endif
|
|
|
|
/* unregisters the driver also if no more ports are left */
|
|
static void pl011_unregister_port(struct uart_amba_port *uap)
|
|
@@ -2738,12 +2736,7 @@ 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->port.dev = dev;
|
|
uap->port.mapbase = mmiobase->start;
|