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

Commit 39cca168 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Fix output PGA enabling in wm_hubs CODECs 



The output PGA was not being powered up in headphone and speaker paths,
removing the ability to offer volume control and mute with the output
PGA.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Cc: stable@kernel.org
parent 90db8ece

sound/soc/codecs/wm_hubs.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -740,12 +740,12 @@ static const struct snd_soc_dapm_route analogue_routes[] = { 




	{ "SPKL", "Input Switch", "MIXINL" },

	{ "SPKL", "Input Switch", "MIXINL" },

	{ "SPKL", "IN1LP Switch", "IN1LP" },

	{ "SPKL", "IN1LP Switch", "IN1LP" },

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

	{ "SPKL", "Output Switch", "Left Output PGA" },

	{ "SPKL", NULL, "TOCLK" },

	{ "SPKL", NULL, "TOCLK" },





	{ "SPKR", "Input Switch", "MIXINR" },

	{ "SPKR", "Input Switch", "MIXINR" },

	{ "SPKR", "IN1RP Switch", "IN1RP" },

	{ "SPKR", "IN1RP Switch", "IN1RP" },

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

	{ "SPKR", "Output Switch", "Right Output PGA" },

	{ "SPKR", NULL, "TOCLK" },

	{ "SPKR", NULL, "TOCLK" },





	{ "SPKL Boost", "Direct Voice Switch", "Direct Voice" },

	{ "SPKL Boost", "Direct Voice Switch", "Direct Voice" },
@@ -767,8 +767,8 @@ static const struct snd_soc_dapm_route analogue_routes[] = { 
	{ "SPKOUTRP", NULL, "SPKR Driver" },

	{ "SPKOUTRP", NULL, "SPKR Driver" },

	{ "SPKOUTRN", NULL, "SPKR Driver" },

	{ "SPKOUTRN", NULL, "SPKR Driver" },





	{ "Left Headphone Mux", "Mixer", "Left Output Mixer" },

	{ "Left Headphone Mux", "Mixer", "Left Output PGA" },

	{ "Right Headphone Mux", "Mixer", "Right Output Mixer" },

	{ "Right Headphone Mux", "Mixer", "Right Output PGA" },





	{ "Headphone PGA", NULL, "Left Headphone Mux" },

	{ "Headphone PGA", NULL, "Left Headphone Mux" },

	{ "Headphone PGA", NULL, "Right Headphone Mux" },

	{ "Headphone PGA", NULL, "Right Headphone Mux" },