ASoC: sun50i-codec-analog: Make line out routes stereo

This matches the hardware more accurately, and is necessary for
including the (stereo) line out mute switch in the DAPM graph.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Link: https://lore.kernel.org/r/20200726025334.59931-7-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 176d665..df39f6f 100644 (file)
--- a/sound/soc/sunxi/sun50i-codec-analog.c
+++ b/sound/soc/sunxi/sun50i-codec-analog.c
@@ -328,7 +328,9 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = {
                             SUN50I_ADDA_HP_CTRL_HPPA_EN, 0, NULL, 0),
        SND_SOC_DAPM_OUTPUT("HP"),
 
-       SND_SOC_DAPM_MUX("Line Out Source Playback Route",
+       SND_SOC_DAPM_MUX("Left Line Out Source",
+                        SND_SOC_NOPM, 0, 0, sun50i_codec_lineout_src),
+       SND_SOC_DAPM_MUX("Right Line Out Source",
                         SND_SOC_NOPM, 0, 0, sun50i_codec_lineout_src),
        SND_SOC_DAPM_OUTPUT("LINEOUT"),
 
@@ -439,12 +441,14 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = {
        { "Mic2 Amplifier", NULL, "MIC2"},
 
        /* Line-out Routes */
-       { "Line Out Source Playback Route", "Stereo", "Left Mixer" },
-       { "Line Out Source Playback Route", "Stereo", "Right Mixer" },
-       { "Line Out Source Playback Route", "Mono Differential", "Left Mixer" },
-       { "Line Out Source Playback Route", "Mono Differential",
-               "Right Mixer" },
-       { "LINEOUT", NULL, "Line Out Source Playback Route" },
+       { "Left Line Out Source", "Stereo", "Left Mixer" },
+       { "Left Line Out Source", "Mono Differential", "Left Mixer" },
+       { "Left Line Out Source", "Mono Differential", "Right Mixer" },
+       { "LINEOUT", NULL, "Left Line Out Source" },
+
+       { "Right Line Out Source", "Stereo", "Right Mixer" },
+       { "Right Line Out Source", "Mono Differential", "Left Line Out Source" },
+       { "LINEOUT", NULL, "Right Line Out Source" },
 
        /* Earpiece Routes */
        { "Earpiece Source Playback Route", "DACL", "Left DAC" },