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

Commit 44008559 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1

parents b0b3e6f8 b793eb60

sound/soc/codecs/wm8994.c

+4 −3
Original line number Diff line number Diff line
@@ -1206,7 +1206,6 @@ SND_SOC_DAPM_INPUT("DMIC1DAT"), 
SND_SOC_DAPM_INPUT("DMIC2DAT"),

SND_SOC_DAPM_INPUT("Clock"),



SND_SOC_DAPM_MICBIAS("MICBIAS", WM8994_MICBIAS, 2, 0),

SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev,

		      SND_SOC_DAPM_PRE_PMU),
@@ -1517,8 +1516,10 @@ static const struct snd_soc_dapm_route wm8994_revd_intercon[] = { 
	{ "AIF2DACDAT", NULL, "AIF1DACDAT" },

	{ "AIF1ADCDAT", NULL, "AIF2ADCDAT" },

	{ "AIF2ADCDAT", NULL, "AIF1ADCDAT" },

	{ "MICBIAS", NULL, "CLK_SYS" },

	{ "MICBIAS", NULL, "MICBIAS Supply" },

	{ "MICBIAS1", NULL, "CLK_SYS" },

	{ "MICBIAS1", NULL, "MICBIAS Supply" },

	{ "MICBIAS2", NULL, "CLK_SYS" },

	{ "MICBIAS2", NULL, "MICBIAS Supply" },

};



static const struct snd_soc_dapm_route wm8994_intercon[] = {