p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus

This commit is contained in:
Mark Brown 2013-10-24 11:23:56 +01:00
parent ebc0b38625 6b2afee11a
commit b85e95781c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/tlv320aic3x.c
View File

@ -674,6 +674,8 @@ static const struct snd_soc_dapm_route intercon[] = {
/* Left Input */ /* Left Input */
{"Left Line1L Mux", "single-ended", "LINE1L"}, {"Left Line1L Mux", "single-ended", "LINE1L"},
{"Left Line1L Mux", "differential", "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", "single-ended", "LINE2L"},
{"Left Line2L Mux", "differential", "LINE2L"}, {"Left Line2L Mux", "differential", "LINE2L"},
@ -690,6 +692,8 @@ static const struct snd_soc_dapm_route intercon[] = {
/* Right Input */ /* Right Input */
{"Right Line1R Mux", "single-ended", "LINE1R"}, {"Right Line1R Mux", "single-ended", "LINE1R"},
{"Right Line1R Mux", "differential", "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", "single-ended", "LINE2R"},
{"Right Line2R Mux", "differential", "LINE2R"}, {"Right Line2R Mux", "differential", "LINE2R"},