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

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

ASoC: Ensure output PGA is enabled for line outputs in wm_hubs 



Also fix a left/right typo while we're at it.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com.>
Cc: stable@kernel.org
parent 25709f6d

sound/soc/codecs/wm_hubs.c

+8 −8
Original line number Diff line number Diff line
@@ -787,17 +787,17 @@ static const struct snd_soc_dapm_route analogue_routes[] = { 
static const struct snd_soc_dapm_route lineout1_diff_routes[] = {

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

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

	{ "LINEOUT1 Mixer", "Output Switch", "Left Output Mixer" },

	{ "LINEOUT1 Mixer", "Output Switch", "Left Output PGA" },



	{ "LINEOUT1N Driver", NULL, "LINEOUT1 Mixer" },

	{ "LINEOUT1P Driver", NULL, "LINEOUT1 Mixer" },

};



static const struct snd_soc_dapm_route lineout1_se_routes[] = {

	{ "LINEOUT1N Mixer", "Left Output Switch", "Left Output Mixer" },

	{ "LINEOUT1N Mixer", "Right Output Switch", "Left Output Mixer" },

	{ "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" },

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



	{ "LINEOUT1P Mixer", "Left Output Switch", "Left Output Mixer" },

	{ "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" },



	{ "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },

	{ "LINEOUT1P Driver", NULL, "LINEOUT1P Mixer" },
@@ -806,17 +806,17 @@ 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", "Output Switch", "Right Output Mixer" },

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



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

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

};



static const struct snd_soc_dapm_route lineout2_se_routes[] = {

	{ "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" },

	{ "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" },

	{ "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },

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



	{ "LINEOUT2P Mixer", "Right Output Switch", "Right Output Mixer" },

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



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

	{ "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" },