From e7a0975abf62ae4026411e0759fa83b640437f65 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Fri, 10 Apr 2020 17:10:03 -0700 Subject: [PATCH] ANDROID: GKI: Add configs needed for ARM Fixed Virtual Platform Bug: 142352330 Change-Id: Ifedce69a0250403775344d67499fe3888899c3f6 Signed-off-by: Peter Collingbourne --- arch/arm64/configs/gki_defconfig | 3 ++- arch/x86/configs/gki_defconfig | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 56752fd7c2a9..942beffc4c03 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -295,7 +295,7 @@ CONFIG_USB_USBNET=y # CONFIG_WLAN_VENDOR_QUANTENNA is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set +# CONFIG_MOUSE_PS2 is not set CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_XPAD=y CONFIG_INPUT_TOUCHSCREEN=y @@ -332,6 +332,7 @@ CONFIG_SPMI=y # CONFIG_PINCTRL_SUN50I_H5 is not set # CONFIG_PINCTRL_SUN50I_H6 is not set # CONFIG_PINCTRL_SUN50I_H6_R is not set +CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_POWER_AVS=y CONFIG_POWER_RESET_HISI=y # CONFIG_HWMON is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 5ce410458aba..52c34d2823b9 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -269,7 +269,7 @@ CONFIG_USB_USBNET=y # CONFIG_WLAN_VENDOR_QUANTENNA is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set +# CONFIG_MOUSE_PS2 is not set CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_XPAD=y CONFIG_INPUT_TOUCHSCREEN=y @@ -292,6 +292,7 @@ CONFIG_HPET=y # CONFIG_I2C_HELPER_AUTO is not set CONFIG_SPI=y CONFIG_GPIOLIB=y +CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_HWMON is not set CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100