1 files changed, 1804 insertions, 811 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index acc91daa1c55..b194be09e74d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3,6 +3,8 @@
  *
  * Copyright 2005 Wolfson Microelectronics PLC.
  * Copyright 2005 Openedhand Ltd.
+ * Copyright (C) 2010 Slimlogic Ltd.
+ * Copyright (C) 2010 Texas Instruments Inc.
  *
  * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  *         with code, comments and ideas from :-
@@ -31,17 +33,23 @@
 #include <linux/slab.h>
 #include <sound/ac97_codec.h>
 #include <sound/core.h>
+#include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/asoc.h>
+
+#define NAME_SIZE       32
+
 static DEFINE_MUTEX(pcm_mutex);
 static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq);
 
 #ifdef CONFIG_DEBUG_FS
-static struct dentry *debugfs_root;
+struct dentry *snd_soc_debugfs_root;
+EXPORT_SYMBOL_GPL(snd_soc_debugfs_root);
 #endif
 
 static DEFINE_MUTEX(client_mutex);
@@ -50,8 +58,7 @@ static LIST_HEAD(dai_list);
 static LIST_HEAD(platform_list);
 static LIST_HEAD(codec_list);
 
-static int snd_soc_register_card(struct snd_soc_card *card);
-static int snd_soc_unregister_card(struct snd_soc_card *card);
+static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num);
 
 /*
  * This is a timeout to do a DAPM powerdown after a stream is closed().
@@ -62,83 +69,111 @@ static int pmdown_time = 5000;
 module_param(pmdown_time, int, 0);
 MODULE_PARM_DESC(pmdown_time, "DAPM stream powerdown time (msecs)");
 
-/*
- * This function forces any delayed work to be queued and run.
- */
-static int run_delayed_work(struct delayed_work *dwork)
+/* returns the minimum number of bytes needed to represent
+ * a particular given value */
+static int min_bytes_needed(unsigned long val)
+{
+        int c = 0;
+        int i;
+
+        for (i = (sizeof val * 8) - 1; i >= 0; --i, ++c)
+                if (val & (1UL << i))
+                        break;
+        c = (sizeof val * 8) - c;
+        if (!c || (c % 8))
+                c = (c + 8) / 8;
+        else
+                c /= 8;
+        return c;
+}
+
+/* fill buf which is 'len' bytes with a formatted
+ * string of the form 'reg: value\n' */
+static int format_register_str(struct snd_soc_codec *codec,
+                               unsigned int reg, char *buf, size_t len)
 {
+        int wordsize = min_bytes_needed(codec->driver->reg_cache_size) * 2;
+        int regsize = codec->driver->reg_word_size * 2;
         int ret;
+        char tmpbuf[len + 1];
+        char regbuf[regsize + 1];
 
-        /* cancel any work waiting to be queued. */
-        ret = cancel_delayed_work(dwork);
+        /* since tmpbuf is allocated on the stack, warn the callers if they
+         * try to abuse this function */
+        WARN_ON(len > 63);
 
-        /* if there was any work waiting then we run it now and
-         * wait for it's completion */
-        if (ret) {
-                schedule_delayed_work(dwork, 0);
-                flush_scheduled_work();
+        /* +2 for ': ' and + 1 for '\n' */
+        if (wordsize + regsize + 2 + 1 != len)
+                return -EINVAL;
+
+        ret = snd_soc_read(codec , reg);
+        if (ret < 0) {
+                memset(regbuf, 'X', regsize);
+                regbuf[regsize] = '\0';
+        } else {
+                snprintf(regbuf, regsize + 1, "%.*x", regsize, ret);
         }
-        return ret;
+
+        /* prepare the buffer */
+        snprintf(tmpbuf, len + 1, "%.*x: %s\n", wordsize, reg, regbuf);
+        /* copy it back to the caller without the '\0' */
+        memcpy(buf, tmpbuf, len);
+
+        return 0;
 }
 
 /* codec register dump */
-static ssize_t soc_codec_reg_show(struct snd_soc_codec *codec, char *buf)
+static ssize_t soc_codec_reg_show(struct snd_soc_codec *codec, char *buf,
+                                  size_t count, loff_t pos)
 {
-        int ret, i, step = 1, count = 0;
+        int i, step = 1;
+        int wordsize, regsize;
+        int len;
+        size_t total = 0;
+        loff_t p = 0;
 
-        if (!codec->reg_cache_size)
-                return 0;
+        wordsize = min_bytes_needed(codec->driver->reg_cache_size) * 2;
+        regsize = codec->driver->reg_word_size * 2;
 
-        if (codec->reg_cache_step)
-                step = codec->reg_cache_step;
+        len = wordsize + regsize + 2 + 1;
 
-        count += sprintf(buf, "%s registers\n", codec->name);
-        for (i = 0; i < codec->reg_cache_size; i += step) {
-                if (codec->readable_register && !codec->readable_register(i))
-                        continue;
+        if (!codec->driver->reg_cache_size)
+                return 0;
 
-                count += sprintf(buf + count, "%2x: ", i);
-                if (count >= PAGE_SIZE - 1)
-                        break;
+        if (codec->driver->reg_cache_step)
+                step = codec->driver->reg_cache_step;
 
-                if (codec->display_register) {
-                        count += codec->display_register(codec, buf + count,
+        for (i = 0; i < codec->driver->reg_cache_size; i += step) {
+                if (codec->readable_register && !codec->readable_register(codec, i))
+                        continue;
+                if (codec->driver->display_register) {
+                        count += codec->driver->display_register(codec, buf + count,
                                                          PAGE_SIZE - count, i);
                 } else {
-                        /* If the read fails it's almost certainly due to
-                         * the register being volatile and the device being
-                         * powered off.
-                         */
-                        ret = codec->read(codec, i);
-                        if (ret >= 0)
-                                count += snprintf(buf + count,
-                                                  PAGE_SIZE - count,
-                                                  "%4x", ret);
-                        else
-                                count += snprintf(buf + count,
-                                                  PAGE_SIZE - count,
-                                                  "<no data: %d>", ret);
+                        /* only support larger than PAGE_SIZE bytes debugfs
+                         * entries for the default case */
+                        if (p >= pos) {
+                                if (total + len >= count - 1)
+                                        break;
+                                format_register_str(codec, i, buf + total, len);
+                                total += len;
+                        }
+                        p += len;
                 }
-
-                if (count >= PAGE_SIZE - 1)
-                        break;
-
-                count += snprintf(buf + count, PAGE_SIZE - count, "\n");
-                if (count >= PAGE_SIZE - 1)
-                        break;
         }
 
-        /* Truncate count; min() would cause a warning */
-        if (count >= PAGE_SIZE)
-                count = PAGE_SIZE - 1;
+        total = min(total, count - 1);
 
-        return count;
+        return total;
 }
+
 static ssize_t codec_reg_show(struct device *dev,
         struct device_attribute *attr, char *buf)
 {
-        struct snd_soc_device *devdata = dev_get_drvdata(dev);
-        return soc_codec_reg_show(devdata->card->codec, buf);
+        struct snd_soc_pcm_runtime *rtd =
+                        container_of(dev, struct snd_soc_pcm_runtime, dev);
+
+        return soc_codec_reg_show(rtd->codec, buf, PAGE_SIZE, 0);
 }
 
 static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
@@ -146,20 +181,23 @@ static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
 static ssize_t pmdown_time_show(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        struct snd_soc_device *socdev = dev_get_drvdata(dev);
-        struct snd_soc_card *card = socdev->card;
+        struct snd_soc_pcm_runtime *rtd =
+                        container_of(dev, struct snd_soc_pcm_runtime, dev);
 
-        return sprintf(buf, "%ld\n", card->pmdown_time);
+        return sprintf(buf, "%ld\n", rtd->pmdown_time);
 }
 
 static ssize_t pmdown_time_set(struct device *dev,
                                struct device_attribute *attr,
                                const char *buf, size_t count)
 {
-        struct snd_soc_device *socdev = dev_get_drvdata(dev);
-        struct snd_soc_card *card = socdev->card;
+        struct snd_soc_pcm_runtime *rtd =
+                        container_of(dev, struct snd_soc_pcm_runtime, dev);
+        int ret;
 
-        strict_strtol(buf, 10, &card->pmdown_time);
+        ret = strict_strtol(buf, 10, &rtd->pmdown_time);
+        if (ret)
+                return ret;
 
         return count;
 }
@@ -174,16 +212,28 @@ static int codec_reg_open_file(struct inode *inode, struct file *file)
 }
 
 static ssize_t codec_reg_read_file(struct file *file, char __user *user_buf,
-                               size_t count, loff_t *ppos)
+                                   size_t count, loff_t *ppos)
 {
         ssize_t ret;
         struct snd_soc_codec *codec = file->private_data;
-        char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        char *buf;
+
+        if (*ppos < 0 || !count)
+                return -EINVAL;
+
+        buf = kmalloc(count, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
-        ret = soc_codec_reg_show(codec, buf);
-        if (ret >= 0)
-                ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
+
+        ret = soc_codec_reg_show(codec, buf, count, *ppos);
+        if (ret >= 0) {
+                if (copy_to_user(user_buf, buf, ret)) {
+                        kfree(buf);
+                        return -EFAULT;
+                }
+                *ppos += ret;
+        }
+
         kfree(buf);
         return ret;
 }
@@ -192,7 +242,7 @@ static ssize_t codec_reg_write_file(struct file *file,
                 const char __user *user_buf, size_t count, loff_t *ppos)
 {
         char buf[32];
-        int buf_size;
+        size_t buf_size;
         char *start = buf;
         unsigned long reg, value;
         int step = 1;
@@ -203,19 +253,21 @@ static ssize_t codec_reg_write_file(struct file *file,
                 return -EFAULT;
         buf[buf_size] = 0;
 
-        if (codec->reg_cache_step)
-                step = codec->reg_cache_step;
+        if (codec->driver->reg_cache_step)
+                step = codec->driver->reg_cache_step;
 
         while (*start == ' ')
                 start++;
         reg = simple_strtoul(start, &start, 16);
-        if ((reg >= codec->reg_cache_size) || (reg % step))
-                return -EINVAL;
         while (*start == ' ')
                 start++;
         if (strict_strtoul(start, 16, &value))
                 return -EINVAL;
-        codec->write(codec, reg, value);
+
+        /* Userspace has been fiddling around behind the kernel's back */
+        add_taint(TAINT_USER);
+
+        snd_soc_write(codec, reg, value);
         return buf_size;
 }
 
@@ -223,27 +275,26 @@ static const struct file_operations codec_reg_fops = {
         .open = codec_reg_open_file,
         .read = codec_reg_read_file,
         .write = codec_reg_write_file,
+        .llseek = default_llseek,
 };
 
 static void soc_init_codec_debugfs(struct snd_soc_codec *codec)
 {
-        char codec_root[128];
+        struct dentry *debugfs_card_root = codec->card->debugfs_card_root;
 
-        if (codec->dev)
-                snprintf(codec_root, sizeof(codec_root),
-                        "%s.%s", codec->name, dev_name(codec->dev));
-        else
-                snprintf(codec_root, sizeof(codec_root),
-                        "%s", codec->name);
-
-        codec->debugfs_codec_root = debugfs_create_dir(codec_root,
-                                                       debugfs_root);
+        codec->debugfs_codec_root = debugfs_create_dir(codec->name,
+                                                       debugfs_card_root);
         if (!codec->debugfs_codec_root) {
                 printk(KERN_WARNING
                        "ASoC: Failed to create codec debugfs directory\n");
                 return;
         }
 
+        debugfs_create_bool("cache_sync", 0444, codec->debugfs_codec_root,
+                            &codec->cache_sync);
+        debugfs_create_bool("cache_only", 0444, codec->debugfs_codec_root,
+                            &codec->cache_only);
+
         codec->debugfs_reg = debugfs_create_file("codec_reg", 0644,
                                                  codec->debugfs_codec_root,
                                                  codec, &codec_reg_fops);
@@ -251,20 +302,7 @@ static void soc_init_codec_debugfs(struct snd_soc_codec *codec)
                 printk(KERN_WARNING
                        "ASoC: Failed to create codec register debugfs file\n");
 
-        codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,
-                                                     codec->debugfs_codec_root,
-                                                     &codec->pop_time);
-        if (!codec->debugfs_pop_time)
-                printk(KERN_WARNING
-                       "Failed to create pop time debugfs file\n");
-
-        codec->debugfs_dapm = debugfs_create_dir("dapm",
-                                                 codec->debugfs_codec_root);
-        if (!codec->debugfs_dapm)
-                printk(KERN_WARNING
-                       "Failed to create DAPM debugfs directory\n");
-
-        snd_soc_dapm_debugfs_init(codec);
+        snd_soc_dapm_debugfs_init(&codec->dapm, codec->debugfs_codec_root);
 }
 
 static void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec)
@@ -272,6 +310,129 @@ static void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec)
         debugfs_remove_recursive(codec->debugfs_codec_root);
 }
 
+static ssize_t codec_list_read_file(struct file *file, char __user *user_buf,
+                                    size_t count, loff_t *ppos)
+{
+        char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        ssize_t len, ret = 0;
+        struct snd_soc_codec *codec;
+
+        if (!buf)
+                return -ENOMEM;
+
+        list_for_each_entry(codec, &codec_list, list) {
+                len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n",
+                               codec->name);
+                if (len >= 0)
+                        ret += len;
+                if (ret > PAGE_SIZE) {
+                        ret = PAGE_SIZE;
+                        break;
+                }
+        }
+
+        if (ret >= 0)
+                ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
+
+        kfree(buf);
+
+        return ret;
+}
+
+static const struct file_operations codec_list_fops = {
+        .read = codec_list_read_file,
+        .llseek = default_llseek,/* read accesses f_pos */
+};
+
+static ssize_t dai_list_read_file(struct file *file, char __user *user_buf,
+                                  size_t count, loff_t *ppos)
+{
+        char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        ssize_t len, ret = 0;
+        struct snd_soc_dai *dai;
+
+        if (!buf)
+                return -ENOMEM;
+
+        list_for_each_entry(dai, &dai_list, list) {
+                len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", dai->name);
+                if (len >= 0)
+                        ret += len;
+                if (ret > PAGE_SIZE) {
+                        ret = PAGE_SIZE;
+                        break;
+                }
+        }
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
+
+        kfree(buf);
+
+        return ret;
+}
+
+static const struct file_operations dai_list_fops = {
+        .read = dai_list_read_file,
+        .llseek = default_llseek,/* read accesses f_pos */
+};
+
+static ssize_t platform_list_read_file(struct file *file,
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos)
+{
+        char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        ssize_t len, ret = 0;
+        struct snd_soc_platform *platform;
+
+        if (!buf)
+                return -ENOMEM;
+
+        list_for_each_entry(platform, &platform_list, list) {
+                len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n",
+                               platform->name);
+                if (len >= 0)
+                        ret += len;
+                if (ret > PAGE_SIZE) {
+                        ret = PAGE_SIZE;
+                        break;
+                }
+        }
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
+
+        kfree(buf);
+
+        return ret;
+}
+
+static const struct file_operations platform_list_fops = {
+        .read = platform_list_read_file,
+        .llseek = default_llseek,/* read accesses f_pos */
+};
+
+static void soc_init_card_debugfs(struct snd_soc_card *card)
+{
+        card->debugfs_card_root = debugfs_create_dir(card->name,
+                                                     snd_soc_debugfs_root);
+        if (!card->debugfs_card_root) {
+                dev_warn(card->dev,
+                         "ASoC: Failed to create codec debugfs directory\n");
+                return;
+        }
+
+        card->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,
+                                                    card->debugfs_card_root,
+                                                    &card->pop_time);
+        if (!card->debugfs_pop_time)
+                dev_warn(card->dev,
+                       "Failed to create pop time debugfs file\n");
+}
+
+static void soc_cleanup_card_debugfs(struct snd_soc_card *card)
+{
+        debugfs_remove_recursive(card->debugfs_card_root);
+}
+
 #else
 
 static inline void soc_init_codec_debugfs(struct snd_soc_codec *codec)
