From 727bc3e38a9aa22d62cd321e69731d5210ec7710 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Thu, 10 Feb 2022 11:20:10 -0800 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_SERIAL_8250_RUNTIME_UARTS=0 8250_core registers 4 ISA uart ports by default, which can cause problems on some devices which don't have them. This change doesn't break earlycon=uart8250, but it will cause the 8250_of and 8250_pci sub drivers to be unable to register ports. Boards that really need the full 8250 driver to take over from earlycon can use the "8250.nr_uarts=X" kernel command line option to restore the ports allocation. Bug: 216312411 Signed-off-by: Alistair Delva Change-Id: I04715394b32bd98544657101de4537df34554ea9 --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 821b5398bae5..0a460f635066 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -371,6 +371,7 @@ CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y # CONFIG_SERIAL_8250_EXAR is not set +CONFIG_SERIAL_8250_RUNTIME_UARTS=0 CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_AMBA_PL011=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 030a8b418458..91ed9b2d92fe 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -342,6 +342,7 @@ CONFIG_INPUT_UINPUT=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_RUNTIME_UARTS=0 CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_CONSOLE=y