diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-18 14:17:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-18 14:17:14 +0100 |
| commit | 40f8989695660dee984338861ca9900b8e0b5183 (patch) | |
| tree | 1b9843b2f5d46bafeb3a0a6378e316d71baa95b4 /sound/soc | |
| parent | 2a5e9dab9acfb76cf0a4f96a9a17dc6eab2e472b (diff) | |
| parent | 6b2afee11a05dfc2bb75bc6bb709c61130df37ae (diff) | |
| download | kernel_goldelico_gta04-40f8989695660dee984338861ca9900b8e0b5183.zip kernel_goldelico_gta04-40f8989695660dee984338861ca9900b8e0b5183.tar.gz kernel_goldelico_gta04-40f8989695660dee984338861ca9900b8e0b5183.tar.bz2 | |
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
Diffstat (limited to 'sound/soc')
| -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 6e3f269..64ad84d 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"}, |