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

Commit d9194003 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd: Enable MBHC ADC by default" into msm-4.9

parents 64f4c89b 1c474678

sound/soc/codecs/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -888,6 +888,8 @@ config SND_SOC_WCD9330 
config SND_SOC_WCD9335

        tristate

	depends on WCD9335_CODEC

	select SND_SOC_WCD_MBHC

	select SND_SOC_WCD_MBHC_LEGACY



config SND_SOC_WCD934X

        tristate
@@ -903,6 +905,7 @@ config SND_SOC_WCD934X_MBHC 
        tristate

	depends on SND_SOC_WCD934X

	select SND_SOC_WCD_MBHC

	select SND_SOC_WCD_MBHC_ADC



config SND_SOC_WSA881X

        tristate
@@ -931,8 +934,6 @@ config AUDIO_EXT_CLK 


config SND_SOC_WCD_MBHC

	tristate

	default y if (SND_SOC_MSM8909_WCD=y || SND_SOC_SDM660_CDC=y || SND_SOC_WCD9335=y) && SND_SOC_MDMCALIFORNIUM!=y

	select SND_SOC_WCD_MBHC_LEGACY



config SND_SOC_WCD_MBHC_LEGACY

	tristate

sound/soc/codecs/sdm660_cdc/Kconfig

+2 −0
Original line number Diff line number Diff line 


config SND_SOC_SDM660_CDC

	tristate "MSM Internal PMIC based codec"

	select SND_SOC_WCD_MBHC

	select SND_SOC_WCD_MBHC_LEGACY