Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 963 insertions, 540 deletions

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 03cb7c05ebec..32ab7fc4579a 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/async.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
@@ -42,9 +43,11 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
-#include <sound/soc-dapm.h>
+#include <sound/soc.h>
 #include <sound/initval.h>
 
+#include <trace/events/asoc.h>
+
 /* dapm power sequences - make this per codec in the future */
 static int dapm_up_seq[] = {
         [snd_soc_dapm_pre] = 0,
@@ -54,12 +57,14 @@ static int dapm_up_seq[] = {
         [snd_soc_dapm_aif_out] = 3,
         [snd_soc_dapm_mic] = 4,
         [snd_soc_dapm_mux] = 5,
+        [snd_soc_dapm_virt_mux] = 5,
         [snd_soc_dapm_value_mux] = 5,
         [snd_soc_dapm_dac] = 6,
         [snd_soc_dapm_mixer] = 7,
         [snd_soc_dapm_mixer_named_ctl] = 7,
         [snd_soc_dapm_pga] = 8,
         [snd_soc_dapm_adc] = 9,
+        [snd_soc_dapm_out_drv] = 10,
         [snd_soc_dapm_hp] = 10,
         [snd_soc_dapm_spk] = 10,
         [snd_soc_dapm_post] = 11,
@@ -70,6 +75,7 @@ static int dapm_down_seq[] = {
         [snd_soc_dapm_adc] = 1,
         [snd_soc_dapm_hp] = 2,
         [snd_soc_dapm_spk] = 2,
+        [snd_soc_dapm_out_drv] = 2,
         [snd_soc_dapm_pga] = 4,
         [snd_soc_dapm_mixer_named_ctl] = 5,
         [snd_soc_dapm_mixer] = 5,
@@ -77,6 +83,7 @@ static int dapm_down_seq[] = {
         [snd_soc_dapm_mic] = 7,
         [snd_soc_dapm_micbias] = 8,
         [snd_soc_dapm_mux] = 9,
+        [snd_soc_dapm_virt_mux] = 9,
         [snd_soc_dapm_value_mux] = 9,
         [snd_soc_dapm_aif_in] = 10,
         [snd_soc_dapm_aif_out] = 10,
@@ -90,17 +97,24 @@ static void pop_wait(u32 pop_time)
                 schedule_timeout_uninterruptible(msecs_to_jiffies(pop_time));
 }
 
-static void pop_dbg(u32 pop_time, const char *fmt, ...)
+static void pop_dbg(struct device *dev, u32 pop_time, const char *fmt, ...)
 {
         va_list args;
+        char *buf;
 
-        va_start(args, fmt);
+        if (!pop_time)
+                return;
 
-        if (pop_time) {
-                vprintk(fmt, args);
-        }
+        buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        if (buf == NULL)
+                return;
 
+        va_start(args, fmt);
+        vsnprintf(buf, PAGE_SIZE, fmt, args);
+        dev_info(dev, "%s", buf);
         va_end(args);
+
+        kfree(buf);
 }
 
 /* create a new dapm widget */
@@ -112,47 +126,54 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget(
 
 /**
  * snd_soc_dapm_set_bias_level - set the bias level for the system
- * @socdev: audio device
+ * @dapm: DAPM context
  * @level: level to configure
  *
  * Configure the bias (power) levels for the SoC audio device.
  *
  * Returns 0 for success else error.
  */
-static int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
+static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
                                        enum snd_soc_bias_level level)
 {
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_codec *codec = socdev->card->codec;
+        struct snd_soc_card *card = dapm->card;
         int ret = 0;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
-                dev_dbg(socdev->dev, "Setting full bias\n");
+                dev_dbg(dapm->dev, "Setting full bias\n");
                 break;
         case SND_SOC_BIAS_PREPARE:
-                dev_dbg(socdev->dev, "Setting bias prepare\n");
+                dev_dbg(dapm->dev, "Setting bias prepare\n");
                 break;
         case SND_SOC_BIAS_STANDBY:
-                dev_dbg(socdev->dev, "Setting standby bias\n");
+                dev_dbg(dapm->dev, "Setting standby bias\n");
                 break;
         case SND_SOC_BIAS_OFF:
-                dev_dbg(socdev->dev, "Setting bias off\n");
+                dev_dbg(dapm->dev, "Setting bias off\n");
                 break;
         default:
-                dev_err(socdev->dev, "Setting invalid bias %d\n", level);
+                dev_err(dapm->dev, "Setting invalid bias %d\n", level);
                 return -EINVAL;
         }
 
-        if (card->set_bias_level)
+        trace_snd_soc_bias_level_start(card, level);
+
+        if (card && card->set_bias_level)
                 ret = card->set_bias_level(card, level);
         if (ret == 0) {
-                if (codec->set_bias_level)
-                        ret = codec->set_bias_level(codec, level);
+                if (dapm->codec && dapm->codec->driver->set_bias_level)
+                        ret = dapm->codec->driver->set_bias_level(dapm->codec, level);
                 else
-                        codec->bias_level = level;
+                        dapm->bias_level = level;
+        }
+        if (ret == 0) {
+                if (card && card->set_bias_level_post)
+                        ret = card->set_bias_level_post(card, level);
         }
 
+        trace_snd_soc_bias_level_done(card, level);
+
         return ret;
 }
 
@@ -166,7 +187,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
         case snd_soc_dapm_mixer_named_ctl: {
                 int val;
                 struct soc_mixer_control *mc = (struct soc_mixer_control *)
-                        w->kcontrols[i].private_value;
+                        w->kcontrol_news[i].private_value;
                 unsigned int reg = mc->reg;
                 unsigned int shift = mc->shift;
                 int max = mc->max;
@@ -183,7 +204,8 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
         }
         break;
         case snd_soc_dapm_mux: {
-                struct soc_enum *e = (struct soc_enum *)w->kcontrols[i].private_value;
+                struct soc_enum *e = (struct soc_enum *)
+                        w->kcontrol_news[i].private_value;
                 int val, item, bitmask;
 
                 for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
@@ -198,9 +220,24 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
                 }
         }
         break;
+        case snd_soc_dapm_virt_mux: {
+                struct soc_enum *e = (struct soc_enum *)
+                        w->kcontrol_news[i].private_value;
+
+                p->connect = 0;
+                /* since a virtual mux has no backing registers to
+                 * decide which path to connect, it will try to match
+                 * with the first enumeration.  This is to ensure
+                 * that the default mux choice (the first) will be
+                 * correctly powered up during initialization.
+                 */
+                if (!strcmp(p->name, e->texts[0]))
+                        p->connect = 1;
+        }
+        break;
         case snd_soc_dapm_value_mux: {
                 struct soc_enum *e = (struct soc_enum *)
-                        w->kcontrols[i].private_value;
+                        w->kcontrol_news[i].private_value;
                 int val, item;
 
                 val = snd_soc_read(w->codec, e->reg);
@@ -219,6 +256,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
         break;
         /* does not effect routing - always connected */
         case snd_soc_dapm_pga:
+        case snd_soc_dapm_out_drv:
         case snd_soc_dapm_output:
         case snd_soc_dapm_adc:
         case snd_soc_dapm_input:
@@ -243,7 +281,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
 }
 
 /* connect mux widget to its interconnecting audio paths */
-static int dapm_connect_mux(struct snd_soc_codec *codec,
+static int dapm_connect_mux(struct snd_soc_dapm_context *dapm,
         struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest,
         struct snd_soc_dapm_path *path, const char *control_name,
         const struct snd_kcontrol_new *kcontrol)
@@ -253,7 +291,7 @@ static int dapm_connect_mux(struct snd_soc_codec *codec,
 
         for (i = 0; i < e->max; i++) {
                 if (!(strcmp(control_name, e->texts[i]))) {
-                        list_add(&path->list, &codec->dapm_paths);
+                        list_add(&path->list, &dapm->card->paths);
                         list_add(&path->list_sink, &dest->sources);
                         list_add(&path->list_source, &src->sinks);
                         path->name = (char*)e->texts[i];
@@ -266,7 +304,7 @@ static int dapm_connect_mux(struct snd_soc_codec *codec,
 }
 
 /* connect mixer widget to its interconnecting audio paths */
-static int dapm_connect_mixer(struct snd_soc_codec *codec,
+static int dapm_connect_mixer(struct snd_soc_dapm_context *dapm,
         struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest,
         struct snd_soc_dapm_path *path, const char *control_name)
 {
@@ -274,11 +312,11 @@ static int dapm_connect_mixer(struct snd_soc_codec *codec,
 
         /* search for mixer kcontrol */
         for (i = 0; i < dest->num_kcontrols; i++) {
-                if (!strcmp(control_name, dest->kcontrols[i].name)) {
-                        list_add(&path->list, &codec->dapm_paths);
+                if (!strcmp(control_name, dest->kcontrol_news[i].name)) {
+                        list_add(&path->list, &dapm->card->paths);
                         list_add(&path->list_sink, &dest->sources);
                         list_add(&path->list_source, &src->sinks);
-                        path->name = dest->kcontrols[i].name;
+                        path->name = dest->kcontrol_news[i].name;
                         dapm_set_path_status(dest, path, i);
                         return 0;
                 }
@@ -286,49 +324,52 @@ static int dapm_connect_mixer(struct snd_soc_codec *codec,
         return -ENODEV;
 }
 
-/* update dapm codec register bits */
-static int dapm_update_bits(struct snd_soc_dapm_widget *widget)
+static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
+        struct snd_soc_dapm_widget *kcontrolw,
+        const struct snd_kcontrol_new *kcontrol_new,
+        struct snd_kcontrol **kcontrol)
 {
-        int change, power;
-        unsigned int old, new;
-        struct snd_soc_codec *codec = widget->codec;
-
-        /* check for valid widgets */
-        if (widget->reg < 0 || widget->id == snd_soc_dapm_input ||
-                widget->id == snd_soc_dapm_output ||
-                widget->id == snd_soc_dapm_hp ||
-                widget->id == snd_soc_dapm_mic ||
-                widget->id == snd_soc_dapm_line ||
-                widget->id == snd_soc_dapm_spk)
-                return 0;
+        struct snd_soc_dapm_widget *w;
+        int i;
 
-        power = widget->power;
-        if (widget->invert)
-                power = (power ? 0:1);
+        *kcontrol = NULL;
 
-        old = snd_soc_read(codec, widget->reg);
-        new = (old & ~(0x1 << widget->shift)) | (power << widget->shift);
+        list_for_each_entry(w, &dapm->card->widgets, list) {
+                if (w == kcontrolw || w->dapm != kcontrolw->dapm)
+                        continue;
+                for (i = 0; i < w->num_kcontrols; i++) {
+                        if (&w->kcontrol_news[i] == kcontrol_new) {
+                                if (w->kcontrols)
+                                        *kcontrol = w->kcontrols[i];
+                                return 1;
+                        }
+                }
+        }
 
-        change = old != new;
-        if (change) {
-                pop_dbg(codec->pop_time, "pop test %s : %s in %d ms\n",
-                        widget->name, widget->power ? "on" : "off",
-                        codec->pop_time);
-                pop_wait(codec->pop_time);
-                snd_soc_write(codec, widget->reg, new);
-        }
-        pr_debug("reg %x old %x new %x change %d\n", widget->reg,
-                 old, new, change);
-        return change;
+        return 0;
 }
 
 /* create new dapm mixer control */
-static int dapm_new_mixer(struct snd_soc_codec *codec,
-        struct snd_soc_dapm_widget *w)
+static int dapm_new_mixer(struct snd_soc_dapm_widget *w)
 {
+        struct snd_soc_dapm_context *dapm = w->dapm;
         int i, ret = 0;
-        size_t name_len;
+        size_t name_len, prefix_len;
         struct snd_soc_dapm_path *path;
+        struct snd_card *card = dapm->card->snd_card;
+        const char *prefix;
+        struct snd_soc_dapm_widget_list *wlist;
+        size_t wlistsize;
+
+        if (dapm->codec)
+                prefix = dapm->codec->name_prefix;
+        else
+                prefix = NULL;
+
+        if (prefix)
+                prefix_len = strlen(prefix) + 1;
+        else
+                prefix_len = 0;
 
         /* add kcontrol */
         for (i = 0; i < w->num_kcontrols; i++) {
@@ -337,97 +378,178 @@ static int dapm_new_mixer(struct snd_soc_codec *codec,
                 list_for_each_entry(path, &w->sources, list_sink) {
 
                         /* mixer/mux paths name must match control name */
-                        if (path->name != (char*)w->kcontrols[i].name)
+                        if (path->name != (char *)w->kcontrol_news[i].name)
                                 continue;
 
+                        wlistsize = sizeof(struct snd_soc_dapm_widget_list) +
+                                    sizeof(struct snd_soc_dapm_widget *),
+                        wlist = kzalloc(wlistsize, GFP_KERNEL);
+                        if (wlist == NULL) {
+                                dev_err(dapm->dev,
+                                        "asoc: can't allocate widget list for %s\n",
+                                        w->name);
+                                return -ENOMEM;
+                        }
+                        wlist->num_widgets = 1;
+                        wlist->widgets[0] = w;
+
                         /* add dapm control with long name.
                          * for dapm_mixer this is the concatenation of the
                          * mixer and kcontrol name.
                          * for dapm_mixer_named_ctl this is simply the
                          * kcontrol name.
                          */
-                        name_len = strlen(w->kcontrols[i].name) + 1;
+                        name_len = strlen(w->kcontrol_news[i].name) + 1;
                         if (w->id != snd_soc_dapm_mixer_named_ctl)
                                 name_len += 1 + strlen(w->name);
 
                         path->long_name = kmalloc(name_len, GFP_KERNEL);
 
-                        if (path->long_name == NULL)
+                        if (path->long_name == NULL) {
+                                kfree(wlist);
                                 return -ENOMEM;
+                        }
 
                         switch (w->id) {
                         default:
+                                /* The control will get a prefix from
+                                 * the control creation process but
+                                 * we're also using the same prefix
+                                 * for widgets so cut the prefix off
+                                 * the front of the widget name.
+                                 */
                                 snprintf(path->long_name, name_len, "%s %s",
-                                         w->name, w->kcontrols[i].name);
+                                         w->name + prefix_len,
+                                         w->kcontrol_news[i].name);
                                 break;
                         case snd_soc_dapm_mixer_named_ctl:
                                 snprintf(path->long_name, name_len, "%s",
-                                         w->kcontrols[i].name);
+                                         w->kcontrol_news[i].name);
                                 break;
                         }
 
                         path->long_name[name_len - 1] = '\0';
 
-                        path->kcontrol = snd_soc_cnew(&w->kcontrols[i], w,
-                                path->long_name);
-                        ret = snd_ctl_add(codec->card, path->kcontrol);
+                        path->kcontrol = snd_soc_cnew(&w->kcontrol_news[i],
+                                                      wlist, path->long_name,
+                                                      prefix);
+                        ret = snd_ctl_add(card, path->kcontrol);
                         if (ret < 0) {
-                                printk(KERN_ERR "asoc: failed to add dapm kcontrol %s: %d\n",
-                                       path->long_name,
-                                       ret);
+                                dev_err(dapm->dev,
+                                        "asoc: failed to add dapm kcontrol %s: %d\n",
+                                        path->long_name, ret);
+                                kfree(wlist);
                                 kfree(path->long_name);
                                 path->long_name = NULL;
                                 return ret;
                         }
+                        w->kcontrols[i] = path->kcontrol;
                 }
         }
         return ret;
 }
 
 /* create new dapm mux control */
-static int dapm_new_mux(struct snd_soc_codec *codec,
-        struct snd_soc_dapm_widget *w)
+static int dapm_new_mux(struct snd_soc_dapm_widget *w)
 {
+        struct snd_soc_dapm_context *dapm = w->dapm;
         struct snd_soc_dapm_path *path = NULL;
         struct snd_kcontrol *kcontrol;
-        int ret = 0;
-
-        if (!w->num_kcontrols) {
-                printk(KERN_ERR "asoc: mux %s has no controls\n", w->name);
+        struct snd_card *card = dapm->card->snd_card;
+        const char *prefix;
+        size_t prefix_len;
+        int ret;
+        struct snd_soc_dapm_widget_list *wlist;
+        int shared, wlistentries;
+        size_t wlistsize;
+        char *name;
+
+        if (w->num_kcontrols != 1) {
+                dev_err(dapm->dev,
+                        "asoc: mux %s has incorrect number of controls\n",
+                        w->name);
                 return -EINVAL;
         }
 
-        kcontrol = snd_soc_cnew(&w->kcontrols[0], w, w->name);
-        ret = snd_ctl_add(codec->card, kcontrol);
-        if (ret < 0)
-                goto err;
+        shared = dapm_is_shared_kcontrol(dapm, w, &w->kcontrol_news[0],
+                                         &kcontrol);
+        if (kcontrol) {
+                wlist = kcontrol->private_data;
+                wlistentries = wlist->num_widgets + 1;
+        } else {
+                wlist = NULL;
+                wlistentries = 1;
+        }
+        wlistsize = sizeof(struct snd_soc_dapm_widget_list) +
+                wlistentries * sizeof(struct snd_soc_dapm_widget *),
+        wlist = krealloc(wlist, wlistsize, GFP_KERNEL);
+        if (wlist == NULL) {
+                dev_err(dapm->dev,
+                        "asoc: can't allocate widget list for %s\n", w->name);
+                return -ENOMEM;
+        }
+        wlist->num_widgets = wlistentries;
+        wlist->widgets[wlistentries - 1] = w;
+
+        if (!kcontrol) {
+                if (dapm->codec)
+                        prefix = dapm->codec->name_prefix;
+                else
+                        prefix = NULL;
+
+                if (shared) {
+                        name = w->kcontrol_news[0].name;
+                        prefix_len = 0;
+                } else {
+                        name = w->name;
+                        if (prefix)
+                                prefix_len = strlen(prefix) + 1;
+                        else
+                                prefix_len = 0;
+                }
+
+                /*
+                 * The control will get a prefix from the control creation
+                 * process but we're also using the same prefix for widgets so
+                 * cut the prefix off the front of the widget name.
+                 */
+                kcontrol = snd_soc_cnew(&w->kcontrol_news[0], wlist,
+                                        name + prefix_len, prefix);
+                ret = snd_ctl_add(card, kcontrol);
+                if (ret < 0) {
+                        dev_err(dapm->dev,
+                                "asoc: failed to add kcontrol %s\n", w->name);
+                        kfree(wlist);
+                        return ret;
+                }
+        }
+
+        kcontrol->private_data = wlist;
+
+        w->kcontrols[0] = kcontrol;
 
         list_for_each_entry(path, &w->sources, list_sink)
                 path->kcontrol = kcontrol;
 
-        return ret;
-
-err:
-        printk(KERN_ERR "asoc: failed to add kcontrol %s\n", w->name);
-        return ret;
+        return 0;
 }
 
 /* create new dapm volume control */
-static int dapm_new_pga(struct snd_soc_codec *codec,
-        struct snd_soc_dapm_widget *w)
+static int dapm_new_pga(struct snd_soc_dapm_widget *w)
 {
         if (w->num_kcontrols)
-                pr_err("asoc: PGA controls not supported: '%s'\n", w->name);
+                dev_err(w->dapm->dev,
+                        "asoc: PGA controls not supported: '%s'\n", w->name);
 
         return 0;
 }
 
 /* reset 'walked' bit for each dapm path */
-static inline void dapm_clear_walk(struct snd_soc_codec *codec)
+static inline void dapm_clear_walk(struct snd_soc_dapm_context *dapm)
 {
         struct snd_soc_dapm_path *p;
 
-        list_for_each_entry(p, &codec->dapm_paths, list)
+        list_for_each_entry(p, &dapm->card->paths, list)
                 p->walked = 0;
 }
 
@@ -437,13 +559,14 @@ static inline void dapm_clear_walk(struct snd_soc_codec *codec)
  */
 static int snd_soc_dapm_suspend_check(struct snd_soc_dapm_widget *widget)
 {
-        struct snd_soc_codec *codec = widget->codec;
+        int level = snd_power_get_state(widget->dapm->card->snd_card);
 
-        switch (snd_power_get_state(codec->card)) {
+        switch (level) {
         case SNDRV_CTL_POWER_D3hot:
         case SNDRV_CTL_POWER_D3cold:
                 if (widget->ignore_suspend)
-                        pr_debug("%s ignoring suspend\n", widget->name);
+                        dev_dbg(widget->dapm->dev, "%s ignoring suspend\n",
+                                widget->name);
                 return widget->ignore_suspend;
         default:
                 return 1;
@@ -565,57 +688,6 @@ int dapm_reg_event(struct snd_soc_dapm_widget *w,
 }
 EXPORT_SYMBOL_GPL(dapm_reg_event);
 
-/* Standard power change method, used to apply power changes to most
- * widgets.
- */
-static int dapm_generic_apply_power(struct snd_soc_dapm_widget *w)
-{
-        int ret;
-
-        /* call any power change event handlers */
-        if (w->event)
-                pr_debug("power %s event for %s flags %x\n",
-                         w->power ? "on" : "off",
-                         w->name, w->event_flags);
-
-        /* power up pre event */
-        if (w->power && w->event &&
-            (w->event_flags & SND_SOC_DAPM_PRE_PMU)) {
-                ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMU);
-                if (ret < 0)
-                        return ret;
-        }
-
-        /* power down pre event */
-        if (!w->power && w->event &&
-            (w->event_flags & SND_SOC_DAPM_PRE_PMD)) {
-                ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMD);
-                if (ret < 0)
-                        return ret;
-        }
-
-        dapm_update_bits(w);
-
-        /* power up post event */
-        if (w->power && w->event &&
-            (w->event_flags & SND_SOC_DAPM_POST_PMU)) {
-                ret = w->event(w,
-                               NULL, SND_SOC_DAPM_POST_PMU);
-                if (ret < 0)
-                        return ret;
-        }
-
-        /* power down post event */
-        if (!w->power && w->event &&
-            (w->event_flags & SND_SOC_DAPM_POST_PMD)) {
-                ret = w->event(w, NULL, SND_SOC_DAPM_POST_PMD);
-                if (ret < 0)
-                        return ret;
-        }
-
-        return 0;
-}
-
 /* Generic check to see if a widget should be powered.
  */
 static int dapm_generic_check_power(struct snd_soc_dapm_widget *w)
@@ -623,9 +695,9 @@ static int dapm_generic_check_power(struct snd_soc_dapm_widget *w)
         int in, out;
 
         in = is_connected_input_ep(w);
-        dapm_clear_walk(w->codec);
+        dapm_clear_walk(w->dapm);
         out = is_connected_output_ep(w);
-        dapm_clear_walk(w->codec);
+        dapm_clear_walk(w->dapm);
         return out != 0 && in != 0;
 }
 
@@ -636,7 +708,7 @@ static int dapm_adc_check_power(struct snd_soc_dapm_widget *w)
 
         if (w->active) {
                 in = is_connected_input_ep(w);
-                dapm_clear_walk(w->codec);
+                dapm_clear_walk(w->dapm);
                 return in != 0;
         } else {
                 return dapm_generic_check_power(w);
@@ -650,7 +722,7 @@ static int dapm_dac_check_power(struct snd_soc_dapm_widget *w)
 
         if (w->active) {
                 out = is_connected_output_ep(w);
-                dapm_clear_walk(w->codec);
+                dapm_clear_walk(w->dapm);
                 return out != 0;
         } else {
                 return dapm_generic_check_power(w);
@@ -669,28 +741,49 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w)
                     !path->connected(path->source, path->sink))
                         continue;
 
-                if (path->sink && path->sink->power_check &&
+                if (!path->sink)
+                        continue;
+
+                if (path->sink->force) {
+                        power = 1;
+                        break;
+                }
+
+                if (path->sink->power_check &&
                     path->sink->power_check(path->sink)) {
                         power = 1;
                         break;
                 }
         }
 
-        dapm_clear_walk(w->codec);
+        dapm_clear_walk(w->dapm);
 
         return power;
 }
 
 static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
                             struct snd_soc_dapm_widget *b,
-                            int sort[])
+                            bool power_up)
 {
-        if (a->codec != b->codec)
-                return (unsigned long)a - (unsigned long)b;
+        int *sort;
+
+        if (power_up)
+                sort = dapm_up_seq;
+        else
+                sort = dapm_down_seq;
+
         if (sort[a->id] != sort[b->id])
                 return sort[a->id] - sort[b->id];
+        if (a->subseq != b->subseq) {
+                if (power_up)
+                        return a->subseq - b->subseq;
+                else
+                        return b->subseq - a->subseq;
+        }
         if (a->reg != b->reg)
                 return a->reg - b->reg;
+        if (a->dapm != b->dapm)
+                return (unsigned long)a->dapm - (unsigned long)b->dapm;
 
         return 0;
 }
@@ -698,12 +791,12 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
 /* Insert a widget in order into a DAPM power sequence. */
 static void dapm_seq_insert(struct snd_soc_dapm_widget *new_widget,
                             struct list_head *list,
-                            int sort[])
+                            bool power_up)
 {
         struct snd_soc_dapm_widget *w;
 
         list_for_each_entry(w, list, power_list)
-                if (dapm_seq_compare(new_widget, w, sort) < 0) {
+                if (dapm_seq_compare(new_widget, w, power_up) < 0) {
                         list_add_tail(&new_widget->power_list, &w->power_list);
                         return;
                 }
@@ -711,12 +804,57 @@ static void dapm_seq_insert(struct snd_soc_dapm_widget *new_widget,
         list_add_tail(&new_widget->power_list, list);
 }
 
+static void dapm_seq_check_event(struct snd_soc_dapm_context *dapm,
+                                 struct snd_soc_dapm_widget *w, int event)
+{
+        struct snd_soc_card *card = dapm->card;
+        const char *ev_name;
+        int power, ret;
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                ev_name = "PRE_PMU";
+                power = 1;
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+                ev_name = "POST_PMU";
+                power = 1;
+                break;
+        case SND_SOC_DAPM_PRE_PMD:
+                ev_name = "PRE_PMD";
+                power = 0;
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                ev_name = "POST_PMD";
+                power = 0;
+                break;
+        default:
+                BUG();
+                return;
+        }
+
+        if (w->power != power)
+                return;
+
+        if (w->event && (w->event_flags & event)) {
+                pop_dbg(dapm->dev, card->pop_time, "pop test : %s %s\n",
+                        w->name, ev_name);
+                trace_snd_soc_dapm_widget_event_start(w, event);
+                ret = w->event(w, NULL, event);
+                trace_snd_soc_dapm_widget_event_done(w, event);
+                if (ret < 0)
+                        pr_err("%s: %s event failed: %d\n",
+                               ev_name, w->name, ret);
+        }
+}
+
 /* Apply the coalesced changes from a DAPM sequence */
-static void dapm_seq_run_coalesced(struct snd_soc_codec *codec,
+static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm,
                                    struct list_head *pending)
 {
+        struct snd_soc_card *card = dapm->card;
         struct snd_soc_dapm_widget *w;
-        int reg, power, ret;
+        int reg, power;
         unsigned int value = 0;
         unsigned int mask = 0;
         unsigned int cur_mask;
@@ -737,64 +875,26 @@ static void dapm_seq_run_coalesced(struct snd_soc_codec *codec,
                 if (power)
                         value |= cur_mask;
 
-                pop_dbg(codec->pop_time,
+                pop_dbg(dapm->dev, card->pop_time,
                         "pop test : Queue %s: reg=0x%x, 0x%x/0x%x\n",
                         w->name, reg, value, mask);
 
-                /* power up pre event */
-                if (w->power && w->event &&
-                    (w->event_flags & SND_SOC_DAPM_PRE_PMU)) {
-                        pop_dbg(codec->pop_time, "pop test : %s PRE_PMU\n",
-                                w->name);
-                        ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMU);
-                        if (ret < 0)
-                                pr_err("%s: pre event failed: %d\n",
-                                       w->name, ret);
-                }
-
-                /* power down pre event */
-                if (!w->power && w->event &&
-                    (w->event_flags & SND_SOC_DAPM_PRE_PMD)) {
-                        pop_dbg(codec->pop_time, "pop test : %s PRE_PMD\n",
-                                w->name);
-                        ret = w->event(w, NULL, SND_SOC_DAPM_PRE_PMD);
-                        if (ret < 0)
-                                pr_err("%s: pre event failed: %d\n",
-                                       w->name, ret);
-                }
+                /* Check for events */
+                dapm_seq_check_event(dapm, w, SND_SOC_DAPM_PRE_PMU);
+                dapm_seq_check_event(dapm, w, SND_SOC_DAPM_PRE_PMD);
         }
 
         if (reg >= 0) {
-                pop_dbg(codec->pop_time,
+                pop_dbg(dapm->dev, card->pop_time,
                         "pop test : Applying 0x%x/0x%x to %x in %dms\n",
-                        value, mask, reg, codec->pop_time);
-                pop_wait(codec->pop_time);
-                snd_soc_update_bits(codec, reg, mask, value);
+                        value, mask, reg, card->pop_time);
+                pop_wait(card->pop_time);
+                snd_soc_update_bits(dapm->codec, reg, mask, value);
         }
 
         list_for_each_entry(w, pending, power_list) {
-                /* power up post event */
-                if (w->power && w->event &&
-                    (w->event_flags & SND_SOC_DAPM_POST_PMU)) {
-                        pop_dbg(codec->pop_time, "pop test : %s POST_PMU\n",
-                                w->name);
-                        ret = w->event(w,
-                                       NULL, SND_SOC_DAPM_POST_PMU);
-                        if (ret < 0)
-                                pr_err("%s: post event failed: %d\n",
-                                       w->name, ret);
-                }
-
-                /* power down post event */
-                if (!w->power && w->event &&
-                    (w->event_flags & SND_SOC_DAPM_POST_PMD)) {
-                        pop_dbg(codec->pop_time, "pop test : %s POST_PMD\n",
-                                w->name);
-                        ret = w->event(w, NULL, SND_SOC_DAPM_POST_PMD);
-                        if (ret < 0)
-                                pr_err("%s: post event failed: %d\n",
-                                       w->name, ret);
-                }
+                dapm_seq_check_event(dapm, w, SND_SOC_DAPM_POST_PMU);
+                dapm_seq_check_event(dapm, w, SND_SOC_DAPM_POST_PMD);
         }
 }
 
@@ -806,26 +906,45 @@ static void dapm_seq_run_coalesced(struct snd_soc_codec *codec,
  * Currently anything that requires more than a single write is not
  * handled.
  */
-static void dapm_seq_run(struct snd_soc_codec *codec, struct list_head *list,
-                         int event, int sort[])
+static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
+                         struct list_head *list, int event, bool power_up)
 {
         struct snd_soc_dapm_widget *w, *n;
         LIST_HEAD(pending);
         int cur_sort = -1;
+        int cur_subseq = -1;
         int cur_reg = SND_SOC_NOPM;
-        int ret;
+        struct snd_soc_dapm_context *cur_dapm = NULL;
+        int ret, i;
+        int *sort;
+
+        if (power_up)
+                sort = dapm_up_seq;
+        else
+                sort = dapm_down_seq;
 
         list_for_each_entry_safe(w, n, list, power_list) {
                 ret = 0;
 
                 /* Do we need to apply any queued changes? */
-                if (sort[w->id] != cur_sort || w->reg != cur_reg) {
+                if (sort[w->id] != cur_sort || w->reg != cur_reg ||
+                    w->dapm != cur_dapm || w->subseq != cur_subseq) {
                         if (!list_empty(&pending))
-                                dapm_seq_run_coalesced(codec, &pending);
+                                dapm_seq_run_coalesced(cur_dapm, &pending);
+
+                        if (cur_dapm && cur_dapm->seq_notifier) {
+                                for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
+                                        if (sort[i] == cur_sort)
+                                                cur_dapm->seq_notifier(cur_dapm,
+                                                                       i,
+                                                                       cur_subseq);
+                        }
 
                         INIT_LIST_HEAD(&pending);
                         cur_sort = -1;
+                        cur_subseq = -1;
                         cur_reg = SND_SOC_NOPM;
+                        cur_dapm = NULL;
                 }
 
                 switch (w->id) {
@@ -855,31 +974,120 @@ static void dapm_seq_run(struct snd_soc_codec *codec, struct list_head *list,
                                                NULL, SND_SOC_DAPM_POST_PMD);
                         break;
 
-                case snd_soc_dapm_input:
-                case snd_soc_dapm_output:
-                case snd_soc_dapm_hp:
-                case snd_soc_dapm_mic:
-                case snd_soc_dapm_line:
-                case snd_soc_dapm_spk:
-                        /* No register support currently */
-                        ret = dapm_generic_apply_power(w);
-                        break;
-
                 default:
                         /* Queue it up for application */
                         cur_sort = sort[w->id];
+                        cur_subseq = w->subseq;
                         cur_reg = w->reg;
+                        cur_dapm = w->dapm;
                         list_move(&w->power_list, &pending);
                         break;
                 }
 
                 if (ret < 0)
-                        pr_err("Failed to apply widget power: %d\n",
-                               ret);
+                        dev_err(w->dapm->dev,
+                                "Failed to apply widget power: %d\n", ret);
         }
 
         if (!list_empty(&pending))
-                dapm_seq_run_coalesced(codec, &pending);
+                dapm_seq_run_coalesced(cur_dapm, &pending);
+
+        if (cur_dapm && cur_dapm->seq_notifier) {
+                for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
+                        if (sort[i] == cur_sort)
+                                cur_dapm->seq_notifier(cur_dapm,
+                                                       i, cur_subseq);
+        }
+}
+
+static void dapm_widget_update(struct snd_soc_dapm_context *dapm)
+{
+        struct snd_soc_dapm_update *update = dapm->update;
+        struct snd_soc_dapm_widget *w;
+        int ret;
+
+        if (!update)
+                return;
+
+        w = update->widget;
+
+        if (w->event &&
+            (w->event_flags & SND_SOC_DAPM_PRE_REG)) {
+                ret = w->event(w, update->kcontrol, SND_SOC_DAPM_PRE_REG);
+                if (ret != 0)
+                        pr_err("%s DAPM pre-event failed: %d\n",
+                               w->name, ret);
+        }
+
+        ret = snd_soc_update_bits(w->codec, update->reg, update->mask,
+                                  update->val);
+        if (ret < 0)
+                pr_err("%s DAPM update failed: %d\n", w->name, ret);
+
+        if (w->event &&
+            (w->event_flags & SND_SOC_DAPM_POST_REG)) {
+                ret = w->event(w, update->kcontrol, SND_SOC_DAPM_POST_REG);
+                if (ret != 0)
+                        pr_err("%s DAPM post-event failed: %d\n",
+                               w->name, ret);
+        }
+}
+
+/* Async callback run prior to DAPM sequences - brings to _PREPARE if
+ * they're changing state.
+ */
+static void dapm_pre_sequence_async(void *data, async_cookie_t cookie)
+{
+        struct snd_soc_dapm_context *d = data;
+        int ret;
+
+        if (d->dev_power && d->bias_level == SND_SOC_BIAS_OFF) {
+                ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_STANDBY);
+                if (ret != 0)
+                        dev_err(d->dev,
+                                "Failed to turn on bias: %d\n", ret);
+        }
+
+        /* If we're changing to all on or all off then prepare */
+        if ((d->dev_power && d->bias_level == SND_SOC_BIAS_STANDBY) ||
+            (!d->dev_power && d->bias_level == SND_SOC_BIAS_ON)) {
+                ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_PREPARE);
+                if (ret != 0)
+                        dev_err(d->dev,
+                                "Failed to prepare bias: %d\n", ret);
+        }
+}
+
+/* Async callback run prior to DAPM sequences - brings to their final
+ * state.
+ */
+static void dapm_post_sequence_async(void *data, async_cookie_t cookie)
+{
+        struct snd_soc_dapm_context *d = data;
+        int ret;
+
+        /* If we just powered the last thing off drop to standby bias */
+        if (d->bias_level == SND_SOC_BIAS_PREPARE && !d->dev_power) {
+                ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_STANDBY);
+                if (ret != 0)
+                        dev_err(d->dev, "Failed to apply standby bias: %d\n",
+                                ret);
+        }
+
+        /* If we're in standby and can support bias off then do that */
+        if (d->bias_level == SND_SOC_BIAS_STANDBY && d->idle_bias_off) {
+                ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_OFF);
+                if (ret != 0)
+                        dev_err(d->dev, "Failed to turn off bias: %d\n", ret);
+        }
+
+        /* If we just powered up then move to active bias */
+        if (d->bias_level == SND_SOC_BIAS_PREPARE && d->dev_power) {
+                ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_ON);
+                if (ret != 0)
+                        dev_err(d->dev, "Failed to apply active bias: %d\n",
+                                ret);
+        }
 }
 
 /*
@@ -891,26 +1099,32 @@ static void dapm_seq_run(struct snd_soc_codec *codec, struct list_head *list,
  *  o Input pin to Output pin (bypass, sidetone)
  *  o DAC to ADC (loopback).
  */
-static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
+static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
 {
-        struct snd_soc_device *socdev = codec->socdev;
+        struct snd_soc_card *card = dapm->card;
         struct snd_soc_dapm_widget *w;
+        struct snd_soc_dapm_context *d;
         LIST_HEAD(up_list);
         LIST_HEAD(down_list);
-        int ret = 0;
+        LIST_HEAD(async_domain);
         int power;
-        int sys_power = 0;
+
+        trace_snd_soc_dapm_start(card);
+
+        list_for_each_entry(d, &card->dapm_list, list)
+                if (d->n_widgets || d->codec == NULL)
+                        d->dev_power = 0;
 
         /* Check which widgets we need to power and store them in
          * lists indicating if they should be powered up or down.
          */
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
+        list_for_each_entry(w, &card->widgets, list) {
                 switch (w->id) {
                 case snd_soc_dapm_pre:
-                        dapm_seq_insert(w, &down_list, dapm_down_seq);
+                        dapm_seq_insert(w, &down_list, false);
                         break;
                 case snd_soc_dapm_post:
-                        dapm_seq_insert(w, &up_list, dapm_up_seq);
+                        dapm_seq_insert(w, &up_list, true);
                         break;
 
                 default:
@@ -922,15 +1136,17 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                         else
                                 power = 1;
                         if (power)
-                                sys_power = 1;
+                                w->dapm->dev_power = 1;
 
                         if (w->power == power)
                                 continue;
 
+                        trace_snd_soc_dapm_widget_power(w, power);
+
                         if (power)
-                                dapm_seq_insert(w, &up_list, dapm_up_seq);
+                                dapm_seq_insert(w, &up_list, true);
                         else
-                                dapm_seq_insert(w, &down_list, dapm_down_seq);
+                                dapm_seq_insert(w, &down_list, false);
 
                         w->power = power;
                         break;
@@ -940,23 +1156,26 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
         /* If there are no DAPM widgets then try to figure out power from the
          * event type.
          */
-        if (list_empty(&codec->dapm_widgets)) {
+        if (!dapm->n_widgets) {
                 switch (event) {
                 case SND_SOC_DAPM_STREAM_START:
                 case SND_SOC_DAPM_STREAM_RESUME:
-                        sys_power = 1;
+                        dapm->dev_power = 1;
+                        break;
+                case SND_SOC_DAPM_STREAM_STOP:
+                        dapm->dev_power = !!dapm->codec->active;
                         break;
                 case SND_SOC_DAPM_STREAM_SUSPEND:
-                        sys_power = 0;
+                        dapm->dev_power = 0;
                         break;
                 case SND_SOC_DAPM_STREAM_NOP:
-                        switch (codec->bias_level) {
+                        switch (dapm->bias_level) {
                                 case SND_SOC_BIAS_STANDBY:
                                 case SND_SOC_BIAS_OFF:
-                                        sys_power = 0;
+                                        dapm->dev_power = 0;
                                         break;
                                 default:
-                                        sys_power = 1;
+                                        dapm->dev_power = 1;
                                         break;
                         }
                         break;
@@ -965,55 +1184,40 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
                 }
         }
 
-        if (sys_power && codec->bias_level == SND_SOC_BIAS_OFF) {
-                ret = snd_soc_dapm_set_bias_level(socdev,
-                                                  SND_SOC_BIAS_STANDBY);
-                if (ret != 0)
-                        pr_err("Failed to turn on bias: %d\n", ret);
-        }
+        /* Force all contexts in the card to the same bias state */
+        power = 0;
+        list_for_each_entry(d, &card->dapm_list, list)
+                if (d->dev_power)
+                        power = 1;
+        list_for_each_entry(d, &card->dapm_list, list)
+                d->dev_power = power;
 
-        /* If we're changing to all on or all off then prepare */
-        if ((sys_power && codec->bias_level == SND_SOC_BIAS_STANDBY) ||
-            (!sys_power && codec->bias_level == SND_SOC_BIAS_ON)) {
-                ret = snd_soc_dapm_set_bias_level(socdev,
-                                                  SND_SOC_BIAS_PREPARE);
-                if (ret != 0)
-                        pr_err("Failed to prepare bias: %d\n", ret);
-        }
+
+        /* Run all the bias changes in parallel */
+        list_for_each_entry(d, &dapm->card->dapm_list, list)
+                async_schedule_domain(dapm_pre_sequence_async, d,
+                                        &async_domain);
+        async_synchronize_full_domain(&async_domain);
 
         /* Power down widgets first; try to avoid amplifying pops. */
-        dapm_seq_run(codec, &down_list, event, dapm_down_seq);
+        dapm_seq_run(dapm, &down_list, event, false);
+
+        dapm_widget_update(dapm);
 
         /* Now power up. */
-        dapm_seq_run(codec, &up_list, event, dapm_up_seq);
+        dapm_seq_run(dapm, &up_list, event, true);
 
-        /* If we just powered the last thing off drop to standby bias */
-        if (codec->bias_level == SND_SOC_BIAS_PREPARE && !sys_power) {
-                ret = snd_soc_dapm_set_bias_level(socdev,
-                                                  SND_SOC_BIAS_STANDBY);
-                if (ret != 0)
-                        pr_err("Failed to apply standby bias: %d\n", ret);
-        }
+        /* Run all the bias changes in parallel */
+        list_for_each_entry(d, &dapm->card->dapm_list, list)
+                async_schedule_domain(dapm_post_sequence_async, d,
+                                        &async_domain);
+        async_synchronize_full_domain(&async_domain);
 
-        /* If we're in standby and can support bias off then do that */
-        if (codec->bias_level == SND_SOC_BIAS_STANDBY &&
-            codec->idle_bias_off) {
-                ret = snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_OFF);
-                if (ret != 0)
-                        pr_err("Failed to turn off bias: %d\n", ret);
-        }
+        pop_dbg(dapm->dev, card->pop_time,
+                "DAPM sequencing finished, waiting %dms\n", card->pop_time);
+        pop_wait(card->pop_time);
 
-        /* If we just powered up then move to active bias */
-        if (codec->bias_level == SND_SOC_BIAS_PREPARE && sys_power) {
-                ret = snd_soc_dapm_set_bias_level(socdev,
-                                                  SND_SOC_BIAS_ON);
-                if (ret != 0)
-                        pr_err("Failed to apply active bias: %d\n", ret);
-        }
-
-        pop_dbg(codec->pop_time, "DAPM sequencing finished, waiting %dms\n",
-                codec->pop_time);
-        pop_wait(codec->pop_time);
+        trace_snd_soc_dapm_done(card);
 
         return 0;
 }
@@ -1040,9 +1244,9 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
                 return -ENOMEM;
 
         in = is_connected_input_ep(w);
-        dapm_clear_walk(w->codec);
+        dapm_clear_walk(w->dapm);
         out = is_connected_output_ep(w);
-        dapm_clear_walk(w->codec);
+        dapm_clear_walk(w->dapm);
 
         ret = snprintf(buf, PAGE_SIZE, "%s: %s  in %d out %d",
                        w->name, w->power ? "On" : "Off", in, out);
@@ -1065,7 +1269,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
 
                 if (p->connect)
                         ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                        " in  %s %s\n",
+                                        " in  \"%s\" \"%s\"\n",
                                         p->name ? p->name : "static",
                                         p->source->name);
         }
@@ -1075,7 +1279,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
 
                 if (p->connect)
                         ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                        " out %s %s\n",
+                                        " out \"%s\" \"%s\"\n",
                                         p->name ? p->name : "static",
                                         p->sink->name);
         }
@@ -1089,33 +1293,107 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
 static const struct file_operations dapm_widget_power_fops = {
         .open = dapm_widget_power_open_file,
         .read = dapm_widget_power_read_file,
+        .llseek = default_llseek,
 };
 
-void snd_soc_dapm_debugfs_init(struct snd_soc_codec *codec)
+static int dapm_bias_open_file(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static ssize_t dapm_bias_read_file(struct file *file, char __user *user_buf,
+                                   size_t count, loff_t *ppos)
+{
+        struct snd_soc_dapm_context *dapm = file->private_data;
+        char *level;
+
+        switch (dapm->bias_level) {
+        case SND_SOC_BIAS_ON:
+                level = "On\n";
+                break;
+        case SND_SOC_BIAS_PREPARE:
+                level = "Prepare\n";
+                break;
+        case SND_SOC_BIAS_STANDBY:
+                level = "Standby\n";
+                break;
+        case SND_SOC_BIAS_OFF:
+                level = "Off\n";
+                break;
+        default:
+                BUG();
+                level = "Unknown\n";
+                break;
+        }
+
+        return simple_read_from_buffer(user_buf, count, ppos, level,
+                                       strlen(level));
+}
+
+static const struct file_operations dapm_bias_fops = {
+        .open = dapm_bias_open_file,
+        .read = dapm_bias_read_file,
+        .llseek = default_llseek,
+};
+
+void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
+        struct dentry *parent)
 {
-        struct snd_soc_dapm_widget *w;
         struct dentry *d;
 
-        if (!codec->debugfs_dapm)
+        dapm->debugfs_dapm = debugfs_create_dir("dapm", parent);
+
+        if (!dapm->debugfs_dapm) {
+                printk(KERN_WARNING
+                       "Failed to create DAPM debugfs directory\n");
                 return;
+        }
 
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
-                if (!w->name)
-                        continue;
+        d = debugfs_create_file("bias_level", 0444,
+                                dapm->debugfs_dapm, dapm,
+                                &dapm_bias_fops);
+        if (!d)
+                dev_warn(dapm->dev,
+                         "ASoC: Failed to create bias level debugfs file\n");
+}
 
-                d = debugfs_create_file(w->name, 0444,
-                                        codec->debugfs_dapm, w,
-                                        &dapm_widget_power_fops);
-                if (!d)
-                        printk(KERN_WARNING
-                               "ASoC: Failed to create %s debugfs file\n",
-                               w->name);
-        }
+static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)
+{
+        struct snd_soc_dapm_context *dapm = w->dapm;
+        struct dentry *d;
+
+        if (!dapm->debugfs_dapm || !w->name)
+                return;
+
+        d = debugfs_create_file(w->name, 0444,
+                                dapm->debugfs_dapm, w,
+                                &dapm_widget_power_fops);
+        if (!d)
+                dev_warn(w->dapm->dev,
+                        "ASoC: Failed to create %s debugfs file\n",
+                        w->name);
 }
