Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdf10ece authored Jan 31, 2020 by qctecmdr Committed by Gerrit - the friendly Code Review server Jan 31, 2020

Merge "defconfig: lahaina: remove disablement of SPMI temp alarm driver"

parents b8d282e1 acbb167a

arch/arm64/configs/vendor/lahaina_QGKI.config

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

arch/arm64/configs/vendor/lahaina_debug.config

+0 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,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