@@ -281,6 +442,14 @@ static inline void soc_init_codec_debugfs(struct snd_soc_codec *codec)
 static inline void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec)
 {
 }
+
+static inline void soc_init_card_debugfs(struct snd_soc_card *card)
+{
+}
+
+static inline void soc_cleanup_card_debugfs(struct snd_soc_card *card)
+{
+}
 #endif
 
 #ifdef CONFIG_SND_SOC_AC97_BUS
@@ -305,7 +474,7 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec)
         codec->ac97->dev.release = soc_ac97_device_release;
 
         dev_set_name(&codec->ac97->dev, "%d-%d:%s",
-                     codec->card->number, 0, codec->name);
+                     codec->card->snd_card->number, 0, codec->name);
         err = device_register(&codec->ac97->dev);
         if (err < 0) {
                 snd_printk(KERN_ERR "Can't register ac97 bus\n");
@@ -319,27 +488,34 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec)
 static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_dai_link *machine = rtd->dai;
-        struct snd_soc_dai *cpu_dai = machine->cpu_dai;
-        struct snd_soc_dai *codec_dai = machine->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         int ret;
 
-        if (codec_dai->symmetric_rates || cpu_dai->symmetric_rates ||
-            machine->symmetric_rates) {
-                dev_dbg(card->dev, "Symmetry forces %dHz rate\n",
-                        machine->rate);
+        if (!codec_dai->driver->symmetric_rates &&
+            !cpu_dai->driver->symmetric_rates &&
+            !rtd->dai_link->symmetric_rates)
+                return 0;
 
-                ret = snd_pcm_hw_constraint_minmax(substream->runtime,
-                                                   SNDRV_PCM_HW_PARAM_RATE,
-                                                   machine->rate,
-                                                   machine->rate);
-                if (ret < 0) {
-                        dev_err(card->dev,
-                                "Unable to apply rate symmetry constraint: %d\n", ret);
-                        return ret;
-                }
+        /* This can happen if multiple streams are starting simultaneously -
+         * the second can need to get its constraints before the first has
+         * picked a rate.  Complain and allow the application to carry on.
+         */
+        if (!rtd->rate) {
+                dev_warn(&rtd->dev,
+                         "Not enforcing symmetric_rates due to race\n");
+                return 0;
+        }
+
+        dev_dbg(&rtd->dev, "Symmetry forces %dHz rate\n", rtd->rate);
+
+        ret = snd_pcm_hw_constraint_minmax(substream->runtime,
+                                           SNDRV_PCM_HW_PARAM_RATE,
+                                           rtd->rate, rtd->rate);
+        if (ret < 0) {
+                dev_err(&rtd->dev,
+                        "Unable to apply rate symmetry constraint: %d\n", ret);
+                return ret;
         }
 
         return 0;
@@ -353,20 +529,19 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream)
 static int soc_pcm_open(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_card *card = socdev->card;
         struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_soc_dai_link *machine = rtd->dai;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_dai *cpu_dai = machine->cpu_dai;
-        struct snd_soc_dai *codec_dai = machine->codec_dai;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_dai_driver *cpu_dai_drv = cpu_dai->driver;
+        struct snd_soc_dai_driver *codec_dai_drv = codec_dai->driver;
         int ret = 0;
 
         mutex_lock(&pcm_mutex);
 
         /* startup the audio subsystem */
-        if (cpu_dai->ops->startup) {
-                ret = cpu_dai->ops->startup(substream, cpu_dai);
+        if (cpu_dai->driver->ops->startup) {
+                ret = cpu_dai->driver->ops->startup(substream, cpu_dai);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: can't open interface %s\n",
                                 cpu_dai->name);
@@ -374,16 +549,16 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
                 }
         }
 
-        if (platform->pcm_ops->open) {
-                ret = platform->pcm_ops->open(substream);
+        if (platform->driver->ops && platform->driver->ops->open) {
+                ret = platform->driver->ops->open(substream);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: can't open platform %s\n", platform->name);
                         goto platform_err;
                 }
         }
 
-        if (codec_dai->ops->startup) {
-                ret = codec_dai->ops->startup(substream, codec_dai);
+        if (codec_dai->driver->ops->startup) {
+                ret = codec_dai->driver->ops->startup(substream, codec_dai);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: can't open codec %s\n",
                                 codec_dai->name);
@@ -391,63 +566,64 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
                 }
         }
 
-        if (machine->ops && machine->ops->startup) {
-                ret = machine->ops->startup(substream);
+        if (rtd->dai_link->ops && rtd->dai_link->ops->startup) {
+                ret = rtd->dai_link->ops->startup(substream);
                 if (ret < 0) {
-                        printk(KERN_ERR "asoc: %s startup failed\n", machine->name);
+                        printk(KERN_ERR "asoc: %s startup failed\n", rtd->dai_link->name);
                         goto machine_err;
                 }
         }
 
-        /* Check that the codec and cpu DAI's are compatible */
+        /* Check that the codec and cpu DAIs are compatible */
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 runtime->hw.rate_min =
-                        max(codec_dai->playback.rate_min,
-                            cpu_dai->playback.rate_min);
+                        max(codec_dai_drv->playback.rate_min,
+                            cpu_dai_drv->playback.rate_min);
                 runtime->hw.rate_max =
-                        min(codec_dai->playback.rate_max,
-                            cpu_dai->playback.rate_max);
+                        min(codec_dai_drv->playback.rate_max,
+                            cpu_dai_drv->playback.rate_max);
                 runtime->hw.channels_min =
-                        max(codec_dai->playback.channels_min,
-                                cpu_dai->playback.channels_min);
+                        max(codec_dai_drv->playback.channels_min,
+                                cpu_dai_drv->playback.channels_min);
                 runtime->hw.channels_max =
-                        min(codec_dai->playback.channels_max,
-                                cpu_dai->playback.channels_max);
+                        min(codec_dai_drv->playback.channels_max,
+                                cpu_dai_drv->playback.channels_max);
                 runtime->hw.formats =
-                        codec_dai->playback.formats & cpu_dai->playback.formats;
+                        codec_dai_drv->playback.formats & cpu_dai_drv->playback.formats;
                 runtime->hw.rates =
-                        codec_dai->playback.rates & cpu_dai->playback.rates;
-                if (codec_dai->playback.rates
+                        codec_dai_drv->playback.rates & cpu_dai_drv->playback.rates;
+                if (codec_dai_drv->playback.rates
                            & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))
-                        runtime->hw.rates |= cpu_dai->playback.rates;
-                if (cpu_dai->playback.rates
+                        runtime->hw.rates |= cpu_dai_drv->playback.rates;
+                if (cpu_dai_drv->playback.rates
                            & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))
-                        runtime->hw.rates |= codec_dai->playback.rates;
+                        runtime->hw.rates |= codec_dai_drv->playback.rates;
         } else {
                 runtime->hw.rate_min =
-                        max(codec_dai->capture.rate_min,
-                            cpu_dai->capture.rate_min);
+                        max(codec_dai_drv->capture.rate_min,
+                            cpu_dai_drv->capture.rate_min);
                 runtime->hw.rate_max =
-                        min(codec_dai->capture.rate_max,
-                            cpu_dai->capture.rate_max);
+                        min(codec_dai_drv->capture.rate_max,
+                            cpu_dai_drv->capture.rate_max);
                 runtime->hw.channels_min =
-                        max(codec_dai->capture.channels_min,
-                                cpu_dai->capture.channels_min);
+                        max(codec_dai_drv->capture.channels_min,
+                                cpu_dai_drv->capture.channels_min);
                 runtime->hw.channels_max =
-                        min(codec_dai->capture.channels_max,
-                                cpu_dai->capture.channels_max);
+                        min(codec_dai_drv->capture.channels_max,
+                                cpu_dai_drv->capture.channels_max);
                 runtime->hw.formats =
-                        codec_dai->capture.formats & cpu_dai->capture.formats;
+                        codec_dai_drv->capture.formats & cpu_dai_drv->capture.formats;
                 runtime->hw.rates =
-                        codec_dai->capture.rates & cpu_dai->capture.rates;
-                if (codec_dai->capture.rates
+                        codec_dai_drv->capture.rates & cpu_dai_drv->capture.rates;
+                if (codec_dai_drv->capture.rates
                            & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))
-                        runtime->hw.rates |= cpu_dai->capture.rates;
-                if (cpu_dai->capture.rates
+                        runtime->hw.rates |= cpu_dai_drv->capture.rates;
+                if (cpu_dai_drv->capture.rates
                            & (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))
-                        runtime->hw.rates |= codec_dai->capture.rates;
+                        runtime->hw.rates |= codec_dai_drv->capture.rates;
         }
 
+        ret = -EINVAL;
         snd_pcm_limit_hw_rates(runtime);
         if (!runtime->hw.rates) {
                 printk(KERN_ERR "asoc: %s <-> %s No matching rates\n",
@@ -459,9 +635,10 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
                         codec_dai->name, cpu_dai->name);
                 goto config_err;
         }
-        if (!runtime->hw.channels_min || !runtime->hw.channels_max) {
+        if (!runtime->hw.channels_min || !runtime->hw.channels_max ||
+            runtime->hw.channels_min > runtime->hw.channels_max) {
                 printk(KERN_ERR "asoc: %s <-> %s No matching channels\n",
-                        codec_dai->name, cpu_dai->name);
+                                codec_dai->name, cpu_dai->name);
                 goto config_err;
         }
 
@@ -472,7 +649,8 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
                         goto config_err;
         }
 
-        pr_debug("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name);
+        pr_debug("asoc: %s <-> %s info:\n",
+                        codec_dai->name, cpu_dai->name);
         pr_debug("asoc: rate mask 0x%x\n", runtime->hw.rates);
         pr_debug("asoc: min ch %d max ch %d\n", runtime->hw.channels_min,
                  runtime->hw.channels_max);
@@ -480,33 +658,33 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
                  runtime->hw.rate_max);
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                cpu_dai->playback.active++;
-                codec_dai->playback.active++;
+                cpu_dai->playback_active++;
+                codec_dai->playback_active++;
         } else {
-                cpu_dai->capture.active++;
-                codec_dai->capture.active++;
+                cpu_dai->capture_active++;
+                codec_dai->capture_active++;
         }
         cpu_dai->active++;
         codec_dai->active++;
-        card->codec->active++;
+        rtd->codec->active++;
         mutex_unlock(&pcm_mutex);
         return 0;
 
 config_err:
-        if (machine->ops && machine->ops->shutdown)
-                machine->ops->shutdown(substream);
+        if (rtd->dai_link->ops && rtd->dai_link->ops->shutdown)
+                rtd->dai_link->ops->shutdown(substream);
 
 machine_err:
-        if (codec_dai->ops->shutdown)
-                codec_dai->ops->shutdown(substream, codec_dai);
+        if (codec_dai->driver->ops->shutdown)
+                codec_dai->driver->ops->shutdown(substream, codec_dai);
 
 codec_dai_err:
-        if (platform->pcm_ops->close)
-                platform->pcm_ops->close(substream);
+        if (platform->driver->ops && platform->driver->ops->close)
+                platform->driver->ops->close(substream);
 
 platform_err:
-        if (cpu_dai->ops->shutdown)
-                cpu_dai->ops->shutdown(substream, cpu_dai);
+        if (cpu_dai->driver->ops->shutdown)
+                cpu_dai->driver->ops->shutdown(substream, cpu_dai);
 out:
         mutex_unlock(&pcm_mutex);
         return ret;
