ASoC: Add a per-card DAPM context

This means that rather than adding the board specific DAPM widgets to a
random CODEC DAPM context they can be added to the card itself which is
a bit cleaner. Previously there only was one DAPM context and it was
tied to the single supported CODEC.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 65d865f..8064cd1 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -729,6 +729,9 @@ struct snd_soc_card {
        struct list_head paths;
        struct list_head dapm_list;
 
+       /* Generic DAPM context for the card */
+       struct snd_soc_dapm_context dapm;
+
 #ifdef CONFIG_DEBUG_FS
        struct dentry *debugfs_card_root;
        struct dentry *debugfs_pop_time;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 64befac..24bfc3f 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1837,6 +1837,11 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
        }
        card->snd_card->dev = card->dev;
 
+       card->dapm.bias_level = SND_SOC_BIAS_OFF;
+       card->dapm.dev = card->dev;
+       card->dapm.card = card;
+       list_add(&card->dapm.list, &card->dapm_list);
+
 #ifdef CONFIG_PM_SLEEP
        /* deferred resume work */
        INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
@@ -1867,6 +1872,14 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
                }
        }
 
+       card->dapm.debugfs_dapm = debugfs_create_dir("dapm",
+                                                    card->debugfs_card_root);
+       if (!card->dapm.debugfs_dapm)
+               printk(KERN_WARNING
+                      "Failed to create card DAPM debugfs directory\n");
+
+       snd_soc_dapm_debugfs_init(&card->dapm);
+
        snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
                 "%s",  card->name);
        snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),