Commit b85e9578 authored by Mark Brown's avatar Mark Brown

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

parents ebc0b386 6b2afee1
...@@ -674,6 +674,8 @@ static const struct snd_soc_dapm_route intercon[] = { ...@@ -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[] = { ...@@ -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"},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment