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
nexedi
linux
Commits
1cba77c1
Commit
1cba77c1
authored
Oct 12, 2011
by
Mark Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASoC: Update WM5100 accessory detection for revision A
Signed-off-by:
Mark Brown
<
broonie@opensource.wolfsonmicro.com
>
parent
7c04241a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
sound/soc/codecs/wm5100.c
sound/soc/codecs/wm5100.c
+3
-0
sound/soc/codecs/wm5100.h
sound/soc/codecs/wm5100.h
+7
-0
No files found.
sound/soc/codecs/wm5100.c
View file @
1cba77c1
...
@@ -2132,6 +2132,9 @@ static void wm5100_set_detect_mode(struct snd_soc_codec *codec, int the_mode)
...
@@ -2132,6 +2132,9 @@ static void wm5100_set_detect_mode(struct snd_soc_codec *codec, int the_mode)
WM5100_ACCDET_SRC
,
WM5100_ACCDET_SRC
,
(
mode
->
bias
<<
WM5100_ACCDET_BIAS_SRC_SHIFT
)
|
(
mode
->
bias
<<
WM5100_ACCDET_BIAS_SRC_SHIFT
)
|
mode
->
micd_src
<<
WM5100_ACCDET_SRC_SHIFT
);
mode
->
micd_src
<<
WM5100_ACCDET_SRC_SHIFT
);
snd_soc_update_bits
(
codec
,
WM5100_MISC_CONTROL
,
WM5100_HPCOM_SRC
,
mode
->
micd_src
<<
WM5100_HPCOM_SRC_SHIFT
);
wm5100
->
jack_mode
=
the_mode
;
wm5100
->
jack_mode
=
the_mode
;
...
...
sound/soc/codecs/wm5100.h
View file @
1cba77c1
...
@@ -96,6 +96,7 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
...
@@ -96,6 +96,7 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
#define WM5100_MIC_DETECT_1 0x290
#define WM5100_MIC_DETECT_1 0x290
#define WM5100_MIC_DETECT_2 0x291
#define WM5100_MIC_DETECT_2 0x291
#define WM5100_MIC_DETECT_3 0x292
#define WM5100_MIC_DETECT_3 0x292
#define WM5100_MISC_CONTROL 0x2BB
#define WM5100_INPUT_ENABLES 0x301
#define WM5100_INPUT_ENABLES 0x301
#define WM5100_INPUT_ENABLES_STATUS 0x302
#define WM5100_INPUT_ENABLES_STATUS 0x302
#define WM5100_IN1L_CONTROL 0x310
#define WM5100_IN1L_CONTROL 0x310
...
@@ -1388,6 +1389,12 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
...
@@ -1388,6 +1389,12 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
#define WM5100_ACCDET_STS_SHIFT 0
/* ACCDET_STS */
#define WM5100_ACCDET_STS_SHIFT 0
/* ACCDET_STS */
#define WM5100_ACCDET_STS_WIDTH 1
/* ACCDET_STS */
#define WM5100_ACCDET_STS_WIDTH 1
/* ACCDET_STS */
/*
* R699 (0x2BB) - Misc Control
*/
#define WM5100_HPCOM_SRC 0x200
/* HPCOM_SRC */
#define WM5100_HPCOM_SRC_SHIFT 9
/* HPCOM_SRC */
/*
/*
* R769 (0x301) - Input Enables
* R769 (0x301) - Input Enables
*/
*/
...
...
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