From 03a7305505991563ed9757c69f78857531e5d349 Mon Sep 17 00:00:00 2001 From: David Collins Date: Thu, 30 Jan 2020 13:50:27 -0800 Subject: [PATCH] defconfig: lahaina: correct PMIC ADC driver config enablement Move CONFIG_QCOM_SPMI_ADC5 into lahaina_GKI.config so that the PMIC ADC driver can be used in GKI builds. Also, change CONFIG_QTI_ADC_TM from 'm' to 'y' so that it is statically compiled in QGKI builds. Change-Id: I6d40beecd8c2d309d5fd177ab70e111e467922ce Signed-off-by: David Collins --- arch/arm64/configs/vendor/lahaina_GKI.config | 1 + arch/arm64/configs/vendor/lahaina_QGKI.config | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config index 37c82d890a37..072b618f4233 100644 --- a/arch/arm64/configs/vendor/lahaina_GKI.config +++ b/arch/arm64/configs/vendor/lahaina_GKI.config @@ -14,6 +14,7 @@ CONFIG_MFD_I2C_PMIC=m CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_NVMEM_SPMI_SDAM=m CONFIG_RTC_DRV_PM8XXX=m +CONFIG_QCOM_SPMI_ADC5=m CONFIG_QCOM_SPMI_TEMP_ALARM=m CONFIG_INPUT_QPNP_POWER_ON=m CONFIG_NOP_USB_XCEIV=m diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index b89a58a5a810..2bf61b3ec0aa 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -103,8 +103,7 @@ CONFIG_QTI_QMI_SENSOR=y CONFIG_QTI_BCL_PMIC5=y CONFIG_QTI_BCL_SOC_DRIVER=y CONFIG_QTI_QMI_COOLING_DEVICE=y -CONFIG_QTI_ADC_TM=m -CONFIG_QCOM_SPMI_ADC5=m +CONFIG_QTI_ADC_TM=y CONFIG_SPS=y # CONFIG_SPS_SUPPORT_BAMDMA is not set CONFIG_SPS_SUPPORT_NDP_BAM=y