2 files changed, 15 insertions, 0 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 8064cd130356..11d59bd13886 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -718,6 +718,14 @@ struct snd_soc_card {
         struct snd_soc_pcm_runtime *rtd_aux;
         int num_aux_rtd;
 
+        /*
+         * Card-specific routes and widgets.
+         */
+        struct snd_soc_dapm_widget *dapm_widgets;
+        int num_dapm_widgets;
+        struct snd_soc_dapm_route *dapm_routes;
+        int num_dapm_routes;
+
         struct work_struct deferred_resume_work;
 
         /* lists of probed devices belonging to this card */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 24bfc3ff8e17..6a2839c18447 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)