+
+static void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)
+{
+        debugfs_remove_recursive(dapm->debugfs_dapm);
+}
+
 #else
-void snd_soc_dapm_debugfs_init(struct snd_soc_codec *codec)
+void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
+        struct dentry *parent)
+{
+}
+
+static inline void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)
+{
+}
+
+static inline void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)
 {
 }
+
 #endif
 
 /* test and update the power status of a mux widget */
@@ -1127,6 +1405,7 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
         int found = 0;
 
         if (widget->id != snd_soc_dapm_mux &&
+            widget->id != snd_soc_dapm_virt_mux &&
             widget->id != snd_soc_dapm_value_mux)
                 return -ENODEV;
 
@@ -1134,7 +1413,7 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
                 return 0;
 
         /* find dapm widget path assoc with kcontrol */
-        list_for_each_entry(path, &widget->codec->dapm_paths, list) {
+        list_for_each_entry(path, &widget->dapm->card->paths, list) {
                 if (path->kcontrol != kcontrol)
                         continue;
 
@@ -1150,7 +1429,7 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
         }
 
         if (found)
-                dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP);
+                dapm_power_widgets(widget->dapm, SND_SOC_DAPM_STREAM_NOP);
 
         return 0;
 }
@@ -1168,7 +1447,7 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
                 return -ENODEV;
 
         /* find dapm widget path assoc with kcontrol */
