diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-02 18:35:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-03 11:15:26 +0000 |
| commit | b8ad29debd7401d257da923480d32838172c431a (patch) | |
| tree | 0c0912832989599de0ae8275d5d77305027191f5 /sound/soc/soc-core.c | |
| parent | e37a4970cd7ab6aec9e848cd3c355fd47fd18afd (diff) | |
| download | linux-3.10-b8ad29debd7401d257da923480d32838172c431a.tar.gz linux-3.10-b8ad29debd7401d257da923480d32838172c431a.tar.bz2 linux-3.10-b8ad29debd7401d257da923480d32838172c431a.zip | |
ASoC: Allow card DAPM widgets and routes to be set up at registration
These will be added after all devices are registered and allow most DAI
init functions in machine drivers to be replaced by simple data.
Regular controls are not supported as the registration function still
works in terms of CODECs.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 24bfc3ff8e1..6a2839c1844 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1872,6 +1872,13 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) } } + if (card->dapm_widgets) + snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets, + card->num_dapm_widgets); + if (card->dapm_routes) + snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes, + card->num_dapm_routes); + card->dapm.debugfs_dapm = debugfs_create_dir("dapm", card->debugfs_card_root); if (!card->dapm.debugfs_dapm) |