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

Commit 56c90e53 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: Add the new widget to enable external micbias2"

parents c6aad0b5 89102e2e

sound/soc/codecs/msm8x16-wcd.c

+5 −0
Original line number Diff line number Diff line
@@ -2017,9 +2017,11 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"MIC BIAS Internal1", NULL, "INT_LDO_H"},

	{"MIC BIAS Internal2", NULL, "INT_LDO_H"},

	{"MIC BIAS External", NULL, "INT_LDO_H"},

	{"MIC BIAS External2", NULL, "INT_LDO_H"},

	{"MIC BIAS Internal1", NULL, "MICBIAS_REGULATOR"},

	{"MIC BIAS Internal2", NULL, "MICBIAS_REGULATOR"},

	{"MIC BIAS External", NULL, "MICBIAS_REGULATOR"},

	{"MIC BIAS External2", NULL, "MICBIAS_REGULATOR"},

};



static int msm8x16_wcd_startup(struct snd_pcm_substream *substream,
@@ -2521,6 +2523,9 @@ static const struct snd_soc_dapm_widget msm8x16_wcd_dapm_widgets[] = { 
	SND_SOC_DAPM_MICBIAS("MIC BIAS External",

		MSM8X16_WCD_A_ANALOG_MICB_1_EN, 7, 0),



	SND_SOC_DAPM_MICBIAS("MIC BIAS External2",

		MSM8X16_WCD_A_ANALOG_MICB_2_EN, 7, 0),



	SND_SOC_DAPM_INPUT("AMIC3"),



	SND_SOC_DAPM_MUX_E("DEC1 MUX",