-        list_for_each_entry(path, &widget->codec->dapm_paths, list) {
+        list_for_each_entry(path, &widget->dapm->card->paths, list) {
                 if (path->kcontrol != kcontrol)
                         continue;
 
@@ -1179,7 +1458,7 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
         }
 
         if (found)
-                dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP);
+                dapm_power_widgets(widget->dapm, SND_SOC_DAPM_STREAM_NOP);
 
         return 0;
 }
@@ -1188,13 +1467,16 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
 static ssize_t dapm_widget_show(struct device *dev,
         struct device_attribute *attr, char *buf)
 {
-        struct snd_soc_device *devdata = dev_get_drvdata(dev);
-        struct snd_soc_codec *codec = devdata->card->codec;
+        struct snd_soc_pcm_runtime *rtd =
+                        container_of(dev, struct snd_soc_pcm_runtime, dev);
+        struct snd_soc_codec *codec =rtd->codec;
         struct snd_soc_dapm_widget *w;
         int count = 0;
         char *state = "not set";
 
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
+        list_for_each_entry(w, &codec->card->widgets, list) {
+                if (w->dapm != &codec->dapm)
+                        continue;
 
                 /* only display widgets that burnm power */
                 switch (w->id) {
@@ -1206,6 +1488,7 @@ static ssize_t dapm_widget_show(struct device *dev,
                 case snd_soc_dapm_dac:
                 case snd_soc_dapm_adc:
                 case snd_soc_dapm_pga:
+                case snd_soc_dapm_out_drv:
                 case snd_soc_dapm_mixer:
                 case snd_soc_dapm_mixer_named_ctl:
                 case snd_soc_dapm_supply:
@@ -1218,7 +1501,7 @@ static ssize_t dapm_widget_show(struct device *dev,
                 }
         }
 
-        switch (codec->bias_level) {
+        switch (codec->dapm.bias_level) {
         case SND_SOC_BIAS_ON:
                 state = "On";
                 break;
@@ -1250,79 +1533,141 @@ static void snd_soc_dapm_sys_remove(struct device *dev)
 }
 
 /* free all dapm widgets and resources */
-static void dapm_free_widgets(struct snd_soc_codec *codec)
+static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)
 {
         struct snd_soc_dapm_widget *w, *next_w;
         struct snd_soc_dapm_path *p, *next_p;
 
-        list_for_each_entry_safe(w, next_w, &codec->dapm_widgets, list) {
+        list_for_each_entry_safe(w, next_w, &dapm->card->widgets, list) {
+                if (w->dapm != dapm)
+                        continue;
                 list_del(&w->list);
+                /*
+                 * remove source and sink paths associated to this widget.
+                 * While removing the path, remove reference to it from both
+                 * source and sink widgets so that path is removed only once.
+                 */
+                list_for_each_entry_safe(p, next_p, &w->sources, list_sink) {
+                        list_del(&p->list_sink);
+                        list_del(&p->list_source);
+                        list_del(&p->list);
+                        kfree(p->long_name);
+                        kfree(p);
+                }
+                list_for_each_entry_safe(p, next_p, &w->sinks, list_source) {
+                        list_del(&p->list_sink);
+                        list_del(&p->list_source);
+                        list_del(&p->list);
+                        kfree(p->long_name);
+                        kfree(p);
+                }
+                kfree(w->kcontrols);
+                kfree(w->name);
                 kfree(w);
         }
-
-        list_for_each_entry_safe(p, next_p, &codec->dapm_paths, list) {
-                list_del(&p->list);
-                kfree(p->long_name);
-                kfree(p);
-        }
 }
 
-static int snd_soc_dapm_set_pin(struct snd_soc_codec *codec,
-                                const char *pin, int status)
+static struct snd_soc_dapm_widget *dapm_find_widget(
+                        struct snd_soc_dapm_context *dapm, const char *pin,
+                        bool search_other_contexts)
 {
         struct snd_soc_dapm_widget *w;
+        struct snd_soc_dapm_widget *fallback = NULL;
 
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
+        list_for_each_entry(w, &dapm->card->widgets, list) {
                 if (!strcmp(w->name, pin)) {
-                        pr_debug("dapm: %s: pin %s\n", codec->name, pin);
-                        w->connected = status;
-                        /* Allow disabling of forced pins */
-                        if (status == 0)
-                                w->force = 0;
-                        return 0;
+                        if (w->dapm == dapm)
+                                return w;
+                        else
+                                fallback = w;
                 }
         }
 
-        pr_err("dapm: %s: configuring unknown pin %s\n", codec->name, pin);
-        return -EINVAL;
+        if (search_other_contexts)
+                return fallback;
+
+        return NULL;
+}
+
+static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm,
+                                const char *pin, int status)
+{
+        struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);
+
+        if (!w) {
+                dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
+                return -EINVAL;
+        }
+
+        w->connected = status;
+        if (status == 0)
+                w->force = 0;
+
+        return 0;
 }
 
 /**
  * snd_soc_dapm_sync - scan and power dapm paths
- * @codec: audio codec
+ * @dapm: DAPM context
  *
  * Walks all dapm audio paths and powers widgets according to their
  * stream or path usage.
  *
  * Returns 0 for success.
  */
-int snd_soc_dapm_sync(struct snd_soc_codec *codec)
+int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm)
 {
-        return dapm_power_widgets(codec, SND_SOC_DAPM_STREAM_NOP);
+        return dapm_power_widgets(dapm, SND_SOC_DAPM_STREAM_NOP);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_sync);
 
-static int snd_soc_dapm_add_route(struct snd_soc_codec *codec,
+static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
                                   const struct snd_soc_dapm_route *route)
 {
         struct snd_soc_dapm_path *path;
         struct snd_soc_dapm_widget *wsource = NULL, *wsink = NULL, *w;
-        const char *sink = route->sink;
+        struct snd_soc_dapm_widget *wtsource = NULL, *wtsink = NULL;
+        const char *sink;
         const char *control = route->control;
-        const char *source = route->source;
+        const char *source;
+        char prefixed_sink[80];
+        char prefixed_source[80];
         int ret = 0;
 
-        /* find src and dest widgets */
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
+        if (dapm->codec && dapm->codec->name_prefix) {
+                snprintf(prefixed_sink, sizeof(prefixed_sink), "%s %s",
+                         dapm->codec->name_prefix, route->sink);
+                sink = prefixed_sink;
+                snprintf(prefixed_source, sizeof(prefixed_source), "%s %s",
+                         dapm->codec->name_prefix, route->source);
+                source = prefixed_source;
+        } else {
+                sink = route->sink;
+                source = route->source;
+        }
 
+        /*
+         * find src and dest widgets over all widgets but favor a widget from
+         * current DAPM context
+         */
+        list_for_each_entry(w, &dapm->card->widgets, list) {
                 if (!wsink && !(strcmp(w->name, sink))) {
-                        wsink = w;
+                        wtsink = w;
+                        if (w->dapm == dapm)
+                                wsink = w;
                         continue;
                 }
                 if (!wsource && !(strcmp(w->name, source))) {
-                        wsource = w;
+                        wtsource = w;
+                        if (w->dapm == dapm)
+                                wsource = w;
                 }
         }
+        /* use widget from another DAPM context if not found from this */
+        if (!wsink)
+                wsink = wtsink;
+        if (!wsource)
+                wsource = wtsource;
 
         if (wsource == NULL || wsink == NULL)
                 return -ENODEV;
@@ -1356,7 +1701,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec,
 
         /* connect static paths */
         if (control == NULL) {
-                list_add(&path->list, &codec->dapm_paths);
+                list_add(&path->list, &dapm->card->paths);
                 list_add(&path->list_sink, &wsink->sources);
                 list_add(&path->list_source, &wsource->sinks);
                 path->connect = 1;
@@ -1364,10 +1709,11 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec,
         }
 
         /* connect dynamic paths */
-        switch(wsink->id) {
+        switch (wsink->id) {
         case snd_soc_dapm_adc:
         case snd_soc_dapm_dac:
         case snd_soc_dapm_pga:
+        case snd_soc_dapm_out_drv:
         case snd_soc_dapm_input:
         case snd_soc_dapm_output:
         case snd_soc_dapm_micbias:
@@ -1377,22 +1723,23 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec,
         case snd_soc_dapm_supply:
         case snd_soc_dapm_aif_in:
         case snd_soc_dapm_aif_out:
-                list_add(&path->list, &codec->dapm_paths);
+                list_add(&path->list, &dapm->card->paths);
                 list_add(&path->list_sink, &wsink->sources);
                 list_add(&path->list_source, &wsource->sinks);
                 path->connect = 1;
                 return 0;
         case snd_soc_dapm_mux:
+        case snd_soc_dapm_virt_mux:
         case snd_soc_dapm_value_mux:
-                ret = dapm_connect_mux(codec, wsource, wsink, path, control,
-                        &wsink->kcontrols[0]);
+                ret = dapm_connect_mux(dapm, wsource, wsink, path, control,
+                        &wsink->kcontrol_news[0]);
                 if (ret != 0)
                         goto err;
                 break;
         case snd_soc_dapm_switch:
         case snd_soc_dapm_mixer:
         case snd_soc_dapm_mixer_named_ctl:
-                ret = dapm_connect_mixer(codec, wsource, wsink, path, control);
+                ret = dapm_connect_mixer(dapm, wsource, wsink, path, control);
                 if (ret != 0)
                         goto err;
                 break;
@@ -1400,7 +1747,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec,
         case snd_soc_dapm_mic:
         case snd_soc_dapm_line:
         case snd_soc_dapm_spk:
-                list_add(&path->list, &codec->dapm_paths);
+                list_add(&path->list, &dapm->card->paths);
                 list_add(&path->list_sink, &wsink->sources);
                 list_add(&path->list_source, &wsource->sinks);
                 path->connect = 0;
@@ -1409,15 +1756,15 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec,
         return 0;
 
 err:
-        printk(KERN_WARNING "asoc: no dapm match for %s --> %s --> %s\n", source,
-                control, sink);
+        dev_warn(dapm->dev, "asoc: no dapm match for %s --> %s --> %s\n",
+                 source, control, sink);
         kfree(path);
         return ret;
 }
 
 /**
  * snd_soc_dapm_add_routes - Add routes between DAPM widgets
- * @codec: codec
+ * @dapm: DAPM context
  * @route: audio routes
  * @num: number of routes
  *
@@ -1428,17 +1775,16 @@ err:
  * Returns 0 for success else error. On error all resources can be freed
  * with a call to snd_soc_card_free().
  */
-int snd_soc_dapm_add_routes(struct snd_soc_codec *codec,
+int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,
                             const struct snd_soc_dapm_route *route, int num)
 {
         int i, ret;
 
         for (i = 0; i < num; i++) {
-                ret = snd_soc_dapm_add_route(codec, route);
+                ret = snd_soc_dapm_add_route(dapm, route);
                 if (ret < 0) {
-                        printk(KERN_ERR "Failed to add route %s->%s\n",
-                               route->source,
-                               route->sink);
+                        dev_err(dapm->dev, "Failed to add route %s->%s\n",
+                                route->source, route->sink);
                         return ret;
                 }
                 route++;
@@ -1450,32 +1796,42 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_add_routes);
 
 /**
  * snd_soc_dapm_new_widgets - add new dapm widgets
- * @codec: audio codec
+ * @dapm: DAPM context
  *
  * Checks the codec for any new dapm widgets and creates them if found.
  *
  * Returns 0 for success.
  */
-int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec)
+int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
 {
         struct snd_soc_dapm_widget *w;
+        unsigned int val;
 
-        list_for_each_entry(w, &codec->dapm_widgets, list)
+        list_for_each_entry(w, &dapm->card->widgets, list)
         {
                 if (w->new)
                         continue;
 
+                if (w->num_kcontrols) {
+                        w->kcontrols = kzalloc(w->num_kcontrols *
+                                                sizeof(struct snd_kcontrol *),
+                                                GFP_KERNEL);
+                        if (!w->kcontrols)
+                                return -ENOMEM;
+                }
+
                 switch(w->id) {
                 case snd_soc_dapm_switch:
                 case snd_soc_dapm_mixer:
                 case snd_soc_dapm_mixer_named_ctl:
                         w->power_check = dapm_generic_check_power;
-                        dapm_new_mixer(codec, w);
+                        dapm_new_mixer(w);
                         break;
                 case snd_soc_dapm_mux:
+                case snd_soc_dapm_virt_mux:
                 case snd_soc_dapm_value_mux:
                         w->power_check = dapm_generic_check_power;
-                        dapm_new_mux(codec, w);
+                        dapm_new_mux(w);
                         break;
                 case snd_soc_dapm_adc:
                 case snd_soc_dapm_aif_out:
@@ -1486,8 +1842,9 @@ int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec)
                         w->power_check = dapm_dac_check_power;
                         break;
                 case snd_soc_dapm_pga:
+                case snd_soc_dapm_out_drv:
                         w->power_check = dapm_generic_check_power;
-                        dapm_new_pga(codec, w);
+                        dapm_new_pga(w);
                         break;
                 case snd_soc_dapm_input:
                 case snd_soc_dapm_output:
@@ -1505,10 +1862,24 @@ int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec)
                 case snd_soc_dapm_post:
                         break;
                 }
+
+                /* Read the initial power state from the device */
+                if (w->reg >= 0) {
+                        val = snd_soc_read(w->codec, w->reg);
+                        val &= 1 << w->shift;
+                        if (w->invert)
+                                val = !val;
+
+                        if (val)
+                                w->power = 1;
+                }
+
                 w->new = 1;
+
+                dapm_debugfs_add_widget(w);
         }
 
-        dapm_power_widgets(codec, SND_SOC_DAPM_STREAM_NOP);
+        dapm_power_widgets(dapm, SND_SOC_DAPM_STREAM_NOP);
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_new_widgets);
@@ -1525,7 +1896,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_new_widgets);
 int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         unsigned int reg = mc->reg;