@@ -519,29 +697,25 @@ out:
  */
 static void close_delayed_work(struct work_struct *work)
 {
-        struct snd_soc_card *card = container_of(work, struct snd_soc_card,
-                                                 delayed_work.work);
-        struct snd_soc_codec *codec = card->codec;
-        struct snd_soc_dai *codec_dai;
-        int i;
+        struct snd_soc_pcm_runtime *rtd =
+                        container_of(work, struct snd_soc_pcm_runtime, delayed_work.work);
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
 
         mutex_lock(&pcm_mutex);
-        for (i = 0; i < codec->num_dai; i++) {
-                codec_dai = &codec->dai[i];
-
-                pr_debug("pop wq checking: %s status: %s waiting: %s\n",
-                         codec_dai->playback.stream_name,
-                         codec_dai->playback.active ? "active" : "inactive",
-                         codec_dai->pop_wait ? "yes" : "no");
-
-                /* are we waiting on this codec DAI stream */
-                if (codec_dai->pop_wait == 1) {
-                        codec_dai->pop_wait = 0;
-                        snd_soc_dapm_stream_event(codec,
-                                codec_dai->playback.stream_name,
-                                SND_SOC_DAPM_STREAM_STOP);
-                }
+
+        pr_debug("pop wq checking: %s status: %s waiting: %s\n",
+                 codec_dai->driver->playback.stream_name,
+                 codec_dai->playback_active ? "active" : "inactive",
+                 codec_dai->pop_wait ? "yes" : "no");
+
+        /* are we waiting on this codec DAI stream */
+        if (codec_dai->pop_wait == 1) {
+                codec_dai->pop_wait = 0;
+                snd_soc_dapm_stream_event(rtd,
+                        codec_dai->driver->playback.stream_name,
+                        SND_SOC_DAPM_STREAM_STOP);
         }
+
         mutex_unlock(&pcm_mutex);
 }
 
@@ -553,22 +727,19 @@ static void close_delayed_work(struct work_struct *work)
 static int soc_codec_close(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_dai_link *machine = rtd->dai;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_dai *cpu_dai = machine->cpu_dai;
-        struct snd_soc_dai *codec_dai = machine->codec_dai;
-        struct snd_soc_codec *codec = card->codec;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_codec *codec = rtd->codec;
 
         mutex_lock(&pcm_mutex);
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                cpu_dai->playback.active--;
-                codec_dai->playback.active--;
+                cpu_dai->playback_active--;
+                codec_dai->playback_active--;
         } else {
-                cpu_dai->capture.active--;
-                codec_dai->capture.active--;
+                cpu_dai->capture_active--;
+                codec_dai->capture_active--;
         }
 
         cpu_dai->active--;
@@ -581,27 +752,28 @@ static int soc_codec_close(struct snd_pcm_substream *substream)
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 snd_soc_dai_digital_mute(codec_dai, 1);
 
-        if (cpu_dai->ops->shutdown)
-                cpu_dai->ops->shutdown(substream, cpu_dai);
+        if (cpu_dai->driver->ops->shutdown)
+                cpu_dai->driver->ops->shutdown(substream, cpu_dai);
 
-        if (codec_dai->ops->shutdown)
-                codec_dai->ops->shutdown(substream, codec_dai);
+        if (codec_dai->driver->ops->shutdown)
+                codec_dai->driver->ops->shutdown(substream, codec_dai);
 
-        if (machine->ops && machine->ops->shutdown)
-                machine->ops->shutdown(substream);
+        if (rtd->dai_link->ops && rtd->dai_link->ops->shutdown)
+                rtd->dai_link->ops->shutdown(substream);
 
-        if (platform->pcm_ops->close)
-                platform->pcm_ops->close(substream);
+        if (platform->driver->ops && platform->driver->ops->close)
+                platform->driver->ops->close(substream);
+        cpu_dai->runtime = NULL;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 /* start delayed pop wq here for playback streams */
                 codec_dai->pop_wait = 1;
-                schedule_delayed_work(&card->delayed_work,
-                        msecs_to_jiffies(card->pmdown_time));
+                schedule_delayed_work(&rtd->delayed_work,
+                        msecs_to_jiffies(rtd->pmdown_time));
         } else {
                 /* capture streams can be powered down now */
-                snd_soc_dapm_stream_event(codec,
-                        codec_dai->capture.stream_name,
+                snd_soc_dapm_stream_event(rtd,
+                        codec_dai->driver->capture.stream_name,
                         SND_SOC_DAPM_STREAM_STOP);
         }
 
@@ -617,43 +789,39 @@ static int soc_codec_close(struct snd_pcm_substream *substream)
 static int soc_pcm_prepare(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_dai_link *machine = rtd->dai;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_dai *cpu_dai = machine->cpu_dai;
-        struct snd_soc_dai *codec_dai = machine->codec_dai;
-        struct snd_soc_codec *codec = card->codec;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         int ret = 0;
 
         mutex_lock(&pcm_mutex);
 
-        if (machine->ops && machine->ops->prepare) {
-                ret = machine->ops->prepare(substream);
+        if (rtd->dai_link->ops && rtd->dai_link->ops->prepare) {
+                ret = rtd->dai_link->ops->prepare(substream);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: machine prepare error\n");
                         goto out;
                 }
         }
 
-        if (platform->pcm_ops->prepare) {
-                ret = platform->pcm_ops->prepare(substream);
+        if (platform->driver->ops && platform->driver->ops->prepare) {
+                ret = platform->driver->ops->prepare(substream);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: platform prepare error\n");
                         goto out;
                 }
         }
 
-        if (codec_dai->ops->prepare) {
-                ret = codec_dai->ops->prepare(substream, codec_dai);
+        if (codec_dai->driver->ops->prepare) {
+                ret = codec_dai->driver->ops->prepare(substream, codec_dai);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: codec DAI prepare error\n");
                         goto out;
                 }
         }
 
-        if (cpu_dai->ops->prepare) {
-                ret = cpu_dai->ops->prepare(substream, cpu_dai);
+        if (cpu_dai->driver->ops->prepare) {
+                ret = cpu_dai->driver->ops->prepare(substream, cpu_dai);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: cpu DAI prepare error\n");
                         goto out;
@@ -664,16 +832,16 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
             codec_dai->pop_wait) {
                 codec_dai->pop_wait = 0;
-                cancel_delayed_work(&card->delayed_work);
+                cancel_delayed_work(&rtd->delayed_work);
         }
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                snd_soc_dapm_stream_event(codec,
-                                          codec_dai->playback.stream_name,
+                snd_soc_dapm_stream_event(rtd,
+                                          codec_dai->driver->playback.stream_name,
                                           SND_SOC_DAPM_STREAM_START);
         else
-                snd_soc_dapm_stream_event(codec,
-                                          codec_dai->capture.stream_name,
+                snd_soc_dapm_stream_event(rtd,
+                                          codec_dai->driver->capture.stream_name,
                                           SND_SOC_DAPM_STREAM_START);
 
         snd_soc_dai_digital_mute(codec_dai, 0);
@@ -692,26 +860,23 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_dai_link *machine = rtd->dai;
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_dai *cpu_dai = machine->cpu_dai;
-        struct snd_soc_dai *codec_dai = machine->codec_dai;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         int ret = 0;
 
         mutex_lock(&pcm_mutex);
 
-        if (machine->ops && machine->ops->hw_params) {
-                ret = machine->ops->hw_params(substream, params);
+        if (rtd->dai_link->ops && rtd->dai_link->ops->hw_params) {
+                ret = rtd->dai_link->ops->hw_params(substream, params);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: machine hw_params failed\n");
                         goto out;
                 }
         }
 
-        if (codec_dai->ops->hw_params) {
-                ret = codec_dai->ops->hw_params(substream, params, codec_dai);
+        if (codec_dai->driver->ops->hw_params) {
+                ret = codec_dai->driver->ops->hw_params(substream, params, codec_dai);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: can't set codec %s hw params\n",
                                 codec_dai->name);
@@ -719,8 +884,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
                 }
         }
 
-        if (cpu_dai->ops->hw_params) {
-                ret = cpu_dai->ops->hw_params(substream, params, cpu_dai);
+        if (cpu_dai->driver->ops->hw_params) {
+                ret = cpu_dai->driver->ops->hw_params(substream, params, cpu_dai);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: interface %s hw params failed\n",
                                 cpu_dai->name);
@@ -728,8 +893,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
                 }
         }
 
-        if (platform->pcm_ops->hw_params) {
-                ret = platform->pcm_ops->hw_params(substream, params);
+        if (platform->driver->ops && platform->driver->ops->hw_params) {
+                ret = platform->driver->ops->hw_params(substream, params);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: platform %s hw params failed\n",
                                 platform->name);
@@ -737,41 +902,38 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
                 }
         }
 
-        machine->rate = params_rate(params);
+        rtd->rate = params_rate(params);
 
 out:
         mutex_unlock(&pcm_mutex);
         return ret;
 
 platform_err:
-        if (cpu_dai->ops->hw_free)
-                cpu_dai->ops->hw_free(substream, cpu_dai);
+        if (cpu_dai->driver->ops->hw_free)
+                cpu_dai->driver->ops->hw_free(substream, cpu_dai);
 
 interface_err:
-        if (codec_dai->ops->hw_free)
-                codec_dai->ops->hw_free(substream, codec_dai);
+        if (codec_dai->driver->ops->hw_free)
+                codec_dai->driver->ops->hw_free(substream, codec_dai);
 
 codec_err:
-        if (machine->ops && machine->ops->hw_free)
-                machine->ops->hw_free(substream);
+        if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free)
+                rtd->dai_link->ops->hw_free(substream);
 
         mutex_unlock(&pcm_mutex);
         return ret;
 }
 
 /*
- * Free's resources allocated by hw_params, can be called multiple times
+ * Frees resources allocated by hw_params, can be called multiple times
  */
 static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_dai_link *machine = rtd->dai;
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_dai *cpu_dai = machine->cpu_dai;
-        struct snd_soc_dai *codec_dai = machine->codec_dai;
-        struct snd_soc_codec *codec = card->codec;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_codec *codec = rtd->codec;
 
         mutex_lock(&pcm_mutex);
 
@@ -780,19 +942,19 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
                 snd_soc_dai_digital_mute(codec_dai, 1);
 
         /* free any machine hw params */
-        if (machine->ops && machine->ops->hw_free)
-                machine->ops->hw_free(substream);
+        if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free)
+                rtd->dai_link->ops->hw_free(substream);
 
         /* free any DMA resources */
-        if (platform->pcm_ops->hw_free)
-                platform->pcm_ops->hw_free(substream);
+        if (platform->driver->ops && platform->driver->ops->hw_free)
+                platform->driver->ops->hw_free(substream);
 
-        /* now free hw params for the DAI's  */
-        if (codec_dai->ops->hw_free)
-                codec_dai->ops->hw_free(substream, codec_dai);
+        /* now free hw params for the DAIs  */
+        if (codec_dai->driver->ops->hw_free)
+                codec_dai->driver->ops->hw_free(substream, codec_dai);
 
-        if (cpu_dai->ops->hw_free)
-                cpu_dai->ops->hw_free(substream, cpu_dai);
+        if (cpu_dai->driver->ops->hw_free)
+                cpu_dai->driver->ops->hw_free(substream, cpu_dai);
 
         mutex_unlock(&pcm_mutex);
         return 0;
@@ -801,28 +963,25 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
 static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_card *card= socdev->card;
-        struct snd_soc_dai_link *machine = rtd->dai;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_dai *cpu_dai = machine->cpu_dai;
-        struct snd_soc_dai *codec_dai = machine->codec_dai;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         int ret;
 
