Subject: [PATCH 069/104] ASoC: dapm - allow custom widgets to update power events.

In preparation for ASoC DSP support.

Allow for the operation of custom mixer and mux DAPM widgets that can call
snd_soc_dapm_mixer_update_power() and snd_soc_dapm_mux_update_power() directly
after updating their status.

This adds two previously static calls to the public DAPM API.

Signed-off-by: Liam Girdwood <lrg@ti.com>

2 files changed, 32 insertions, 11 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 0f67cf6383d..22827a4897c 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -266,6 +266,12 @@
         .get = snd_soc_dapm_get_enum_virt, \
         .put = snd_soc_dapm_put_enum_virt, \
         .private_value = (unsigned long)&xenum }
+#define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = snd_soc_info_enum_double, \
+        .get = xget, \
+        .put = xput, \
+        .private_value = (unsigned long)&xenum }
 #define SOC_DAPM_VALUE_ENUM(xname, xenum) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_enum_double, \
@@ -356,6 +362,12 @@ int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,
 int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd,
         const char *stream, int event);
 void snd_soc_dapm_shutdown(struct snd_soc_card *card);
+/* external DAPM widget events */
+int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
+                struct snd_kcontrol *kcontrol, int connect);
+int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
+                                 struct snd_kcontrol *kcontrol, int change,
+                                 int mux, struct soc_enum *e);
 
 /* dapm sys fs - used by the core */
 int snd_soc_dapm_sys_add(struct device *dev);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 199afd92895..7c368ea40ac 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -50,6 +50,8 @@
 
 #define PATH_MAX_HOPS 16
 
+int soc_dsp_runtime_update(struct snd_soc_dapm_widget *);
+
 /* dapm power sequences - make this per codec in the future */
 static int dapm_up_seq[] = {
         [snd_soc_dapm_pre] = 0,
@@ -167,7 +169,7 @@ static void dapm_clear_paths(struct snd_soc_dapm_context *dapm)
         struct snd_soc_dapm_widget *w;
         struct list_head *l;
 
-        list_for_each(l, &dapm->paths) {
+        list_for_each(l, &dapm->card->paths) {
                 p = list_entry(l, struct snd_soc_dapm_path, list);
                 p->length = 0;
         }
@@ -1807,7 +1809,7 @@ static inline void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)
 #endif
 
 /* test and update the power status of a mux widget */
-static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
+int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
                                  struct snd_kcontrol *kcontrol, int change,
                                  int mux, struct soc_enum *e)
 {
@@ -1824,6 +1826,7 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
 
         /* find dapm widget path assoc with kcontrol */
         list_for_each_entry(path, &widget->dapm->card->paths, list) {
+
                 if (path->kcontrol != kcontrol)
                         continue;
 
@@ -1838,15 +1841,18 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
                         path->connect = 0; /* old connection must be powered down */
         }
 
-        if (found)
+        if (found) {
                 dapm_power_widgets(widget->dapm, SND_SOC_DAPM_STREAM_NOP);
+                soc_dsp_runtime_update(widget);
+        }
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(snd_soc_dapm_mux_update_power);
 
 /* test and update the power status of a mixer or switch widget */
-static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
-                                   struct snd_kcontrol *kcontrol, int connect)
+int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
+                struct snd_kcontrol *kcontrol, int connect)
 {
         struct snd_soc_dapm_path *path;
         int found = 0;
@@ -1867,11 +1873,14 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
                 break;
         }
 
-        if (found)
+        if (found) {
                 dapm_power_widgets(widget->dapm, SND_SOC_DAPM_STREAM_NOP);
+                soc_dsp_runtime_update(widget);
+        }
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(snd_soc_dapm_mixer_update_power);
 
 /* show dapm widget status in sys fs */
 static ssize_t dapm_widget_show(struct device *dev,
@@ -2469,7 +2478,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
                         update.val = val;
                         widget->dapm->update = &update;
 
-                        dapm_mixer_update_power(widget, kcontrol, connect);
+                        snd_soc_dapm_mixer_update_power(widget, kcontrol, connect);
 
                         widget->dapm->update = NULL;
                 }
@@ -2560,7 +2569,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
                         update.val = val;
                         widget->dapm->update = &update;
 
-                        dapm_mux_update_power(widget, kcontrol, change, mux, e);
+                        snd_soc_dapm_mux_update_power(widget, kcontrol, change, mux, e);
 
                         widget->dapm->update = NULL;
                 }
@@ -2621,8 +2630,8 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
 
                         widget->value = ucontrol->value.enumerated.item[0];
 
-                        dapm_mux_update_power(widget, kcontrol, change,
-                                              widget->value, e);
+                        snd_soc_dapm_mux_update_power(widget, kcontrol, change,
+                                        widget->value, e);
                 }
         }
 
@@ -2725,7 +2734,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
                         update.val = val;
                         widget->dapm->update = &update;
 
-                        dapm_mux_update_power(widget, kcontrol, change, mux, e);
+                        snd_soc_dapm_mux_update_power(widget, kcontrol, change, mux, e);
 
                         widget->dapm->update = NULL;
                 }