@@ -1564,66 +1936,59 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_volsw);
 int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
+        struct snd_soc_codec *codec = widget->codec;
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         unsigned int reg = mc->reg;
         unsigned int shift = mc->shift;
-        unsigned int rshift = mc->rshift;
         int max = mc->max;
         unsigned int mask = (1 << fls(max)) - 1;
         unsigned int invert = mc->invert;
-        unsigned int val, val2, val_mask;
-        int connect;
-        int ret;
+        unsigned int val;
+        int connect, change;
+        struct snd_soc_dapm_update update;
+        int wi;
 
         val = (ucontrol->value.integer.value[0] & mask);
 
         if (invert)
                 val = max - val;
-        val_mask = mask << shift;
+        mask = mask << shift;
         val = val << shift;
-        if (shift != rshift) {
-                val2 = (ucontrol->value.integer.value[1] & mask);
-                if (invert)
-                        val2 = max - val2;
-                val_mask |= mask << rshift;
-                val |= val2 << rshift;
-        }
 
-        mutex_lock(&widget->codec->mutex);
-        widget->value = val;
+        if (val)
+                /* new connection */
+                connect = invert ? 0 : 1;
+        else
+                /* old connection must be powered down */
+                connect = invert ? 1 : 0;
 
-        if (snd_soc_test_bits(widget->codec, reg, val_mask, val)) {
-                if (val)
-                        /* new connection */
-                        connect = invert ? 0:1;
-                else
-                        /* old connection must be powered down */
-                        connect = invert ? 1:0;
+        mutex_lock(&codec->mutex);
 
-                dapm_mixer_update_power(widget, kcontrol, connect);
-        }
+        change = snd_soc_test_bits(widget->codec, reg, mask, val);
+        if (change) {
+                for (wi = 0; wi < wlist->num_widgets; wi++) {
+                        widget = wlist->widgets[wi];
 
-        if (widget->event) {
-                if (widget->event_flags & SND_SOC_DAPM_PRE_REG) {
-                        ret = widget->event(widget, kcontrol,
-                                                SND_SOC_DAPM_PRE_REG);
-                        if (ret < 0) {
-                                ret = 1;
-                                goto out;
-                        }
+                        widget->value = val;
+
+                        update.kcontrol = kcontrol;
+                        update.widget = widget;
+                        update.reg = reg;
+                        update.mask = mask;
+                        update.val = val;
+                        widget->dapm->update = &update;
+
+                        dapm_mixer_update_power(widget, kcontrol, connect);
+
+                        widget->dapm->update = NULL;
                 }
-                ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);
-                if (widget->event_flags & SND_SOC_DAPM_POST_REG)
-                        ret = widget->event(widget, kcontrol,
-                                                SND_SOC_DAPM_POST_REG);
-        } else
-                ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);
-
-out:
-        mutex_unlock(&widget->codec->mutex);
-        return ret;
+        }
+
+        mutex_unlock(&codec->mutex);
+        return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw);
 
