summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2017-01-08 02:57:06 +0800
committerMark Brown <broonie@kernel.org>2017-01-09 19:48:35 +0000
commit19426bdedb72b965db0ebf2106e95e9eeb3b5935 (patch)
tree410ad61aff562c768e46e6520d90e42614f70edf /sound
parent7762681a3ada5fca6017e75ea7f9cdac08fc50b9 (diff)
downloadlinux-stable-19426bdedb72b965db0ebf2106e95e9eeb3b5935.tar.gz
linux-stable-19426bdedb72b965db0ebf2106e95e9eeb3b5935.tar.bz2
linux-stable-19426bdedb72b965db0ebf2106e95e9eeb3b5935.zip
ASoC: sun4i-codec: Add "Right Mixer" to "Line Out Mono Diff." route
The mono differential output for "Line Out" downmixes the stereo audio from the mixer, instead of just taking the left channel. Add a route from the "Right Mixer" to "Line Out Source Playback Route" through the "Mono Differential" path, so DAPM doesn't shut down everything if the left channel is muted. Fixes: 0f909f98d7cb ("ASoC: sun4i-codec: Add support for A31 Line Out playback") Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sunxi/sun4i-codec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 848af01692a0..c3aab10fa085 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -1058,6 +1058,7 @@ static const struct snd_soc_dapm_route sun6i_codec_codec_dapm_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" },
/* ADC Routes */