ASoC: sun50i-codec-analog: Enable DAPM for headphone switch

By including the headphone mute switch to the DAPM graph, both the
headphone amplifier and the Mixer/DAC inputs can be powered off when
the headphones are muted.

The mute switch is between the source selection and the amplifier,
as per the diagram in the SoC manual.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Link: https://lore.kernel.org/r/20200726025334.59931-6-samuel@sholland.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c
index f988510..176d665 100644 (file)
--- a/sound/soc/sunxi/sun50i-codec-analog.c
+++ b/sound/soc/sunxi/sun50i-codec-analog.c
@@ -193,11 +193,6 @@ static const struct snd_kcontrol_new sun50i_a64_codec_controls[] = {
                       SUN50I_ADDA_HP_CTRL_HPVOL, 0x3f, 0,
                       sun50i_codec_hp_vol_scale),
 
-       SOC_DOUBLE("Headphone Playback Switch",
-                  SUN50I_ADDA_MIX_DAC_CTRL,
-                  SUN50I_ADDA_MIX_DAC_CTRL_LHPPAMUTE,
-                  SUN50I_ADDA_MIX_DAC_CTRL_RHPPAMUTE, 1, 0),
-
        /* Mixer pre-gain */
        SOC_SINGLE_TLV("Mic1 Playback Volume", SUN50I_ADDA_MIC1_CTRL,
                       SUN50I_ADDA_MIC1_CTRL_MIC1G,
@@ -264,6 +259,12 @@ static const struct snd_kcontrol_new sun50i_codec_hp_src[] = {
                      sun50i_codec_hp_src_enum),
 };
 
+static const struct snd_kcontrol_new sun50i_codec_hp_switch =
+       SOC_DAPM_DOUBLE("Headphone Playback Switch",
+                       SUN50I_ADDA_MIX_DAC_CTRL,
+                       SUN50I_ADDA_MIX_DAC_CTRL_LHPPAMUTE,
+                       SUN50I_ADDA_MIX_DAC_CTRL_RHPPAMUTE, 1, 0);
+
 static const char * const sun50i_codec_lineout_src_enum_text[] = {
        "Stereo", "Mono Differential",
 };
@@ -315,6 +316,10 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = {
                         SND_SOC_NOPM, 0, 0, sun50i_codec_hp_src),
        SND_SOC_DAPM_MUX("Right Headphone Source",
                         SND_SOC_NOPM, 0, 0, sun50i_codec_hp_src),
+       SND_SOC_DAPM_SWITCH("Left Headphone Switch",
+                           SND_SOC_NOPM, 0, 0, &sun50i_codec_hp_switch),
+       SND_SOC_DAPM_SWITCH("Right Headphone Switch",
+                           SND_SOC_NOPM, 0, 0, &sun50i_codec_hp_switch),
        SND_SOC_DAPM_OUT_DRV("Left Headphone Amp",
                             SND_SOC_NOPM, 0, 0, NULL, 0),
        SND_SOC_DAPM_OUT_DRV("Right Headphone Amp",
@@ -413,13 +418,15 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = {
        /* Headphone Routes */
        { "Left Headphone Source", "DAC", "Left DAC" },
        { "Left Headphone Source", "Mixer", "Left Mixer" },
-       { "Left Headphone Amp", NULL, "Left Headphone Source" },
+       { "Left Headphone Switch", "Headphone Playback Switch", "Left Headphone Source" },
+       { "Left Headphone Amp", NULL, "Left Headphone Switch" },
        { "Left Headphone Amp", NULL, "Headphone Amp" },
        { "HP", NULL, "Left Headphone Amp" },
 
        { "Right Headphone Source", "DAC", "Right DAC" },
        { "Right Headphone Source", "Mixer", "Right Mixer" },
-       { "Right Headphone Amp", NULL, "Right Headphone Source" },
+       { "Right Headphone Switch", "Headphone Playback Switch", "Right Headphone Source" },
+       { "Right Headphone Amp", NULL, "Right Headphone Switch" },
        { "Right Headphone Amp", NULL, "Headphone Amp" },
        { "HP", NULL, "Right Headphone Amp" },