@@ -1639,7 +2004,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw);
 int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val, bitmask;
 
@@ -1667,11 +2033,14 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_enum_double);
 int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
+        struct snd_soc_codec *codec = widget->codec;
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val, mux, change;
         unsigned int mask, bitmask;
-        int ret = 0;
+        struct snd_soc_dapm_update update;
+        int wi;
 
         for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
                 ;
@@ -1687,27 +2056,30 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
                 mask |= (bitmask - 1) << e->shift_r;
         }
 
-        mutex_lock(&widget->codec->mutex);
-        widget->value = val;
+        mutex_lock(&codec->mutex);
+
         change = snd_soc_test_bits(widget->codec, e->reg, mask, val);
-        dapm_mux_update_power(widget, kcontrol, change, mux, e);
+        if (change) {
+                for (wi = 0; wi < wlist->num_widgets; wi++) {
+                        widget = wlist->widgets[wi];
 
-        if (widget->event_flags & SND_SOC_DAPM_PRE_REG) {
-                ret = widget->event(widget,
-                                    kcontrol, SND_SOC_DAPM_PRE_REG);
-                if (ret < 0)
-                        goto out;
-        }
+                        widget->value = val;
 
-        ret = snd_soc_update_bits(widget->codec, e->reg, mask, val);
+                        update.kcontrol = kcontrol;
+                        update.widget = widget;
+                        update.reg = e->reg;
+                        update.mask = mask;
+                        update.val = val;
+                        widget->dapm->update = &update;
 
-        if (widget->event_flags & SND_SOC_DAPM_POST_REG)
-                ret = widget->event(widget,
-                                    kcontrol, SND_SOC_DAPM_POST_REG);
+                        dapm_mux_update_power(widget, kcontrol, change, mux, e);
 
-out:
-        mutex_unlock(&widget->codec->mutex);
-        return ret;
+                        widget->dapm->update = NULL;
+                }
+        }
+
+        mutex_unlock(&codec->mutex);
+        return change;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_double);
 
