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
489773c2
Commit
489773c2
authored
Jan 31, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASoC: wm8993: Convert to use a regmap patch
Signed-off-by:
Mark Brown
<
broonie@opensource.wolfsonmicro.com
>
parent
bc122e34
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
sound/soc/codecs/wm8993.c
sound/soc/codecs/wm8993.c
+13
-5
No files found.
sound/soc/codecs/wm8993.c
View file @
489773c2
...
...
@@ -1077,11 +1077,6 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
regcache_cache_only
(
wm8993
->
regmap
,
false
);
regcache_sync
(
wm8993
->
regmap
);
/* Tune DC servo configuration */
snd_soc_write
(
codec
,
0x44
,
3
);
snd_soc_write
(
codec
,
0x56
,
3
);
snd_soc_write
(
codec
,
0x44
,
0
);
/* Bring up VMID with fast soft start */
snd_soc_update_bits
(
codec
,
WM8993_ANTIPOP2
,
WM8993_STARTUP_BIAS_ENA
|
...
...
@@ -1691,6 +1686,13 @@ static int wm8993_resume(struct snd_soc_codec *codec)
#define wm8993_resume NULL
#endif
/* Tune DC servo configuration */
static
struct
reg_default
wm8993_regmap_patch
[]
=
{
{
0x44
,
3
},
{
0x56
,
3
},
{
0x44
,
0
},
};
static
const
struct
regmap_config
wm8993_regmap
=
{
.
reg_bits
=
8
,
.
val_bits
=
16
,
...
...
@@ -1769,6 +1771,12 @@ static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
if
(
ret
!=
0
)
goto
err_enable
;
ret
=
regmap_register_patch
(
wm8993
->
regmap
,
wm8993_regmap_patch
,
ARRAY_SIZE
(
wm8993_regmap_patch
));
if
(
ret
!=
0
)
dev_warn
(
wm8993
->
dev
,
"Failed to apply regmap patch: %d
\n
"
,
ret
);
if
(
i2c
->
irq
)
{
/* Put GPIO1 into interrupt mode (only GPIO1 can output IRQ) */
ret
=
regmap_update_bits
(
wm8993
->
regmap
,
WM8993_GPIO1
,
...
...
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