-        if (codec_dai->ops->trigger) {
-                ret = codec_dai->ops->trigger(substream, cmd, codec_dai);
+        if (codec_dai->driver->ops->trigger) {
+                ret = codec_dai->driver->ops->trigger(substream, cmd, codec_dai);
                 if (ret < 0)
                         return ret;
         }
 
-        if (platform->pcm_ops->trigger) {
-                ret = platform->pcm_ops->trigger(substream, cmd);
+        if (platform->driver->ops && platform->driver->ops->trigger) {
+                ret = platform->driver->ops->trigger(substream, cmd);
                 if (ret < 0)
                         return ret;
         }
 
-        if (cpu_dai->ops->trigger) {
-                ret = cpu_dai->ops->trigger(substream, cmd, cpu_dai);
+        if (cpu_dai->driver->ops->trigger) {
+                ret = cpu_dai->driver->ops->trigger(substream, cmd, cpu_dai);
                 if (ret < 0)
                         return ret;
         }
@@ -837,27 +996,24 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_dai_link *machine = rtd->dai;
-        struct snd_soc_dai *cpu_dai = machine->cpu_dai;
-        struct snd_soc_dai *codec_dai = machine->codec_dai;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_pcm_runtime *runtime = substream->runtime;
         snd_pcm_uframes_t offset = 0;
         snd_pcm_sframes_t delay = 0;
 
-        if (platform->pcm_ops->pointer)
-                offset = platform->pcm_ops->pointer(substream);
+        if (platform->driver->ops && platform->driver->ops->pointer)
+                offset = platform->driver->ops->pointer(substream);
 
-        if (cpu_dai->ops->delay)
-                delay += cpu_dai->ops->delay(substream, cpu_dai);
+        if (cpu_dai->driver->ops->delay)
+                delay += cpu_dai->driver->ops->delay(substream, cpu_dai);
 
-        if (codec_dai->ops->delay)
-                delay += codec_dai->ops->delay(substream, codec_dai);
+        if (codec_dai->driver->ops->delay)
+                delay += codec_dai->driver->ops->delay(substream, codec_dai);
 
-        if (platform->delay)
-                delay += platform->delay(substream, codec_dai);
+        if (platform->driver->delay)
+                delay += platform->driver->delay(substream, codec_dai);
 
         runtime->delay = delay;
 
@@ -875,447 +1031,954 @@ static struct snd_pcm_ops soc_pcm_ops = {
         .pointer        = soc_pcm_pointer,
 };
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 /* powers down audio subsystem for suspend */
-static int soc_suspend(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
-        struct snd_soc_codec *codec = card->codec;
+int snd_soc_suspend(struct device *dev)
+{
+        struct snd_soc_card *card = dev_get_drvdata(dev);
+        struct snd_soc_codec *codec;
         int i;
 
         /* If the initialization of this soc device failed, there is no codec
          * associated with it. Just bail out in this case.
          */
-        if (!codec)
+        if (list_empty(&card->codec_dev_list))
                 return 0;
 
         /* Due to the resume being scheduled into a workqueue we could
         * suspend before that's finished - wait for it to complete.
          */
-        snd_power_lock(codec->card);
-        snd_power_wait(codec->card, SNDRV_CTL_POWER_D0);
-        snd_power_unlock(codec->card);
+        snd_power_lock(card->snd_card);
+        snd_power_wait(card->snd_card, SNDRV_CTL_POWER_D0);
+        snd_power_unlock(card->snd_card);
 
         /* we're going to block userspace touching us until resume completes */
-        snd_power_change_state(codec->card, SNDRV_CTL_POWER_D3hot);
+        snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D3hot);
 
-        /* mute any active DAC's */
-        for (i = 0; i < card->num_links; i++) {
-                struct snd_soc_dai *dai = card->dai_link[i].codec_dai;
+        /* mute any active DACs */
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *dai = card->rtd[i].codec_dai;
+                struct snd_soc_dai_driver *drv = dai->driver;
 
-                if (card->dai_link[i].ignore_suspend)
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                if (dai->ops->digital_mute && dai->playback.active)
-                        dai->ops->digital_mute(dai, 1);
+                if (drv->ops->digital_mute && dai->playback_active)
+                        drv->ops->digital_mute(dai, 1);
         }
 
         /* suspend all pcms */
-        for (i = 0; i < card->num_links; i++) {
-                if (card->dai_link[i].ignore_suspend)
+        for (i = 0; i < card->num_rtd; i++) {
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                snd_pcm_suspend_all(card->dai_link[i].pcm);
+                snd_pcm_suspend_all(card->rtd[i].pcm);
         }
 
         if (card->suspend_pre)
-                card->suspend_pre(pdev, PMSG_SUSPEND);
+                card->suspend_pre(card);
 
-        for (i = 0; i < card->num_links; i++) {
-                struct snd_soc_dai  *cpu_dai = card->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
+                struct snd_soc_platform *platform = card->rtd[i].platform;
 
-                if (card->dai_link[i].ignore_suspend)
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                if (cpu_dai->suspend && !cpu_dai->ac97_control)
-                        cpu_dai->suspend(cpu_dai);
-                if (platform->suspend)
-                        platform->suspend(&card->dai_link[i]);
+                if (cpu_dai->driver->suspend && !cpu_dai->driver->ac97_control)
+                        cpu_dai->driver->suspend(cpu_dai);
+                if (platform->driver->suspend && !platform->suspended) {
+                        platform->driver->suspend(cpu_dai);
+                        platform->suspended = 1;
+                }
         }
 
         /* close any waiting streams and save state */
-        run_delayed_work(&card->delayed_work);
-        codec->suspend_bias_level = codec->bias_level;
+        for (i = 0; i < card->num_rtd; i++) {
+                flush_delayed_work_sync(&card->rtd[i].delayed_work);
+                card->rtd[i].codec->dapm.suspend_bias_level = card->rtd[i].codec->dapm.bias_level;
+        }
 
-        for (i = 0; i < codec->num_dai; i++) {
-                char *stream = codec->dai[i].playback.stream_name;
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai_driver *driver = card->rtd[i].codec_dai->driver;
 
-                if (card->dai_link[i].ignore_suspend)
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                if (stream != NULL)
-                        snd_soc_dapm_stream_event(codec, stream,
+                if (driver->playback.stream_name != NULL)
+                        snd_soc_dapm_stream_event(&card->rtd[i], driver->playback.stream_name,
                                 SND_SOC_DAPM_STREAM_SUSPEND);
-                stream = codec->dai[i].capture.stream_name;
-                if (stream != NULL)
-                        snd_soc_dapm_stream_event(codec, stream,
+
+                if (driver->capture.stream_name != NULL)
+                        snd_soc_dapm_stream_event(&card->rtd[i], driver->capture.stream_name,
                                 SND_SOC_DAPM_STREAM_SUSPEND);
         }
 
-        /* If there are paths active then the CODEC will be held with
-         * bias _ON and should not be suspended. */
-        if (codec_dev->suspend) {
-                switch (codec->bias_level) {
-                case SND_SOC_BIAS_STANDBY:
-                case SND_SOC_BIAS_OFF:
-                        codec_dev->suspend(pdev, PMSG_SUSPEND);
-                        break;
-                default:
-                        dev_dbg(socdev->dev, "CODEC is on over suspend\n");
-                        break;
+        /* suspend all CODECs */
+        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
+                /* If there are paths active then the CODEC will be held with
+                 * bias _ON and should not be suspended. */
+                if (!codec->suspended && codec->driver->suspend) {
+                        switch (codec->dapm.bias_level) {
+                        case SND_SOC_BIAS_STANDBY:
+                        case SND_SOC_BIAS_OFF:
+                                codec->driver->suspend(codec, PMSG_SUSPEND);
+                                codec->suspended = 1;
+                                break;
+                        default:
+                                dev_dbg(codec->dev, "CODEC is on over suspend\n");
+                                break;
+                        }
                 }
         }
 
-        for (i = 0; i < card->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
 
-                if (card->dai_link[i].ignore_suspend)
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                if (cpu_dai->suspend && cpu_dai->ac97_control)
-                        cpu_dai->suspend(cpu_dai);
+                if (cpu_dai->driver->suspend && cpu_dai->driver->ac97_control)
+                        cpu_dai->driver->suspend(cpu_dai);
         }
 
         if (card->suspend_post)
-                card->suspend_post(pdev, PMSG_SUSPEND);
+                card->suspend_post(card);
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(snd_soc_suspend);
 
 /* deferred resume work, so resume can complete before we finished
  * setting our codec back up, which can be very slow on I2C
  */
 static void soc_resume_deferred(struct work_struct *work)
 {
-        struct snd_soc_card *card = container_of(work,
-                                                 struct snd_soc_card,
-                                                 deferred_resume_work);
-        struct snd_soc_device *socdev = card->socdev;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
-        struct snd_soc_codec *codec = card->codec;
-        struct platform_device *pdev = to_platform_device(socdev->dev);
+        struct snd_soc_card *card =
+                        container_of(work, struct snd_soc_card, deferred_resume_work);
+        struct snd_soc_codec *codec;
         int i;
 
         /* our power state is still SNDRV_CTL_POWER_D3hot from suspend time,
          * so userspace apps are blocked from touching us
          */
 
-        dev_dbg(socdev->dev, "starting resume work\n");
+        dev_dbg(card->dev, "starting resume work\n");
 
         /* Bring us up into D2 so that DAPM starts enabling things */
-        snd_power_change_state(codec->card, SNDRV_CTL_POWER_D2);
+        snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D2);
 
         if (card->resume_pre)
-                card->resume_pre(pdev);
+                card->resume_pre(card);
 
-        for (i = 0; i < card->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
+        /* resume AC97 DAIs */
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
 
-                if (card->dai_link[i].ignore_suspend)
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                if (cpu_dai->resume && cpu_dai->ac97_control)
-                        cpu_dai->resume(cpu_dai);
-        }
-
-        /* If the CODEC was idle over suspend then it will have been
-         * left with bias OFF or STANDBY and suspended so we must now
-         * resume.  Otherwise the suspend was suppressed.
-         */
-        if (codec_dev->resume) {
-                switch (codec->bias_level) {
-                case SND_SOC_BIAS_STANDBY:
-                case SND_SOC_BIAS_OFF:
-                        codec_dev->resume(pdev);
-                        break;
-                default:
-                        dev_dbg(socdev->dev, "CODEC was on over suspend\n");
-                        break;
+                if (cpu_dai->driver->resume && cpu_dai->driver->ac97_control)
+                        cpu_dai->driver->resume(cpu_dai);
+        }
+
+        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
+                /* If the CODEC was idle over suspend then it will have been
+                 * left with bias OFF or STANDBY and suspended so we must now
+                 * resume.  Otherwise the suspend was suppressed.
+                 */
+                if (codec->driver->resume && codec->suspended) {
+                        switch (codec->dapm.bias_level) {
+                        case SND_SOC_BIAS_STANDBY:
+                        case SND_SOC_BIAS_OFF:
+                                codec->driver->resume(codec);
+                                codec->suspended = 0;
+                                break;
+                        default:
+                                dev_dbg(codec->dev, "CODEC was on over suspend\n");
+                                break;
+                        }
                 }
         }
 
-        for (i = 0; i < codec->num_dai; i++) {
-                char *stream = codec->dai[i].playback.stream_name;
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai_driver *driver = card->rtd[i].codec_dai->driver;
 
-                if (card->dai_link[i].ignore_suspend)
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                if (stream != NULL)
-                        snd_soc_dapm_stream_event(codec, stream,
+                if (driver->playback.stream_name != NULL)
+                        snd_soc_dapm_stream_event(&card->rtd[i], driver->playback.stream_name,
                                 SND_SOC_DAPM_STREAM_RESUME);
-                stream = codec->dai[i].capture.stream_name;
-                if (stream != NULL)
-                        snd_soc_dapm_stream_event(codec, stream,
+
+                if (driver->capture.stream_name != NULL)
+                        snd_soc_dapm_stream_event(&card->rtd[i], driver->capture.stream_name,
                                 SND_SOC_DAPM_STREAM_RESUME);
         }
 
         /* unmute any active DACs */
-        for (i = 0; i < card->num_links; i++) {
-                struct snd_soc_dai *dai = card->dai_link[i].codec_dai;
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *dai = card->rtd[i].codec_dai;
+                struct snd_soc_dai_driver *drv = dai->driver;
 
-                if (card->dai_link[i].ignore_suspend)
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                if (dai->ops->digital_mute && dai->playback.active)
-                        dai->ops->digital_mute(dai, 0);
+                if (drv->ops->digital_mute && dai->playback_active)
+                        drv->ops->digital_mute(dai, 0);
         }
 
-        for (i = 0; i < card->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
+                struct snd_soc_platform *platform = card->rtd[i].platform;
 
-                if (card->dai_link[i].ignore_suspend)
+                if (card->rtd[i].dai_link->ignore_suspend)
                         continue;
 
-                if (cpu_dai->resume && !cpu_dai->ac97_control)
-                        cpu_dai->resume(cpu_dai);
-                if (platform->resume)
-                        platform->resume(&card->dai_link[i]);
+                if (cpu_dai->driver->resume && !cpu_dai->driver->ac97_control)
+                        cpu_dai->driver->resume(cpu_dai);
+                if (platform->driver->resume && platform->suspended) {
+                        platform->driver->resume(cpu_dai);
+                        platform->suspended = 0;
+                }
         }
 
         if (card->resume_post)
-                card->resume_post(pdev);
+                card->resume_post(card);
 
-        dev_dbg(socdev->dev, "resume work completed\n");
+        dev_dbg(card->dev, "resume work completed\n");
 
         /* userspace can access us now we are back as we were before */
-        snd_power_change_state(codec->card, SNDRV_CTL_POWER_D0);
+        snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D0);
 }
 
 /* powers up audio subsystem after a suspend */
-static int soc_resume(struct device *dev)
+int snd_soc_resume(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_dai *cpu_dai = card->dai_link[0].cpu_dai;
-
-        /* If the initialization of this soc device failed, there is no codec
-         * associated with it. Just bail out in this case.
-         */
-        if (!card->codec)
-                return 0;
+        struct snd_soc_card *card = dev_get_drvdata(dev);
+        int i;
 
         /* AC97 devices might have other drivers hanging off them so
          * need to resume immediately.  Other drivers don't have that
          * problem and may take a substantial amount of time to resume
          * due to I/O costs and anti-pop so handle them out of line.
          */
-        if (cpu_dai->ac97_control) {
-                dev_dbg(socdev->dev, "Resuming AC97 immediately\n");
-                soc_resume_deferred(&card->deferred_resume_work);
-        } else {
-                dev_dbg(socdev->dev, "Scheduling resume work\n");
-                if (!schedule_work(&card->deferred_resume_work))
-                        dev_err(socdev->dev, "resume work item may be lost\n");
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai;
+                if (cpu_dai->driver->ac97_control) {
+                        dev_dbg(dev, "Resuming AC97 immediately\n");
+                        soc_resume_deferred(&card->deferred_resume_work);
+                } else {
+                        dev_dbg(dev, "Scheduling resume work\n");
+                        if (!schedule_work(&card->deferred_resume_work))
+                                dev_err(dev, "resume work item may be lost\n");
+                }
         }
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(snd_soc_resume);
 #else
-#define soc_suspend     NULL
-#define soc_resume      NULL
+#define snd_soc_suspend NULL
+#define snd_soc_resume NULL
 #endif
 
 static struct snd_soc_dai_ops null_dai_ops = {
 };
 
-static void snd_soc_instantiate_card(struct snd_soc_card *card)
+static int soc_bind_dai_link(struct snd_soc_card *card, int num)
 {
-        struct platform_device *pdev = container_of(card->dev,
-                                                    struct platform_device,
-                                                    dev);
-        struct snd_soc_codec_device *codec_dev = card->socdev->codec_dev;
+        struct snd_soc_dai_link *dai_link = &card->dai_link[num];
+        struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
         struct snd_soc_codec *codec;
         struct snd_soc_platform *platform;
-        struct snd_soc_dai *dai;
-        int i, found, ret, ac97;
+        struct snd_soc_dai *codec_dai, *cpu_dai;
+        const char *platform_name;
+
+        if (rtd->complete)
+                return 1;
+        dev_dbg(card->dev, "binding %s at idx %d\n", dai_link->name, num);
+
+        /* do we already have the CPU DAI for this link ? */
+        if (rtd->cpu_dai) {
+                goto find_codec;
+        }
+        /* no, then find CPU DAI from registered DAIs*/
+        list_for_each_entry(cpu_dai, &dai_list, list) {
+                if (!strcmp(cpu_dai->name, dai_link->cpu_dai_name)) {
+                        rtd->cpu_dai = cpu_dai;
+                        goto find_codec;
+                }
+        }
+        dev_dbg(card->dev, "CPU DAI %s not registered\n",
+                        dai_link->cpu_dai_name);
 
-        if (card->instantiated)
-                return;
+find_codec:
+        /* do we already have the CODEC for this link ? */
+        if (rtd->codec) {
+                goto find_platform;
+        }
 
-        found = 0;
-        list_for_each_entry(platform, &platform_list, list)
-                if (card->platform == platform) {
-                        found = 1;
-                        break;
+        /* no, then find CODEC from registered CODECs*/
+        list_for_each_entry(codec, &codec_list, list) {
+                if (!strcmp(codec->name, dai_link->codec_name)) {
+                        rtd->codec = codec;
+
+                        /* CODEC found, so find CODEC DAI from registered DAIs from this CODEC*/
+                        list_for_each_entry(codec_dai, &dai_list, list) {
+                                if (codec->dev == codec_dai->dev &&
+                                                !strcmp(codec_dai->name, dai_link->codec_dai_name)) {
+                                        rtd->codec_dai = codec_dai;
+                                        goto find_platform;
+                                }
+                        }
+                        dev_dbg(card->dev, "CODEC DAI %s not registered\n",
+                                        dai_link->codec_dai_name);
+
+                        goto find_platform;
                 }
-        if (!found) {
-                dev_dbg(card->dev, "Platform %s not registered\n",
-                        card->platform->name);
-                return;
         }
+        dev_dbg(card->dev, "CODEC %s not registered\n",
+                        dai_link->codec_name);
 
-        ac97 = 0;
-        for (i = 0; i < card->num_links; i++) {
-                found = 0;
-                list_for_each_entry(dai, &dai_list, list)
-                        if (card->dai_link[i].cpu_dai == dai) {
-                                found = 1;
-                                break;
-                        }
-                if (!found) {
-                        dev_dbg(card->dev, "DAI %s not registered\n",
-                                card->dai_link[i].cpu_dai->name);
-                        return;
+find_platform:
+        /* do we need a platform? */
+        if (rtd->platform)
+                goto out;
+
+        /* if there's no platform we match on the empty platform */
+        platform_name = dai_link->platform_name;
+        if (!platform_name)
+                platform_name = "snd-soc-dummy";
+
+        /* no, then find one from the set of registered platforms */
+        list_for_each_entry(platform, &platform_list, list) {
+                if (!strcmp(platform->name, platform_name)) {
+                        rtd->platform = platform;
+                        goto out;
                 }
+        }
+
+        dev_dbg(card->dev, "platform %s not registered\n",
+                        dai_link->platform_name);
+        return 0;
 
-                if (card->dai_link[i].cpu_dai->ac97_control)
-                        ac97 = 1;
+out:
+        /* mark rtd as complete if we found all 4 of our client devices */
+        if (rtd->codec && rtd->codec_dai && rtd->platform && rtd->cpu_dai) {
+                rtd->complete = 1;
+                card->num_rtd++;
         }
+        return 1;
+}
 
-        for (i = 0; i < card->num_links; i++) {
-                if (!card->dai_link[i].codec_dai->ops)
-                        card->dai_link[i].codec_dai->ops = &null_dai_ops;
+static void soc_remove_codec(struct snd_soc_codec *codec)
+{
+        int err;
+
+        if (codec->driver->remove) {
+                err = codec->driver->remove(codec);
+                if (err < 0)
+                        dev_err(codec->dev,
+                                "asoc: failed to remove %s: %d\n",
+                                codec->name, err);
         }
 
-        /* If we have AC97 in the system then don't wait for the
-         * codec.  This will need revisiting if we have to handle
-         * systems with mixed AC97 and non-AC97 parts.  Only check for
-         * DAIs currently; we can't do this per link since some AC97
-         * codecs have non-AC97 DAIs.
-         */
-        if (!ac97)
-                for (i = 0; i < card->num_links; i++) {
-                        found = 0;
-                        list_for_each_entry(dai, &dai_list, list)
-                                if (card->dai_link[i].codec_dai == dai) {
-                                        found = 1;
-                                        break;
-                                }
-                        if (!found) {
-                                dev_dbg(card->dev, "DAI %s not registered\n",
-                                        card->dai_link[i].codec_dai->name);
-                                return;
-                        }
+        /* Make sure all DAPM widgets are freed */
+        snd_soc_dapm_free(&codec->dapm);
+
+        soc_cleanup_codec_debugfs(codec);
+        codec->probed = 0;
+        list_del(&codec->card_list);
+        module_put(codec->dev->driver->owner);
+}
+
+static void soc_remove_dai_link(struct snd_soc_card *card, int num)
+{
+        struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
+        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai, *cpu_dai = rtd->cpu_dai;
+        int err;
+
+        /* unregister the rtd device */
+        if (rtd->dev_registered) {
+                device_remove_file(&rtd->dev, &dev_attr_pmdown_time);
+                device_remove_file(&rtd->dev, &dev_attr_codec_reg);
+                device_unregister(&rtd->dev);
+                rtd->dev_registered = 0;
+        }
+
+        /* remove the CODEC DAI */
+        if (codec_dai && codec_dai->probed) {
+                if (codec_dai->driver->remove) {
+                        err = codec_dai->driver->remove(codec_dai);
+                        if (err < 0)
+                                printk(KERN_ERR "asoc: failed to remove %s\n", codec_dai->name);
+                }
+                codec_dai->probed = 0;
+                list_del(&codec_dai->card_list);
+        }
+
+        /* remove the platform */
+        if (platform && platform->probed) {
+                if (platform->driver->remove) {
+                        err = platform->driver->remove(platform);
+                        if (err < 0)
+                                printk(KERN_ERR "asoc: failed to remove %s\n", platform->name);
                 }
+                platform->probed = 0;
+                list_del(&platform->card_list);
+                module_put(platform->dev->driver->owner);
+        }
 
-        /* Note that we do not current check for codec components */
+        /* remove the CODEC */
+        if (codec && codec->probed)
+                soc_remove_codec(codec);
 
-        dev_dbg(card->dev, "All components present, instantiating\n");
+        /* remove the cpu_dai */
+        if (cpu_dai && cpu_dai->probed) {
+                if (cpu_dai->driver->remove) {
+                        err = cpu_dai->driver->remove(cpu_dai);
+                        if (err < 0)
+                                printk(KERN_ERR "asoc: failed to remove %s\n", cpu_dai->name);
+                }
+                cpu_dai->probed = 0;
+                list_del(&cpu_dai->card_list);
+                module_put(cpu_dai->dev->driver->owner);
+        }
+}
 
-        /* Found everything, bring it up */
-        card->pmdown_time = pmdown_time;
+static void soc_remove_dai_links(struct snd_soc_card *card)
+{
+        int i;
 
-        if (card->probe) {
-                ret = card->probe(pdev);
-                if (ret < 0)
-                        return;
+        for (i = 0; i < card->num_rtd; i++)
+                soc_remove_dai_link(card, i);
+
+        card->num_rtd = 0;
+}
+
+static void soc_set_name_prefix(struct snd_soc_card *card,
+                                struct snd_soc_codec *codec)
+{
+        int i;
+
+        if (card->codec_conf == NULL)
+                return;
+
+        for (i = 0; i < card->num_configs; i++) {
+                struct snd_soc_codec_conf *map = &card->codec_conf[i];
+                if (map->dev_name && !strcmp(codec->name, map->dev_name)) {
+                        codec->name_prefix = map->name_prefix;
+                        break;
+                }
         }
+}
 
-        for (i = 0; i < card->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
-                if (cpu_dai->probe) {
-                        ret = cpu_dai->probe(pdev, cpu_dai);
-                        if (ret < 0)
-                                goto cpu_dai_err;
+static int soc_probe_codec(struct snd_soc_card *card,
+                           struct snd_soc_codec *codec)
+{
+        int ret = 0;
+        const struct snd_soc_codec_driver *driver = codec->driver;
+
+        codec->card = card;
+        codec->dapm.card = card;
+        soc_set_name_prefix(card, codec);
+
+        if (!try_module_get(codec->dev->driver->owner))
+                return -ENODEV;
+
+        soc_init_codec_debugfs(codec);
+
+        if (driver->dapm_widgets)
+                snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets,
+                                          driver->num_dapm_widgets);
+
+        if (driver->probe) {
+                ret = driver->probe(codec);
+                if (ret < 0) {
+                        dev_err(codec->dev,
+                                "asoc: failed to probe CODEC %s: %d\n",
+                                codec->name, ret);
+                        goto err_probe;
                 }
         }
 
-        if (codec_dev->probe) {
-                ret = codec_dev->probe(pdev);
-                if (ret < 0)
-                        goto cpu_dai_err;
+        if (driver->controls)
+                snd_soc_add_controls(codec, driver->controls,
+                                     driver->num_controls);
+        if (driver->dapm_routes)
+                snd_soc_dapm_add_routes(&codec->dapm, driver->dapm_routes,
+                                        driver->num_dapm_routes);
+
+        /* mark codec as probed and add to card codec list */
+        codec->probed = 1;
+        list_add(&codec->card_list, &card->codec_dev_list);
+        list_add(&codec->dapm.list, &card->dapm_list);
+
+        return 0;
+
+err_probe:
+        soc_cleanup_codec_debugfs(codec);
+        module_put(codec->dev->driver->owner);
+
+        return ret;
+}
+
+static void rtd_release(struct device *dev) {}
+
+static int soc_post_component_init(struct snd_soc_card *card,
+                                   struct snd_soc_codec *codec,
+                                   int num, int dailess)
+{
+        struct snd_soc_dai_link *dai_link = NULL;
+        struct snd_soc_aux_dev *aux_dev = NULL;
+        struct snd_soc_pcm_runtime *rtd;
+        const char *temp, *name;
+        int ret = 0;
+
+        if (!dailess) {
+                dai_link = &card->dai_link[num];
+                rtd = &card->rtd[num];
+                name = dai_link->name;
+        } else {
+                aux_dev = &card->aux_dev[num];
+                rtd = &card->rtd_aux[num];
+                name = aux_dev->name;
+        }
+        rtd->card = card;
+
+        /* machine controls, routes and widgets are not prefixed */
+        temp = codec->name_prefix;
+        codec->name_prefix = NULL;
+
+        /* do machine specific initialization */
+        if (!dailess && dai_link->init)
+                ret = dai_link->init(rtd);
+        else if (dailess && aux_dev->init)
+                ret = aux_dev->init(&codec->dapm);
+        if (ret < 0) {
+                dev_err(card->dev, "asoc: failed to init %s: %d\n", name, ret);
+                return ret;
+        }
+        codec->name_prefix = temp;
+
+        /* Make sure all DAPM widgets are instantiated */
+        snd_soc_dapm_new_widgets(&codec->dapm);
+
+        /* register the rtd device */
+        rtd->codec = codec;
+        rtd->dev.parent = card->dev;
+        rtd->dev.release = rtd_release;
+        rtd->dev.init_name = name;
+        ret = device_register(&rtd->dev);
+        if (ret < 0) {
+                dev_err(card->dev,
+                        "asoc: failed to register runtime device: %d\n", ret);
+                return ret;
+        }
+        rtd->dev_registered = 1;
+
+        /* add DAPM sysfs entries for this codec */
+        ret = snd_soc_dapm_sys_add(&rtd->dev);
+        if (ret < 0)
+                dev_err(codec->dev,
+                        "asoc: failed to add codec dapm sysfs entries: %d\n",
+                        ret);
+
+        /* add codec sysfs entries */
+        ret = device_create_file(&rtd->dev, &dev_attr_codec_reg);
+        if (ret < 0)
+                dev_err(codec->dev,
+                        "asoc: failed to add codec sysfs files: %d\n", ret);
+
+        return 0;
+}
+
+static int soc_probe_dai_link(struct snd_soc_card *card, int num)
+{
+        struct snd_soc_dai_link *dai_link = &card->dai_link[num];
+        struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
+        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai, *cpu_dai = rtd->cpu_dai;
+        int ret;
+
+        dev_dbg(card->dev, "probe %s dai link %d\n", card->name, num);
+
+        /* config components */
+        codec_dai->codec = codec;
+        cpu_dai->platform = platform;
+        codec_dai->card = card;
+        cpu_dai->card = card;
+
+        /* set default power off timeout */
+        rtd->pmdown_time = pmdown_time;
+
+        /* probe the cpu_dai */
+        if (!cpu_dai->probed) {
+                if (!try_module_get(cpu_dai->dev->driver->owner))
+                        return -ENODEV;
+
+                if (cpu_dai->driver->probe) {
+                        ret = cpu_dai->driver->probe(cpu_dai);
+                        if (ret < 0) {
+                                printk(KERN_ERR "asoc: failed to probe CPU DAI %s\n",
+                                                cpu_dai->name);
+                                module_put(cpu_dai->dev->driver->owner);
+                                return ret;
+                        }
+                }
+                cpu_dai->probed = 1;
+                /* mark cpu_dai as probed and add to card cpu_dai list */
+                list_add(&cpu_dai->card_list, &card->dai_dev_list);
         }
-        codec = card->codec;
 
-        if (platform->probe) {
-                ret = platform->probe(pdev);
+        /* probe the CODEC */
+        if (!codec->probed) {
+                ret = soc_probe_codec(card, codec);
                 if (ret < 0)
-                        goto platform_err;
+                        return ret;
         }
 
-        /* DAPM stream work */
-        INIT_DELAYED_WORK(&card->delayed_work, close_delayed_work);
-#ifdef CONFIG_PM
-        /* deferred resume work */
-        INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
-#endif
+        /* probe the platform */
+        if (!platform->probed) {
+                if (!try_module_get(platform->dev->driver->owner))
+                        return -ENODEV;
 
-        for (i = 0; i < card->num_links; i++) {
-                if (card->dai_link[i].init) {
-                        ret = card->dai_link[i].init(codec);
+                if (platform->driver->probe) {
+                        ret = platform->driver->probe(platform);
                         if (ret < 0) {
-                                printk(KERN_ERR "asoc: failed to init %s\n",
-                                        card->dai_link[i].stream_name);
-                                continue;
+                                printk(KERN_ERR "asoc: failed to probe platform %s\n",
+                                                platform->name);
+                                module_put(platform->dev->driver->owner);
+                                return ret;
                         }
                 }
-                if (card->dai_link[i].codec_dai->ac97_control)
-                        ac97 = 1;
+                /* mark platform as probed and add to card platform list */
+                platform->probed = 1;
+                list_add(&platform->card_list, &card->platform_dev_list);
         }
 
-        snprintf(codec->card->shortname, sizeof(codec->card->shortname),
-                 "%s",  card->name);
-        snprintf(codec->card->longname, sizeof(codec->card->longname),
-                 "%s (%s)", card->name, codec->name);
+        /* probe the CODEC DAI */
+        if (!codec_dai->probed) {
+                if (codec_dai->driver->probe) {
+                        ret = codec_dai->driver->probe(codec_dai);
+                        if (ret < 0) {
+                                printk(KERN_ERR "asoc: failed to probe CODEC DAI %s\n",
+                                                codec_dai->name);
+                                return ret;
+                        }
+                }
 
-        /* Make sure all DAPM widgets are instantiated */
-        snd_soc_dapm_new_widgets(codec);
+                /* mark cpu_dai as probed and add to card cpu_dai list */
+                codec_dai->probed = 1;
+                list_add(&codec_dai->card_list, &card->dai_dev_list);
+        }
+
+        /* DAPM dai link stream work */
+        INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work);
+
+        ret = soc_post_component_init(card, codec, num, 0);
+        if (ret)
+                return ret;
+
+        ret = device_create_file(&rtd->dev, &dev_attr_pmdown_time);
+        if (ret < 0)
+                printk(KERN_WARNING "asoc: failed to add pmdown_time sysfs\n");
 
-        ret = snd_card_register(codec->card);
+        /* create the pcm */
+        ret = soc_new_pcm(rtd, num);
         if (ret < 0) {
-                printk(KERN_ERR "asoc: failed to register soundcard for %s\n",
-                                codec->name);
-                goto card_err;
+                printk(KERN_ERR "asoc: can't create pcm %s\n", dai_link->stream_name);
+                return ret;
         }
 
-        mutex_lock(&codec->mutex);
+        /* add platform data for AC97 devices */
+        if (rtd->codec_dai->driver->ac97_control)
+                snd_ac97_dev_add_pdata(codec->ac97, rtd->cpu_dai->ac97_pdata);
+
+        return 0;
+}
+
 #ifdef CONFIG_SND_SOC_AC97_BUS
+static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
+{
+        int ret;
+
         /* Only instantiate AC97 if not already done by the adaptor
          * for the generic AC97 subsystem.
          */
-        if (ac97 && strcmp(codec->name, "AC97") != 0) {
-                ret = soc_ac97_dev_register(codec);
+        if (rtd->codec_dai->driver->ac97_control && !rtd->codec->ac97_registered) {
+                /*
+                 * It is possible that the AC97 device is already registered to
+                 * the device subsystem. This happens when the device is created
+                 * via snd_ac97_mixer(). Currently only SoC codec that does so
+                 * is the generic AC97 glue but others migh emerge.
+                 *
+                 * In those cases we don't try to register the device again.
+                 */
+                if (!rtd->codec->ac97_created)
+                        return 0;
+
+                ret = soc_ac97_dev_register(rtd->codec);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: AC97 device register failed\n");
-                        snd_card_free(codec->card);
-                        mutex_unlock(&codec->mutex);
-                        goto card_err;
+                        return ret;
                 }
+
+                rtd->codec->ac97_registered = 1;
         }
+        return 0;
+}
+
+static void soc_unregister_ac97_dai_link(struct snd_soc_codec *codec)
+{
+        if (codec->ac97_registered) {
+                soc_ac97_dev_unregister(codec);
+                codec->ac97_registered = 0;
+        }
+}
 #endif
 
-        ret = snd_soc_dapm_sys_add(card->socdev->dev);
-        if (ret < 0)
-                printk(KERN_WARNING "asoc: failed to add dapm sysfs entries\n");
+static int soc_probe_aux_dev(struct snd_soc_card *card, int num)
+{
+        struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
+        struct snd_soc_codec *codec;
+        int ret = -ENODEV;
+
+        /* find CODEC from registered CODECs*/
+        list_for_each_entry(codec, &codec_list, list) {
+                if (!strcmp(codec->name, aux_dev->codec_name)) {
+                        if (codec->probed) {
+                                dev_err(codec->dev,
+                                        "asoc: codec already probed");
+                                ret = -EBUSY;
+                                goto out;
+                        }
+                        goto found;
+                }
+        }
+        /* codec not found */
+        dev_err(card->dev, "asoc: codec %s not found", aux_dev->codec_name);
+        goto out;
 
-        ret = device_create_file(card->socdev->dev, &dev_attr_pmdown_time);
+found:
+        ret = soc_probe_codec(card, codec);
         if (ret < 0)
-                printk(KERN_WARNING "asoc: failed to add pmdown_time sysfs\n");
+                return ret;
 
-        ret = device_create_file(card->socdev->dev, &dev_attr_codec_reg);
-        if (ret < 0)
-                printk(KERN_WARNING "asoc: failed to add codec sysfs files\n");
+        ret = soc_post_component_init(card, codec, num, 1);
 
-        soc_init_codec_debugfs(codec);
-        mutex_unlock(&codec->mutex);
+out:
+        return ret;
+}
 
-        card->instantiated = 1;
+static void soc_remove_aux_dev(struct snd_soc_card *card, int num)
+{
+        struct snd_soc_pcm_runtime *rtd = &card->rtd_aux[num];
+        struct snd_soc_codec *codec = rtd->codec;
 
-        return;
+        /* unregister the rtd device */
+        if (rtd->dev_registered) {
+                device_remove_file(&rtd->dev, &dev_attr_codec_reg);
+                device_unregister(&rtd->dev);
+                rtd->dev_registered = 0;
+        }
 
-card_err:
-        if (platform->remove)
-                platform->remove(pdev);
+        if (codec && codec->probed)
+                soc_remove_codec(codec);
+}
 
-platform_err:
-        if (codec_dev->remove)
-                codec_dev->remove(pdev);
+static int snd_soc_init_codec_cache(struct snd_soc_codec *codec,
+                                    enum snd_soc_compress_type compress_type)
+{
+        int ret;
+
+        if (codec->cache_init)
+                return 0;
 
-cpu_dai_err:
-        for (i--; i >= 0; i--) {
-                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
-                if (cpu_dai->remove)
-                        cpu_dai->remove(pdev, cpu_dai);
+        /* override the compress_type if necessary */
+        if (compress_type && codec->compress_type != compress_type)
+                codec->compress_type = compress_type;
+        ret = snd_soc_cache_init(codec);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to set cache compression type: %d\n",
+                        ret);
+                return ret;
         }
+        codec->cache_init = 1;
+        return 0;
+}
 
+static void snd_soc_instantiate_card(struct snd_soc_card *card)
+{
+        struct snd_soc_codec *codec;
+        struct snd_soc_codec_conf *codec_conf;
+        enum snd_soc_compress_type compress_type;
+        int ret, i;
+
+        mutex_lock(&card->mutex);
+
+        if (card->instantiated) {
+                mutex_unlock(&card->mutex);
+                return;
+        }
+
+        /* bind DAIs */
+        for (i = 0; i < card->num_links; i++)
+                soc_bind_dai_link(card, i);
+
+        /* bind completed ? */
+        if (card->num_rtd != card->num_links) {
+                mutex_unlock(&card->mutex);
+                return;
+        }
+
+        /* initialize the register cache for each available codec */
+        list_for_each_entry(codec, &codec_list, list) {
+                if (codec->cache_init)
+                        continue;
+                /* by default we don't override the compress_type */
+                compress_type = 0;
+                /* check to see if we need to override the compress_type */
+                for (i = 0; i < card->num_configs; ++i) {
+                        codec_conf = &card->codec_conf[i];
+                        if (!strcmp(codec->name, codec_conf->dev_name)) {
+                                compress_type = codec_conf->compress_type;
+                                if (compress_type && compress_type
+                                    != codec->compress_type)
+                                        break;
+                        }
+                }
+                ret = snd_soc_init_codec_cache(codec, compress_type);
+                if (ret < 0) {
+                        mutex_unlock(&card->mutex);
+                        return;
+                }
+        }
+
+        /* card bind complete so register a sound card */
+        ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
+                        card->owner, 0, &card->snd_card);
+        if (ret < 0) {
+                printk(KERN_ERR "asoc: can't create sound card for card %s\n",
+                        card->name);
+                mutex_unlock(&card->mutex);
+                return;
+        }
+        card->snd_card->dev = card->dev;
+
+        card->dapm.bias_level = SND_SOC_BIAS_OFF;
+        card->dapm.dev = card->dev;
+        card->dapm.card = card;
+        list_add(&card->dapm.list, &card->dapm_list);
+
+#ifdef CONFIG_DEBUG_FS
+        snd_soc_dapm_debugfs_init(&card->dapm, card->debugfs_card_root);
+#endif
+
+#ifdef CONFIG_PM_SLEEP
+        /* deferred resume work */
+        INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
+#endif
+
+        if (card->dapm_widgets)
+                snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
+                                          card->num_dapm_widgets);
+
+        /* initialise the sound card only once */
+        if (card->probe) {
+                ret = card->probe(card);
+                if (ret < 0)
+                        goto card_probe_error;
+        }
+
+        for (i = 0; i < card->num_links; i++) {
+                ret = soc_probe_dai_link(card, i);
+                if (ret < 0) {
+                        pr_err("asoc: failed to instantiate card %s: %d\n",
+                               card->name, ret);
+                        goto probe_dai_err;
+                }
+        }
+
+        for (i = 0; i < card->num_aux_devs; i++) {
+                ret = soc_probe_aux_dev(card, i);
+                if (ret < 0) {
+                        pr_err("asoc: failed to add auxiliary devices %s: %d\n",
+                               card->name, ret);
+                        goto probe_aux_dev_err;
+                }
+        }
+
+        /* We should have a non-codec control add function but we don't */
+        if (card->controls)
+                snd_soc_add_controls(list_first_entry(&card->codec_dev_list,
+                                                      struct snd_soc_codec,
+                                                      card_list),
+                                     card->controls,
+                                     card->num_controls);
+
+        if (card->dapm_routes)
+                snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,
+                                        card->num_dapm_routes);
+
+        snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
+                 "%s", card->name);
+        snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),
+                 "%s", card->long_name ? card->long_name : card->name);
+        if (card->driver_name)
+                strlcpy(card->snd_card->driver, card->driver_name,
+                        sizeof(card->snd_card->driver));
+
+        if (card->late_probe) {
+                ret = card->late_probe(card);
+                if (ret < 0) {
+                        dev_err(card->dev, "%s late_probe() failed: %d\n",
+                                card->name, ret);
+                        goto probe_aux_dev_err;
+                }
+        }
+
+        ret = snd_card_register(card->snd_card);
+        if (ret < 0) {
+                printk(KERN_ERR "asoc: failed to register soundcard for %s\n", card->name);
+                goto probe_aux_dev_err;
+        }
+
+#ifdef CONFIG_SND_SOC_AC97_BUS
+        /* register any AC97 codecs */
+        for (i = 0; i < card->num_rtd; i++) {
+                ret = soc_register_ac97_dai_link(&card->rtd[i]);
+                if (ret < 0) {
+                        printk(KERN_ERR "asoc: failed to register AC97 %s\n", card->name);
+                        while (--i >= 0)
+                                soc_unregister_ac97_dai_link(card->rtd[i].codec);
+                        goto probe_aux_dev_err;
+                }
+        }
+#endif
+
+        card->instantiated = 1;
+        mutex_unlock(&card->mutex);
+        return;
+
+probe_aux_dev_err:
+        for (i = 0; i < card->num_aux_devs; i++)
+                soc_remove_aux_dev(card, i);
+
+probe_dai_err:
+        soc_remove_dai_links(card);
+
+card_probe_error:
         if (card->remove)
-                card->remove(pdev);
+                card->remove(card);
+
+        snd_card_free(card->snd_card);
+
+        mutex_unlock(&card->mutex);
 }
 
 /*
@@ -1332,15 +1995,19 @@ static void snd_soc_instantiate_cards(void)
 /* probes a new socdev */
 static int soc_probe(struct platform_device *pdev)
 {
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
         int ret = 0;
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_card *card = socdev->card;
 
-        /* Bodge while we push things out of socdev */
-        card->socdev = socdev;
+        /*
+         * no card, so machine driver should be registering card
+         * we should not be here in that case so ret error
+         */
+        if (!card)
+                return -EINVAL;
 
         /* Bodge while we unpick instantiation */
         card->dev = &pdev->dev;
+
         ret = snd_soc_register_card(card);
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to register card\n");
@@ -1350,122 +2017,124 @@ static int soc_probe(struct platform_device *pdev)
         return 0;
 }
 
-/* removes a socdev */
-static int soc_remove(struct platform_device *pdev)
+static int soc_cleanup_card_resources(struct snd_soc_card *card)
 {
         int i;
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
 
-        if (card->instantiated) {
-                run_delayed_work(&card->delayed_work);
+        /* make sure any delayed work runs */
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
+                flush_delayed_work_sync(&rtd->delayed_work);
+        }
 
-                if (platform->remove)
-                        platform->remove(pdev);
+        /* remove auxiliary devices */
+        for (i = 0; i < card->num_aux_devs; i++)
+                soc_remove_aux_dev(card, i);
 
-                if (codec_dev->remove)
-                        codec_dev->remove(pdev);
+        /* remove and free each DAI */
+        soc_remove_dai_links(card);
 
-                for (i = 0; i < card->num_links; i++) {
-                        struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
-                        if (cpu_dai->remove)
-                                cpu_dai->remove(pdev, cpu_dai);
-                }
+        soc_cleanup_card_debugfs(card);
 
-                if (card->remove)
-                        card->remove(pdev);
-        }
+        /* remove the card */
+        if (card->remove)
+                card->remove(card);
 
-        snd_soc_unregister_card(card);
+        snd_soc_dapm_free(&card->dapm);
+
+        kfree(card->rtd);
+        snd_card_free(card->snd_card);
+        return 0;
+
+}
 
+/* removes a socdev */
+static int soc_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
         return 0;
 }
 
-static int soc_poweroff(struct device *dev)
+int snd_soc_poweroff(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_card *card = socdev->card;
+        struct snd_soc_card *card = dev_get_drvdata(dev);
+        int i;
 
         if (!card->instantiated)
                 return 0;
 
         /* Flush out pmdown_time work - we actually do want to run it
          * now, we're shutting down so no imminent restart. */
-        run_delayed_work(&card->delayed_work);
+        for (i = 0; i < card->num_rtd; i++) {
+                struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
+                flush_delayed_work_sync(&rtd->delayed_work);
+        }
 
-        snd_soc_dapm_shutdown(socdev);
+        snd_soc_dapm_shutdown(card);
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(snd_soc_poweroff);
 
-static const struct dev_pm_ops soc_pm_ops = {
-        .suspend = soc_suspend,
-        .resume = soc_resume,
-        .poweroff = soc_poweroff,
+const struct dev_pm_ops snd_soc_pm_ops = {
+        .suspend = snd_soc_suspend,
+        .resume = snd_soc_resume,
+        .poweroff = snd_soc_poweroff,
 };
+EXPORT_SYMBOL_GPL(snd_soc_pm_ops);
 
 /* ASoC platform driver */
 static struct platform_driver soc_driver = {
         .driver         = {
                 .name           = "soc-audio",
                 .owner          = THIS_MODULE,
-                .pm             = &soc_pm_ops,
+                .pm             = &snd_soc_pm_ops,
         },
         .probe          = soc_probe,
         .remove         = soc_remove,
 };
 
 /* create a new pcm */
-static int soc_new_pcm(struct snd_soc_device *socdev,
-        struct snd_soc_dai_link *dai_link, int num)
-{
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_codec *codec = card->codec;
-        struct snd_soc_platform *platform = card->platform;
-        struct snd_soc_dai *codec_dai = dai_link->codec_dai;
-        struct snd_soc_dai *cpu_dai = dai_link->cpu_dai;
-        struct snd_soc_pcm_runtime *rtd;
+static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
+{
+        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         struct snd_pcm *pcm;
         char new_name[64];
         int ret = 0, playback = 0, capture = 0;
 
-        rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime), GFP_KERNEL);
-        if (rtd == NULL)
-                return -ENOMEM;
-
-        rtd->dai = dai_link;
-        rtd->socdev = socdev;
-        codec_dai->codec = card->codec;
-
         /* check client and interface hw capabilities */
         snprintf(new_name, sizeof(new_name), "%s %s-%d",
-                 dai_link->stream_name, codec_dai->name, num);
+                        rtd->dai_link->stream_name, codec_dai->name, num);
 
-        if (codec_dai->playback.channels_min)
+        if (codec_dai->driver->playback.channels_min)
                 playback = 1;
-        if (codec_dai->capture.channels_min)
+        if (codec_dai->driver->capture.channels_min)
                 capture = 1;
 
-        ret = snd_pcm_new(codec->card, new_name, codec->pcm_devs++, playback,
-                capture, &pcm);
+        dev_dbg(rtd->card->dev, "registered pcm #%d %s\n",num,new_name);
+        ret = snd_pcm_new(rtd->card->snd_card, new_name,
+                        num, playback, capture, &pcm);
         if (ret < 0) {
-                printk(KERN_ERR "asoc: can't create pcm for codec %s\n",
-                        codec->name);
-                kfree(rtd);
+                printk(KERN_ERR "asoc: can't create pcm for codec %s\n", codec->name);
                 return ret;
         }
 
-        dai_link->pcm = pcm;
+        rtd->pcm = pcm;
         pcm->private_data = rtd;
-        soc_pcm_ops.mmap = platform->pcm_ops->mmap;
-        soc_pcm_ops.ioctl = platform->pcm_ops->ioctl;
-        soc_pcm_ops.copy = platform->pcm_ops->copy;
-        soc_pcm_ops.silence = platform->pcm_ops->silence;
-        soc_pcm_ops.ack = platform->pcm_ops->ack;
-        soc_pcm_ops.page = platform->pcm_ops->page;
+        if (platform->driver->ops) {
+                soc_pcm_ops.mmap = platform->driver->ops->mmap;
+                soc_pcm_ops.pointer = platform->driver->ops->pointer;
+                soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
+                soc_pcm_ops.copy = platform->driver->ops->copy;
+                soc_pcm_ops.silence = platform->driver->ops->silence;
+                soc_pcm_ops.ack = platform->driver->ops->ack;
+                soc_pcm_ops.page = platform->driver->ops->page;
+        }
 
         if (playback)
                 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &soc_pcm_ops);
@@ -1473,14 +2142,16 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
         if (capture)
                 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &soc_pcm_ops);
 
-        ret = platform->pcm_new(codec->card, codec_dai, pcm);
-        if (ret < 0) {
-                printk(KERN_ERR "asoc: platform pcm constructor failed\n");
-                kfree(rtd);
-                return ret;
+        if (platform->driver->pcm_new) {
+                ret = platform->driver->pcm_new(rtd->card->snd_card,
+                                                codec_dai, pcm);
+                if (ret < 0) {
+                        pr_err("asoc: platform pcm constructor failed\n");
+                        return ret;
+                }
         }
 
-        pcm->private_free = platform->pcm_free;
+        pcm->private_free = platform->driver->pcm_free;
         printk(KERN_INFO "asoc: %s <-> %s mapping ok\n", codec_dai->name,
                 cpu_dai->name);
         return ret;
@@ -1494,16 +2165,53 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
  *
  * Boolean function indiciating if a CODEC register is volatile.
  */
-int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg)
+int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,
+                                    unsigned int reg)
 {
         if (codec->volatile_register)
-                return codec->volatile_register(reg);
+                return codec->volatile_register(codec, reg);
         else
                 return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_volatile_register);
 
 /**
+ * snd_soc_codec_readable_register: Report if a register is readable.
+ *
+ * @codec: CODEC to query.
+ * @reg: Register to query.
+ *
+ * Boolean function indicating if a CODEC register is readable.
+ */
+int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
+                                    unsigned int reg)
+{
+        if (codec->readable_register)
+                return codec->readable_register(codec, reg);
+        else
+                return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_codec_readable_register);
+
+/**
+ * snd_soc_codec_writable_register: Report if a register is writable.
+ *
+ * @codec: CODEC to query.
+ * @reg: Register to query.
+ *
+ * Boolean function indicating if a CODEC register is writable.
+ */
+int snd_soc_codec_writable_register(struct snd_soc_codec *codec,
+                                    unsigned int reg)
+{
+        if (codec->writable_register)
+                return codec->writable_register(codec, reg);
+        else
+                return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_codec_writable_register);
+
+/**
  * snd_soc_new_ac97_codec - initailise AC97 device
  * @codec: audio codec
  * @ops: AC97 bus operations
@@ -1532,7 +2240,13 @@ int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
 
         codec->ac97->bus->ops = ops;
         codec->ac97->num = num;
-        codec->dev = &codec->ac97->dev;
+
+        /*
+         * Mark the AC97 device to be created by us. This way we ensure that the
+         * device will be registered with the device subsystem later on.
+         */
+        codec->ac97_created = 1;
+
         mutex_unlock(&codec->mutex);
         return 0;
 }
@@ -1547,13 +2261,45 @@ EXPORT_SYMBOL_GPL(snd_soc_new_ac97_codec);
 void snd_soc_free_ac97_codec(struct snd_soc_codec *codec)
 {
         mutex_lock(&codec->mutex);
+#ifdef CONFIG_SND_SOC_AC97_BUS
+        soc_unregister_ac97_dai_link(codec);
+#endif
         kfree(codec->ac97->bus);
         kfree(codec->ac97);
         codec->ac97 = NULL;
+        codec->ac97_created = 0;
         mutex_unlock(&codec->mutex);
 }
 EXPORT_SYMBOL_GPL(snd_soc_free_ac97_codec);
 
+unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg)
+{
+        unsigned int ret;
+
+        ret = codec->read(codec, reg);
+        dev_dbg(codec->dev, "read %x => %x\n", reg, ret);
+        trace_snd_soc_reg_read(codec, reg, ret);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_read);
+
+unsigned int snd_soc_write(struct snd_soc_codec *codec,
+                           unsigned int reg, unsigned int val)
+{
+        dev_dbg(codec->dev, "write %x = %x\n", reg, val);
+        trace_snd_soc_reg_write(codec, reg, val);
+        return codec->write(codec, reg, val);
+}
+EXPORT_SYMBOL_GPL(snd_soc_write);
+
+unsigned int snd_soc_bulk_write_raw(struct snd_soc_codec *codec,
+                                    unsigned int reg, const void *data, size_t len)
+{
+        return codec->bulk_write_raw(codec, reg, data, len);
+}
+EXPORT_SYMBOL_GPL(snd_soc_bulk_write_raw);
+
 /**
  * snd_soc_update_bits - update codec register bits
  * @codec: audio codec
@@ -1563,19 +2309,27 @@ EXPORT_SYMBOL_GPL(snd_soc_free_ac97_codec);
  *
  * Writes new register value.
  *
- * Returns 1 for change else 0.
+ * Returns 1 for change, 0 for no change, or negative error code.
  */
 int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
                                 unsigned int mask, unsigned int value)
 {
         int change;
         unsigned int old, new;
+        int ret;
 
-        old = snd_soc_read(codec, reg);
+        ret = snd_soc_read(codec, reg);
+        if (ret < 0)
+                return ret;
+
+        old = ret;
         new = (old & ~mask) | value;
         change = old != new;
-        if (change)
-                snd_soc_write(codec, reg, new);
+        if (change) {
+                ret = snd_soc_write(codec, reg, new);
+                if (ret < 0)
+                        return ret;
+        }
 
         return change;
 }
@@ -1633,95 +2387,6 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
 EXPORT_SYMBOL_GPL(snd_soc_test_bits);
 
 /**
- * snd_soc_new_pcms - create new sound card and pcms
- * @socdev: the SoC audio device
- * @idx: ALSA card index
- * @xid: card identification
- *
- * Create a new sound card based upon the codec and interface pcms.
- *
- * Returns 0 for success, else error.
- */
-int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
-{
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_codec *codec = card->codec;
-        int ret, i;
-
-        mutex_lock(&codec->mutex);
-
-        /* register a sound card */
-        ret = snd_card_create(idx, xid, codec->owner, 0, &codec->card);
-        if (ret < 0) {
-                printk(KERN_ERR "asoc: can't create sound card for codec %s\n",
-                        codec->name);
-                mutex_unlock(&codec->mutex);
-                return ret;
-        }
-
-        codec->socdev = socdev;
-        codec->card->dev = socdev->dev;
-        codec->card->private_data = codec;
-        strncpy(codec->card->driver, codec->name, sizeof(codec->card->driver));
-
-        /* create the pcms */
-        for (i = 0; i < card->num_links; i++) {
-                ret = soc_new_pcm(socdev, &card->dai_link[i], i);
-                if (ret < 0) {
-                        printk(KERN_ERR "asoc: can't create pcm %s\n",
-                                card->dai_link[i].stream_name);
-                        mutex_unlock(&codec->mutex);
-                        return ret;
-                }
-                /* Check for codec->ac97 to handle the ac97.c fun */
-                if (card->dai_link[i].codec_dai->ac97_control && codec->ac97) {
-                        snd_ac97_dev_add_pdata(codec->ac97,
-                                card->dai_link[i].cpu_dai->ac97_pdata);
-                }
-        }
-
-        mutex_unlock(&codec->mutex);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(snd_soc_new_pcms);
-
-/**
- * snd_soc_free_pcms - free sound card and pcms
- * @socdev: the SoC audio device
- *
- * Frees sound card and pcms associated with the socdev.
- * Also unregister the codec if it is an AC97 device.
- */
-void snd_soc_free_pcms(struct snd_soc_device *socdev)
-{
-        struct snd_soc_codec *codec = socdev->card->codec;
-#ifdef CONFIG_SND_SOC_AC97_BUS
-        struct snd_soc_dai *codec_dai;
-        int i;
-#endif
-
-        mutex_lock(&codec->mutex);
-        soc_cleanup_codec_debugfs(codec);
-#ifdef CONFIG_SND_SOC_AC97_BUS
-        for (i = 0; i < codec->num_dai; i++) {
-                codec_dai = &codec->dai[i];
-                if (codec_dai->ac97_control && codec->ac97 &&
-                    strcmp(codec->name, "AC97") != 0) {
-                        soc_ac97_dev_unregister(codec);
-                        goto free_card;
-                }
-        }
-free_card:
-#endif
-
-        if (codec->card)
-                snd_card_free(codec->card);
-        device_remove_file(socdev->dev, &dev_attr_codec_reg);
-        mutex_unlock(&codec->mutex);
-}
-EXPORT_SYMBOL_GPL(snd_soc_free_pcms);
-
-/**
  * snd_soc_set_runtime_hwparams - set the runtime hardware parameters
  * @substream: the pcm substream
  * @hw: the hardware parameters
@@ -1749,22 +2414,45 @@ EXPORT_SYMBOL_GPL(snd_soc_set_runtime_hwparams);
  * @_template: control template
  * @data: control private data
  * @long_name: control long name
+ * @prefix: control name prefix
  *
  * Create a new mixer control from a template control.
  *
  * Returns 0 for success, else error.
  */
 struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,
-        void *data, char *long_name)
+                                  void *data, char *long_name,
+                                  const char *prefix)
 {
         struct snd_kcontrol_new template;
+        struct snd_kcontrol *kcontrol;
+        char *name = NULL;
+        int name_len;
 
         memcpy(&template, _template, sizeof(template));
-        if (long_name)
-                template.name = long_name;
         template.index = 0;
 
-        return snd_ctl_new1(&template, data);
+        if (!long_name)
+                long_name = template.name;
+
+        if (prefix) {
+                name_len = strlen(long_name) + strlen(prefix) + 2;
+                name = kmalloc(name_len, GFP_ATOMIC);
+                if (!name)
+                        return NULL;
+
+                snprintf(name, name_len, "%s %s", prefix, long_name);
+
+                template.name = name;
+        } else {
+                template.name = long_name;
+        }
+
+        kcontrol = snd_ctl_new1(&template, data);
+
+        kfree(name);
+
+        return kcontrol;
 }
 EXPORT_SYMBOL_GPL(snd_soc_cnew);
 
@@ -1782,15 +2470,17 @@ EXPORT_SYMBOL_GPL(snd_soc_cnew);
 int snd_soc_add_controls(struct snd_soc_codec *codec,
         const struct snd_kcontrol_new *controls, int num_controls)
 {
-        struct snd_card *card = codec->card;
+        struct snd_card *card = codec->card->snd_card;
         int err, i;
 
         for (i = 0; i < num_controls; i++) {
                 const struct snd_kcontrol_new *control = &controls[i];
-                err = snd_ctl_add(card, snd_soc_cnew(control, codec, NULL));
+                err = snd_ctl_add(card, snd_soc_cnew(control, codec,
+                                                     control->name,
+                                                     codec->name_prefix));
                 if (err < 0) {
-                        dev_err(codec->dev, "%s: Failed to add %s\n",
-                                codec->name, control->name);
+                        dev_err(codec->dev, "%s: Failed to add %s: %d\n",
+                                codec->name, control->name, err);
                         return err;
                 }
         }
@@ -2337,7 +3027,7 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw_s8);
 int snd_soc_limit_volume(struct snd_soc_codec *codec,
         const char *name, int max)
 {
-        struct snd_card *card = codec->card;
+        struct snd_card *card = codec->card->snd_card;
         struct snd_kcontrol *kctl;
         struct soc_mixer_control *mc;
         int found = 0;
@@ -2469,14 +3159,36 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw_2r_sx);
 int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
         unsigned int freq, int dir)
 {
-        if (dai->ops && dai->ops->set_sysclk)
-                return dai->ops->set_sysclk(dai, clk_id, freq, dir);
+        if (dai->driver && dai->driver->ops->set_sysclk)
+                return dai->driver->ops->set_sysclk(dai, clk_id, freq, dir);
+        else if (dai->codec && dai->codec->driver->set_sysclk)
+                return dai->codec->driver->set_sysclk(dai->codec, clk_id,
+                                                      freq, dir);
         else
                 return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk);
 
 /**
+ * snd_soc_codec_set_sysclk - configure CODEC system or master clock.
+ * @codec: CODEC
+ * @clk_id: DAI specific clock ID
+ * @freq: new clock frequency in Hz
+ * @dir: new clock direction - input/output.
+ *
+ * Configures the CODEC master (MCLK) or system (SYSCLK) clocking.
+ */
+int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id,
+        unsigned int freq, int dir)
+{
+        if (codec->driver->set_sysclk)
+                return codec->driver->set_sysclk(codec, clk_id, freq, dir);
+        else
+                return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_codec_set_sysclk);
+
+/**
  * snd_soc_dai_set_clkdiv - configure DAI clock dividers.
  * @dai: DAI
  * @div_id: DAI specific clock divider ID
@@ -2489,8 +3201,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk);
 int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,
         int div_id, int div)
 {
-        if (dai->ops && dai->ops->set_clkdiv)
-                return dai->ops->set_clkdiv(dai, div_id, div);
+        if (dai->driver && dai->driver->ops->set_clkdiv)
+                return dai->driver->ops->set_clkdiv(dai, div_id, div);
         else
                 return -EINVAL;
 }
@@ -2509,14 +3221,38 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_clkdiv);
 int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int pll_id, int source,
         unsigned int freq_in, unsigned int freq_out)
 {
-        if (dai->ops && dai->ops->set_pll)
-                return dai->ops->set_pll(dai, pll_id, source,
+        if (dai->driver && dai->driver->ops->set_pll)
+                return dai->driver->ops->set_pll(dai, pll_id, source,
                                          freq_in, freq_out);
+        else if (dai->codec && dai->codec->driver->set_pll)
+                return dai->codec->driver->set_pll(dai->codec, pll_id, source,
+                                                   freq_in, freq_out);
         else
                 return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dai_set_pll);
 
+/*
+ * snd_soc_codec_set_pll - configure codec PLL.
+ * @codec: CODEC
+ * @pll_id: DAI specific PLL ID
+ * @source: DAI specific source for the PLL
+ * @freq_in: PLL input clock frequency in Hz
+ * @freq_out: requested PLL output clock frequency in Hz
+ *
+ * Configures and enables PLL to generate output clock based on input clock.
+ */
+int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,
+                          unsigned int freq_in, unsigned int freq_out)
+{
+        if (codec->driver->set_pll)
+                return codec->driver->set_pll(codec, pll_id, source,
+                                              freq_in, freq_out);
+        else
+                return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_codec_set_pll);
+
 /**
  * snd_soc_dai_set_fmt - configure DAI hardware audio format.
  * @dai: DAI
@@ -2526,8 +3262,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_pll);
  */
 int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
-        if (dai->ops && dai->ops->set_fmt)
-                return dai->ops->set_fmt(dai, fmt);
+        if (dai->driver && dai->driver->ops->set_fmt)
+                return dai->driver->ops->set_fmt(dai, fmt);
         else
                 return -EINVAL;
 }
@@ -2547,8 +3283,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt);
 int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,
         unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
 {
-        if (dai->ops && dai->ops->set_tdm_slot)
-                return dai->ops->set_tdm_slot(dai, tx_mask, rx_mask,
+        if (dai->driver && dai->driver->ops->set_tdm_slot)
+                return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask,
                                 slots, slot_width);
         else
                 return -EINVAL;
@@ -2571,8 +3307,8 @@ int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai,
         unsigned int tx_num, unsigned int *tx_slot,
         unsigned int rx_num, unsigned int *rx_slot)
 {
-        if (dai->ops && dai->ops->set_channel_map)
-                return dai->ops->set_channel_map(dai, tx_num, tx_slot,
+        if (dai->driver && dai->driver->ops->set_channel_map)
+                return dai->driver->ops->set_channel_map(dai, tx_num, tx_slot,
                         rx_num, rx_slot);
         else
                 return -EINVAL;
@@ -2588,8 +3324,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_channel_map);
  */
 int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate)
 {
-        if (dai->ops && dai->ops->set_tristate)
-                return dai->ops->set_tristate(dai, tristate);
+        if (dai->driver && dai->driver->ops->set_tristate)
+                return dai->driver->ops->set_tristate(dai, tristate);
         else
                 return -EINVAL;
 }
