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
afe8db5f
Commit
afe8db5f
authored
Aug 14, 2011
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-3.1' into for-3.2
parents
dc5de62b
a115c728
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
sound/soc/codecs/wm8750.c
sound/soc/codecs/wm8750.c
+1
-1
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8962.c
+4
-4
No files found.
sound/soc/codecs/wm8750.c
View file @
afe8db5f
...
...
@@ -789,7 +789,7 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi)
static
const
struct
spi_device_id
wm8750_spi_ids
[]
=
{
{
"wm8750"
,
0
},
{
"wm8987"
,
0
},
{
0
,
0
},
{
},
};
MODULE_DEVICE_TABLE
(
spi
,
wm8750_spi_ids
);
...
...
sound/soc/codecs/wm8962.c
View file @
afe8db5f
...
...
@@ -2927,10 +2927,6 @@ static int wm8962_set_bias_level(struct snd_soc_codec *codec,
WM8962_BIAS_ENA
|
0x180
);
msleep
(
5
);
snd_soc_update_bits
(
codec
,
WM8962_CLOCKING2
,
WM8962_CLKREG_OVD
,
WM8962_CLKREG_OVD
);
}
/* VMID 2*250k */
...
...
@@ -3868,6 +3864,10 @@ static int wm8962_probe(struct snd_soc_codec *codec)
*/
snd_soc_update_bits
(
codec
,
WM8962_CLOCKING2
,
WM8962_SYSCLK_ENA
,
0
);
/* Ensure we have soft control over all registers */
snd_soc_update_bits
(
codec
,
WM8962_CLOCKING2
,
WM8962_CLKREG_OVD
,
WM8962_CLKREG_OVD
);
regulator_bulk_disable
(
ARRAY_SIZE
(
wm8962
->
supplies
),
wm8962
->
supplies
);
if
(
pdata
)
{
...
...
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