@@ -1721,7 +2093,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_double);
 int snd_soc_dapm_get_enum_virt(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
 
         ucontrol->value.enumerated.item[0] = widget->value;
 
@@ -1739,22 +2112,33 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_enum_virt);
 int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
+        struct snd_soc_codec *codec = widget->codec;
         struct soc_enum *e =
                 (struct soc_enum *)kcontrol->private_value;
         int change;
         int ret = 0;
+        int wi;
 
         if (ucontrol->value.enumerated.item[0] >= e->max)
                 return -EINVAL;
 
-        mutex_lock(&widget->codec->mutex);
+        mutex_lock(&codec->mutex);
 
         change = widget->value != ucontrol->value.enumerated.item[0];
-        widget->value = ucontrol->value.enumerated.item[0];
-        dapm_mux_update_power(widget, kcontrol, change, widget->value, e);
+        if (change) {
+                for (wi = 0; wi < wlist->num_widgets; wi++) {
+                        widget = wlist->widgets[wi];
 
-        mutex_unlock(&widget->codec->mutex);
+                        widget->value = ucontrol->value.enumerated.item[0];
+
+                        dapm_mux_update_power(widget, kcontrol, change,
+                                              widget->value, e);
+                }
+        }
+
+        mutex_unlock(&codec->mutex);
         return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt);
