Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
c6eb1fa4
Commit
c6eb1fa4
authored
Mar 04, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/rt5677' into asoc-linus
parents
159c6fc0
70068776
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
sound/soc/codecs/rt5677.c
sound/soc/codecs/rt5677.c
+16
-16
No files found.
sound/soc/codecs/rt5677.c
View file @
c6eb1fa4
...
...
@@ -3284,8 +3284,8 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
{
"IB45 Bypass Mux"
,
"Bypass"
,
"IB45 Mux"
},
{
"IB45 Bypass Mux"
,
"Pass SRC"
,
"IB45 Mux"
},
{
"IB6 Mux"
,
"IF1 DAC 6"
,
"IF1 DAC6"
},
{
"IB6 Mux"
,
"IF2 DAC 6"
,
"IF2 DAC6"
},
{
"IB6 Mux"
,
"IF1 DAC 6"
,
"IF1 DAC6
Mux
"
},
{
"IB6 Mux"
,
"IF2 DAC 6"
,
"IF2 DAC6
Mux
"
},
{
"IB6 Mux"
,
"SLB DAC 6"
,
"SLB DAC6"
},
{
"IB6 Mux"
,
"STO4 ADC MIX L"
,
"Stereo4 ADC MIXL"
},
{
"IB6 Mux"
,
"IF4 DAC L"
,
"IF4 DAC L"
},
...
...
@@ -3293,8 +3293,8 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
{
"IB6 Mux"
,
"STO2 ADC MIX L"
,
"Stereo2 ADC MIXL"
},
{
"IB6 Mux"
,
"STO3 ADC MIX L"
,
"Stereo3 ADC MIXL"
},
{
"IB7 Mux"
,
"IF1 DAC 7"
,
"IF1 DAC7"
},
{
"IB7 Mux"
,
"IF2 DAC 7"
,
"IF2 DAC7"
},
{
"IB7 Mux"
,
"IF1 DAC 7"
,
"IF1 DAC7
Mux
"
},
{
"IB7 Mux"
,
"IF2 DAC 7"
,
"IF2 DAC7
Mux
"
},
{
"IB7 Mux"
,
"SLB DAC 7"
,
"SLB DAC7"
},
{
"IB7 Mux"
,
"STO4 ADC MIX R"
,
"Stereo4 ADC MIXR"
},
{
"IB7 Mux"
,
"IF4 DAC R"
,
"IF4 DAC R"
},
...
...
@@ -3635,15 +3635,15 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
{
"DAC1 FS"
,
NULL
,
"DAC1 MIXL"
},
{
"DAC1 FS"
,
NULL
,
"DAC1 MIXR"
},
{
"DAC2 L Mux"
,
"IF1 DAC 2"
,
"IF1 DAC2"
},
{
"DAC2 L Mux"
,
"IF2 DAC 2"
,
"IF2 DAC2"
},
{
"DAC2 L Mux"
,
"IF1 DAC 2"
,
"IF1 DAC2
Mux
"
},
{
"DAC2 L Mux"
,
"IF2 DAC 2"
,
"IF2 DAC2
Mux
"
},
{
"DAC2 L Mux"
,
"IF3 DAC L"
,
"IF3 DAC L"
},
{
"DAC2 L Mux"
,
"IF4 DAC L"
,
"IF4 DAC L"
},
{
"DAC2 L Mux"
,
"SLB DAC 2"
,
"SLB DAC2"
},
{
"DAC2 L Mux"
,
"OB 2"
,
"OutBound2"
},
{
"DAC2 R Mux"
,
"IF1 DAC 3"
,
"IF1 DAC3"
},
{
"DAC2 R Mux"
,
"IF2 DAC 3"
,
"IF2 DAC3"
},
{
"DAC2 R Mux"
,
"IF1 DAC 3"
,
"IF1 DAC3
Mux
"
},
{
"DAC2 R Mux"
,
"IF2 DAC 3"
,
"IF2 DAC3
Mux
"
},
{
"DAC2 R Mux"
,
"IF3 DAC R"
,
"IF3 DAC R"
},
{
"DAC2 R Mux"
,
"IF4 DAC R"
,
"IF4 DAC R"
},
{
"DAC2 R Mux"
,
"SLB DAC 3"
,
"SLB DAC3"
},
...
...
@@ -3651,29 +3651,29 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
{
"DAC2 R Mux"
,
"Haptic Generator"
,
"Haptic Generator"
},
{
"DAC2 R Mux"
,
"VAD ADC"
,
"VAD ADC Mux"
},
{
"DAC3 L Mux"
,
"IF1 DAC 4"
,
"IF1 DAC4"
},
{
"DAC3 L Mux"
,
"IF2 DAC 4"
,
"IF2 DAC4"
},
{
"DAC3 L Mux"
,
"IF1 DAC 4"
,
"IF1 DAC4
Mux
"
},
{
"DAC3 L Mux"
,
"IF2 DAC 4"
,
"IF2 DAC4
Mux
"
},
{
"DAC3 L Mux"
,
"IF3 DAC L"
,
"IF3 DAC L"
},
{
"DAC3 L Mux"
,
"IF4 DAC L"
,
"IF4 DAC L"
},
{
"DAC3 L Mux"
,
"SLB DAC 4"
,
"SLB DAC4"
},
{
"DAC3 L Mux"
,
"OB 4"
,
"OutBound4"
},
{
"DAC3 R Mux"
,
"IF1 DAC 5"
,
"IF1 DAC
4
"
},
{
"DAC3 R Mux"
,
"IF2 DAC 5"
,
"IF2 DAC
4
"
},
{
"DAC3 R Mux"
,
"IF1 DAC 5"
,
"IF1 DAC
5 Mux
"
},
{
"DAC3 R Mux"
,
"IF2 DAC 5"
,
"IF2 DAC
5 Mux
"
},
{
"DAC3 R Mux"
,
"IF3 DAC R"
,
"IF3 DAC R"
},
{
"DAC3 R Mux"
,
"IF4 DAC R"
,
"IF4 DAC R"
},
{
"DAC3 R Mux"
,
"SLB DAC 5"
,
"SLB DAC5"
},
{
"DAC3 R Mux"
,
"OB 5"
,
"OutBound5"
},
{
"DAC4 L Mux"
,
"IF1 DAC 6"
,
"IF1 DAC6"
},
{
"DAC4 L Mux"
,
"IF2 DAC 6"
,
"IF2 DAC6"
},
{
"DAC4 L Mux"
,
"IF1 DAC 6"
,
"IF1 DAC6
Mux
"
},
{
"DAC4 L Mux"
,
"IF2 DAC 6"
,
"IF2 DAC6
Mux
"
},
{
"DAC4 L Mux"
,
"IF3 DAC L"
,
"IF3 DAC L"
},
{
"DAC4 L Mux"
,
"IF4 DAC L"
,
"IF4 DAC L"
},
{
"DAC4 L Mux"
,
"SLB DAC 6"
,
"SLB DAC6"
},
{
"DAC4 L Mux"
,
"OB 6"
,
"OutBound6"
},
{
"DAC4 R Mux"
,
"IF1 DAC 7"
,
"IF1 DAC7"
},
{
"DAC4 R Mux"
,
"IF2 DAC 7"
,
"IF2 DAC7"
},
{
"DAC4 R Mux"
,
"IF1 DAC 7"
,
"IF1 DAC7
Mux
"
},
{
"DAC4 R Mux"
,
"IF2 DAC 7"
,
"IF2 DAC7
Mux
"
},
{
"DAC4 R Mux"
,
"IF3 DAC R"
,
"IF3 DAC R"
},
{
"DAC4 R Mux"
,
"IF4 DAC R"
,
"IF4 DAC R"
},
{
"DAC4 R Mux"
,
"SLB DAC 7"
,
"SLB DAC7"
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment