From 7db9eec14fc159fdc005732f75f2322b691ad1d4 Mon Sep 17 00:00:00 2001
From: Raghavendra Rao Ananta <rananta@codeaurora.org>
Date: Sat, 12 Sep 2020 20:50:27 -0700
Subject: [PATCH] aarch64: defconfig: Cleanup the lahaina_GKI.config

Cleanup the redundant defconfig fragments from lahaina_GKI.config,
that are already enabled in gki_defconfig.

Change-Id: Iee78de5836407506a910a9d257072ab154dde0e1
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
---
 arch/arm64/configs/vendor/lahaina_GKI.config  | 11 -----------
 arch/arm64/configs/vendor/lahaina_QGKI.config |  2 ++
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 0db72e6249f9..afe3761329d8 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -12,7 +12,6 @@ CONFIG_REGULATOR_PROXY_CONSUMER=m
 CONFIG_PINCTRL_MSM=m
 CONFIG_PINCTRL_LAHAINA=m
 CONFIG_PINCTRL_SHIMA=m
-CONFIG_KEYBOARD_GPIO=m
 CONFIG_SND_USB_AUDIO_QMI=m
 CONFIG_EXTCON=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
@@ -34,13 +33,11 @@ CONFIG_USB_DWC3_QCOM=m
 CONFIG_USB_DWC3_MSM=m
 CONFIG_USB_EHSET_TEST_FIXTURE=m
 CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_CONFIGFS_NCM=m
 CONFIG_USB_CONFIGFS_F_DIAG=m
 CONFIG_USB_CONFIGFS_F_CCID=m
 CONFIG_USB_CONFIGFS_F_CDEV=m
 CONFIG_USB_CONFIGFS_F_GSI=m
 CONFIG_USB_CONFIGFS_F_UAC2=m
-CONFIG_USB_STORAGE=m
 CONFIG_TYPEC_UCSI=m
 CONFIG_UCSI_QTI_GLINK=m
 CONFIG_INTERCONNECT_QCOM=m
@@ -49,10 +46,8 @@ CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m
 CONFIG_PHY_QCOM_UFS_V4=m
 CONFIG_SCSI_UFS_QCOM=m
-CONFIG_SCSI_UFS_BSG=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_MSM_CORE_HANG_DETECT=m
-CONFIG_PANIC_ON_OOPS=y
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_LAHAINA_LLCC=m
 CONFIG_QCOM_SHIMA_LLCC=m
@@ -71,7 +66,6 @@ CONFIG_QCOM_SMP2P=m
 CONFIG_QCOM_SMSM=m
 CONFIG_MSM_QMP=m
 CONFIG_QCOM_SMP2P_SLEEPSTATE=m
-CONFIG_RPMSG_CHAR=m
 CONFIG_RPMSG_QCOM_GLINK_SMEM=m
 CONFIG_QCOM_GLINK=m
 CONFIG_MSM_GLINK_SSR=m
@@ -170,10 +164,8 @@ CONFIG_HVC_HAVEN=m
 CONFIG_MSM_GENI_SE=m
 CONFIG_SERIAL_MSM_GENI=m
 CONFIG_SERIAL_MSM_GENI_HALF_SAMPLING=y
-CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MSM_GENI=m
 CONFIG_SPI_MSM_GENI=m
-CONFIG_SPI_SPIDEV=y
 # CONFIG_SERIAL_MSM is not set
 CONFIG_MSM_GPI_DMA=m
 CONFIG_MSM_GPI_DMA_DEBUG=y
@@ -195,8 +187,6 @@ CONFIG_INTERCONNECT_TEST=m
 CONFIG_SCSI_UFS_CRYPTO_QTI=m
 CONFIG_QTI_CRYPTO_COMMON=m
 CONFIG_QTI_HW_KEY_MANAGER=m
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=m
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_SLIMBUS_MSM_NGD=m
 CONFIG_QRTR_HAVEN=m
@@ -205,7 +195,6 @@ CONFIG_QCOM_PDC=m
 CONFIG_HEADER_TEST=y
 CONFIG_HEADERS_INSTALL=y
 CONFIG_KERNEL_HEADER_TEST=y
-CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_PROPERTIES is not set
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_ST=m
diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 64cb2e193a1e..b20cc1ef68d7 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -21,6 +21,8 @@ CONFIG_QCOM_LLCC_PERFMON=m
 CONFIG_SCHED_WALT=y
 CONFIG_QCOM_HYP_CORE_CTL=y
 CONFIG_QGKI=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_SPI_SPIDEV=y
 CONFIG_REGULATOR_QTI_DEBUG=y
 CONFIG_REGMAP_QTI_DEBUG=y
 CONFIG_IPC_LOGGING=y