@@ -1775,7 +2159,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt);
 int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int reg_val, val, mux;
 
@@ -1815,11 +2200,14 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_value_enum_double);
 int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
+        struct snd_soc_codec *codec = widget->codec;
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val, mux, change;
         unsigned int mask;
-        int ret = 0;
+        struct snd_soc_dapm_update update;
+        int wi;
 
         if (ucontrol->value.enumerated.item[0] > e->max - 1)
                 return -EINVAL;
@@ -1833,27 +2221,30 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
                 mask |= e->mask << e->shift_r;
         }
 
-        mutex_lock(&widget->codec->mutex);
-        widget->value = val;
+        mutex_lock(&codec->mutex);
+
         change = snd_soc_test_bits(widget->codec, e->reg, mask, val);
-        dapm_mux_update_power(widget, kcontrol, change, mux, e);
+        if (change) {
+                for (wi = 0; wi < wlist->num_widgets; wi++) {
+                        widget = wlist->widgets[wi];
 
-        if (widget->event_flags & SND_SOC_DAPM_PRE_REG) {
-                ret = widget->event(widget,
-                                    kcontrol, SND_SOC_DAPM_PRE_REG);
-                if (ret < 0)
-                        goto out;
-        }
+                        widget->value = val;
 
-        ret = snd_soc_update_bits(widget->codec, e->reg, mask, val);
+                        update.kcontrol = kcontrol;
+                        update.widget = widget;
+                        update.reg = e->reg;
+                        update.mask = mask;
+                        update.val = val;
+                        widget->dapm->update = &update;
 
-        if (widget->event_flags & SND_SOC_DAPM_POST_REG)
-                ret = widget->event(widget,
-                                    kcontrol, SND_SOC_DAPM_POST_REG);
+                        dapm_mux_update_power(widget, kcontrol, change, mux, e);
 
-out:
-        mutex_unlock(&widget->codec->mutex);
-        return ret;
+                        widget->dapm->update = NULL;
+                }
+        }
+
+        mutex_unlock(&codec->mutex);
+        return change;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_put_value_enum_double);
 
@@ -1892,7 +2283,7 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,
         mutex_lock(&codec->mutex);
 
         ucontrol->value.integer.value[0] =
-                snd_soc_dapm_get_pin_status(codec, pin);
+                snd_soc_dapm_get_pin_status(&codec->dapm, pin);
 
         mutex_unlock(&codec->mutex);
 
@@ -1915,11 +2306,11 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
         mutex_lock(&codec->mutex);
 
         if (ucontrol->value.integer.value[0])
-                snd_soc_dapm_enable_pin(codec, pin);
+                snd_soc_dapm_enable_pin(&codec->dapm, pin);
         else
-                snd_soc_dapm_disable_pin(codec, pin);
+                snd_soc_dapm_disable_pin(&codec->dapm, pin);
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(&codec->dapm);
 
         mutex_unlock(&codec->mutex);
 
@@ -1929,26 +2320,43 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_put_pin_switch);
 
 /**
  * snd_soc_dapm_new_control - create new dapm control
- * @codec: audio codec
+ * @dapm: DAPM context
  * @widget: widget template
  *
  * Creates a new dapm control based upon the template.
  *
  * Returns 0 for success else error.
  */
-int snd_soc_dapm_new_control(struct snd_soc_codec *codec,
+int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
         const struct snd_soc_dapm_widget *widget)
 {
         struct snd_soc_dapm_widget *w;
+        size_t name_len;
 
         if ((w = dapm_cnew_widget(widget)) == NULL)
                 return -ENOMEM;
 
-        w->codec = codec;
+        name_len = strlen(widget->name) + 1;
+        if (dapm->codec && dapm->codec->name_prefix)
+                name_len += 1 + strlen(dapm->codec->name_prefix);
+        w->name = kmalloc(name_len, GFP_KERNEL);
+        if (w->name == NULL) {
+                kfree(w);
+                return -ENOMEM;
+        }
+        if (dapm->codec && dapm->codec->name_prefix)
+                snprintf(w->name, name_len, "%s %s",
+                        dapm->codec->name_prefix, widget->name);
+        else
+                snprintf(w->name, name_len, "%s", widget->name);
+
+        dapm->n_widgets++;
+        w->dapm = dapm;
+        w->codec = dapm->codec;
         INIT_LIST_HEAD(&w->sources);
         INIT_LIST_HEAD(&w->sinks);
         INIT_LIST_HEAD(&w->list);
-        list_add(&w->list, &codec->dapm_widgets);
+        list_add(&w->list, &dapm->card->widgets);
 
         /* machine layer set ups unconnected pins and insertions */
         w->connected = 1;
@@ -1958,7 +2366,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control);
 
 /**
  * snd_soc_dapm_new_controls - create new dapm controls
- * @codec: audio codec
+ * @dapm: DAPM context
  * @widget: widget array
  * @num: number of widgets
  *
@@ -1966,18 +2374,18 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control);
  *
  * Returns 0 for success else error.
  */
