From acbb167a16095a72c983ade3a746b4e61da7bbd4 Mon Sep 17 00:00:00 2001 From: David Collins Date: Thu, 30 Jan 2020 15:24:17 -0800 Subject: [PATCH] defconfig: lahaina: remove disablement of SPMI temp alarm driver CONFIG_QCOM_SPMI_TEMP_ALARM is incorrectly disabled in lahaina_QGKI.config and lahaina_debug.config. Remove this disablement so that the SPMI temp alarm driver is compiled in both GKI and QGKI builds. Change-Id: I2f54dae62dabe50758974c70f39f713141d16d8f Signed-off-by: David Collins --- arch/arm64/configs/vendor/lahaina_QGKI.config | 2 -- arch/arm64/configs/vendor/lahaina_debug.config | 1 - 2 files changed, 3 deletions(-) diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index b89a58a5a810..c100ff72d0b9 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -86,12 +86,10 @@ CONFIG_CORESIGHT_DUMMY=y CONFIG_CORESIGHT_REMOTE_ETM=y CONFIG_CORESIGHT_TGU=y CONFIG_AUDIO_QGKI=y -# CONFIG_QCOM_SPMI_TEMP_ALARM is not set # CONFIG_CORESIGHT_CATU is not set # CONFIG_CORESIGHT_CTI_SAVE_DISABLE is not set # CONFIG_CORESIGHT_TPDM_DEFAULT_ENABLE is not set CONFIG_BTFM_SLIM=m -# CONFIG_QCOM_SPMI_TEMP_ALARM is not set # CONFIG_SND_SOC_WCD9335 is not set # CONFIG_SLIM_QCOM_CTRL is not set # CONFIG_SLIM_QCOM_NGD_CTRL is not set diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config index 1861ccf098b7..1d97c7180835 100644 --- a/arch/arm64/configs/vendor/lahaina_debug.config +++ b/arch/arm64/configs/vendor/lahaina_debug.config @@ -46,7 +46,6 @@ CONFIG_CNSS_QCA6490=y CONFIG_CNSS_UTILS=m CONFIG_CNSS_GENL=m CONFIG_WCNSS_MEM_PRE_ALLOC=m -# CONFIG_QCOM_SPMI_TEMP_ALARM is not set CONFIG_MHI_BUS=y CONFIG_MHI_DEBUG=y CONFIG_MHI_UCI=y