summaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-07 19:18:44 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-08 09:18:11 +0900
commitb7af1dafdfaf8419065399d07fb7cbae14b286ef (patch)
tree1b7a97fdc716edeed1b236e65d8afd3c3cbd03d3 /include/sound/soc.h
parentd9b3e4c5156476a4baf0d7e0f47ba2816b4fff8e (diff)
downloadop-kernel-dev-b7af1dafdfaf8419065399d07fb7cbae14b286ef.zip
op-kernel-dev-b7af1dafdfaf8419065399d07fb7cbae14b286ef.tar.gz
ASoC: Add data based control initialisation for CODECs and cards
Allow CODEC and card drivers to point to an array of controls from their driver structure rather than explicitly calling snd_soc_add_controls(). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 2720a9f..435cb83 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -577,7 +577,9 @@ struct snd_soc_codec_driver {
pm_message_t state);
int (*resume)(struct snd_soc_codec *);
- /* Default DAPM setup, added after probe() is run */
+ /* Default control and setup, added after probe() is run */
+ const struct snd_kcontrol_new *controls;
+ int num_controls;
const struct snd_soc_dapm_widget *dapm_widgets;
int num_dapm_widgets;
const struct snd_soc_dapm_route *dapm_routes;
@@ -747,6 +749,9 @@ struct snd_soc_card {
struct snd_soc_pcm_runtime *rtd_aux;
int num_aux_rtd;
+ const struct snd_kcontrol_new *controls;
+ int num_controls;
+
/*
* Card-specific routes and widgets.
*/
OpenPOWER on IntegriCloud