From 069e12986fd81e33097f806c8f2787f5d5416bfd Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Mon, 29 Mar 2021 15:41:43 -0700 Subject: [PATCH] ANDROID: GKI: Enable SERIAL_8250_DW Enable support for designware quirks in the 8250 driver. This could be built as a module, but if the 8250 earlycon driver is being used, doing so causes problems at boot. When clk_unused_disable() disables the uart clocks while the earlycon driver is using them, but before the full driver loads to take over the clocks, the device will reboot. This adds a relatively small amount of code to GKI so it should be harmless, at least until a way is found to split the 8250 earlycon support from the full driver. Bug: 183963484 Change-Id: I6e54dfce347f546e954703af083a9c55cf2ddd88 Signed-off-by: Alistair Delva (cherry picked from commit 2c5e03c769614cd2a98e3bc22664b8766bc2b4c7) Signed-off-by: Yongqin Liu --- 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 21102fe87a1c..f1aea345f539 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -317,6 +317,7 @@ CONFIG_SERIAL_8250=y 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 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index f43a1e7b14d4..6d41f164bb2f 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -289,6 +289,7 @@ 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_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_DEV_BUS=y CONFIG_HW_RANDOM=y