@@ -2604,8 +3340,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate);
  */
 int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute)
 {
-        if (dai->ops && dai->ops->digital_mute)
-                return dai->ops->digital_mute(dai, mute);
+        if (dai->driver && dai->driver->ops->digital_mute)
+                return dai->driver->ops->digital_mute(dai, mute);
         else
                 return -EINVAL;
 }
@@ -2616,17 +3352,33 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_digital_mute);
  *
  * @card: Card to register
  *
- * Note that currently this is an internal only function: it will be
- * exposed to machine drivers after further backporting of ASoC v2
- * registration APIs.
  */
-static int snd_soc_register_card(struct snd_soc_card *card)
+int snd_soc_register_card(struct snd_soc_card *card)
 {
+        int i;
+
         if (!card->name || !card->dev)
                 return -EINVAL;
 
+        dev_set_drvdata(card->dev, card);
+
+        snd_soc_initialize_card_lists(card);
+
+        soc_init_card_debugfs(card);
+
+        card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) *
+                            (card->num_links + card->num_aux_devs),
+                            GFP_KERNEL);
+        if (card->rtd == NULL)
+                return -ENOMEM;
+        card->rtd_aux = &card->rtd[card->num_links];
+
+        for (i = 0; i < card->num_links; i++)
+                card->rtd[i].dai_link = &card->dai_link[i];
+
         INIT_LIST_HEAD(&card->list);
         card->instantiated = 0;
