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
804c0a95
Commit
804c0a95
authored
Jan 11, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
parents
fffe9b89
26eb5a9a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
sound/soc/codecs/arizona.c
sound/soc/codecs/arizona.c
+3
-0
sound/soc/codecs/wm5110.c
sound/soc/codecs/wm5110.c
+4
-6
No files found.
sound/soc/codecs/arizona.c
View file @
804c0a95
...
@@ -1494,6 +1494,9 @@ static int arizona_startup(struct snd_pcm_substream *substream,
...
@@ -1494,6 +1494,9 @@ static int arizona_startup(struct snd_pcm_substream *substream,
const
struct
snd_pcm_hw_constraint_list
*
constraint
;
const
struct
snd_pcm_hw_constraint_list
*
constraint
;
unsigned
int
base_rate
;
unsigned
int
base_rate
;
if
(
!
substream
->
runtime
)
return
0
;
switch
(
dai_priv
->
clk
)
{
switch
(
dai_priv
->
clk
)
{
case
ARIZONA_CLK_SYSCLK
:
case
ARIZONA_CLK_SYSCLK
:
base_rate
=
priv
->
sysclk
;
base_rate
=
priv
->
sysclk
;
...
...
sound/soc/codecs/wm5110.c
View file @
804c0a95
...
@@ -437,18 +437,17 @@ static int wm5110_in_pga_get(struct snd_kcontrol *kcontrol,
...
@@ -437,18 +437,17 @@ static int wm5110_in_pga_get(struct snd_kcontrol *kcontrol,
{
{
struct
snd_soc_codec
*
codec
=
snd_soc_kcontrol_codec
(
kcontrol
);
struct
snd_soc_codec
*
codec
=
snd_soc_kcontrol_codec
(
kcontrol
);
struct
snd_soc_dapm_context
*
dapm
=
snd_soc_codec_get_dapm
(
codec
);
struct
snd_soc_dapm_context
*
dapm
=
snd_soc_codec_get_dapm
(
codec
);
struct
snd_soc_card
*
card
=
dapm
->
card
;
int
ret
;
int
ret
;
/*
/*
* PGA Volume is also used as part of the enable sequence, so
* PGA Volume is also used as part of the enable sequence, so
* usage of it should be avoided whilst that is running.
* usage of it should be avoided whilst that is running.
*/
*/
mutex_lock_nested
(
&
card
->
dapm_mutex
,
SND_SOC_DAPM_CLASS_RUNTIME
);
snd_soc_dapm_mutex_lock
(
dapm
);
ret
=
snd_soc_get_volsw_range
(
kcontrol
,
ucontrol
);
ret
=
snd_soc_get_volsw_range
(
kcontrol
,
ucontrol
);
mutex_unlock
(
&
card
->
dapm_mutex
);
snd_soc_dapm_mutex_unlock
(
dapm
);
return
ret
;
return
ret
;
}
}
...
@@ -458,18 +457,17 @@ static int wm5110_in_pga_put(struct snd_kcontrol *kcontrol,
...
@@ -458,18 +457,17 @@ static int wm5110_in_pga_put(struct snd_kcontrol *kcontrol,
{
{
struct
snd_soc_codec
*
codec
=
snd_soc_kcontrol_codec
(
kcontrol
);
struct
snd_soc_codec
*
codec
=
snd_soc_kcontrol_codec
(
kcontrol
);
struct
snd_soc_dapm_context
*
dapm
=
snd_soc_codec_get_dapm
(
codec
);
struct
snd_soc_dapm_context
*
dapm
=
snd_soc_codec_get_dapm
(
codec
);
struct
snd_soc_card
*
card
=
dapm
->
card
;
int
ret
;
int
ret
;
/*
/*
* PGA Volume is also used as part of the enable sequence, so
* PGA Volume is also used as part of the enable sequence, so
* usage of it should be avoided whilst that is running.
* usage of it should be avoided whilst that is running.
*/
*/
mutex_lock_nested
(
&
card
->
dapm_mutex
,
SND_SOC_DAPM_CLASS_RUNTIME
);
snd_soc_dapm_mutex_lock
(
dapm
);
ret
=
snd_soc_put_volsw_range
(
kcontrol
,
ucontrol
);
ret
=
snd_soc_put_volsw_range
(
kcontrol
,
ucontrol
);
mutex_unlock
(
&
card
->
dapm_mutex
);
snd_soc_dapm_mutex_unlock
(
dapm
);
return
ret
;
return
ret
;
}
}
...
...
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