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

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

Merge "ASoC: wcd9xxx: Register callback for external micbias"

parents 319270c2 3baba60b

sound/soc/codecs/msm8x10-wcd.c

+5 −3
Original line number Diff line number Diff line
@@ -2424,6 +2424,11 @@ static const struct snd_soc_dapm_widget msm8x10_wcd_dapm_widgets[] = { 
		MSM8X10_WCD_A_MICB_1_CTL, 7, 0,

		msm8x10_wcd_codec_enable_micbias, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_MICBIAS_E("MIC BIAS External",

		MSM8X10_WCD_A_MICB_1_CTL, 7, 0,

		msm8x10_wcd_codec_enable_micbias, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_ADC_E("ADC1", NULL, MSM8X10_WCD_A_TX_1_EN, 7, 0,

		msm8x10_wcd_codec_enable_adc, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
@@ -2439,9 +2444,6 @@ static const struct snd_soc_dapm_widget msm8x10_wcd_dapm_widgets[] = { 
	SND_SOC_DAPM_MUX("ADC2 MUX", SND_SOC_NOPM, 0, 0,

		&tx_adc2_mux),



	SND_SOC_DAPM_MICBIAS("MIC BIAS External", MSM8X10_WCD_A_MICB_1_CTL,

			     7, 0),



	SND_SOC_DAPM_INPUT("AMIC3"),



	SND_SOC_DAPM_MUX_E("DEC1 MUX",