summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-18 15:17:14 +0200
committerMark Brown <broonie@linaro.org>2013-10-18 15:17:14 +0200
commit40f8989695660dee984338861ca9900b8e0b5183 (patch)
tree1b9843b2f5d46bafeb3a0a6378e316d71baa95b4
parentMerge remote-tracking branch 'asoc/fix/rcar' into asoc-linus (diff)
parentASoC: tlv320aic3x: Connect 'Left Line1R Mux' and 'Right Line1L Mux' (diff)
downloadlinux-40f8989695660dee984338861ca9900b8e0b5183.tar.xz
linux-40f8989695660dee984338861ca9900b8e0b5183.zip
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
-rw-r--r--sound/soc/codecs/tlv320aic3x.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 6e3f269243e0..64ad84d8a306 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -674,6 +674,8 @@ static const struct snd_soc_dapm_route intercon[] = {
/* Left Input */
{"Left Line1L Mux", "single-ended", "LINE1L"},
{"Left Line1L Mux", "differential", "LINE1L"},
+ {"Left Line1R Mux", "single-ended", "LINE1R"},
+ {"Left Line1R Mux", "differential", "LINE1R"},
{"Left Line2L Mux", "single-ended", "LINE2L"},
{"Left Line2L Mux", "differential", "LINE2L"},
@@ -690,6 +692,8 @@ static const struct snd_soc_dapm_route intercon[] = {
/* Right Input */
{"Right Line1R Mux", "single-ended", "LINE1R"},
{"Right Line1R Mux", "differential", "LINE1R"},
+ {"Right Line1L Mux", "single-ended", "LINE1L"},
+ {"Right Line1L Mux", "differential", "LINE1L"},
{"Right Line2R Mux", "single-ended", "LINE2R"},
{"Right Line2R Mux", "differential", "LINE2R"},