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
4277c2a2
Commit
4277c2a2
authored
Apr 12, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next
parents
106c386a
939dc51b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
sound/soc/codecs/wm2000.c
sound/soc/codecs/wm2000.c
+3
-1
sound/soc/codecs/wm2000.h
sound/soc/codecs/wm2000.h
+2
-0
No files found.
sound/soc/codecs/wm2000.c
View file @
4277c2a2
...
@@ -761,6 +761,8 @@ static bool wm2000_readable_reg(struct device *dev, unsigned int reg)
...
@@ -761,6 +761,8 @@ static bool wm2000_readable_reg(struct device *dev, unsigned int reg)
case
WM2000_REG_SYS_CTL2
:
case
WM2000_REG_SYS_CTL2
:
case
WM2000_REG_ANC_STAT
:
case
WM2000_REG_ANC_STAT
:
case
WM2000_REG_IF_CTL
:
case
WM2000_REG_IF_CTL
:
case
WM2000_REG_ANA_MIC_CTL
:
case
WM2000_REG_SPK_CTL
:
return
true
;
return
true
;
default:
default:
return
false
;
return
false
;
...
@@ -771,7 +773,7 @@ static const struct regmap_config wm2000_regmap = {
...
@@ -771,7 +773,7 @@ static const struct regmap_config wm2000_regmap = {
.
reg_bits
=
16
,
.
reg_bits
=
16
,
.
val_bits
=
8
,
.
val_bits
=
8
,
.
max_register
=
WM2000_REG_
IF
_CTL
,
.
max_register
=
WM2000_REG_
SPK
_CTL
,
.
readable_reg
=
wm2000_readable_reg
,
.
readable_reg
=
wm2000_readable_reg
,
};
};
...
...
sound/soc/codecs/wm2000.h
View file @
4277c2a2
...
@@ -30,6 +30,8 @@
...
@@ -30,6 +30,8 @@
#define WM2000_REG_SYS_CTL2 0xf004
#define WM2000_REG_SYS_CTL2 0xf004
#define WM2000_REG_ANC_STAT 0xf005
#define WM2000_REG_ANC_STAT 0xf005
#define WM2000_REG_IF_CTL 0xf006
#define WM2000_REG_IF_CTL 0xf006
#define WM2000_REG_ANA_MIC_CTL 0xf028
#define WM2000_REG_SPK_CTL 0xf034
/* SPEECH_CLARITY */
/* SPEECH_CLARITY */
#define WM2000_SPEECH_CLARITY 0x01
#define WM2000_SPEECH_CLARITY 0x01
...
...
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