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
6f775ba0
Commit
6f775ba0
authored
Oct 06, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream/wm8350' into for-2.6.32
parents
b266002a
5b7dde34
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8350.c
+2
-2
No files found.
sound/soc/codecs/wm8350.c
View file @
6f775ba0
...
@@ -579,7 +579,7 @@ static const struct snd_kcontrol_new wm8350_left_capt_mixer_controls[] = {
...
@@ -579,7 +579,7 @@ static const struct snd_kcontrol_new wm8350_left_capt_mixer_controls[] = {
SOC_DAPM_SINGLE_TLV
(
"L3 Capture Volume"
,
SOC_DAPM_SINGLE_TLV
(
"L3 Capture Volume"
,
WM8350_INPUT_MIXER_VOLUME_L
,
9
,
7
,
0
,
out_mix_tlv
),
WM8350_INPUT_MIXER_VOLUME_L
,
9
,
7
,
0
,
out_mix_tlv
),
SOC_DAPM_SINGLE
(
"PGA Capture Switch"
,
SOC_DAPM_SINGLE
(
"PGA Capture Switch"
,
WM8350_LEFT_INPUT_VOLUME
,
14
,
1
,
0
),
WM8350_LEFT_INPUT_VOLUME
,
14
,
1
,
1
),
};
};
/* Right Input Mixer */
/* Right Input Mixer */
...
@@ -589,7 +589,7 @@ static const struct snd_kcontrol_new wm8350_right_capt_mixer_controls[] = {
...
@@ -589,7 +589,7 @@ static const struct snd_kcontrol_new wm8350_right_capt_mixer_controls[] = {
SOC_DAPM_SINGLE_TLV
(
"L3 Capture Volume"
,
SOC_DAPM_SINGLE_TLV
(
"L3 Capture Volume"
,
WM8350_INPUT_MIXER_VOLUME_R
,
13
,
7
,
0
,
out_mix_tlv
),
WM8350_INPUT_MIXER_VOLUME_R
,
13
,
7
,
0
,
out_mix_tlv
),
SOC_DAPM_SINGLE
(
"PGA Capture Switch"
,
SOC_DAPM_SINGLE
(
"PGA Capture Switch"
,
WM8350_RIGHT_INPUT_VOLUME
,
14
,
1
,
0
),
WM8350_RIGHT_INPUT_VOLUME
,
14
,
1
,
1
),
};
};
/* Left Mic Mixer */
/* Left Mic Mixer */
...
...
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