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
6234eabf
Commit
6234eabf
authored
Aug 22, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
parents
ece59528
92bb4c32
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
83 deletions
+62
-83
include/sound/soc.h
include/sound/soc.h
+2
-0
sound/soc/codecs/wm_adsp.c
sound/soc/codecs/wm_adsp.c
+42
-82
sound/soc/codecs/wm_adsp.h
sound/soc/codecs/wm_adsp.h
+2
-1
sound/soc/soc-core.c
sound/soc/soc-core.c
+16
-0
No files found.
include/sound/soc.h
View file @
6234eabf
...
...
@@ -477,6 +477,8 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
struct
snd_kcontrol
*
snd_soc_cnew
(
const
struct
snd_kcontrol_new
*
_template
,
void
*
data
,
const
char
*
long_name
,
const
char
*
prefix
);
struct
snd_kcontrol
*
snd_soc_card_get_kcontrol
(
struct
snd_soc_card
*
soc_card
,
const
char
*
name
);
int
snd_soc_add_codec_controls
(
struct
snd_soc_codec
*
codec
,
const
struct
snd_kcontrol_new
*
controls
,
int
num_controls
);
int
snd_soc_add_platform_controls
(
struct
snd_soc_platform
*
platform
,
...
...
sound/soc/codecs/wm_adsp.c
View file @
6234eabf
This diff is collapsed.
Click to expand it.
sound/soc/codecs/wm_adsp.h
View file @
6234eabf
...
...
@@ -39,6 +39,7 @@ struct wm_adsp {
int
type
;
struct
device
*
dev
;
struct
regmap
*
regmap
;
struct
snd_soc_card
*
card
;
int
base
;
int
sysclk_reg
;
...
...
@@ -57,7 +58,7 @@ struct wm_adsp {
struct
regulator
*
dvfs
;
struct
wm_coeff
*
wm_coeff
;
struct
list_head
ctl_list
;
};
#define WM_ADSP1(wname, num) \
...
...
sound/soc/soc-core.c
View file @
6234eabf
...
...
@@ -2452,6 +2452,22 @@ static int snd_soc_add_controls(struct snd_card *card, struct device *dev,
return
0
;
}
struct
snd_kcontrol
*
snd_soc_card_get_kcontrol
(
struct
snd_soc_card
*
soc_card
,
const
char
*
name
)
{
struct
snd_card
*
card
=
soc_card
->
snd_card
;
struct
snd_kcontrol
*
kctl
;
if
(
unlikely
(
!
name
))
return
NULL
;
list_for_each_entry
(
kctl
,
&
card
->
controls
,
list
)
if
(
!
strncmp
(
kctl
->
id
.
name
,
name
,
sizeof
(
kctl
->
id
.
name
)))
return
kctl
;
return
NULL
;
}
EXPORT_SYMBOL_GPL
(
snd_soc_card_get_kcontrol
);
/**
* snd_soc_add_codec_controls - add an array of controls to a codec.
* Convenience function to add a list of controls. Many codecs were
...
...
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