[DistroKit] [PATCH] v7a: kernel: use 8250-based serial driver for OMAP

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

v6.18-rc1 introduced commit ca8be8fc2c ("ARM: dts: am33xx-l4: fix UART
compatible"), which changed the compatible for the serial device nodes
to satisfy a binding checker warning.

Prior to that commit, there were two drivers that matched the UART
on the AM335x, but now there is only one and it's not the one we had
enabled in our kernel config.

Enable the 8250 UART driver and disable the old one we no longer use.
As this changes the name of the UART devices from /dev/ttyO to /dev/ttyS
by default (unless the CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP compatibility
option is enabled), we also enable CONFIG_DRIVER_SERIAL_NS16550_OMAP_TTYS
in barebox, so the correct TTY device is fixed up.

Reported-by: Michael Olbrich <mol@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/barebox-am335x-mlo.config | 2 +-
 configs/platform-v7a/barebox.config            | 2 +-
 configs/platform-v7a/kernelconfig              | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index 0390ce03603a..964ad484b126 100644
--- a/configs/platform-v7a/barebox-am335x-mlo.config
+++ b/configs/platform-v7a/barebox-am335x-mlo.config
@@ -247,7 +247,7 @@ CONFIG_OF_GPIO=y
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_DRIVER_SERIAL_ARM_DCC is not set
 CONFIG_DRIVER_SERIAL_NS16550=y
-# CONFIG_DRIVER_SERIAL_NS16550_OMAP_TTYS is not set
+CONFIG_DRIVER_SERIAL_NS16550_OMAP_TTYS=y
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
 # CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 94158ea58381..7c696f1f48e1 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -724,7 +724,7 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_DRIVER_SERIAL_IMX=y
 CONFIG_DRIVER_SERIAL_STM32=y
 CONFIG_DRIVER_SERIAL_NS16550=y
-# CONFIG_DRIVER_SERIAL_NS16550_OMAP_TTYS is not set
+CONFIG_DRIVER_SERIAL_NS16550_OMAP_TTYS=y
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
 # CONFIG_DRIVER_SERIAL_LPUART32 is not set
 # CONFIG_SERIAL_SIFIVE is not set
diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig
index f637dd7518ea..2985ce961e01 100644
--- a/configs/platform-v7a/kernelconfig
+++ b/configs/platform-v7a/kernelconfig
@@ -1966,7 +1966,8 @@ CONFIG_SERIAL_8250_BCM2835AUX=y
 CONFIG_SERIAL_8250_FSL=y
 # CONFIG_SERIAL_8250_DW is not set
 # CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_OMAP is not set
+CONFIG_SERIAL_8250_OMAP=y
+# CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
 
 #
@@ -1988,8 +1989,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
-- 
2.47.3