ASoC: wm8974: Correct boost mixer inputs

Bit 6 of INPPGA (INPPGAMUTE) does not control the Aux path, it controls
the input PGA path, as can been seen from Figure 8 Input Boost Stage in
the datasheet. Update the naming of things in the driver to match this
and update the routing to also reflect this.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231113155916.1741027-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index 044b6f604c090a69401597a5d2427cad86c46466..260bac695b20ab7f93ed1584f1437fd6f219dc92 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -186,7 +186,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8974_MONOMIX, 0, 1, 0),
 
 /* Boost mixer */
 static const struct snd_kcontrol_new wm8974_boost_mixer[] = {
-SOC_DAPM_SINGLE("Aux Switch", WM8974_INPPGA, 6, 1, 1),
+SOC_DAPM_SINGLE("PGA Switch", WM8974_INPPGA, 6, 1, 1),
 };
 
 /* Input PGA */
@@ -246,8 +246,8 @@ static const struct snd_soc_dapm_route wm8974_dapm_routes[] = {
 
        /* Boost Mixer */
        {"ADC", NULL, "Boost Mixer"},
-       {"Boost Mixer", "Aux Switch", "Aux Input"},
-       {"Boost Mixer", NULL, "Input PGA"},
+       {"Boost Mixer", NULL, "Aux Input"},
+       {"Boost Mixer", "PGA Switch", "Input PGA"},
        {"Boost Mixer", NULL, "MICP"},
 
        /* Input PGA */