+        mutex_init(&card->mutex);
 
         mutex_lock(&client_mutex);
         list_add(&card->list, &card_list);
@@ -2637,45 +3389,113 @@ static int snd_soc_register_card(struct snd_soc_card *card)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(snd_soc_register_card);
 
 /**
  * snd_soc_unregister_card - Unregister a card with the ASoC core
  *
  * @card: Card to unregister
  *
- * Note that currently this is an internal only function: it will be
- * exposed to machine drivers after further backporting of ASoC v2
- * registration APIs.
  */
-static int snd_soc_unregister_card(struct snd_soc_card *card)
+int snd_soc_unregister_card(struct snd_soc_card *card)
 {
+        if (card->instantiated)
+                soc_cleanup_card_resources(card);
         mutex_lock(&client_mutex);
         list_del(&card->list);
         mutex_unlock(&client_mutex);
-
         dev_dbg(card->dev, "Unregistered card '%s'\n", card->name);
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(snd_soc_unregister_card);
+
+/*
+ * Simplify DAI link configuration by removing ".-1" from device names
+ * and sanitizing names.
+ */
+static char *fmt_single_name(struct device *dev, int *id)
+{
+        char *found, name[NAME_SIZE];
+        int id1, id2;
+
+        if (dev_name(dev) == NULL)
+                return NULL;
+
+        strlcpy(name, dev_name(dev), NAME_SIZE);
+
+        /* are we a "%s.%d" name (platform and SPI components) */
+        found = strstr(name, dev->driver->name);
+        if (found) {
+                /* get ID */
+                if (sscanf(&found[strlen(dev->driver->name)], ".%d", id) == 1) {
+
+                        /* discard ID from name if ID == -1 */
+                        if (*id == -1)
+                                found[strlen(dev->driver->name)] = '\0';
+                }
+
+        } else {
+                /* I2C component devices are named "bus-addr"  */
+                if (sscanf(name, "%x-%x", &id1, &id2) == 2) {
+                        char tmp[NAME_SIZE];
+
+                        /* create unique ID number from I2C addr and bus */
+                        *id = ((id1 & 0xffff) << 16) + id2;
+
+                        /* sanitize component name for DAI link creation */
+                        snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, name);
+                        strlcpy(name, tmp, NAME_SIZE);
+                } else
+                        *id = 0;
+        }
+
+        return kstrdup(name, GFP_KERNEL);
+}
+
+/*
+ * Simplify DAI link naming for single devices with multiple DAIs by removing
+ * any ".-1" and using the DAI name (instead of device name).
+ */
+static inline char *fmt_multiple_name(struct device *dev,
+                struct snd_soc_dai_driver *dai_drv)
+{
+        if (dai_drv->name == NULL) {
+                printk(KERN_ERR "asoc: error - multiple DAI %s registered with no name\n",
+                                dev_name(dev));
+                return NULL;
+        }
+
+        return kstrdup(dai_drv->name, GFP_KERNEL);
+}
 
 /**
  * snd_soc_register_dai - Register a DAI with the ASoC core
  *
  * @dai: DAI to register
  */