-int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
+int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
         const struct snd_soc_dapm_widget *widget,
         int num)
 {
         int i, ret;
 
         for (i = 0; i < num; i++) {
-                ret = snd_soc_dapm_new_control(codec, widget);
+                ret = snd_soc_dapm_new_control(dapm, widget);
                 if (ret < 0) {
-                        printk(KERN_ERR
-                               "ASoC: Failed to create DAPM control %s: %d\n",
-                               widget->name, ret);
+                        dev_err(dapm->dev,
+                                "ASoC: Failed to create DAPM control %s: %d\n",
+                                widget->name, ret);
                         return ret;
                 }
                 widget++;
@@ -1986,33 +2394,17 @@ int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_new_controls);
 
-
-/**
- * snd_soc_dapm_stream_event - send a stream event to the dapm core
- * @codec: audio codec
- * @stream: stream name
- * @event: stream event
- *
- * Sends a stream event to the dapm core. The core then makes any
- * necessary widget power changes.
- *
- * Returns 0 for success else error.
- */
-int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
-        char *stream, int event)
+static void soc_dapm_stream_event(struct snd_soc_dapm_context *dapm,
+        const char *stream, int event)
 {
         struct snd_soc_dapm_widget *w;
 
-        if (stream == NULL)
-                return 0;
-
-        mutex_lock(&codec->mutex);
-        list_for_each_entry(w, &codec->dapm_widgets, list)
+        list_for_each_entry(w, &dapm->card->widgets, list)
         {
-                if (!w->sname)
+                if (!w->sname || w->dapm != dapm)
                         continue;
-                pr_debug("widget %s\n %s stream %s event %d\n",
-                         w->name, w->sname, stream, event);
+                dev_dbg(w->dapm->dev, "widget %s\n %s stream %s event %d\n",
+                        w->name, w->sname, stream, event);
                 if (strstr(w->sname, stream)) {
                         switch(event) {
                         case SND_SOC_DAPM_STREAM_START:
@@ -2030,15 +2422,37 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
                 }
         }
 
-        dapm_power_widgets(codec, event);
+        dapm_power_widgets(dapm, event);
+}
+
+/**
+ * snd_soc_dapm_stream_event - send a stream event to the dapm core
+ * @rtd: PCM runtime data
+ * @stream: stream name
+ * @event: stream event
+ *
+ * Sends a stream event to the dapm core. The core then makes any
+ * necessary widget power changes.
+ *
+ * Returns 0 for success else error.
+ */
+int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd,
+        const char *stream, int event)
+{
+        struct snd_soc_codec *codec = rtd->codec;
+
+        if (stream == NULL)
+                return 0;
+
+        mutex_lock(&codec->mutex);
+        soc_dapm_stream_event(&codec->dapm, stream, event);
         mutex_unlock(&codec->mutex);
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_dapm_stream_event);
 
 /**
  * snd_soc_dapm_enable_pin - enable pin.
- * @codec: SoC codec
+ * @dapm: DAPM context
  * @pin: pin name
  *
  * Enables input/output pin and its parents or children widgets iff there is
@@ -2046,15 +2460,15 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_stream_event);
  * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to
  * do any widget power switching.
  */
-int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin)
+int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin)
 {
-        return snd_soc_dapm_set_pin(codec, pin, 1);
+        return snd_soc_dapm_set_pin(dapm, pin, 1);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin);
 
 /**
  * snd_soc_dapm_force_enable_pin - force a pin to be enabled
- * @codec: SoC codec
+ * @dapm: DAPM context
  * @pin: pin name
  *
  * Enables input/output pin regardless of any other state.  This is
@@ -2064,42 +2478,43 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_enable_pin);
  * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to
  * do any widget power switching.
  */
-int snd_soc_dapm_force_enable_pin(struct snd_soc_codec *codec, const char *pin)
+int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,
+                                  const char *pin)
 {
-        struct snd_soc_dapm_widget *w;
+        struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);
 
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
-                if (!strcmp(w->name, pin)) {
-                        pr_debug("dapm: %s: pin %s\n", codec->name, pin);
-                        w->connected = 1;
-                        w->force = 1;
-                        return 0;
-                }
+        if (!w) {
+                dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
+                return -EINVAL;
         }
 
-        pr_err("dapm: %s: configuring unknown pin %s\n", codec->name, pin);
-        return -EINVAL;
+        dev_dbg(w->dapm->dev, "dapm: force enable pin %s\n", pin);
+        w->connected = 1;
+        w->force = 1;
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_force_enable_pin);
 
 /**
  * snd_soc_dapm_disable_pin - disable pin.
- * @codec: SoC codec
+ * @dapm: DAPM context
  * @pin: pin name
  *
  * Disables input/output pin and its parents or children widgets.
  * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to
  * do any widget power switching.
  */
-int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, const char *pin)
+int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm,
+                             const char *pin)
 {
-        return snd_soc_dapm_set_pin(codec, pin, 0);
+        return snd_soc_dapm_set_pin(dapm, pin, 0);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_disable_pin);
 
 /**
  * snd_soc_dapm_nc_pin - permanently disable pin.
- * @codec: SoC codec
+ * @dapm: DAPM context
  * @pin: pin name
  *
  * Marks the specified pin as being not connected, disabling it along
@@ -2111,29 +2526,28 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_disable_pin);
  * NOTE: snd_soc_dapm_sync() needs to be called after this for DAPM to
  * do any widget power switching.
  */
-int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, const char *pin)
+int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin)
 {
-        return snd_soc_dapm_set_pin(codec, pin, 0);
+        return snd_soc_dapm_set_pin(dapm, pin, 0);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_nc_pin);
 
 /**
  * snd_soc_dapm_get_pin_status - get audio pin status
- * @codec: audio codec
+ * @dapm: DAPM context
  * @pin: audio signal pin endpoint (or start point)
  *
  * Get audio pin status - connected or disconnected.
  *
  * Returns 1 for connected otherwise 0.
  */
-int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin)
+int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,
+                                const char *pin)
 {
-        struct snd_soc_dapm_widget *w;
+        struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);
 
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
-                if (!strcmp(w->name, pin))
-                        return w->connected;
-        }
+        if (w)
+                return w->connected;
 
         return 0;
 }
@@ -2141,7 +2555,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_status);
 
 /**
  * snd_soc_dapm_ignore_suspend - ignore suspend status for DAPM endpoint
- * @codec: audio codec
+ * @dapm: DAPM context
  * @pin: audio signal pin endpoint (or start point)
  *
  * Mark the given endpoint or pin as ignoring suspend.  When the
@@ -2150,50 +2564,48 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_status);
  * normal means at suspend time, it will not be turned on if it was not
  * already enabled.
  */
-int snd_soc_dapm_ignore_suspend(struct snd_soc_codec *codec, const char *pin)
+int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
+                                const char *pin)
 {
-        struct snd_soc_dapm_widget *w;
+        struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, false);
 
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
-                if (!strcmp(w->name, pin)) {
-                        w->ignore_suspend = 1;
-                        return 0;
-                }
+        if (!w) {
+                dev_err(dapm->dev, "dapm: unknown pin %s\n", pin);
+                return -EINVAL;
         }
 
-        pr_err("Unknown DAPM pin: %s\n", pin);
-        return -EINVAL;
+        w->ignore_suspend = 1;
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);
 
 /**
  * snd_soc_dapm_free - free dapm resources
- * @socdev: SoC device
+ * @card: SoC device
  *
  * Free all dapm widgets and resources.
  */
-void snd_soc_dapm_free(struct snd_soc_device *socdev)
+void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm)
 {
-        struct snd_soc_codec *codec = socdev->card->codec;
-
-        snd_soc_dapm_sys_remove(socdev->dev);
-        dapm_free_widgets(codec);
+        snd_soc_dapm_sys_remove(dapm->dev);
+        dapm_debugfs_cleanup(dapm);
+        dapm_free_widgets(dapm);
+        list_del(&dapm->list);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_free);
 
-/*
- * snd_soc_dapm_shutdown - callback for system shutdown
- */
-void snd_soc_dapm_shutdown(struct snd_soc_device *socdev)
+static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm)
 {
-        struct snd_soc_codec *codec = socdev->card->codec;
         struct snd_soc_dapm_widget *w;
         LIST_HEAD(down_list);
         int powerdown = 0;
 
-        list_for_each_entry(w, &codec->dapm_widgets, list) {
+        list_for_each_entry(w, &dapm->card->widgets, list) {
+                if (w->dapm != dapm)
+                        continue;
                 if (w->power) {
-                        dapm_seq_insert(w, &down_list, dapm_down_seq);
+                        dapm_seq_insert(w, &down_list, false);
                         w->power = 0;
                         powerdown = 1;
                 }
@@ -2203,12 +2615,23 @@ void snd_soc_dapm_shutdown(struct snd_soc_device *socdev)
          * standby.
          */
         if (powerdown) {
-                snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_PREPARE);
-                dapm_seq_run(codec, &down_list, 0, dapm_down_seq);
-                snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_STANDBY);
+                snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_PREPARE);
+                dapm_seq_run(dapm, &down_list, 0, false);
+                snd_soc_dapm_set_bias_level(dapm, SND_SOC_BIAS_STANDBY);
         }
+}
 
-        snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_OFF);
+/*
+ * snd_soc_dapm_shutdown - callback for system shutdown
+ */
+void snd_soc_dapm_shutdown(struct snd_soc_card *card)
+{
+        struct snd_soc_codec *codec;
+
+        list_for_each_entry(codec, &card->codec_dev_list, list) {
+                soc_dapm_shutdown_codec(&codec->dapm);
+                snd_soc_dapm_set_bias_level(&codec->dapm, SND_SOC_BIAS_OFF);
+        }
 }
 
 /* Module information */