diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-18 09:17:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-18 09:17:14 -0400 |
commit | 40f8989695660dee984338861ca9900b8e0b5183 (patch) | |
tree | 1b9843b2f5d46bafeb3a0a6378e316d71baa95b4 | |
parent | 2a5e9dab9acfb76cf0a4f96a9a17dc6eab2e472b (diff) | |
parent | 6b2afee11a05dfc2bb75bc6bb709c61130df37ae (diff) |
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 4 |
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[] = { | |||
674 | /* Left Input */ | 674 | /* Left Input */ |
675 | {"Left Line1L Mux", "single-ended", "LINE1L"}, | 675 | {"Left Line1L Mux", "single-ended", "LINE1L"}, |
676 | {"Left Line1L Mux", "differential", "LINE1L"}, | 676 | {"Left Line1L Mux", "differential", "LINE1L"}, |
677 | {"Left Line1R Mux", "single-ended", "LINE1R"}, | ||
678 | {"Left Line1R Mux", "differential", "LINE1R"}, | ||
677 | 679 | ||
678 | {"Left Line2L Mux", "single-ended", "LINE2L"}, | 680 | {"Left Line2L Mux", "single-ended", "LINE2L"}, |
679 | {"Left Line2L Mux", "differential", "LINE2L"}, | 681 | {"Left Line2L Mux", "differential", "LINE2L"}, |
@@ -690,6 +692,8 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
690 | /* Right Input */ | 692 | /* Right Input */ |
691 | {"Right Line1R Mux", "single-ended", "LINE1R"}, | 693 | {"Right Line1R Mux", "single-ended", "LINE1R"}, |
692 | {"Right Line1R Mux", "differential", "LINE1R"}, | 694 | {"Right Line1R Mux", "differential", "LINE1R"}, |
695 | {"Right Line1L Mux", "single-ended", "LINE1L"}, | ||
696 | {"Right Line1L Mux", "differential", "LINE1L"}, | ||
693 | 697 | ||
694 | {"Right Line2R Mux", "single-ended", "LINE2R"}, | 698 | {"Right Line2R Mux", "single-ended", "LINE2R"}, |
695 | {"Right Line2R Mux", "differential", "LINE2R"}, | 699 | {"Right Line2R Mux", "differential", "LINE2R"}, |