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

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

ASoC: wm_hubs: Fix routing of input PGAs to line output mixer 



IN1L/R is routed to both line output mixers, we don't route IN1 to LINEOUT1
and IN2 to LINEOUT2.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org
parent 1ae5cbc5

sound/soc/codecs/wm_hubs.c

+4 −4
Original line number Diff line number Diff line
@@ -586,8 +586,8 @@ SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER1, 0, 1, 0), 
};



static const struct snd_kcontrol_new line2_mix[] = {

SOC_DAPM_SINGLE("IN2R Switch", WM8993_LINE_MIXER2, 2, 1, 0),

SOC_DAPM_SINGLE("IN2L Switch", WM8993_LINE_MIXER2, 1, 1, 0),

SOC_DAPM_SINGLE("IN1R Switch", WM8993_LINE_MIXER2, 2, 1, 0),

SOC_DAPM_SINGLE("IN1L Switch", WM8993_LINE_MIXER2, 1, 1, 0),

SOC_DAPM_SINGLE("Output Switch", WM8993_LINE_MIXER2, 0, 1, 0),

};
@@ -848,8 +848,8 @@ static const struct snd_soc_dapm_route lineout1_se_routes[] = { 
};



static const struct snd_soc_dapm_route lineout2_diff_routes[] = {

	{ "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" },

	{ "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" },

	{ "LINEOUT2 Mixer", "IN1L Switch", "IN1L PGA" },

	{ "LINEOUT2 Mixer", "IN1R Switch", "IN1R PGA" },

	{ "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" },



	{ "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },