diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-07 06:18:44 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-07 20:18:11 -0400 |
commit | b7af1dafdfaf8419065399d07fb7cbae14b286ef (patch) | |
tree | 1b7a97fdc716edeed1b236e65d8afd3c3cbd03d3 /include/sound | |
parent | d9b3e4c5156476a4baf0d7e0f47ba2816b4fff8e (diff) |
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')
-rw-r--r-- | include/sound/soc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 2720a9f3780b..435cb83c7f48 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -577,7 +577,9 @@ struct snd_soc_codec_driver { | |||
577 | pm_message_t state); | 577 | pm_message_t state); |
578 | int (*resume)(struct snd_soc_codec *); | 578 | int (*resume)(struct snd_soc_codec *); |
579 | 579 | ||
580 | /* Default DAPM setup, added after probe() is run */ | 580 | /* Default control and setup, added after probe() is run */ |
581 | const struct snd_kcontrol_new *controls; | ||
582 | int num_controls; | ||
581 | const struct snd_soc_dapm_widget *dapm_widgets; | 583 | const struct snd_soc_dapm_widget *dapm_widgets; |
582 | int num_dapm_widgets; | 584 | int num_dapm_widgets; |
583 | const struct snd_soc_dapm_route *dapm_routes; | 585 | const struct snd_soc_dapm_route *dapm_routes; |
@@ -747,6 +749,9 @@ struct snd_soc_card { | |||
747 | struct snd_soc_pcm_runtime *rtd_aux; | 749 | struct snd_soc_pcm_runtime *rtd_aux; |
748 | int num_aux_rtd; | 750 | int num_aux_rtd; |
749 | 751 | ||
752 | const struct snd_kcontrol_new *controls; | ||
753 | int num_controls; | ||
754 | |||
750 | /* | 755 | /* |
751 | * Card-specific routes and widgets. | 756 | * Card-specific routes and widgets. |
752 | */ | 757 | */ |