-int snd_soc_register_dai(struct snd_soc_dai *dai)
+int snd_soc_register_dai(struct device *dev,
+                struct snd_soc_dai_driver *dai_drv)
 {
-        if (!dai->name)
-                return -EINVAL;
+        struct snd_soc_dai *dai;
 
-        /* The device should become mandatory over time */
-        if (!dai->dev)
-                printk(KERN_WARNING "No device for DAI %s\n", dai->name);
+        dev_dbg(dev, "dai register %s\n", dev_name(dev));
 
-        if (!dai->ops)
-                dai->ops = &null_dai_ops;
+        dai = kzalloc(sizeof(struct snd_soc_dai), GFP_KERNEL);
+        if (dai == NULL)
+                return -ENOMEM;
 
-        INIT_LIST_HEAD(&dai->list);
+        /* create DAI component name */
+        dai->name = fmt_single_name(dev, &dai->id);
+        if (dai->name == NULL) {
+                kfree(dai);
+                return -ENOMEM;
+        }
+
+        dai->dev = dev;
+        dai->driver = dai_drv;
+        if (!dai->driver->ops)
+                dai->driver->ops = &null_dai_ops;
 
         mutex_lock(&client_mutex);
         list_add(&dai->list, &dai_list);
@@ -2693,13 +3513,24 @@ EXPORT_SYMBOL_GPL(snd_soc_register_dai);
  *
  * @dai: DAI to unregister
  */
-void snd_soc_unregister_dai(struct snd_soc_dai *dai)
+void snd_soc_unregister_dai(struct device *dev)
 {
+        struct snd_soc_dai *dai;
+
+        list_for_each_entry(dai, &dai_list, list) {
+                if (dev == dai->dev)
+                        goto found;
+        }
+        return;
+
+found:
         mutex_lock(&client_mutex);
         list_del(&dai->list);
         mutex_unlock(&client_mutex);
 
         pr_debug("Unregistered DAI '%s'\n", dai->name);
+        kfree(dai->name);
+        kfree(dai);
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_dai);
 
@@ -2709,21 +3540,54 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dai);
  * @dai: Array of DAIs to register
  * @count: Number of DAIs
  */
-int snd_soc_register_dais(struct snd_soc_dai *dai, size_t count)
+int snd_soc_register_dais(struct device *dev,
+                struct snd_soc_dai_driver *dai_drv, size_t count)
 {
-        int i, ret;
+        struct snd_soc_dai *dai;
+        int i, ret = 0;
+
+        dev_dbg(dev, "dai register %s #%Zu\n", dev_name(dev), count);
 
         for (i = 0; i < count; i++) {
-                ret = snd_soc_register_dai(&dai[i]);
-                if (ret != 0)
+
+                dai = kzalloc(sizeof(struct snd_soc_dai), GFP_KERNEL);
+                if (dai == NULL) {
+                        ret = -ENOMEM;
                         goto err;
+                }
+
+                /* create DAI component name */
+                dai->name = fmt_multiple_name(dev, &dai_drv[i]);
+                if (dai->name == NULL) {
+                        kfree(dai);
+                        ret = -EINVAL;
+                        goto err;
+                }
+
+                dai->dev = dev;
+                dai->driver = &dai_drv[i];
+                if (dai->driver->id)
+                        dai->id = dai->driver->id;
+                else
+                        dai->id = i;
+                if (!dai->driver->ops)
+                        dai->driver->ops = &null_dai_ops;
+
+                mutex_lock(&client_mutex);
+                list_add(&dai->list, &dai_list);
+                mutex_unlock(&client_mutex);
+
+                pr_debug("Registered DAI '%s'\n", dai->name);
         }
 
+        mutex_lock(&client_mutex);
+        snd_soc_instantiate_cards();
+        mutex_unlock(&client_mutex);
         return 0;
 
 err:
         for (i--; i >= 0; i--)
-                snd_soc_unregister_dai(&dai[i]);
+                snd_soc_unregister_dai(dev);
 
         return ret;
 }
@@ -2735,12 +3599,12 @@ EXPORT_SYMBOL_GPL(snd_soc_register_dais);
  * @dai: Array of DAIs to unregister
  * @count: Number of DAIs
  */
-void snd_soc_unregister_dais(struct snd_soc_dai *dai, size_t count)
+void snd_soc_unregister_dais(struct device *dev, size_t count)
 {
         int i;
 
         for (i = 0; i < count; i++)
-                snd_soc_unregister_dai(&dai[i]);
+                snd_soc_unregister_dai(dev);
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);
 
@@ -2749,12 +3613,26 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);
  *
  * @platform: platform to register
  */
-int snd_soc_register_platform(struct snd_soc_platform *platform)
+int snd_soc_register_platform(struct device *dev,
+                struct snd_soc_platform_driver *platform_drv)
 {
-        if (!platform->name)
-                return -EINVAL;
+        struct snd_soc_platform *platform;
+
+        dev_dbg(dev, "platform register %s\n", dev_name(dev));
+
+        platform = kzalloc(sizeof(struct snd_soc_platform), GFP_KERNEL);
+        if (platform == NULL)
+                return -ENOMEM;
 
-        INIT_LIST_HEAD(&platform->list);
+        /* create platform component name */
+        platform->name = fmt_single_name(dev, &platform->id);
+        if (platform->name == NULL) {
+                kfree(platform);
+                return -ENOMEM;
+        }
+
+        platform->dev = dev;
+        platform->driver = platform_drv;
 
         mutex_lock(&client_mutex);
         list_add(&platform->list, &platform_list);
@@ -2772,13 +3650,24 @@ EXPORT_SYMBOL_GPL(snd_soc_register_platform);
  *
  * @platform: platform to unregister
  */
-void snd_soc_unregister_platform(struct snd_soc_platform *platform)
+void snd_soc_unregister_platform(struct device *dev)
 {
+        struct snd_soc_platform *platform;
+
+        list_for_each_entry(platform, &platform_list, list) {
+                if (dev == platform->dev)
+                        goto found;
+        }
+        return;
+
+found:
         mutex_lock(&client_mutex);
         list_del(&platform->list);
         mutex_unlock(&client_mutex);
 
         pr_debug("Unregistered platform '%s'\n", platform->name);
+        kfree(platform->name);
+        kfree(platform);
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_platform);
 
@@ -2820,22 +3709,86 @@ static void fixup_codec_formats(struct snd_soc_pcm_stream *stream)
  *
  * @codec: codec to register
  */
-int snd_soc_register_codec(struct snd_soc_codec *codec)
+int snd_soc_register_codec(struct device *dev,
+                           const struct snd_soc_codec_driver *codec_drv,
+                           struct snd_soc_dai_driver *dai_drv,
+                           int num_dai)
 {
-        int i;
+        size_t reg_size;
+        struct snd_soc_codec *codec;
+        int ret, i;
 
-        if (!codec->name)
-                return -EINVAL;
+        dev_dbg(dev, "codec register %s\n", dev_name(dev));
+
+        codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
+        if (codec == NULL)
+                return -ENOMEM;
+
+        /* create CODEC component name */
+        codec->name = fmt_single_name(dev, &codec->id);
+        if (codec->name == NULL) {
+                kfree(codec);
+                return -ENOMEM;
+        }
+
+        if (codec_drv->compress_type)
+                codec->compress_type = codec_drv->compress_type;
+        else
+                codec->compress_type = SND_SOC_FLAT_COMPRESSION;
+
+        codec->write = codec_drv->write;
+        codec->read = codec_drv->read;
+        codec->volatile_register = codec_drv->volatile_register;
+        codec->readable_register = codec_drv->readable_register;
+        codec->writable_register = codec_drv->writable_register;
+        codec->dapm.bias_level = SND_SOC_BIAS_OFF;
+        codec->dapm.dev = dev;
+        codec->dapm.codec = codec;
+        codec->dapm.seq_notifier = codec_drv->seq_notifier;
+        codec->dev = dev;
+        codec->driver = codec_drv;
+        codec->num_dai = num_dai;
+        mutex_init(&codec->mutex);
+
+        /* allocate CODEC register cache */
+        if (codec_drv->reg_cache_size && codec_drv->reg_word_size) {
+                reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
+                codec->reg_size = reg_size;
+                /* it is necessary to make a copy of the default register cache
+                 * because in the case of using a compression type that requires
+                 * the default register cache to be marked as __devinitconst the
+                 * kernel might have freed the array by the time we initialize
+                 * the cache.
+                 */
+                if (codec_drv->reg_cache_default) {
+                        codec->reg_def_copy = kmemdup(codec_drv->reg_cache_default,
+                                                      reg_size, GFP_KERNEL);
+                        if (!codec->reg_def_copy) {
+                                ret = -ENOMEM;
+                                goto fail;
+                        }
+                }
+        }
 
-        /* The device should become mandatory over time */
-        if (!codec->dev)
-                printk(KERN_WARNING "No device for codec %s\n", codec->name);
+        if (codec_drv->reg_access_size && codec_drv->reg_access_default) {
+                if (!codec->volatile_register)
+                        codec->volatile_register = snd_soc_default_volatile_register;
+                if (!codec->readable_register)
+                        codec->readable_register = snd_soc_default_readable_register;
+                if (!codec->writable_register)
+                        codec->writable_register = snd_soc_default_writable_register;
+        }
 
-        INIT_LIST_HEAD(&codec->list);
+        for (i = 0; i < num_dai; i++) {
+                fixup_codec_formats(&dai_drv[i].playback);
+                fixup_codec_formats(&dai_drv[i].capture);
+        }
 
-        for (i = 0; i < codec->num_dai; i++) {
-                fixup_codec_formats(&codec->dai[i].playback);
-                fixup_codec_formats(&codec->dai[i].capture);
+        /* register any DAIs */
+        if (num_dai) {
+                ret = snd_soc_register_dais(dev, dai_drv, num_dai);
+                if (ret < 0)
+                        goto fail;
         }
 
         mutex_lock(&client_mutex);
@@ -2844,8 +3797,14 @@ int snd_soc_register_codec(struct snd_soc_codec *codec)
         mutex_unlock(&client_mutex);
 
         pr_debug("Registered codec '%s'\n", codec->name);
-
         return 0;
+
+fail:
+        kfree(codec->reg_def_copy);
+        codec->reg_def_copy = NULL;
+        kfree(codec->name);
+        kfree(codec);
+        return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_register_codec);
 
@@ -2854,39 +3813,73 @@ EXPORT_SYMBOL_GPL(snd_soc_register_codec);
  *
  * @codec: codec to unregister
  */
-void snd_soc_unregister_codec(struct snd_soc_codec *codec)
+void snd_soc_unregister_codec(struct device *dev)
 {
+        struct snd_soc_codec *codec;
+        int i;
+
+        list_for_each_entry(codec, &codec_list, list) {
+                if (dev == codec->dev)
+                        goto found;
+        }
+        return;
+
+found:
+        if (codec->num_dai)
+                for (i = 0; i < codec->num_dai; i++)
+                        snd_soc_unregister_dai(dev);
+
         mutex_lock(&client_mutex);
         list_del(&codec->list);
         mutex_unlock(&client_mutex);
 
         pr_debug("Unregistered codec '%s'\n", codec->name);
+
+        snd_soc_cache_exit(codec);
+        kfree(codec->reg_def_copy);
+        kfree(codec->name);
+        kfree(codec);
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
 
 static int __init snd_soc_init(void)
 {
 #ifdef CONFIG_DEBUG_FS
-        debugfs_root = debugfs_create_dir("asoc", NULL);
-        if (IS_ERR(debugfs_root) || !debugfs_root) {
+        snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL);
+        if (IS_ERR(snd_soc_debugfs_root) || !snd_soc_debugfs_root) {
                 printk(KERN_WARNING
                        "ASoC: Failed to create debugfs directory\n");
-                debugfs_root = NULL;
+                snd_soc_debugfs_root = NULL;
         }
+
+        if (!debugfs_create_file("codecs", 0444, snd_soc_debugfs_root, NULL,
+                                 &codec_list_fops))
+                pr_warn("ASoC: Failed to create CODEC list debugfs file\n");
+
+        if (!debugfs_create_file("dais", 0444, snd_soc_debugfs_root, NULL,
+                                 &dai_list_fops))
+                pr_warn("ASoC: Failed to create DAI list debugfs file\n");
+
+        if (!debugfs_create_file("platforms", 0444, snd_soc_debugfs_root, NULL,
+                                 &platform_list_fops))
+                pr_warn("ASoC: Failed to create platform list debugfs file\n");
 #endif
 
+        snd_soc_util_init();
+
         return platform_driver_register(&soc_driver);
 }
+module_init(snd_soc_init);
 
 static void __exit snd_soc_exit(void)
 {
+        snd_soc_util_exit();
+
 #ifdef CONFIG_DEBUG_FS
-        debugfs_remove_recursive(debugfs_root);
+        debugfs_remove_recursive(snd_soc_debugfs_root);
 #endif
         platform_driver_unregister(&soc_driver);
 }
-
-module_init(snd_soc_init);
 module_exit(snd_soc_exit);
 
 /* Module information */