ASoC: core: add support to card re-bind using component framework

This patch aims at achieving dynamic behaviour of audio card when
the dependent components disappear and reappear.

With this patch the card is removed if any of the dependent component
is removed and card is added back if the dependent component comes back.
All this is done using component framework and matching based on
component name.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index a4915148f739f43f08e6c9e52d9bfda6ba41d389..a23ecdf3eff1672f2ec5bb0ac551227b0a6c127b 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -17,6 +17,7 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/component.h>
 #include <linux/regmap.h>
 #include <linux/log2.h>
 #include <sound/core.h>
@@ -1090,6 +1091,12 @@ struct snd_soc_card {
 
        struct work_struct deferred_resume_work;
 
+       /* component framework related */
+       bool components_added;
+       /* set in machine driver to enable/disable auto re-binding */
+       bool auto_bind;
+       struct component_match *match;
+
        /* lists of probed devices belonging to this card */
        struct list_head component_dev_list;
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3be0310d5c810c8310be6e726e9fcffc648366fc..08e18948500931417d90e47d8546e5ee8ae4c9d1 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -279,11 +279,28 @@ static inline void snd_soc_debugfs_exit(void)
 
 #endif
 
+static int snd_soc_card_comp_compare(struct device *dev, void *data)
+{
+       struct snd_soc_component *component;
+
+       lockdep_assert_held(&client_mutex);
+       list_for_each_entry(component, &component_list, list) {
+               if (dev == component->dev) {
+                       if (!strcmp(component->name, data))
+                               return 1;
+                       break;
+               }
+       }
+
+       return 0;
+}
+
 static int snd_soc_rtdcom_add(struct snd_soc_pcm_runtime *rtd,
                              struct snd_soc_component *component)
 {
        struct snd_soc_rtdcom_list *rtdcom;
        struct snd_soc_rtdcom_list *new_rtdcom;
+       char *cname;
 
        for_each_rtdcom(rtd, rtdcom) {
                /* already connected */
@@ -300,6 +317,13 @@ static int snd_soc_rtdcom_add(struct snd_soc_pcm_runtime *rtd,
 
        list_add_tail(&new_rtdcom->list, &rtd->component_list);
 
+       if (rtd->card->auto_bind && !rtd->card->components_added) {
+               cname = devm_kasprintf(rtd->card->dev, GFP_KERNEL,
+                                      "%s", component->name);
+               component_match_add(rtd->card->dev, &rtd->card->match,
+                                   snd_soc_card_comp_compare, cname);
+       }
+
        return 0;
 }
 
@@ -835,6 +859,25 @@ static bool soc_is_dai_link_bound(struct snd_soc_card *card,
        return false;
 }
 
+static int snd_soc_card_comp_bind(struct device *dev)
+{
+       struct snd_soc_card *card = dev_get_drvdata(dev);
+
+       if (card->instantiated)
+               return 0;
+
+       return snd_soc_register_card(card);
+}
+
+static void snd_soc_card_comp_unbind(struct device *dev)
+{
+}
+
+static const struct component_master_ops snd_soc_card_comp_ops = {
+       .bind = snd_soc_card_comp_bind,
+       .unbind = snd_soc_card_comp_unbind,
+};
+
 static int soc_bind_dai_link(struct snd_soc_card *card,
        struct snd_soc_dai_link *dai_link)
 {
@@ -2126,6 +2169,12 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
 
        card->instantiated = 1;
        snd_soc_dapm_sync(&card->dapm);
+       if (card->auto_bind && !card->components_added) {
+               component_master_add_with_match(card->dev,
+                                               &snd_soc_card_comp_ops,
+                                               card->match);
+               card->components_added = true;
+       }
        mutex_unlock(&card->mutex);
        mutex_unlock(&client_mutex);
 
@@ -2749,6 +2798,9 @@ int snd_soc_unregister_card(struct snd_soc_card *card)
                dev_dbg(card->dev, "ASoC: Unregistered card '%s'\n", card->name);
        }
 
+       if (!card->auto_bind && card->components_added)
+               component_master_del(card->dev, &snd_soc_card_comp_ops);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_card);
@@ -3161,8 +3213,17 @@ int snd_soc_add_component(struct device *dev,
 
        snd_soc_component_add(component);
 
+       ret = component_add(dev, NULL);
+       if (ret < 0) {
+               dev_err(dev, "ASoC: Failed to add Component: %d\n", ret);
+               goto err_comp;
+       }
+
        return 0;
 
+err_comp:
+       soc_remove_component(component);
+       snd_soc_unregister_dais(component);
 err_cleanup:
        snd_soc_component_cleanup(component);
 err_free:
@@ -3210,6 +3271,7 @@ static int __snd_soc_unregister_component(struct device *dev)
        mutex_unlock(&client_mutex);
 
        if (found) {
+               component_del(dev, NULL);
                snd_soc_component_cleanup(component);
        }