156 files changed, 3807 insertions, 2116 deletions

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 5da8ca7aee05..9e675c76436c 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -29,6 +29,10 @@ config SND_SOC_AC97_BUS
 config SND_SOC_DMAENGINE_PCM
         bool
 
+config SND_SOC_GENERIC_DMAENGINE_PCM
+        bool
+        select SND_SOC_DMAENGINE_PCM
+
 # All the supported SoCs
 source "sound/soc/atmel/Kconfig"
 source "sound/soc/au1x/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 99f32f7c0692..197b6ae54c8d 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -5,6 +5,10 @@ ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),)
 snd-soc-core-objs += soc-dmaengine-pcm.o
 endif
 
+ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)
+snd-soc-core-objs += soc-generic-dmaengine-pcm.o
+endif
+
 obj-$(CONFIG_SND_SOC)   += snd-soc-core.o
 obj-$(CONFIG_SND_SOC)   += codecs/
 obj-$(CONFIG_SND_SOC)   += generic/
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c
index 30184a4a147a..1d38fd0bc4e2 100644
--- a/sound/soc/atmel/atmel-pcm-dma.c
+++ b/sound/soc/atmel/atmel-pcm-dma.c
@@ -67,9 +67,10 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = {
 static void atmel_pcm_dma_irq(u32 ssc_sr,
         struct snd_pcm_substream *substream)
 {
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct atmel_pcm_dma_params *prtd;
 
-        prtd = snd_dmaengine_pcm_get_data(substream);
+        prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
         if (ssc_sr & prtd->mask->ssc_error) {
                 if (snd_pcm_running(substream))
@@ -104,15 +105,13 @@ static bool filter(struct dma_chan *chan, void *slave)
 }
 
 static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream,
-        struct snd_pcm_hw_params *params)
+        struct snd_pcm_hw_params *params, struct atmel_pcm_dma_params *prtd)
 {
-        struct atmel_pcm_dma_params *prtd;
         struct ssc_device *ssc;
         struct dma_chan *dma_chan;
         struct dma_slave_config slave_config;
         int ret;
 
-        prtd = snd_dmaengine_pcm_get_data(substream);
         ssc = prtd->ssc;
 
         ret = snd_hwparams_to_dma_slave_config(substream, params,
@@ -130,8 +129,6 @@ static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream,
                 slave_config.src_maxburst = 1;
         }
 
-        slave_config.device_fc = false;
-
         dma_chan = snd_dmaengine_pcm_get_chan(substream);
         if (dmaengine_slave_config(dma_chan, &slave_config)) {
                 pr_err("atmel-pcm: failed to configure dma channel\n");
@@ -158,15 +155,13 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream,
         if (ssc->pdev)
                 sdata = ssc->pdev->dev.platform_data;
 
-        ret = snd_dmaengine_pcm_open(substream, filter, sdata);
+        ret = snd_dmaengine_pcm_open_request_chan(substream, filter, sdata);
         if (ret) {
                 pr_err("atmel-pcm: dmaengine pcm open failed\n");
                 return -EINVAL;
         }
 
-        snd_dmaengine_pcm_set_data(substream, prtd);
-
-        ret = atmel_pcm_configure_dma(substream, params);
+        ret = atmel_pcm_configure_dma(substream, params, prtd);
         if (ret) {
                 pr_err("atmel-pcm: failed to configure dmai\n");
                 goto err;
@@ -176,15 +171,16 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream,
 
         return 0;
 err:
-        snd_dmaengine_pcm_close(substream);
+        snd_dmaengine_pcm_close_release_chan(substream);
         return ret;
 }
 
 static int atmel_pcm_dma_prepare(struct snd_pcm_substream *substream)
 {
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct atmel_pcm_dma_params *prtd;
 
-        prtd = snd_dmaengine_pcm_get_data(substream);
+        prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
         ssc_writex(prtd->ssc->regs, SSC_IER, prtd->mask->ssc_error);
         ssc_writex(prtd->ssc->regs, SSC_CR, prtd->mask->ssc_enable);
@@ -199,16 +195,9 @@ static int atmel_pcm_open(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static int atmel_pcm_close(struct snd_pcm_substream *substream)
-{
-        snd_dmaengine_pcm_close(substream);
-
-        return 0;
-}
-
 static struct snd_pcm_ops atmel_pcm_ops = {
         .open           = atmel_pcm_open,
-        .close          = atmel_pcm_close,
+        .close          = snd_dmaengine_pcm_close_release_chan,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = atmel_pcm_hw_params,
         .prepare        = atmel_pcm_dma_prepare,
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index e13580d6c476..f3fdfa07fcb9 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -533,6 +533,49 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 break;
 
         case SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBM_CFM:
+                /*
+                 * DSP/PCM Mode A format, CODEC supplies BCLK and LRC clocks.
+                 *
+                 * The SSC transmit clock is obtained from the BCLK signal on
+                 * on the TK line, and the SSC receive clock is
+                 * generated from the transmit clock.
+                 *
+                 * Data is transferred on first BCLK after LRC pulse rising
+                 * edge.If stereo, the right channel data is contiguous with
+                 * the left channel data.
+                 */
+                rcmr =    SSC_BF(RCMR_PERIOD, 0)
+                        | SSC_BF(RCMR_STTDLY, START_DELAY)
+                        | SSC_BF(RCMR_START, SSC_START_RISING_RF)
+                        | SSC_BF(RCMR_CKI, SSC_CKI_RISING)
+                        | SSC_BF(RCMR_CKO, SSC_CKO_NONE)
+                        | SSC_BF(RCMR_CKS, SSC_CKS_PIN);
+
+                rfmr =    SSC_BF(RFMR_FSEDGE, SSC_FSEDGE_POSITIVE)
+                        | SSC_BF(RFMR_FSOS, SSC_FSOS_NONE)
+                        | SSC_BF(RFMR_FSLEN, 0)
+                        | SSC_BF(RFMR_DATNB, (channels - 1))
+                        | SSC_BIT(RFMR_MSBF)
+                        | SSC_BF(RFMR_LOOP, 0)
+                        | SSC_BF(RFMR_DATLEN, (bits - 1));
+
+                tcmr =    SSC_BF(TCMR_PERIOD, 0)
+                        | SSC_BF(TCMR_STTDLY, START_DELAY)
+                        | SSC_BF(TCMR_START, SSC_START_RISING_RF)
+                        | SSC_BF(TCMR_CKI, SSC_CKI_FALLING)
+                        | SSC_BF(TCMR_CKO, SSC_CKO_NONE)
+                        | SSC_BF(TCMR_CKS, SSC_CKS_PIN);
+
+                tfmr =    SSC_BF(TFMR_FSEDGE, SSC_FSEDGE_POSITIVE)
+                        | SSC_BF(TFMR_FSDEN, 0)
+                        | SSC_BF(TFMR_FSOS, SSC_FSOS_NONE)
+                        | SSC_BF(TFMR_FSLEN, 0)
+                        | SSC_BF(TFMR_DATNB, (channels - 1))
+                        | SSC_BIT(TFMR_MSBF)
+                        | SSC_BF(TFMR_DATDEF, 0)
+                        | SSC_BF(TFMR_DATLEN, (bits - 1));
+                break;
+
         default:
                 printk(KERN_WARNING "atmel_ssc_dai: unsupported DAI format 0x%x\n",
                         ssc_p->daifmt);
@@ -707,13 +750,18 @@ static struct snd_soc_dai_driver atmel_ssc_dai = {
                 .ops = &atmel_ssc_dai_ops,
 };
 
+static const struct snd_soc_component_driver atmel_ssc_component = {
+        .name           = "atmel-ssc",
+};
+
 static int asoc_ssc_init(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct ssc_device *ssc = platform_get_drvdata(pdev);
         int ret;
 
-        ret = snd_soc_register_dai(dev, &atmel_ssc_dai);
+        ret = snd_soc_register_component(dev, &atmel_ssc_component,
+                                         &atmel_ssc_dai, 1);
         if (ret) {
                 dev_err(dev, "Could not register DAI: %d\n", ret);
                 goto err;
@@ -732,7 +780,7 @@ static int asoc_ssc_init(struct device *dev)
         return 0;
 
 err_unregister_dai:
-        snd_soc_unregister_dai(dev);
+        snd_soc_unregister_component(dev);
 err:
         return ret;
 }
@@ -747,7 +795,7 @@ static void asoc_ssc_exit(struct device *dev)
         else
                 atmel_pcm_pdc_platform_unregister(dev);
 
-        snd_soc_unregister_dai(dev);
+        snd_soc_unregister_component(dev);
 }
 
 /**
diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c
index ea7d9d157022..44b8dcecf571 100644
--- a/sound/soc/au1x/ac97c.c
+++ b/sound/soc/au1x/ac97c.c
@@ -223,6 +223,10 @@ static struct snd_soc_dai_driver au1xac97c_dai_driver = {
         .ops                    = &alchemy_ac97c_ops,
 };
 
+static const struct snd_soc_component_driver au1xac97c_component = {
+        .name           = "au1xac97c",
+};
+
 static int au1xac97c_drvprobe(struct platform_device *pdev)
 {
         int ret;
@@ -268,7 +272,8 @@ static int au1xac97c_drvprobe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, ctx);
 
-        ret = snd_soc_register_dai(&pdev->dev, &au1xac97c_dai_driver);
+        ret = snd_soc_register_component(&pdev->dev, &au1xac97c_component,
+                                         &au1xac97c_dai_driver, 1);
         if (ret)
                 return ret;
 
@@ -280,7 +285,7 @@ static int au1xac97c_drvremove(struct platform_device *pdev)
 {
         struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         WR(ctx, AC97_ENABLE, EN_D);     /* clock off, disable */
 
diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c
index 072448afc219..b3f37f6edbcb 100644
--- a/sound/soc/au1x/i2sc.c
+++ b/sound/soc/au1x/i2sc.c
@@ -225,6 +225,10 @@ static struct snd_soc_dai_driver au1xi2s_dai_driver = {
         .ops = &au1xi2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver au1xi2s_component = {
+        .name           = "au1xi2s",
+};
+
 static int au1xi2s_drvprobe(struct platform_device *pdev)
 {
         struct resource *iores, *dmares;
@@ -260,14 +264,15 @@ static int au1xi2s_drvprobe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, ctx);
 
-        return snd_soc_register_dai(&pdev->dev, &au1xi2s_dai_driver);
+        return snd_soc_register_component(&pdev->dev, &au1xi2s_component,
+                                          &au1xi2s_dai_driver, 1);
 }
 
 static int au1xi2s_drvremove(struct platform_device *pdev)
 {
         struct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         WR(ctx, I2S_ENABLE, EN_D);      /* clock off, disable */
 
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index 6ba07e365967..8f1862aa7333 100644
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -361,6 +361,10 @@ static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = {
         .ops = &au1xpsc_ac97_dai_ops,
 };
 
+static const struct snd_soc_component_driver au1xpsc_ac97_component = {
+        .name           = "au1xpsc-ac97",
+};
+
 static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
 {
         int ret;
@@ -419,7 +423,8 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, wd);
 
-        ret = snd_soc_register_dai(&pdev->dev, &wd->dai_drv);
+        ret = snd_soc_register_component(&pdev->dev, &au1xpsc_ac97_component,
+                                         &wd->dai_drv, 1);
         if (ret)
                 return ret;
 
@@ -431,7 +436,7 @@ static int au1xpsc_ac97_drvremove(struct platform_device *pdev)
 {
         struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         /* disable PSC completely */
         au_writel(0, AC97_CFG(wd));
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index 360b4e50d7c8..fe923a7bdc39 100644
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -288,6 +288,10 @@ static const struct snd_soc_dai_driver au1xpsc_i2s_dai_template = {
         .ops = &au1xpsc_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver au1xpsc_i2s_component = {
+        .name           = "au1xpsc-i2s",
+};
+
 static int au1xpsc_i2s_drvprobe(struct platform_device *pdev)
 {
         struct resource *iores, *dmares;
@@ -350,14 +354,15 @@ static int au1xpsc_i2s_drvprobe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, wd);
 
-        return snd_soc_register_dai(&pdev->dev, &wd->dai_drv);
+        return snd_soc_register_component(&pdev->dev, &au1xpsc_i2s_component,
+                                          &wd->dai_drv, 1);
 }
 
 static int au1xpsc_i2s_drvremove(struct platform_device *pdev)
 {
         struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         au_writel(0, I2S_CFG(wd));
         au_sync();
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index 8e41bcb020eb..490217325975 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -282,6 +282,10 @@ static struct snd_soc_dai_driver bfin_ac97_dai = {
                 .formats = SNDRV_PCM_FMTBIT_S16_LE, },
 };
 
+static const struct snd_soc_component_driver bfin_ac97_component = {
+        .name           = "bfin-ac97",
+};
+
 static int asoc_bfin_ac97_probe(struct platform_device *pdev)
 {
         struct sport_device *sport_handle;
@@ -331,7 +335,8 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
                 goto sport_config_err;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &bfin_ac97_dai);
+        ret = snd_soc_register_component(&pdev->dev, &bfin_ac97_component,
+                                         &bfin_ac97_dai, 1);
         if (ret) {
                 pr_err("Failed to register DAI: %d\n", ret);
                 goto sport_config_err;
@@ -356,7 +361,7 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev)
 {
         struct sport_device *sport_handle = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         sport_done(sport_handle);
 #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
         gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index 168d88bccb41..dd0c2a4f83a3 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -245,6 +245,10 @@ static struct snd_soc_dai_driver bf5xx_i2s_dai = {
         .ops = &bf5xx_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver bf5xx_i2s_component = {
+        .name           = "bf5xx-i2s",
+};
+
 static int bf5xx_i2s_probe(struct platform_device *pdev)
 {
         struct sport_device *sport_handle;
@@ -257,7 +261,8 @@ static int bf5xx_i2s_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         /* register with the ASoC layers */
-        ret = snd_soc_register_dai(&pdev->dev, &bf5xx_i2s_dai);
+        ret = snd_soc_register_component(&pdev->dev, &bf5xx_i2s_component,
+                                         &bf5xx_i2s_dai, 1);
         if (ret) {
                 pr_err("Failed to register DAI: %d\n", ret);
                 sport_done(sport_handle);
@@ -273,7 +278,7 @@ static int bf5xx_i2s_remove(struct platform_device *pdev)
 
         pr_debug("%s enter\n", __func__);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         sport_done(sport_handle);
 
         return 0;
diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c
index c1e516ec53ad..69e9a3e935bd 100644
--- a/sound/soc/blackfin/bf5xx-tdm.c
+++ b/sound/soc/blackfin/bf5xx-tdm.c
@@ -249,6 +249,10 @@ static struct snd_soc_dai_driver bf5xx_tdm_dai = {
         .ops = &bf5xx_tdm_dai_ops,
 };
 
+static const struct snd_soc_component_driver bf5xx_tdm_component = {
+        .name           = "bf5xx-tdm",
+};
+
 static int bfin_tdm_probe(struct platform_device *pdev)
 {
         struct sport_device *sport_handle;
@@ -282,7 +286,8 @@ static int bfin_tdm_probe(struct platform_device *pdev)
                 goto sport_config_err;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &bf5xx_tdm_dai);
+        ret = snd_soc_register_component(&pdev->dev, &bf5xx_tdm_component,
+                                         &bf5xx_tdm_dai, 1);
         if (ret) {
                 pr_err("Failed to register DAI: %d\n", ret);
                 goto sport_config_err;
@@ -299,7 +304,7 @@ static int bfin_tdm_remove(struct platform_device *pdev)
 {
         struct sport_device *sport_handle = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         sport_done(sport_handle);
 
         return 0;
diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c
index 8f337972f438..c02405cc007d 100644
--- a/sound/soc/blackfin/bf6xx-i2s.c
+++ b/sound/soc/blackfin/bf6xx-i2s.c
@@ -186,6 +186,10 @@ static struct snd_soc_dai_driver bfin_i2s_dai = {
         .ops = &bfin_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver bfin_i2s_component = {
+        .name           = "bfin-i2s",
+};
+
 static int bfin_i2s_probe(struct platform_device *pdev)
 {
         struct sport_device *sport;
@@ -197,7 +201,8 @@ static int bfin_i2s_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         /* register with the ASoC layers */
-        ret = snd_soc_register_dai(dev, &bfin_i2s_dai);
+        ret = snd_soc_register_component(dev, &bfin_i2s_component,
+                                         &bfin_i2s_dai, 1);
         if (ret) {
                 dev_err(dev, "Failed to register DAI: %d\n", ret);
                 sport_delete(sport);
@@ -212,7 +217,7 @@ static int bfin_i2s_remove(struct platform_device *pdev)
 {
         struct sport_device *sport = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         sport_delete(sport);
 
         return 0;
diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c
index 5db68cf7b281..c43fb214558a 100644
--- a/sound/soc/cirrus/edb93xx.c
+++ b/sound/soc/cirrus/edb93xx.c
@@ -27,7 +27,6 @@
 #include <sound/soc.h>
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
-#include "ep93xx-pcm.h"
 
 static int edb93xx_hw_params(struct snd_pcm_substream *substream,
                              struct snd_pcm_hw_params *params)
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
index 1738d28fb04f..7798fbd5e81d 100644
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@ -23,7 +23,6 @@
 #include <sound/soc.h>
 
 #include <linux/platform_data/dma-ep93xx.h>
-#include "ep93xx-pcm.h"
 
 /*
  * Per channel (1-4) registers.
@@ -101,14 +100,16 @@ struct ep93xx_ac97_info {
 /* currently ALSA only supports a single AC97 device */
 static struct ep93xx_ac97_info *ep93xx_ac97_info;
 
-static struct ep93xx_pcm_dma_params ep93xx_ac97_pcm_out = {
+static struct ep93xx_dma_data ep93xx_ac97_pcm_out = {
         .name           = "ac97-pcm-out",
         .dma_port       = EP93XX_DMA_AAC1,
+        .direction      = DMA_MEM_TO_DEV,
 };
 
-static struct ep93xx_pcm_dma_params ep93xx_ac97_pcm_in = {
+static struct ep93xx_dma_data ep93xx_ac97_pcm_in = {
         .name           = "ac97-pcm-in",
         .dma_port       = EP93XX_DMA_AAC1,
+        .direction      = DMA_DEV_TO_MEM,
 };
 
 static inline unsigned ep93xx_ac97_read_reg(struct ep93xx_ac97_info *info,
@@ -316,7 +317,7 @@ static int ep93xx_ac97_trigger(struct snd_pcm_substream *substream,
 static int ep93xx_ac97_startup(struct snd_pcm_substream *substream,
                                struct snd_soc_dai *dai)
 {
-        struct ep93xx_pcm_dma_params *dma_data;
+        struct ep93xx_dma_data *dma_data;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 dma_data = &ep93xx_ac97_pcm_out;
@@ -353,6 +354,10 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = {
         .ops                    = &ep93xx_ac97_dai_ops,
 };
 
+static const struct snd_soc_component_driver ep93xx_ac97_component = {
+        .name           = "ep93xx-ac97",
+};
+
 static int ep93xx_ac97_probe(struct platform_device *pdev)
 {
         struct ep93xx_ac97_info *info;
@@ -390,7 +395,8 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
         ep93xx_ac97_info = info;
         platform_set_drvdata(pdev, info);
 
-        ret = snd_soc_register_dai(&pdev->dev, &ep93xx_ac97_dai);
+        ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component,
+                                         &ep93xx_ac97_dai, 1);
         if (ret)
                 goto fail;
 
@@ -407,7 +413,7 @@ static int ep93xx_ac97_remove(struct platform_device *pdev)
 {
         struct ep93xx_ac97_info *info = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         /* disable the AC97 controller */
         ep93xx_ac97_write_reg(info, AC97GCR, 0);
diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 323ed69b7975..5c1102e9e159 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -30,8 +30,6 @@
 #include <mach/ep93xx-regs.h>
 #include <linux/platform_data/dma-ep93xx.h>
 
-#include "ep93xx-pcm.h"
-
 #define EP93XX_I2S_TXCLKCFG             0x00
 #define EP93XX_I2S_RXCLKCFG             0x04
 #define EP93XX_I2S_GLCTRL               0x0C
@@ -62,18 +60,20 @@ struct ep93xx_i2s_info {
         struct clk                      *mclk;
         struct clk                      *sclk;
         struct clk                      *lrclk;
-        struct ep93xx_pcm_dma_params    *dma_params;
+        struct ep93xx_dma_data          *dma_data;
         void __iomem                    *regs;
 };
 
-struct ep93xx_pcm_dma_params ep93xx_i2s_dma_params[] = {
+struct ep93xx_dma_data ep93xx_i2s_dma_data[] = {
         [SNDRV_PCM_STREAM_PLAYBACK] = {
                 .name           = "i2s-pcm-out",
-                .dma_port       = EP93XX_DMA_I2S1,
+                .port           = EP93XX_DMA_I2S1,
+                .direction      = DMA_MEM_TO_DEV,
         },
         [SNDRV_PCM_STREAM_CAPTURE] = {
                 .name           = "i2s-pcm-in",
-                .dma_port       = EP93XX_DMA_I2S1,
+                .port           = EP93XX_DMA_I2S1,
+                .direction      = DMA_DEV_TO_MEM,
         },
 };
 
@@ -147,7 +147,7 @@ static int ep93xx_i2s_startup(struct snd_pcm_substream *substream,
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
 
         snd_soc_dai_set_dma_data(cpu_dai, substream,
-                                 &info->dma_params[substream->stream]);
+                                 &info->dma_data[substream->stream]);
         return 0;
 }
 
@@ -366,6 +366,10 @@ static struct snd_soc_dai_driver ep93xx_i2s_dai = {
         .ops            = &ep93xx_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver ep93xx_i2s_component = {
+        .name           = "ep93xx-i2s",
+};
+
 static int ep93xx_i2s_probe(struct platform_device *pdev)
 {
         struct ep93xx_i2s_info *info;
@@ -403,9 +407,10 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
         }
 
         dev_set_drvdata(&pdev->dev, info);
-        info->dma_params = ep93xx_i2s_dma_params;
+        info->dma_data = ep93xx_i2s_dma_data;
 
-        err = snd_soc_register_dai(&pdev->dev, &ep93xx_i2s_dai);
+        err = snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component,
+                                         &ep93xx_i2s_dai, 1);
         if (err)
                 goto fail_put_lrclk;
 
@@ -426,7 +431,7 @@ static int ep93xx_i2s_remove(struct platform_device *pdev)
 {
         struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         dev_set_drvdata(&pdev->dev, NULL);
         clk_put(info->lrclk);
         clk_put(info->sclk);
diff --git a/sound/soc/cirrus/ep93xx-pcm.c b/sound/soc/cirrus/ep93xx-pcm.c
index 72eb7a49e16a..488032690378 100644
--- a/sound/soc/cirrus/ep93xx-pcm.c
+++ b/sound/soc/cirrus/ep93xx-pcm.c
@@ -29,8 +29,6 @@
 #include <mach/hardware.h>
 #include <mach/ep93xx-regs.h>
 
-#include "ep93xx-pcm.h"
-
 static const struct snd_pcm_hardware ep93xx_pcm_hardware = {
         .info                   = (SNDRV_PCM_INFO_MMAP          |
                                    SNDRV_PCM_INFO_MMAP_VALID    |
@@ -68,40 +66,12 @@ static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param)
 static int ep93xx_pcm_open(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct ep93xx_pcm_dma_params *dma_params;
-        struct ep93xx_dma_data *dma_data;
-        int ret;
 
         snd_soc_set_runtime_hwparams(substream, &ep93xx_pcm_hardware);
 
-        dma_data = kmalloc(sizeof(*dma_data), GFP_KERNEL);
-        if (!dma_data)
-                return -ENOMEM;
-
-        dma_params = snd_soc_dai_get_dma_data(cpu_dai, substream);
-        dma_data->port = dma_params->dma_port;
-        dma_data->name = dma_params->name;
-        dma_data->direction = snd_pcm_substream_to_dma_direction(substream);
-
-        ret = snd_dmaengine_pcm_open(substream, ep93xx_pcm_dma_filter, dma_data);
-        if (ret) {
-                kfree(dma_data);
-                return ret;
-        }
-
-        snd_dmaengine_pcm_set_data(substream, dma_data);
-
-        return 0;
-}
-
-static int ep93xx_pcm_close(struct snd_pcm_substream *substream)
-{
-        struct dma_data *dma_data = snd_dmaengine_pcm_get_data(substream);
-
-        snd_dmaengine_pcm_close(substream);
-        kfree(dma_data);
-        return 0;
+        return snd_dmaengine_pcm_open_request_chan(substream,
+                        ep93xx_pcm_dma_filter,
+                        snd_soc_dai_get_dma_data(rtd->cpu_dai, substream));
 }
 
 static int ep93xx_pcm_hw_params(struct snd_pcm_substream *substream,
@@ -131,7 +101,7 @@ static int ep93xx_pcm_mmap(struct snd_pcm_substream *substream,
 
 static struct snd_pcm_ops ep93xx_pcm_ops = {
         .open           = ep93xx_pcm_open,
-        .close          = ep93xx_pcm_close,
+        .close          = snd_dmaengine_pcm_close_release_chan,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = ep93xx_pcm_hw_params,
         .hw_free        = ep93xx_pcm_hw_free,
diff --git a/sound/soc/cirrus/ep93xx-pcm.h b/sound/soc/cirrus/ep93xx-pcm.h
deleted file mode 100644
index 111e1121ecb8..000000000000
--- a/sound/soc/cirrus/ep93xx-pcm.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * sound/soc/ep93xx/ep93xx-pcm.h - EP93xx ALSA PCM interface
- *
- * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
- * Copyright (C) 2006 Applied Data Systems
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _EP93XX_SND_SOC_PCM_H
-#define _EP93XX_SND_SOC_PCM_H
-
-struct ep93xx_pcm_dma_params {
-        char    *name;
-        int     dma_port;
-};
-
-#endif /* _EP93XX_SND_SOC_PCM_H */
diff --git a/sound/soc/cirrus/simone.c b/sound/soc/cirrus/simone.c
index a397bb0d8179..4d094d00c34a 100644
--- a/sound/soc/cirrus/simone.c
+++ b/sound/soc/cirrus/simone.c
@@ -21,8 +21,6 @@
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 
-#include "ep93xx-pcm.h"
-
 static struct snd_soc_dai_link simone_dai = {
         .name           = "AC97",
         .stream_name    = "AC97 HiFi",
diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c
index 9d77fe28dfcc..69041074f2c1 100644
--- a/sound/soc/cirrus/snappercl15.c
+++ b/sound/soc/cirrus/snappercl15.c
@@ -21,7 +21,6 @@
 #include <mach/hardware.h>
 
 #include "../codecs/tlv320aic23.h"
-#include "ep93xx-pcm.h"
 
 #define CODEC_CLOCK 5644800
 
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 45b72561c615..2f45f00e31b0 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -26,6 +26,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_AK4641 if I2C
         select SND_SOC_AK4642 if I2C
         select SND_SOC_AK4671 if I2C
+        select SND_SOC_AK5386
         select SND_SOC_ALC5623 if I2C
         select SND_SOC_ALC5632 if I2C
         select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
@@ -63,6 +64,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_STA32X if I2C
         select SND_SOC_STA529 if I2C
         select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
+        select SND_SOC_TAS5086 if I2C
         select SND_SOC_TLV320AIC23 if I2C
         select SND_SOC_TLV320AIC26 if SPI_MASTER
         select SND_SOC_TLV320AIC32X4 if I2C
@@ -203,6 +205,9 @@ config SND_SOC_AK4642
 config SND_SOC_AK4671
         tristate
 
+config SND_SOC_AK5386
+        tristate
+
 config SND_SOC_ALC5623
        tristate
 config SND_SOC_ALC5632
@@ -320,11 +325,14 @@ config SND_SOC_STA529
 config SND_SOC_STAC9766
         tristate
 
+config SND_SOC_TAS5086
+        tristate
+
 config SND_SOC_TLV320AIC23
         tristate
 
 config SND_SOC_TLV320AIC26
-        tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
+        tristate
         depends on SPI
 
 config SND_SOC_TLV320AIC32X4
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 6a3b3c3b8b41..b9e41c9a1f4c 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -14,6 +14,7 @@ snd-soc-ak4535-objs := ak4535.o
 snd-soc-ak4641-objs := ak4641.o
 snd-soc-ak4642-objs := ak4642.o
 snd-soc-ak4671-objs := ak4671.o
+snd-soc-ak5386-objs := ak5386.o
 snd-soc-arizona-objs := arizona.o
 snd-soc-cq93vc-objs := cq93vc.o
 snd-soc-cs42l51-objs := cs42l51.o
@@ -55,6 +56,7 @@ snd-soc-ssm2602-objs := ssm2602.o
 snd-soc-sta32x-objs := sta32x.o
 snd-soc-sta529-objs := sta529.o
 snd-soc-stac9766-objs := stac9766.o
+snd-soc-tas5086-objs := tas5086.o
 snd-soc-tlv320aic23-objs := tlv320aic23.o
 snd-soc-tlv320aic26-objs := tlv320aic26.o
 snd-soc-tlv320aic3x-objs := tlv320aic3x.o
@@ -137,6 +139,7 @@ obj-$(CONFIG_SND_SOC_AK4535)	+= snd-soc-ak4535.o
 obj-$(CONFIG_SND_SOC_AK4641)    += snd-soc-ak4641.o
 obj-$(CONFIG_SND_SOC_AK4642)    += snd-soc-ak4642.o
 obj-$(CONFIG_SND_SOC_AK4671)    += snd-soc-ak4671.o
+obj-$(CONFIG_SND_SOC_AK5386)    += snd-soc-ak5386.o
 obj-$(CONFIG_SND_SOC_ALC5623)    += snd-soc-alc5623.o
 obj-$(CONFIG_SND_SOC_ALC5632)   += snd-soc-alc5632.o
 obj-$(CONFIG_SND_SOC_ARIZONA)   += snd-soc-arizona.o
@@ -177,6 +180,7 @@ obj-$(CONFIG_SND_SOC_SSM2602)	+= snd-soc-ssm2602.o
 obj-$(CONFIG_SND_SOC_STA32X)   += snd-soc-sta32x.o
 obj-$(CONFIG_SND_SOC_STA529)   += snd-soc-sta529.o
 obj-$(CONFIG_SND_SOC_STAC9766)  += snd-soc-stac9766.o
+obj-$(CONFIG_SND_SOC_TAS5086)   += snd-soc-tas5086.o
 obj-$(CONFIG_SND_SOC_TLV320AIC23)       += snd-soc-tlv320aic23.o
 obj-$(CONFIG_SND_SOC_TLV320AIC26)       += snd-soc-tlv320aic26.o
 obj-$(CONFIG_SND_SOC_TLV320AIC3X)       += snd-soc-tlv320aic3x.o
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index 068b3ae56a17..1aa10ddf3a61 100644
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -133,6 +133,8 @@ struct adau1373 {
 #define ADAU1373_DAI_FORMAT_DSP         0x3
 
 #define ADAU1373_BCLKDIV_SOURCE         BIT(5)
+#define ADAU1373_BCLKDIV_SR_MASK        (0x07 << 2)
+#define ADAU1373_BCLKDIV_BCLK_MASK      0x03
 #define ADAU1373_BCLKDIV_32             0x03
 #define ADAU1373_BCLKDIV_64             0x02
 #define ADAU1373_BCLKDIV_128            0x01
@@ -937,7 +939,8 @@ static int adau1373_hw_params(struct snd_pcm_substream *substream,
         adau1373_dai->enable_src = (div != 0);
 
         snd_soc_update_bits(codec, ADAU1373_BCLKDIV(dai->id),
-                ~ADAU1373_BCLKDIV_SOURCE, (div << 2) | ADAU1373_BCLKDIV_64);
+                ADAU1373_BCLKDIV_SR_MASK | ADAU1373_BCLKDIV_BCLK_MASK,
+                (div << 2) | ADAU1373_BCLKDIV_64);
 
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index 6f6c335a5baa..c7cfdf957e4d 100644
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -55,6 +55,7 @@ static int ak4104_set_dai_fmt(struct snd_soc_dai *codec_dai,
                               unsigned int format)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
+        struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec);
         int val = 0;
         int ret;
 
@@ -77,9 +78,9 @@ static int ak4104_set_dai_fmt(struct snd_soc_dai *codec_dai,
         if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)
                 return -EINVAL;
 
-        ret = snd_soc_update_bits(codec, AK4104_REG_CONTROL1,
-                                  AK4104_CONTROL1_DIF0 | AK4104_CONTROL1_DIF1,
-                                  val);
+        ret = regmap_update_bits(ak4104->regmap, AK4104_REG_CONTROL1,
+                                 AK4104_CONTROL1_DIF0 | AK4104_CONTROL1_DIF1,
+                                 val);
         if (ret < 0)
                 return ret;
 
@@ -91,11 +92,12 @@ static int ak4104_hw_params(struct snd_pcm_substream *substream,
                             struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
-        int val = 0;
+        struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec);
+        int ret, val = 0;
 
         /* set the IEC958 bits: consumer mode, no copyright bit */
         val |= IEC958_AES0_CON_NOT_COPYRIGHT;
-        snd_soc_write(codec, AK4104_REG_CHN_STATUS(0), val);
+        regmap_write(ak4104->regmap, AK4104_REG_CHN_STATUS(0), val);
 
         val = 0;
 
@@ -132,11 +134,33 @@ static int ak4104_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        return snd_soc_write(codec, AK4104_REG_CHN_STATUS(3), val);
+        ret = regmap_write(ak4104->regmap, AK4104_REG_CHN_STATUS(3), val);
+        if (ret < 0)
+                return ret;
+
+        /* enable transmitter */
+        ret = regmap_update_bits(ak4104->regmap, AK4104_REG_TX,
+                                 AK4104_TX_TXE, AK4104_TX_TXE);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int ak4104_hw_free(struct snd_pcm_substream *substream,
+                          struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec);
+
+        /* disable transmitter */
+        return regmap_update_bits(ak4104->regmap, AK4104_REG_TX,
+                                  AK4104_TX_TXE, 0);
 }
 
 static const struct snd_soc_dai_ops ak4101_dai_ops = {
         .hw_params = ak4104_hw_params,
+        .hw_free = ak4104_hw_free,
         .set_fmt = ak4104_set_dai_fmt,
 };
 
@@ -160,20 +184,17 @@ static int ak4104_probe(struct snd_soc_codec *codec)
         int ret;
 
         codec->control_data = ak4104->regmap;
-        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
-        if (ret != 0)
-                return ret;
 
         /* set power-up and non-reset bits */
-        ret = snd_soc_update_bits(codec, AK4104_REG_CONTROL1,
-                                  AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN,
-                                  AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN);
+        ret = regmap_update_bits(ak4104->regmap, AK4104_REG_CONTROL1,
+                                 AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN,
+                                 AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN);
         if (ret < 0)
                 return ret;
 
         /* enable transmitter */
-        ret = snd_soc_update_bits(codec, AK4104_REG_TX,
-                                  AK4104_TX_TXE, AK4104_TX_TXE);
+        ret = regmap_update_bits(ak4104->regmap, AK4104_REG_TX,
+                                 AK4104_TX_TXE, AK4104_TX_TXE);
         if (ret < 0)
                 return ret;
 
@@ -182,8 +203,10 @@ static int ak4104_probe(struct snd_soc_codec *codec)
 
 static int ak4104_remove(struct snd_soc_codec *codec)
 {
-        snd_soc_update_bits(codec, AK4104_REG_CONTROL1,
-                            AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN, 0);
+        struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec);
+
+        regmap_update_bits(ak4104->regmap, AK4104_REG_CONTROL1,
+                           AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN, 0);
 
         return 0;
 }
diff --git a/sound/soc/codecs/ak5386.c b/sound/soc/codecs/ak5386.c
new file mode 100644
index 000000000000..1f303983ae02
--- /dev/null
+++ b/sound/soc/codecs/ak5386.c
@@ -0,0 +1,152 @@
+/*
+ * ALSA SoC driver for
+ *    Asahi Kasei AK5386 Single-ended 24-Bit 192kHz delta-sigma ADC
+ *
+ * (c) 2013 Daniel Mack <zonque@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/of_device.h>
+#include <sound/soc.h>
+#include <sound/pcm.h>
+#include <sound/initval.h>
+
+struct ak5386_priv {
+        int reset_gpio;
+};
+
+static struct snd_soc_codec_driver soc_codec_ak5386;
+
+static int ak5386_set_dai_fmt(struct snd_soc_dai *codec_dai,
+                              unsigned int format)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+
+        format &= SND_SOC_DAIFMT_FORMAT_MASK;
+        if (format != SND_SOC_DAIFMT_LEFT_J &&
+            format != SND_SOC_DAIFMT_I2S) {
+                dev_err(codec->dev, "Invalid DAI format\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int ak5386_hw_params(struct snd_pcm_substream *substream,
+                            struct snd_pcm_hw_params *params,
+                            struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct ak5386_priv *priv = snd_soc_codec_get_drvdata(codec);
+
+        /*
+         * From the datasheet:
+         *
+         * All external clocks (MCLK, SCLK and LRCK) must be present unless
+         * PDN pin = “L”. If these clocks are not provided, the AK5386 may
+         * draw excess current due to its use of internal dynamically
+         * refreshed logic. If the external clocks are not present, place
+         * the AK5386 in power-down mode (PDN pin = “L”).
+         */
+
+        if (gpio_is_valid(priv->reset_gpio))
+                gpio_set_value(priv->reset_gpio, 1);
+
+        return 0;
+}
+
+static int ak5386_hw_free(struct snd_pcm_substream *substream,
+                          struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct ak5386_priv *priv = snd_soc_codec_get_drvdata(codec);
+
+        if (gpio_is_valid(priv->reset_gpio))
+                gpio_set_value(priv->reset_gpio, 0);
+
+        return 0;
+}
+
+static const struct snd_soc_dai_ops ak5386_dai_ops = {
+        .set_fmt        = ak5386_set_dai_fmt,
+        .hw_params      = ak5386_hw_params,
+        .hw_free        = ak5386_hw_free,
+};
+
+static struct snd_soc_dai_driver ak5386_dai = {
+        .name           = "ak5386-hifi",
+        .capture        = {
+                .stream_name    = "Capture",
+                .channels_min   = 1,
+                .channels_max   = 2,
+                .rates          = SNDRV_PCM_RATE_8000_192000,
+                .formats        = SNDRV_PCM_FMTBIT_S8     |
+                                  SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE |
+                                  SNDRV_PCM_FMTBIT_S24_3LE,
+        },
+        .ops    = &ak5386_dai_ops,
+};
+
+#ifdef CONFIG_OF
+static const struct of_device_id ak5386_dt_ids[] = {
+        { .compatible = "asahi-kasei,ak5386", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, ak5386_dt_ids);
+#endif
+
+static int ak5386_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct ak5386_priv *priv;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->reset_gpio = -EINVAL;
+        dev_set_drvdata(dev, priv);
+
+        if (of_match_device(of_match_ptr(ak5386_dt_ids), dev))
+                priv->reset_gpio = of_get_named_gpio(dev->of_node,
+                                                      "reset-gpio", 0);
+
+        if (gpio_is_valid(priv->reset_gpio))
+                if (devm_gpio_request_one(dev, priv->reset_gpio,
+                                          GPIOF_OUT_INIT_LOW,
+                                          "AK5386 Reset"))
+                        priv->reset_gpio = -EINVAL;
+
+        return snd_soc_register_codec(dev, &soc_codec_ak5386,
+                                      &ak5386_dai, 1);
+}
+
+static int ak5386_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_codec(&pdev->dev);
+        return 0;
+}
+
+static struct platform_driver ak5386_driver = {
+        .probe          = ak5386_probe,
+        .remove         = ak5386_remove,
+        .driver         = {
+                .name   = "ak5386",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(ak5386_dt_ids),
+        },
+};
+
+module_platform_driver(ak5386_driver);
+
+MODULE_DESCRIPTION("ASoC driver for AK5386 ADC");
+MODULE_AUTHOR("Daniel Mack <zonque@gmail.com>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index e7d34711412c..389f23253831 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/delay.h>
 #include <linux/gcd.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
@@ -65,6 +66,163 @@
 #define arizona_aif_dbg(_dai, fmt, ...) \
         dev_dbg(_dai->dev, "AIF%d: " fmt, _dai->id, ##__VA_ARGS__)
 
+static int arizona_spk_ev(struct snd_soc_dapm_widget *w,
+                          struct snd_kcontrol *kcontrol,
+                          int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+        bool manual_ena = false;
+        int val;
+
+        switch (arizona->type) {
+        case WM5102:
+                switch (arizona->rev) {
+                case 0:
+                        break;
+                default:
+                        manual_ena = true;
+                        break;
+                }
+        default:
+                break;
+        }
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                if (!priv->spk_ena && manual_ena) {
+                        snd_soc_write(codec, 0x4f5, 0x25a);
+                        priv->spk_ena_pending = true;
+                }
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+                val = snd_soc_read(codec, ARIZONA_INTERRUPT_RAW_STATUS_3);
+                if (val & ARIZONA_SPK_SHUTDOWN_STS) {
+                        dev_crit(arizona->dev,
+                                 "Speaker not enabled due to temperature\n");
+                        return -EBUSY;
+                }
+
+                snd_soc_update_bits(codec, ARIZONA_OUTPUT_ENABLES_1,
+                                    1 << w->shift, 1 << w->shift);
+
+                if (priv->spk_ena_pending) {
+                        msleep(75);
+                        snd_soc_write(codec, 0x4f5, 0xda);
+                        priv->spk_ena_pending = false;
+                        priv->spk_ena++;
+                }
+                break;
+        case SND_SOC_DAPM_PRE_PMD:
+                if (manual_ena) {
+                        priv->spk_ena--;
+                        if (!priv->spk_ena)
+                                snd_soc_write(codec, 0x4f5, 0x25a);
+                }
+
+                snd_soc_update_bits(codec, ARIZONA_OUTPUT_ENABLES_1,
+                                    1 << w->shift, 0);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                if (manual_ena) {
+                        if (!priv->spk_ena)
+                                snd_soc_write(codec, 0x4f5, 0x0da);
+                }
+                break;
+        }
+
+        return 0;
+}
+
+static irqreturn_t arizona_thermal_warn(int irq, void *data)
+{
+        struct arizona *arizona = data;
+        unsigned int val;
+        int ret;
+
+        ret = regmap_read(arizona->regmap, ARIZONA_INTERRUPT_RAW_STATUS_3,
+                          &val);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to read thermal status: %d\n",
+                        ret);
+        } else if (val & ARIZONA_SPK_SHUTDOWN_WARN_STS) {
+                dev_crit(arizona->dev, "Thermal warning\n");
+        }
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t arizona_thermal_shutdown(int irq, void *data)
+{
+        struct arizona *arizona = data;
+        unsigned int val;
+        int ret;
+
+        ret = regmap_read(arizona->regmap, ARIZONA_INTERRUPT_RAW_STATUS_3,
+                          &val);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to read thermal status: %d\n",
+                        ret);
+        } else if (val & ARIZONA_SPK_SHUTDOWN_STS) {
+                dev_crit(arizona->dev, "Thermal shutdown\n");
+                ret = regmap_update_bits(arizona->regmap,
+                                         ARIZONA_OUTPUT_ENABLES_1,
+                                         ARIZONA_OUT4L_ENA |
+                                         ARIZONA_OUT4R_ENA, 0);
+                if (ret != 0)
+                        dev_crit(arizona->dev,
+                                 "Failed to disable speaker outputs: %d\n",
+                                 ret);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static const struct snd_soc_dapm_widget arizona_spkl =
+        SND_SOC_DAPM_PGA_E("OUT4L", SND_SOC_NOPM,
+                           ARIZONA_OUT4L_ENA_SHIFT, 0, NULL, 0, arizona_spk_ev,
+                           SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU);
+
+static const struct snd_soc_dapm_widget arizona_spkr =
+        SND_SOC_DAPM_PGA_E("OUT4R", SND_SOC_NOPM,
+                           ARIZONA_OUT4R_ENA_SHIFT, 0, NULL, 0, arizona_spk_ev,
+                           SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU);
+
+int arizona_init_spk(struct snd_soc_codec *codec)
+{
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+        struct arizona *arizona = priv->arizona;
+        int ret;
+
+        ret = snd_soc_dapm_new_controls(&codec->dapm, &arizona_spkl, 1);
+        if (ret != 0)
+                return ret;
+
+        ret = snd_soc_dapm_new_controls(&codec->dapm, &arizona_spkr, 1);
+        if (ret != 0)
+                return ret;
+
+        ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_SHUTDOWN_WARN,
+                                  "Thermal warning", arizona_thermal_warn,
+                                  arizona);
+        if (ret != 0)
+                dev_err(arizona->dev,
+                        "Failed to get thermal warning IRQ: %d\n",
+                        ret);
+
+        ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_SHUTDOWN,
+                                  "Thermal shutdown", arizona_thermal_shutdown,
+                                  arizona);
+        if (ret != 0)
+                dev_err(arizona->dev,
+                        "Failed to get thermal shutdown IRQ: %d\n",
+                        ret);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(arizona_init_spk);
+
 const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {
         "None",
         "Tone Generator 1",
@@ -274,6 +432,33 @@ EXPORT_SYMBOL_GPL(arizona_mixer_values);
 const DECLARE_TLV_DB_SCALE(arizona_mixer_tlv, -3200, 100, 0);
 EXPORT_SYMBOL_GPL(arizona_mixer_tlv);
 
+const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE] = {
+        "SYNCCLK rate", "8kHz", "16kHz", "ASYNCCLK rate",
+};
+EXPORT_SYMBOL_GPL(arizona_rate_text);
+
+const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE] = {
+        0, 1, 2, 8,
+};
+EXPORT_SYMBOL_GPL(arizona_rate_val);
+
+
+const struct soc_enum arizona_isrc_fsl[] = {
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_ISRC_1_CTRL_2,
+                              ARIZONA_ISRC1_FSL_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_ISRC_2_CTRL_2,
+                              ARIZONA_ISRC2_FSL_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_ISRC_3_CTRL_2,
+                              ARIZONA_ISRC3_FSL_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+};
+EXPORT_SYMBOL_GPL(arizona_isrc_fsl);
+
 static const char *arizona_vol_ramp_text[] = {
         "0ms/6dB", "0.5ms/6dB", "1ms/6dB", "2ms/6dB", "4ms/6dB", "8ms/6dB",
         "15ms/6dB", "30ms/6dB",
@@ -332,9 +517,27 @@ const struct soc_enum arizona_ng_hold =
                         4, arizona_ng_hold_text);
 EXPORT_SYMBOL_GPL(arizona_ng_hold);
 
+static void arizona_in_set_vu(struct snd_soc_codec *codec, int ena)
+{
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+        unsigned int val;
+        int i;
+
+        if (ena)
+                val = ARIZONA_IN_VU;
+        else
+                val = 0;
+
+        for (i = 0; i < priv->num_inputs; i++)
+                snd_soc_update_bits(codec,
+                                    ARIZONA_ADC_DIGITAL_VOLUME_1L + (i * 4),
+                                    ARIZONA_IN_VU, val);
+}
+
 int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
                   int event)
 {
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(w->codec);
         unsigned int reg;
 
         if (w->shift % 2)
@@ -343,13 +546,29 @@ int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
                 reg = ARIZONA_ADC_DIGITAL_VOLUME_1R + ((w->shift / 2) * 8);
 
         switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                priv->in_pending++;
+                break;
         case SND_SOC_DAPM_POST_PMU:
                 snd_soc_update_bits(w->codec, reg, ARIZONA_IN1L_MUTE, 0);
+
+                /* If this is the last input pending then allow VU */
+                priv->in_pending--;
+                if (priv->in_pending == 0) {
+                        msleep(1);
+                        arizona_in_set_vu(w->codec, 1);
+                }
                 break;
         case SND_SOC_DAPM_PRE_PMD:
-                snd_soc_update_bits(w->codec, reg, ARIZONA_IN1L_MUTE,
-                                    ARIZONA_IN1L_MUTE);
+                snd_soc_update_bits(w->codec, reg,
+                                    ARIZONA_IN1L_MUTE | ARIZONA_IN_VU,
+                                    ARIZONA_IN1L_MUTE | ARIZONA_IN_VU);
                 break;
+        case SND_SOC_DAPM_POST_PMD:
+                /* Disable volume updates if no inputs are enabled */
+                reg = snd_soc_read(w->codec, ARIZONA_INPUT_ENABLES);
+                if (reg == 0)
+                        arizona_in_set_vu(w->codec, 0);
         }
 
         return 0;
@@ -360,6 +579,24 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol,
                    int event)
 {
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                switch (w->shift) {
+                case ARIZONA_OUT1L_ENA_SHIFT:
+                case ARIZONA_OUT1R_ENA_SHIFT:
+                case ARIZONA_OUT2L_ENA_SHIFT:
+                case ARIZONA_OUT2R_ENA_SHIFT:
+                case ARIZONA_OUT3L_ENA_SHIFT:
+                case ARIZONA_OUT3R_ENA_SHIFT:
+                        msleep(17);
+                        break;
+
+                default:
+                        break;
+                }
+                break;
+        }
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(arizona_out_ev);
@@ -502,27 +739,27 @@ int arizona_set_sysclk(struct snd_soc_codec *codec, int clk_id,
                 break;
         case 11289600:
         case 12288000:
-                val |= 1 << ARIZONA_SYSCLK_FREQ_SHIFT;
+                val |= ARIZONA_CLK_12MHZ << ARIZONA_SYSCLK_FREQ_SHIFT;
                 break;
         case 22579200:
         case 24576000:
-                val |= 2 << ARIZONA_SYSCLK_FREQ_SHIFT;
+                val |= ARIZONA_CLK_24MHZ << ARIZONA_SYSCLK_FREQ_SHIFT;
                 break;
         case 45158400:
         case 49152000:
-                val |= 3 << ARIZONA_SYSCLK_FREQ_SHIFT;
+                val |= ARIZONA_CLK_49MHZ << ARIZONA_SYSCLK_FREQ_SHIFT;
                 break;
         case 67737600:
         case 73728000:
-                val |= 4 << ARIZONA_SYSCLK_FREQ_SHIFT;
+                val |= ARIZONA_CLK_73MHZ << ARIZONA_SYSCLK_FREQ_SHIFT;
                 break;
         case 90316800:
         case 98304000:
-                val |= 5 << ARIZONA_SYSCLK_FREQ_SHIFT;
+                val |= ARIZONA_CLK_98MHZ << ARIZONA_SYSCLK_FREQ_SHIFT;
                 break;
         case 135475200:
         case 147456000:
-                val |= 6 << ARIZONA_SYSCLK_FREQ_SHIFT;
+                val |= ARIZONA_CLK_147MHZ << ARIZONA_SYSCLK_FREQ_SHIFT;
                 break;
         case 0:
                 dev_dbg(arizona->dev, "%s cleared\n", name);
@@ -816,7 +1053,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
         struct arizona *arizona = priv->arizona;
         int base = dai->driver->base;
         const int *rates;
-        int i, ret;
+        int i, ret, val;
         int chan_limit = arizona->pdata.max_channels_clocked[dai->id - 1];
         int bclk, lrclk, wl, frame, bclk_target;
 
@@ -832,6 +1069,13 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
                 bclk_target *= chan_limit;
         }
 
+        /* Force stereo for I2S mode */
+        val = snd_soc_read(codec, base + ARIZONA_AIF_FORMAT);
+        if (params_channels(params) == 1 && (val & ARIZONA_AIF1_FMT_MASK)) {
+                arizona_aif_dbg(dai, "Forcing stereo mode\n");
+                bclk_target *= 2;
+        }
+
         for (i = 0; i < ARRAY_SIZE(arizona_44k1_bclk_rates); i++) {
                 if (rates[i] >= bclk_target &&
                     rates[i] % params_rate(params) == 0) {
@@ -988,6 +1232,16 @@ static struct {
         { 1000000, 13500000, 0,  1 },
 };
 
+static struct {
+        unsigned int min;
+        unsigned int max;
+        u16 gain;
+} fll_gains[] = {
+        {       0,   256000, 0 },
+        {  256000,  1000000, 2 },
+        { 1000000, 13500000, 4 },
+};
+
 struct arizona_fll_cfg {
         int n;
         int theta;
@@ -995,6 +1249,7 @@ struct arizona_fll_cfg {
         int refdiv;
         int outdiv;
         int fratio;
+        int gain;
 };
 
 static int arizona_calc_fll(struct arizona_fll *fll,
@@ -1054,6 +1309,18 @@ static int arizona_calc_fll(struct arizona_fll *fll,
                 return -EINVAL;
         }
 
+        for (i = 0; i < ARRAY_SIZE(fll_gains); i++) {
+                if (fll_gains[i].min <= Fref && Fref <= fll_gains[i].max) {
+                        cfg->gain = fll_gains[i].gain;
+                        break;
+                }
+        }
+        if (i == ARRAY_SIZE(fll_gains)) {
+                arizona_fll_err(fll, "Unable to find gain for Fref=%uHz\n",
+                                Fref);
+                return -EINVAL;
+        }
+
         cfg->n = target / (ratio * Fref);
 
         if (target % (ratio * Fref)) {
@@ -1081,13 +1348,15 @@ static int arizona_calc_fll(struct arizona_fll *fll,
                         cfg->n, cfg->theta, cfg->lambda);
         arizona_fll_dbg(fll, "FRATIO=%x(%d) OUTDIV=%x REFCLK_DIV=%x\n",
                         cfg->fratio, cfg->fratio, cfg->outdiv, cfg->refdiv);
+        arizona_fll_dbg(fll, "GAIN=%d\n", cfg->gain);
 
         return 0;
 
 }
 
 static void arizona_apply_fll(struct arizona *arizona, unsigned int base,
-                              struct arizona_fll_cfg *cfg, int source)
+                              struct arizona_fll_cfg *cfg, int source,
+                              bool sync)
 {
         regmap_update_bits(arizona->regmap, base + 3,
                            ARIZONA_FLL1_THETA_MASK, cfg->theta);
@@ -1102,87 +1371,84 @@ static void arizona_apply_fll(struct arizona *arizona, unsigned int base,
                            cfg->refdiv << ARIZONA_FLL1_CLK_REF_DIV_SHIFT |
                            source << ARIZONA_FLL1_CLK_REF_SRC_SHIFT);
 
+        if (sync)
+                regmap_update_bits(arizona->regmap, base + 0x7,
+                                   ARIZONA_FLL1_GAIN_MASK,
+                                   cfg->gain << ARIZONA_FLL1_GAIN_SHIFT);
+        else
+                regmap_update_bits(arizona->regmap, base + 0x9,
+                                   ARIZONA_FLL1_GAIN_MASK,
+                                   cfg->gain << ARIZONA_FLL1_GAIN_SHIFT);
+
         regmap_update_bits(arizona->regmap, base + 2,
                            ARIZONA_FLL1_CTRL_UPD | ARIZONA_FLL1_N_MASK,
                            ARIZONA_FLL1_CTRL_UPD | cfg->n);
 }
 
-int arizona_set_fll(struct arizona_fll *fll, int source,
-                    unsigned int Fref, unsigned int Fout)
+static bool arizona_is_enabled_fll(struct arizona_fll *fll)
 {
         struct arizona *arizona = fll->arizona;
-        struct arizona_fll_cfg cfg, sync;
-        unsigned int reg, val;
-        int syncsrc;
-        bool ena;
+        unsigned int reg;
         int ret;
 
-        if (fll->fref == Fref && fll->fout == Fout)
-                return 0;
-
         ret = regmap_read(arizona->regmap, fll->base + 1, &reg);
         if (ret != 0) {
                 arizona_fll_err(fll, "Failed to read current state: %d\n",
                                 ret);
                 return ret;
         }
-        ena = reg & ARIZONA_FLL1_ENA;
 
-        if (Fout) {
-                /* Do we have a 32kHz reference? */
-                regmap_read(arizona->regmap, ARIZONA_CLOCK_32K_1, &val);
-                switch (val & ARIZONA_CLK_32K_SRC_MASK) {
-                case ARIZONA_CLK_SRC_MCLK1:
-                case ARIZONA_CLK_SRC_MCLK2:
-                        syncsrc = val & ARIZONA_CLK_32K_SRC_MASK;
-                        break;
-                default:
-                        syncsrc = -1;
-                }
+        return reg & ARIZONA_FLL1_ENA;
+}
 
-                if (source == syncsrc)
-                        syncsrc = -1;
+static void arizona_enable_fll(struct arizona_fll *fll,
+                              struct arizona_fll_cfg *ref,
+                              struct arizona_fll_cfg *sync)
+{
+        struct arizona *arizona = fll->arizona;
+        int ret;
 
-                if (syncsrc >= 0) {
-                        ret = arizona_calc_fll(fll, &sync, Fref, Fout);
-                        if (ret != 0)
-                                return ret;
+        /*
+         * If we have both REFCLK and SYNCCLK then enable both,
+         * otherwise apply the SYNCCLK settings to REFCLK.
+         */
+        if (fll->ref_src >= 0 && fll->ref_src != fll->sync_src) {
+                regmap_update_bits(arizona->regmap, fll->base + 5,
+                                   ARIZONA_FLL1_OUTDIV_MASK,
+                                   ref->outdiv << ARIZONA_FLL1_OUTDIV_SHIFT);
+
+                arizona_apply_fll(arizona, fll->base, ref, fll->ref_src,
+                                  false);
+                if (fll->sync_src >= 0)
+                        arizona_apply_fll(arizona, fll->base + 0x10, sync,
+                                          fll->sync_src, true);
+        } else if (fll->sync_src >= 0) {
+                regmap_update_bits(arizona->regmap, fll->base + 5,
+                                   ARIZONA_FLL1_OUTDIV_MASK,
+                                   sync->outdiv << ARIZONA_FLL1_OUTDIV_SHIFT);
+
+                arizona_apply_fll(arizona, fll->base, sync,
+                                  fll->sync_src, false);
 
-                        ret = arizona_calc_fll(fll, &cfg, 32768, Fout);
-                        if (ret != 0)
-                                return ret;
-                } else {
-                        ret = arizona_calc_fll(fll, &cfg, Fref, Fout);
-                        if (ret != 0)
-                                return ret;
-                }
-        } else {
-                regmap_update_bits(arizona->regmap, fll->base + 1,
-                                   ARIZONA_FLL1_ENA, 0);
                 regmap_update_bits(arizona->regmap, fll->base + 0x11,
                                    ARIZONA_FLL1_SYNC_ENA, 0);
-
-                if (ena)
-                        pm_runtime_put_autosuspend(arizona->dev);
-
-                fll->fref = Fref;
-                fll->fout = Fout;
-
-                return 0;
-        }
-
-        regmap_update_bits(arizona->regmap, fll->base + 5,
-                           ARIZONA_FLL1_OUTDIV_MASK,
-                           cfg.outdiv << ARIZONA_FLL1_OUTDIV_SHIFT);
-
-        if (syncsrc >= 0) {
-                arizona_apply_fll(arizona, fll->base, &cfg, syncsrc);
-                arizona_apply_fll(arizona, fll->base + 0x10, &sync, source);
         } else {
-                arizona_apply_fll(arizona, fll->base, &cfg, source);
+                arizona_fll_err(fll, "No clocks provided\n");
+                return;
         }
 
-        if (!ena)
+        /*
+         * Increase the bandwidth if we're not using a low frequency
+         * sync source.
+         */
+        if (fll->sync_src >= 0 && fll->sync_freq > 100000)
+                regmap_update_bits(arizona->regmap, fll->base + 0x17,
+                                   ARIZONA_FLL1_SYNC_BW, 0);
+        else
+                regmap_update_bits(arizona->regmap, fll->base + 0x17,
+                                   ARIZONA_FLL1_SYNC_BW, ARIZONA_FLL1_SYNC_BW);
+
+        if (!arizona_is_enabled_fll(fll))
                 pm_runtime_get(arizona->dev);
 
         /* Clear any pending completions */
@@ -1190,7 +1456,8 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
 
         regmap_update_bits(arizona->regmap, fll->base + 1,
                            ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
-        if (syncsrc >= 0)
+        if (fll->ref_src >= 0 && fll->sync_src >= 0 &&
+            fll->ref_src != fll->sync_src)
                 regmap_update_bits(arizona->regmap, fll->base + 0x11,
                                    ARIZONA_FLL1_SYNC_ENA,
                                    ARIZONA_FLL1_SYNC_ENA);
@@ -1199,10 +1466,88 @@ int arizona_set_fll(struct arizona_fll *fll, int source,
                                           msecs_to_jiffies(250));
         if (ret == 0)
                 arizona_fll_warn(fll, "Timed out waiting for lock\n");
+}
+
+static void arizona_disable_fll(struct arizona_fll *fll)
+{
+        struct arizona *arizona = fll->arizona;
+        bool change;
+
+        regmap_update_bits_check(arizona->regmap, fll->base + 1,
+                                 ARIZONA_FLL1_ENA, 0, &change);
+        regmap_update_bits(arizona->regmap, fll->base + 0x11,
+                           ARIZONA_FLL1_SYNC_ENA, 0);
+
+        if (change)
+                pm_runtime_put_autosuspend(arizona->dev);
+}
+
+int arizona_set_fll_refclk(struct arizona_fll *fll, int source,
+                           unsigned int Fref, unsigned int Fout)
+{
+        struct arizona_fll_cfg ref, sync;
+        int ret;
 
-        fll->fref = Fref;
+        if (fll->ref_src == source && fll->ref_freq == Fref)
+                return 0;
+
+        if (fll->fout && Fref > 0) {
+                ret = arizona_calc_fll(fll, &ref, Fref, fll->fout);
+                if (ret != 0)
+                        return ret;
+
+                if (fll->sync_src >= 0) {
+                        ret = arizona_calc_fll(fll, &sync, fll->sync_freq,
+                                               fll->fout);
+                        if (ret != 0)
+                                return ret;
+                }
+        }
+
+        fll->ref_src = source;
+        fll->ref_freq = Fref;
+
+        if (fll->fout && Fref > 0) {
+                arizona_enable_fll(fll, &ref, &sync);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(arizona_set_fll_refclk);
+
+int arizona_set_fll(struct arizona_fll *fll, int source,
+                    unsigned int Fref, unsigned int Fout)
+{
+        struct arizona_fll_cfg ref, sync;
+        int ret;
+
+        if (fll->sync_src == source &&
+            fll->sync_freq == Fref && fll->fout == Fout)
+                return 0;
+
+        if (Fout) {
+                if (fll->ref_src >= 0) {
+                        ret = arizona_calc_fll(fll, &ref, fll->ref_freq,
+                                               Fout);
+                        if (ret != 0)
+                                return ret;
+                }
+
+                ret = arizona_calc_fll(fll, &sync, Fref, Fout);
+                if (ret != 0)
+                        return ret;
+        }
+
+        fll->sync_src = source;
+        fll->sync_freq = Fref;
         fll->fout = Fout;
 
+        if (Fout) {
+                arizona_enable_fll(fll, &ref, &sync);
+        } else {
+                arizona_disable_fll(fll);
+        }
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(arizona_set_fll);
@@ -1211,12 +1556,26 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
                      int ok_irq, struct arizona_fll *fll)
 {
         int ret;
+        unsigned int val;
 
         init_completion(&fll->ok);
 
         fll->id = id;
         fll->base = base;
         fll->arizona = arizona;
+        fll->sync_src = ARIZONA_FLL_SRC_NONE;
+
+        /* Configure default refclk to 32kHz if we have one */
+        regmap_read(arizona->regmap, ARIZONA_CLOCK_32K_1, &val);
+        switch (val & ARIZONA_CLK_32K_SRC_MASK) {
+        case ARIZONA_CLK_SRC_MCLK1:
+        case ARIZONA_CLK_SRC_MCLK2:
+                fll->ref_src = val & ARIZONA_CLK_32K_SRC_MASK;
+                break;
+        default:
+                fll->ref_src = ARIZONA_FLL_SRC_NONE;
+        }
+        fll->ref_freq = 32768;
 
         snprintf(fll->lock_name, sizeof(fll->lock_name), "FLL%d lock", id);
         snprintf(fll->clock_ok_name, sizeof(fll->clock_ok_name),
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 13dd2916b721..af39f1006427 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -32,6 +32,7 @@
 #define ARIZONA_CLK_SRC_AIF2BCLK 0x9
 #define ARIZONA_CLK_SRC_AIF3BCLK 0xa
 
+#define ARIZONA_FLL_SRC_NONE      -1
 #define ARIZONA_FLL_SRC_MCLK1      0
 #define ARIZONA_FLL_SRC_MCLK2      1
 #define ARIZONA_FLL_SRC_SLIMCLK    3
@@ -48,6 +49,14 @@
 #define ARIZONA_MIXER_VOL_SHIFT                 1
 #define ARIZONA_MIXER_VOL_WIDTH                 7
 
+#define ARIZONA_CLK_6MHZ   0
+#define ARIZONA_CLK_12MHZ  1
+#define ARIZONA_CLK_24MHZ  2
+#define ARIZONA_CLK_49MHZ  3
+#define ARIZONA_CLK_73MHZ  4
+#define ARIZONA_CLK_98MHZ  5
+#define ARIZONA_CLK_147MHZ 6
+
 #define ARIZONA_MAX_DAI  4
 #define ARIZONA_MAX_ADSP 4
 
@@ -64,6 +73,12 @@ struct arizona_priv {
         int sysclk;
         int asyncclk;
         struct arizona_dai_priv dai[ARIZONA_MAX_DAI];
+
+        int num_inputs;
+        unsigned int in_pending;
+
+        unsigned int spk_ena:2;
+        unsigned int spk_ena_pending:1;
 };
 
 #define ARIZONA_NUM_MIXER_INPUTS 99
@@ -165,6 +180,12 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
         ARIZONA_MIXER_ROUTES(name, name "L"), \
         ARIZONA_MIXER_ROUTES(name, name "R")
 
+#define ARIZONA_RATE_ENUM_SIZE 4
+extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE];
+extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE];
+
+extern const struct soc_enum arizona_isrc_fsl[];
+
 extern const struct soc_enum arizona_in_vi_ramp;
 extern const struct soc_enum arizona_in_vd_ramp;
 
@@ -201,8 +222,12 @@ struct arizona_fll {
         unsigned int base;
         unsigned int vco_mult;
         struct completion ok;
-        unsigned int fref;
+
         unsigned int fout;
+        int sync_src;
+        unsigned int sync_freq;
+        int ref_src;
+        unsigned int ref_freq;
 
         char lock_name[ARIZONA_FLL_NAME_LEN];
         char clock_ok_name[ARIZONA_FLL_NAME_LEN];
@@ -210,9 +235,13 @@ struct arizona_fll {
 
 extern int arizona_init_fll(struct arizona *arizona, int id, int base,
                             int lock_irq, int ok_irq, struct arizona_fll *fll);
+extern int arizona_set_fll_refclk(struct arizona_fll *fll, int source,
+                                  unsigned int Fref, unsigned int Fout);
 extern int arizona_set_fll(struct arizona_fll *fll, int source,
                            unsigned int Fref, unsigned int Fout);
 
+extern int arizona_init_spk(struct snd_soc_codec *codec);
+
 extern int arizona_init_dai(struct arizona_priv *priv, int dai);
 
 int arizona_set_output_mode(struct snd_soc_codec *codec, int output,
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 2415a4118dbd..03036b326732 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -39,17 +39,15 @@
 
 /*
  * CS4271 registers
- * High byte represents SPI chip address (0x10) + write command (0)
- * Low byte - codec register address
  */
-#define CS4271_MODE1    0x2001  /* Mode Control 1 */
-#define CS4271_DACCTL   0x2002  /* DAC Control */
-#define CS4271_DACVOL   0x2003  /* DAC Volume & Mixing Control */
-#define CS4271_VOLA     0x2004  /* DAC Channel A Volume Control */
-#define CS4271_VOLB     0x2005  /* DAC Channel B Volume Control */
-#define CS4271_ADCCTL   0x2006  /* ADC Control */
-#define CS4271_MODE2    0x2007  /* Mode Control 2 */
-#define CS4271_CHIPID   0x2008  /* Chip ID */
+#define CS4271_MODE1    0x01    /* Mode Control 1 */
+#define CS4271_DACCTL   0x02    /* DAC Control */
+#define CS4271_DACVOL   0x03    /* DAC Volume & Mixing Control */
+#define CS4271_VOLA     0x04    /* DAC Channel A Volume Control */
+#define CS4271_VOLB     0x05    /* DAC Channel B Volume Control */
+#define CS4271_ADCCTL   0x06    /* ADC Control */
+#define CS4271_MODE2    0x07    /* Mode Control 2 */
+#define CS4271_CHIPID   0x08    /* Chip ID */
 
 #define CS4271_FIRSTREG CS4271_MODE1
 #define CS4271_LASTREG  CS4271_MODE2
@@ -144,23 +142,27 @@
  * Array do not include Chip ID, as codec driver does not use
  * registers read operations at all
  */
-static const u8 cs4271_dflt_reg[CS4271_NR_REGS] = {
-        0,
-        0,
-        CS4271_DACCTL_AMUTE,
-        CS4271_DACVOL_SOFT | CS4271_DACVOL_ATAPI_AL_BR,
-        0,
-        0,
-        0,
-        0,
+static const struct reg_default cs4271_reg_defaults[] = {
+        { CS4271_MODE1,         0, },
+        { CS4271_DACCTL,        CS4271_DACCTL_AMUTE, },
+        { CS4271_DACVOL,        CS4271_DACVOL_SOFT | CS4271_DACVOL_ATAPI_AL_BR, },
+        { CS4271_VOLA,          0, },
+        { CS4271_VOLB,          0, },
+        { CS4271_ADCCTL,        0, },
+        { CS4271_MODE2,         0, },
 };
 
+static bool cs4271_volatile_reg(struct device *dev, unsigned int reg)
+{
+        return reg == CS4271_CHIPID;
+}
+
 struct cs4271_private {
         /* SND_SOC_I2C or SND_SOC_SPI */
-        enum snd_soc_control_type       bus_type;
         unsigned int                    mclk;
         bool                            master;
         bool                            deemph;
+        struct regmap                   *regmap;
         /* Current sample rate for de-emphasis control */
         int                             rate;
         /* GPIO driving Reset pin, if any */
@@ -210,14 +212,14 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,
         switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
         case SND_SOC_DAIFMT_LEFT_J:
                 val |= CS4271_MODE1_DAC_DIF_LJ;
-                ret = snd_soc_update_bits(codec, CS4271_ADCCTL,
+                ret = regmap_update_bits(cs4271->regmap, CS4271_ADCCTL,
                         CS4271_ADCCTL_ADC_DIF_MASK, CS4271_ADCCTL_ADC_DIF_LJ);
                 if (ret < 0)
                         return ret;
                 break;
         case SND_SOC_DAIFMT_I2S:
                 val |= CS4271_MODE1_DAC_DIF_I2S;
-                ret = snd_soc_update_bits(codec, CS4271_ADCCTL,
+                ret = regmap_update_bits(cs4271->regmap, CS4271_ADCCTL,
                         CS4271_ADCCTL_ADC_DIF_MASK, CS4271_ADCCTL_ADC_DIF_I2S);
                 if (ret < 0)
                         return ret;
@@ -227,7 +229,7 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,
                 return -EINVAL;
         }
 
-        ret = snd_soc_update_bits(codec, CS4271_MODE1,
+        ret = regmap_update_bits(cs4271->regmap, CS4271_MODE1,
                 CS4271_MODE1_DAC_DIF_MASK | CS4271_MODE1_MASTER, val);
         if (ret < 0)
                 return ret;
@@ -252,7 +254,7 @@ static int cs4271_set_deemph(struct snd_soc_codec *codec)
                 val <<= 4;
         }
 
-        ret = snd_soc_update_bits(codec, CS4271_DACCTL,
+        ret = regmap_update_bits(cs4271->regmap, CS4271_DACCTL,
                 CS4271_DACCTL_DEM_MASK, val);
         if (ret < 0)
                 return ret;
@@ -341,14 +343,14 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
                      !dai->capture_active) ||
                     (substream->stream == SNDRV_PCM_STREAM_CAPTURE &&
                      !dai->playback_active)) {
-                        ret = snd_soc_update_bits(codec, CS4271_MODE2,
-                                                  CS4271_MODE2_PDN,
-                                                  CS4271_MODE2_PDN);
+                        ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
+                                                 CS4271_MODE2_PDN,
+                                                 CS4271_MODE2_PDN);
                         if (ret < 0)
                                 return ret;
 
-                        ret = snd_soc_update_bits(codec, CS4271_MODE2,
-                                                  CS4271_MODE2_PDN, 0);
+                        ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
+                                                 CS4271_MODE2_PDN, 0);
                         if (ret < 0)
                                 return ret;
                 }
@@ -378,7 +380,7 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
 
         val |= cs4271_clk_tab[i].ratio_mask;
 
-        ret = snd_soc_update_bits(codec, CS4271_MODE1,
+        ret = regmap_update_bits(cs4271->regmap, CS4271_MODE1,
                 CS4271_MODE1_MODE_MASK | CS4271_MODE1_DIV_MASK, val);
         if (ret < 0)
                 return ret;
@@ -386,22 +388,29 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
         return cs4271_set_deemph(codec);
 }
 
-static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute)
+static int cs4271_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
 {
         struct snd_soc_codec *codec = dai->codec;
+        struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
         int ret;
         int val_a = 0;
         int val_b = 0;
 
+        if (stream != SNDRV_PCM_STREAM_PLAYBACK)
+                return 0;
+
         if (mute) {
                 val_a = CS4271_VOLA_MUTE;
                 val_b = CS4271_VOLB_MUTE;
         }
 
-        ret = snd_soc_update_bits(codec, CS4271_VOLA, CS4271_VOLA_MUTE, val_a);
+        ret = regmap_update_bits(cs4271->regmap, CS4271_VOLA,
+                                 CS4271_VOLA_MUTE, val_a);
         if (ret < 0)
                 return ret;
-        ret = snd_soc_update_bits(codec, CS4271_VOLB, CS4271_VOLB_MUTE, val_b);
+
+        ret = regmap_update_bits(cs4271->regmap, CS4271_VOLB,
+                                 CS4271_VOLB_MUTE, val_b);
         if (ret < 0)
                 return ret;
 
@@ -436,7 +445,7 @@ static const struct snd_soc_dai_ops cs4271_dai_ops = {
         .hw_params      = cs4271_hw_params,
         .set_sysclk     = cs4271_set_dai_sysclk,
         .set_fmt        = cs4271_set_dai_fmt,
-        .digital_mute   = cs4271_digital_mute,
+        .mute_stream    = cs4271_mute_stream,
 };
 
 static struct snd_soc_dai_driver cs4271_dai = {
@@ -463,25 +472,33 @@ static struct snd_soc_dai_driver cs4271_dai = {
 static int cs4271_soc_suspend(struct snd_soc_codec *codec)
 {
         int ret;
+        struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
+
         /* Set power-down bit */
-        ret = snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN,
-                                  CS4271_MODE2_PDN);
+        ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
+                                 CS4271_MODE2_PDN, CS4271_MODE2_PDN);
         if (ret < 0)
                 return ret;
+
         return 0;
 }
 
 static int cs4271_soc_resume(struct snd_soc_codec *codec)
 {
         int ret;
+        struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
+
         /* Restore codec state */
-        ret = snd_soc_cache_sync(codec);
+        ret = regcache_sync(cs4271->regmap);
         if (ret < 0)
                 return ret;
+
         /* then disable the power-down bit */
-        ret = snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0);
+        ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
+                                 CS4271_MODE2_PDN, 0);
         if (ret < 0)
                 return ret;
+
         return 0;
 }
 #else
@@ -542,40 +559,22 @@ static int cs4271_probe(struct snd_soc_codec *codec)
 
         cs4271->gpio_nreset = gpio_nreset;
 
-        /*
-         * In case of I2C, chip address specified in board data.
-         * So cache IO operations use 8 bit codec register address.
-         * In case of SPI, chip address and register address
-         * passed together as 16 bit value.
-         * Anyway, register address is masked with 0xFF inside
-         * soc-cache code.
-         */
-        if (cs4271->bus_type == SND_SOC_SPI)
-                ret = snd_soc_codec_set_cache_io(codec, 16, 8,
-                        cs4271->bus_type);
-        else
-                ret = snd_soc_codec_set_cache_io(codec, 8, 8,
-                        cs4271->bus_type);
-        if (ret) {
-                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
-                return ret;
-        }
-
-        ret = snd_soc_update_bits(codec, CS4271_MODE2,
-                                  CS4271_MODE2_PDN | CS4271_MODE2_CPEN,
-                                  CS4271_MODE2_PDN | CS4271_MODE2_CPEN);
+        ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
+                                 CS4271_MODE2_PDN | CS4271_MODE2_CPEN,
+                                 CS4271_MODE2_PDN | CS4271_MODE2_CPEN);
         if (ret < 0)
                 return ret;
-        ret = snd_soc_update_bits(codec, CS4271_MODE2, CS4271_MODE2_PDN, 0);
+        ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
+                                 CS4271_MODE2_PDN, 0);
         if (ret < 0)
                 return ret;
         /* Power-up sequence requires 85 uS */
         udelay(85);
 
         if (amutec_eq_bmutec)
-                snd_soc_update_bits(codec, CS4271_MODE2,
-                                    CS4271_MODE2_MUTECAEQUB,
-                                    CS4271_MODE2_MUTECAEQUB);
+                regmap_update_bits(cs4271->regmap, CS4271_MODE2,
+                                   CS4271_MODE2_MUTECAEQUB,
+                                   CS4271_MODE2_MUTECAEQUB);
 
         return snd_soc_add_codec_controls(codec, cs4271_snd_controls,
                 ARRAY_SIZE(cs4271_snd_controls));
@@ -597,13 +596,24 @@ static struct snd_soc_codec_driver soc_codec_dev_cs4271 = {
         .remove                 = cs4271_remove,
         .suspend                = cs4271_soc_suspend,
         .resume                 = cs4271_soc_resume,
-        .reg_cache_default      = cs4271_dflt_reg,
-        .reg_cache_size         = ARRAY_SIZE(cs4271_dflt_reg),
-        .reg_word_size          = sizeof(cs4271_dflt_reg[0]),
-        .compress_type          = SND_SOC_FLAT_COMPRESSION,
 };
 
 #if defined(CONFIG_SPI_MASTER)
+
+static const struct regmap_config cs4271_spi_regmap = {
+        .reg_bits = 16,
+        .val_bits = 8,
+        .max_register = CS4271_LASTREG,
+        .read_flag_mask = 0x21,
+        .write_flag_mask = 0x20,
+
+        .reg_defaults = cs4271_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(cs4271_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = cs4271_volatile_reg,
+};
+
 static int cs4271_spi_probe(struct spi_device *spi)
 {
         struct cs4271_private *cs4271;
@@ -613,7 +623,9 @@ static int cs4271_spi_probe(struct spi_device *spi)
                 return -ENOMEM;
 
         spi_set_drvdata(spi, cs4271);
-        cs4271->bus_type = SND_SOC_SPI;
+        cs4271->regmap = devm_regmap_init_spi(spi, &cs4271_spi_regmap);
+        if (IS_ERR(cs4271->regmap))
+                return PTR_ERR(cs4271->regmap);
 
         return snd_soc_register_codec(&spi->dev, &soc_codec_dev_cs4271,
                 &cs4271_dai, 1);
@@ -643,6 +655,18 @@ static const struct i2c_device_id cs4271_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, cs4271_i2c_id);
 
+static const struct regmap_config cs4271_i2c_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .max_register = CS4271_LASTREG,
+
+        .reg_defaults = cs4271_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(cs4271_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = cs4271_volatile_reg,
+};
+
 static int cs4271_i2c_probe(struct i2c_client *client,
                             const struct i2c_device_id *id)
 {
@@ -653,7 +677,9 @@ static int cs4271_i2c_probe(struct i2c_client *client,
                 return -ENOMEM;
 
         i2c_set_clientdata(client, cs4271);
-        cs4271->bus_type = SND_SOC_I2C;
+        cs4271->regmap = devm_regmap_init_i2c(client, &cs4271_i2c_regmap);
+        if (IS_ERR(cs4271->regmap))
+                return PTR_ERR(cs4271->regmap);
 
         return snd_soc_register_codec(&client->dev, &soc_codec_dev_cs4271,
                 &cs4271_dai, 1);
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 6361dab48bd1..3b20c86cdb01 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1180,7 +1180,11 @@ static int cs42l73_pcm_hw_params(struct snd_pcm_substream *substream,
                 priv->config[id].mmcc &= 0xC0;
                 priv->config[id].mmcc |= cs42l73_mclk_coeffs[mclk_coeff].mmcc;
                 priv->config[id].spc &= 0xFC;
-                priv->config[id].spc |= MCK_SCLK_MCLK;
+                /* Use SCLK=64*Fs if internal MCLK >= 6.4MHz */
+                if (priv->mclk >= 6400000)
+                        priv->config[id].spc |= MCK_SCLK_64FS;
+                else
+                        priv->config[id].spc |= MCK_SCLK_MCLK;
         } else {
                 /* CS42L73 Slave */
                 priv->config[id].spc &= 0xFC;
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index a4c16fd70f77..3eeada57e87d 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -739,14 +739,32 @@ static const unsigned int max98088_micboost_tlv[] = {
        2, 2, TLV_DB_SCALE_ITEM(3000, 0, 0),
 };
 
+static const unsigned int max98088_hp_tlv[] = {
+        TLV_DB_RANGE_HEAD(5),
+        0, 6, TLV_DB_SCALE_ITEM(-6700, 400, 0),
+        7, 14, TLV_DB_SCALE_ITEM(-4000, 300, 0),
+        15, 21, TLV_DB_SCALE_ITEM(-1700, 200, 0),
+        22, 27, TLV_DB_SCALE_ITEM(-400, 100, 0),
+        28, 31, TLV_DB_SCALE_ITEM(150, 50, 0),
+};
+
+static const unsigned int max98088_spk_tlv[] = {
+        TLV_DB_RANGE_HEAD(5),
+        0, 6, TLV_DB_SCALE_ITEM(-6200, 400, 0),
+        7, 14, TLV_DB_SCALE_ITEM(-3500, 300, 0),
+        15, 21, TLV_DB_SCALE_ITEM(-1200, 200, 0),
+        22, 27, TLV_DB_SCALE_ITEM(100, 100, 0),
+        28, 31, TLV_DB_SCALE_ITEM(650, 50, 0),
+};
+
 static const struct snd_kcontrol_new max98088_snd_controls[] = {
 
-       SOC_DOUBLE_R("Headphone Volume", M98088_REG_39_LVL_HP_L,
-               M98088_REG_3A_LVL_HP_R, 0, 31, 0),
-       SOC_DOUBLE_R("Speaker Volume", M98088_REG_3D_LVL_SPK_L,
-               M98088_REG_3E_LVL_SPK_R, 0, 31, 0),
-       SOC_DOUBLE_R("Receiver Volume", M98088_REG_3B_LVL_REC_L,
-               M98088_REG_3C_LVL_REC_R, 0, 31, 0),
+        SOC_DOUBLE_R_TLV("Headphone Volume", M98088_REG_39_LVL_HP_L,
+                         M98088_REG_3A_LVL_HP_R, 0, 31, 0, max98088_hp_tlv),
+        SOC_DOUBLE_R_TLV("Speaker Volume", M98088_REG_3D_LVL_SPK_L,
+                         M98088_REG_3E_LVL_SPK_R, 0, 31, 0, max98088_spk_tlv),
+        SOC_DOUBLE_R_TLV("Receiver Volume", M98088_REG_3B_LVL_REC_L,
+                         M98088_REG_3C_LVL_REC_R, 0, 31, 0, max98088_spk_tlv),
 
        SOC_DOUBLE_R("Headphone Switch", M98088_REG_39_LVL_HP_L,
                M98088_REG_3A_LVL_HP_R, 7, 1, 1),
@@ -2006,7 +2024,7 @@ static int max98088_probe(struct snd_soc_codec *codec)
                        ret);
                goto err_access;
        }
-       dev_info(codec->dev, "revision %c\n", ret + 'A');
+       dev_info(codec->dev, "revision %c\n", ret - 0x40 + 'A');
 
        snd_soc_write(codec, M98088_REG_51_PWR_SYS, M98088_PWRSV);
 
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index fc176044994d..ce0d36412c97 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -23,8 +23,6 @@
 #include <sound/max98090.h>
 #include "max98090.h"
 
-#include <linux/version.h>
-
 #define DEBUG
 #define EXTMIC_METHOD
 #define EXTMIC_METHOD_TEST
@@ -509,16 +507,16 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static const char * max98090_perf_pwr_text[] =
+static const char *max98090_perf_pwr_text[] =
         { "High Performance", "Low Power" };
-static const char * max98090_pwr_perf_text[] =
+static const char *max98090_pwr_perf_text[] =
         { "Low Power", "High Performance" };
 
 static const struct soc_enum max98090_vcmbandgap_enum =
         SOC_ENUM_SINGLE(M98090_REG_BIAS_CONTROL, M98090_VCM_MODE_SHIFT,
                 ARRAY_SIZE(max98090_pwr_perf_text), max98090_pwr_perf_text);
 
-static const char * max98090_osr128_text[] = { "64*fs", "128*fs" };
+static const char *max98090_osr128_text[] = { "64*fs", "128*fs" };
 
 static const struct soc_enum max98090_osr128_enum =
         SOC_ENUM_SINGLE(M98090_REG_ADC_CONTROL, M98090_OSR128_SHIFT,
@@ -535,28 +533,28 @@ static const struct soc_enum max98090_filter_dmic34mode_enum =
                 M98090_FLT_DMIC34MODE_SHIFT,
                 ARRAY_SIZE(max98090_mode_text), max98090_mode_text);
 
-static const char * max98090_drcatk_text[] =
+static const char *max98090_drcatk_text[] =
         { "0.5ms", "1ms", "5ms", "10ms", "25ms", "50ms", "100ms", "200ms" };
 
 static const struct soc_enum max98090_drcatk_enum =
         SOC_ENUM_SINGLE(M98090_REG_DRC_TIMING, M98090_DRCATK_SHIFT,
                 ARRAY_SIZE(max98090_drcatk_text), max98090_drcatk_text);
 
-static const char * max98090_drcrls_text[] =
+static const char *max98090_drcrls_text[] =
         { "8s", "4s", "2s", "1s", "0.5s", "0.25s", "0.125s", "0.0625s" };
 
 static const struct soc_enum max98090_drcrls_enum =
         SOC_ENUM_SINGLE(M98090_REG_DRC_TIMING, M98090_DRCRLS_SHIFT,
                 ARRAY_SIZE(max98090_drcrls_text), max98090_drcrls_text);
 
-static const char * max98090_alccmp_text[] =
+static const char *max98090_alccmp_text[] =
         { "1:1", "1:1.5", "1:2", "1:4", "1:INF" };
 
 static const struct soc_enum max98090_alccmp_enum =
         SOC_ENUM_SINGLE(M98090_REG_DRC_COMPRESSOR, M98090_DRCCMP_SHIFT,
                 ARRAY_SIZE(max98090_alccmp_text), max98090_alccmp_text);
 
-static const char * max98090_drcexp_text[] = { "1:1", "2:1", "3:1" };
+static const char *max98090_drcexp_text[] = { "1:1", "2:1", "3:1" };
 
 static const struct soc_enum max98090_drcexp_enum =
         SOC_ENUM_SINGLE(M98090_REG_DRC_EXPANDER, M98090_DRCEXP_SHIFT,
@@ -859,7 +857,7 @@ static const struct soc_enum mic2_mux_enum =
 static const struct snd_kcontrol_new max98090_mic2_mux =
         SOC_DAPM_ENUM("MIC2 Mux", mic2_mux_enum);
 
-static const char * max98090_micpre_text[] = { "Off", "On" };
+static const char *max98090_micpre_text[] = { "Off", "On" };
 
 static const struct soc_enum max98090_pa1en_enum =
         SOC_ENUM_SINGLE(M98090_REG_MIC1_INPUT_LEVEL, M98090_MIC_PA1EN_SHIFT,
@@ -1703,9 +1701,8 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai,
                  * seen for the case of TDM mode. The remaining cases have
                  * normal logic.
                  */
-                if (max98090->tdm_slots > 1) {
+                if (max98090->tdm_slots > 1)
                         regval ^= M98090_BCI_MASK;
-                }
 
                 snd_soc_write(codec,
                         M98090_REG_INTERFACE_FORMAT, regval);
@@ -2059,17 +2056,14 @@ static irqreturn_t max98090_interrupt(int irq, void *data)
         if (!active)
                 return IRQ_NONE;
 
-        if (active & M98090_CLD_MASK) {
+        if (active & M98090_CLD_MASK)
                 dev_err(codec->dev, "M98090_CLD_MASK\n");
-        }
 
-        if (active & M98090_SLD_MASK) {
+        if (active & M98090_SLD_MASK)
                 dev_dbg(codec->dev, "M98090_SLD_MASK\n");
-        }
 
-        if (active & M98090_ULK_MASK) {
+        if (active & M98090_ULK_MASK)
                 dev_err(codec->dev, "M98090_ULK_MASK\n");
-        }
 
         if (active & M98090_JDET_MASK) {
                 dev_dbg(codec->dev, "M98090_JDET_MASK\n");
@@ -2080,13 +2074,11 @@ static irqreturn_t max98090_interrupt(int irq, void *data)
                         msecs_to_jiffies(100));
         }
 
-        if (active & M98090_DRCACT_MASK) {
+        if (active & M98090_DRCACT_MASK)
                 dev_dbg(codec->dev, "M98090_DRCACT_MASK\n");
-        }
 
-        if (active & M98090_DRCCLP_MASK) {
+        if (active & M98090_DRCCLP_MASK)
                 dev_err(codec->dev, "M98090_DRCCLP_MASK\n");
-        }
 
         return IRQ_HANDLED;
 }
@@ -2324,7 +2316,7 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
         max98090->pdata = i2c->dev.platform_data;
         max98090->irq = i2c->irq;
 
-        max98090->regmap = regmap_init_i2c(i2c, &max98090_regmap);
+        max98090->regmap = devm_regmap_init_i2c(i2c, &max98090_regmap);
         if (IS_ERR(max98090->regmap)) {
                 ret = PTR_ERR(max98090->regmap);
                 dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
@@ -2334,18 +2326,13 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
         ret = snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_max98090, max98090_dai,
                         ARRAY_SIZE(max98090_dai));
-        if (ret < 0)
-                regmap_exit(max98090->regmap);
-
 err_enable:
         return ret;
 }
 
 static int max98090_i2c_remove(struct i2c_client *client)
 {
-        struct max98090_priv *max98090 = dev_get_drvdata(&client->dev);
         snd_soc_unregister_codec(&client->dev);
-        regmap_exit(max98090->regmap);
         return 0;
 }
 
@@ -2369,7 +2356,7 @@ static int max98090_runtime_suspend(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops max98090_pm = {
+static const struct dev_pm_ops max98090_pm = {
         SET_RUNTIME_PM_OPS(max98090_runtime_suspend,
                 max98090_runtime_resume, NULL)
 };
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c
index 566ea3256e2d..721587c9cd84 100644
--- a/sound/soc/codecs/si476x.c
+++ b/sound/soc/codecs/si476x.c
@@ -1,3 +1,22 @@
+/*
+ * sound/soc/codecs/si476x.c -- Codec driver for SI476X chips
+ *
+ * Copyright (C) 2012 Innovative Converged Devices(ICD)
+ * Copyright (C) 2013 Andrey Smirnov
+ *
+ * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <sound/pcm.h>
@@ -45,13 +64,23 @@ static unsigned int si476x_codec_read(struct snd_soc_codec *codec,
                                       unsigned int reg)
 {
         int err;
+        unsigned int val;
         struct si476x_core *core = codec->control_data;
 
         si476x_core_lock(core);
-        err = si476x_core_cmd_get_property(core, reg);
+        if (!si476x_core_is_powered_up(core))
+                regcache_cache_only(core->regmap, true);
+
+        err = regmap_read(core->regmap, reg, &val);
+
+        if (!si476x_core_is_powered_up(core))
+                regcache_cache_only(core->regmap, false);
         si476x_core_unlock(core);
 
-        return err;
+        if (err < 0)
+                return err;
+
+        return val;
 }
 
 static int si476x_codec_write(struct snd_soc_codec *codec,
@@ -61,7 +90,13 @@ static int si476x_codec_write(struct snd_soc_codec *codec,
         struct si476x_core *core = codec->control_data;
 
         si476x_core_lock(core);
-        err = si476x_core_cmd_set_property(core, reg, val);
+        if (!si476x_core_is_powered_up(core))
+                regcache_cache_only(core->regmap, true);
+
+        err = regmap_write(core->regmap, reg, val);
+
+        if (!si476x_core_is_powered_up(core))
+                regcache_cache_only(core->regmap, false);
         si476x_core_unlock(core);
 
         return err;
@@ -140,7 +175,7 @@ static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai,
                 dev_err(codec_dai->codec->dev, "Failed to set output format\n");
                 return err;
         }
-        
+
         return 0;
 }
 
@@ -182,7 +217,7 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream,
 
         err = snd_soc_update_bits(dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
                                   SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK,
-                                  (width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) | 
+                                  (width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) |
                                   (width << SI476X_DIGITAL_IO_SAMPLE_SIZE_SHIFT));
         if (err < 0) {
                 dev_err(dai->codec->dev, "Failed to set output width\n");
@@ -251,6 +286,6 @@ static struct platform_driver si476x_platform_driver = {
 };
 module_platform_driver(si476x_platform_driver);
 
-MODULE_AUTHOR("Andrey Smirnov <andrey.smirnov@convergeddevices.net>");
+MODULE_AUTHOR("Andrey Smirnov <andrew.smirnov@gmail.com>");
 MODULE_DESCRIPTION("ASoC Si4761/64 codec driver");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
new file mode 100644
index 000000000000..d447c4aa1d5e
--- /dev/null
+++ b/sound/soc/codecs/tas5086.c
@@ -0,0 +1,591 @@
+/*
+ * TAS5086 ASoC codec driver
+ *
+ * Copyright (c) 2013 Daniel Mack <zonque@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * TODO:
+ *  - implement DAPM and input muxing
+ *  - implement modulation limit
+ *  - implement non-default PWM start
+ *
+ * Note that this chip has a very unusual register layout, specifically
+ * because the registers are of unequal size, and multi-byte registers
+ * require bulk writes to take effect. Regmap does not support that kind
+ * of devices.
+ *
+ * Currently, the driver does not touch any of the registers >= 0x20, so
+ * it doesn't matter because the entire map can be accessed as 8-bit
+ * array. In case more features will be added in the future
+ * that require access to higher registers, the entire regmap H/W I/O
+ * routines have to be open-coded.
+ */
+
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/i2c.h>
+#include <linux/regmap.h>
+#include <linux/spi/spi.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+#include <sound/tas5086.h>
+
+#define TAS5086_PCM_FORMATS (SNDRV_PCM_FMTBIT_S16_LE  |         \
+                             SNDRV_PCM_FMTBIT_S20_3LE |         \
+                             SNDRV_PCM_FMTBIT_S24_3LE)
+
+#define TAS5086_PCM_RATES   (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100  | \
+                             SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200  | \
+                             SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | \
+                             SNDRV_PCM_RATE_192000)
+
+/*
+ * TAS5086 registers
+ */
+#define TAS5086_CLOCK_CONTROL           0x00    /* Clock control register  */
+#define TAS5086_CLOCK_RATE(val)         (val << 5)
+#define TAS5086_CLOCK_RATE_MASK         (0x7 << 5)
+#define TAS5086_CLOCK_RATIO(val)        (val << 2)
+#define TAS5086_CLOCK_RATIO_MASK        (0x7 << 2)
+#define TAS5086_CLOCK_SCLK_RATIO_48     (1 << 1)
+#define TAS5086_CLOCK_VALID             (1 << 0)
+
+#define TAS5086_DEEMPH_MASK             0x03
+#define TAS5086_SOFT_MUTE_ALL           0x3f
+
+#define TAS5086_DEV_ID                  0x01    /* Device ID register */
+#define TAS5086_ERROR_STATUS            0x02    /* Error status register */
+#define TAS5086_SYS_CONTROL_1           0x03    /* System control register 1 */
+#define TAS5086_SERIAL_DATA_IF          0x04    /* Serial data interface register  */
+#define TAS5086_SYS_CONTROL_2           0x05    /* System control register 2 */
+#define TAS5086_SOFT_MUTE               0x06    /* Soft mute register */
+#define TAS5086_MASTER_VOL              0x07    /* Master volume  */
+#define TAS5086_CHANNEL_VOL(X)          (0x08 + (X))    /* Channel 1-6 volume */
+#define TAS5086_VOLUME_CONTROL          0x09    /* Volume control register */
+#define TAS5086_MOD_LIMIT               0x10    /* Modulation limit register */
+#define TAS5086_PWM_START               0x18    /* PWM start register */
+#define TAS5086_SURROUND                0x19    /* Surround register */
+#define TAS5086_SPLIT_CAP_CHARGE        0x1a    /* Split cap charge period register */
+#define TAS5086_OSC_TRIM                0x1b    /* Oscillator trim register */
+#define TAS5086_BKNDERR                 0x1c
+
+/*
+ * Default TAS5086 power-up configuration
+ */
+static const struct reg_default tas5086_reg_defaults[] = {
+        { 0x00, 0x6c },
+        { 0x01, 0x03 },
+        { 0x02, 0x00 },
+        { 0x03, 0xa0 },
+        { 0x04, 0x05 },
+        { 0x05, 0x60 },
+        { 0x06, 0x00 },
+        { 0x07, 0xff },
+        { 0x08, 0x30 },
+        { 0x09, 0x30 },
+        { 0x0a, 0x30 },
+        { 0x0b, 0x30 },
+        { 0x0c, 0x30 },
+        { 0x0d, 0x30 },
+        { 0x0e, 0xb1 },
+        { 0x0f, 0x00 },
+        { 0x10, 0x02 },
+        { 0x11, 0x00 },
+        { 0x12, 0x00 },
+        { 0x13, 0x00 },
+        { 0x14, 0x00 },
+        { 0x15, 0x00 },
+        { 0x16, 0x00 },
+        { 0x17, 0x00 },
+        { 0x18, 0x3f },
+        { 0x19, 0x00 },
+        { 0x1a, 0x18 },
+        { 0x1b, 0x82 },
+        { 0x1c, 0x05 },
+};
+
+static bool tas5086_accessible_reg(struct device *dev, unsigned int reg)
+{
+        return !((reg == 0x0f) || (reg >= 0x11 && reg <= 0x17));
+}
+
+static bool tas5086_volatile_reg(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case TAS5086_DEV_ID:
+        case TAS5086_ERROR_STATUS:
+                return true;
+        }
+
+        return false;
+}
+
+static bool tas5086_writeable_reg(struct device *dev, unsigned int reg)
+{
+        return tas5086_accessible_reg(dev, reg) && (reg != TAS5086_DEV_ID);
+}
+
+struct tas5086_private {
+        struct regmap   *regmap;
+        unsigned int    mclk, sclk;
+        unsigned int    format;
+        bool            deemph;
+        /* Current sample rate for de-emphasis control */
+        int             rate;
+        /* GPIO driving Reset pin, if any */
+        int             gpio_nreset;
+};
+
+static int tas5086_deemph[] = { 0, 32000, 44100, 48000 };
+
+static int tas5086_set_deemph(struct snd_soc_codec *codec)
+{
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+        int i, val = 0;
+
+        if (priv->deemph)
+                for (i = 0; i < ARRAY_SIZE(tas5086_deemph); i++)
+                        if (tas5086_deemph[i] == priv->rate)
+                                val = i;
+
+        return regmap_update_bits(priv->regmap, TAS5086_SYS_CONTROL_1,
+                                  TAS5086_DEEMPH_MASK, val);
+}
+
+static int tas5086_get_deemph(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        ucontrol->value.enumerated.item[0] = priv->deemph;
+
+        return 0;
+}
+
+static int tas5086_put_deemph(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        priv->deemph = ucontrol->value.enumerated.item[0];
+
+        return tas5086_set_deemph(codec);
+}
+
+
+static int tas5086_set_dai_sysclk(struct snd_soc_dai *codec_dai,
+                                  int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        switch (clk_id) {
+        case TAS5086_CLK_IDX_MCLK:
+                priv->mclk = freq;
+                break;
+        case TAS5086_CLK_IDX_SCLK:
+                priv->sclk = freq;
+                break;
+        }
+
+        return 0;
+}
+
+static int tas5086_set_dai_fmt(struct snd_soc_dai *codec_dai,
+                               unsigned int format)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        /* The TAS5086 can only be slave to all clocks */
+        if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) {
+                dev_err(codec->dev, "Invalid clocking mode\n");
+                return -EINVAL;
+        }
+
+        /* we need to refer to the data format from hw_params() */
+        priv->format = format;
+
+        return 0;
+}
+
+static const int tas5086_sample_rates[] = {
+        32000, 38000, 44100, 48000, 88200, 96000, 176400, 192000
+};
+
+static const int tas5086_ratios[] = {
+        64, 128, 192, 256, 384, 512
+};
+
+static int index_in_array(const int *array, int len, int needle)
+{
+        int i;
+
+        for (i = 0; i < len; i++)
+                if (array[i] == needle)
+                        return i;
+
+        return -ENOENT;
+}
+
+static int tas5086_hw_params(struct snd_pcm_substream *substream,
+                             struct snd_pcm_hw_params *params,
+                             struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+        int val;
+        int ret;
+
+        priv->rate = params_rate(params);
+
+        /* Look up the sample rate and refer to the offset in the list */
+        val = index_in_array(tas5086_sample_rates,
+                             ARRAY_SIZE(tas5086_sample_rates), priv->rate);
+
+        if (val < 0) {
+                dev_err(codec->dev, "Invalid sample rate\n");
+                return -EINVAL;
+        }
+
+        ret = regmap_update_bits(priv->regmap, TAS5086_CLOCK_CONTROL,
+                                 TAS5086_CLOCK_RATE_MASK,
+                                 TAS5086_CLOCK_RATE(val));
+        if (ret < 0)
+                return ret;
+
+        /* MCLK / Fs ratio */
+        val = index_in_array(tas5086_ratios, ARRAY_SIZE(tas5086_ratios),
+                             priv->mclk / priv->rate);
+        if (val < 0) {
+                dev_err(codec->dev, "Inavlid MCLK / Fs ratio\n");
+                return -EINVAL;
+        }
+
+        ret = regmap_update_bits(priv->regmap, TAS5086_CLOCK_CONTROL,
+                                 TAS5086_CLOCK_RATIO_MASK,
+                                 TAS5086_CLOCK_RATIO(val));
+        if (ret < 0)
+                return ret;
+
+
+        ret = regmap_update_bits(priv->regmap, TAS5086_CLOCK_CONTROL,
+                                 TAS5086_CLOCK_SCLK_RATIO_48,
+                                 (priv->sclk == 48 * priv->rate) ? 
+                                        TAS5086_CLOCK_SCLK_RATIO_48 : 0);
+        if (ret < 0)
+                return ret;
+
+        /*
+         * The chip has a very unituitive register mapping and muxes information
+         * about data format and sample depth into the same register, but not on
+         * a logical bit-boundary. Hence, we have to refer to the format passed
+         * in the set_dai_fmt() callback and set up everything from here.
+         *
+         * First, determine the 'base' value, using the format ...
+         */
+        switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_RIGHT_J:
+                val = 0x00;
+                break;
+        case SND_SOC_DAIFMT_I2S:
+                val = 0x03;
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                val = 0x06;
+                break;
+        default:
+                dev_err(codec->dev, "Invalid DAI format\n");
+                return -EINVAL;
+        }
+
+        /* ... then add the offset for the sample bit depth. */
+        switch (params_format(params)) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                val += 0;
+                break;
+        case SNDRV_PCM_FORMAT_S20_3LE:
+                val += 1;
+                break;
+        case SNDRV_PCM_FORMAT_S24_3LE:
+                val += 2;
+                break;
+        default:
+                dev_err(codec->dev, "Invalid bit width\n");
+                return -EINVAL;
+        };
+
+        ret = regmap_write(priv->regmap, TAS5086_SERIAL_DATA_IF, val);
+        if (ret < 0)
+                return ret;
+
+        /* clock is considered valid now */
+        ret = regmap_update_bits(priv->regmap, TAS5086_CLOCK_CONTROL,
+                                 TAS5086_CLOCK_VALID, TAS5086_CLOCK_VALID);
+        if (ret < 0)
+                return ret;
+
+        return tas5086_set_deemph(codec);
+}
+
+static int tas5086_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+        unsigned int val = 0;
+
+        if (mute)
+                val = TAS5086_SOFT_MUTE_ALL;
+
+        return regmap_write(priv->regmap, TAS5086_SOFT_MUTE, val);
+}
+
+/* TAS5086 controls */
+static const DECLARE_TLV_DB_SCALE(tas5086_dac_tlv, -10350, 50, 1);
+
+static const struct snd_kcontrol_new tas5086_controls[] = {
+        SOC_SINGLE_TLV("Master Playback Volume", TAS5086_MASTER_VOL,
+                       0, 0xff, 1, tas5086_dac_tlv),
+        SOC_DOUBLE_R_TLV("Channel 1/2 Playback Volume",
+                         TAS5086_CHANNEL_VOL(0), TAS5086_CHANNEL_VOL(1),
+                         0, 0xff, 1, tas5086_dac_tlv),
+        SOC_DOUBLE_R_TLV("Channel 3/4 Playback Volume",
+                         TAS5086_CHANNEL_VOL(2), TAS5086_CHANNEL_VOL(3),
+                         0, 0xff, 1, tas5086_dac_tlv),
+        SOC_DOUBLE_R_TLV("Channel 5/6 Playback Volume",
+                         TAS5086_CHANNEL_VOL(4), TAS5086_CHANNEL_VOL(5),
+                         0, 0xff, 1, tas5086_dac_tlv),
+        SOC_SINGLE_BOOL_EXT("De-emphasis Switch", 0,
+                            tas5086_get_deemph, tas5086_put_deemph),
+};
+
+static const struct snd_soc_dai_ops tas5086_dai_ops = {
+        .hw_params      = tas5086_hw_params,
+        .set_sysclk     = tas5086_set_dai_sysclk,
+        .set_fmt        = tas5086_set_dai_fmt,
+        .mute_stream    = tas5086_mute_stream,
+};
+
+static struct snd_soc_dai_driver tas5086_dai = {
+        .name = "tas5086-hifi",
+        .playback = {
+                .stream_name    = "Playback",
+                .channels_min   = 2,
+                .channels_max   = 6,
+                .rates          = TAS5086_PCM_RATES,
+                .formats        = TAS5086_PCM_FORMATS,
+        },
+        .ops = &tas5086_dai_ops,
+};
+
+#ifdef CONFIG_PM
+static int tas5086_soc_resume(struct snd_soc_codec *codec)
+{
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        /* Restore codec state */
+        return regcache_sync(priv->regmap);
+}
+#else
+#define tas5086_soc_resume      NULL
+#endif /* CONFIG_PM */
+
+#ifdef CONFIG_OF
+static const struct of_device_id tas5086_dt_ids[] = {
+        { .compatible = "ti,tas5086", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, tas5086_dt_ids);
+#endif
+
+/* charge period values in microseconds */
+static const int tas5086_charge_period[] = {
+          13000,  16900,   23400,   31200,   41600,   54600,   72800,   96200,
+         130000, 156000,  234000,  312000,  416000,  546000,  728000,  962000,
+        1300000, 169000, 2340000, 3120000, 4160000, 5460000, 7280000, 9620000,
+};
+
+static int tas5086_probe(struct snd_soc_codec *codec)
+{
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+        int charge_period = 1300000; /* hardware default is 1300 ms */
+        int i, ret;
+
+        if (of_match_device(of_match_ptr(tas5086_dt_ids), codec->dev)) {
+                struct device_node *of_node = codec->dev->of_node;
+                of_property_read_u32(of_node, "ti,charge-period", &charge_period);
+        }
+
+        /* lookup and set split-capacitor charge period */
+        if (charge_period == 0) {
+                regmap_write(priv->regmap, TAS5086_SPLIT_CAP_CHARGE, 0);
+        } else {
+                i = index_in_array(tas5086_charge_period,
+                                   ARRAY_SIZE(tas5086_charge_period),
+                                   charge_period);
+                if (i >= 0)
+                        regmap_write(priv->regmap, TAS5086_SPLIT_CAP_CHARGE,
+                                     i + 0x08);
+                else
+                        dev_warn(codec->dev,
+                                 "Invalid split-cap charge period of %d ns.\n",
+                                 charge_period);
+        }
+
+        /* enable factory trim */
+        ret = regmap_write(priv->regmap, TAS5086_OSC_TRIM, 0x00);
+        if (ret < 0)
+                return ret;
+
+        /* start all channels */
+        ret = regmap_write(priv->regmap, TAS5086_SYS_CONTROL_2, 0x20);
+        if (ret < 0)
+                return ret;
+
+        /* set master volume to 0 dB */
+        ret = regmap_write(priv->regmap, TAS5086_MASTER_VOL, 0x30);
+        if (ret < 0)
+                return ret;
+
+        /* mute all channels for now */
+        ret = regmap_write(priv->regmap, TAS5086_SOFT_MUTE,
+                           TAS5086_SOFT_MUTE_ALL);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int tas5086_remove(struct snd_soc_codec *codec)
+{
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        if (gpio_is_valid(priv->gpio_nreset))
+                /* Set codec to the reset state */
+                gpio_set_value(priv->gpio_nreset, 0);
+
+        return 0;
+};
+
+static struct snd_soc_codec_driver soc_codec_dev_tas5086 = {
+        .probe                  = tas5086_probe,
+        .remove                 = tas5086_remove,
+        .resume                 = tas5086_soc_resume,
+        .controls               = tas5086_controls,
+        .num_controls           = ARRAY_SIZE(tas5086_controls),
+};
+
+static const struct i2c_device_id tas5086_i2c_id[] = {
+        { "tas5086", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tas5086_i2c_id);
+
+static const struct regmap_config tas5086_regmap = {
+        .reg_bits               = 8,
+        .val_bits               = 8,
+        .max_register           = ARRAY_SIZE(tas5086_reg_defaults),
+        .reg_defaults           = tas5086_reg_defaults,
+        .num_reg_defaults       = ARRAY_SIZE(tas5086_reg_defaults),
+        .cache_type             = REGCACHE_RBTREE,
+        .volatile_reg           = tas5086_volatile_reg,
+        .writeable_reg          = tas5086_writeable_reg,
+        .readable_reg           = tas5086_accessible_reg,
+};
+
+static int tas5086_i2c_probe(struct i2c_client *i2c,
+                             const struct i2c_device_id *id)
+{
+        struct tas5086_private *priv;
+        struct device *dev = &i2c->dev;
+        int gpio_nreset = -EINVAL;
+        int i, ret;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->regmap = devm_regmap_init_i2c(i2c, &tas5086_regmap);
+        if (IS_ERR(priv->regmap)) {
+                ret = PTR_ERR(priv->regmap);
+                dev_err(&i2c->dev, "Failed to create regmap: %d\n", ret);
+                return ret;
+        }
+
+        i2c_set_clientdata(i2c, priv);
+
+        if (of_match_device(of_match_ptr(tas5086_dt_ids), dev)) {
+                struct device_node *of_node = dev->of_node;
+                gpio_nreset = of_get_named_gpio(of_node, "reset-gpio", 0);
+        }
+
+        if (gpio_is_valid(gpio_nreset))
+                if (devm_gpio_request(dev, gpio_nreset, "TAS5086 Reset"))
+                        gpio_nreset = -EINVAL;
+
+        if (gpio_is_valid(gpio_nreset)) {
+                /* Reset codec - minimum assertion time is 400ns */
+                gpio_direction_output(gpio_nreset, 0);
+                udelay(1);
+                gpio_set_value(gpio_nreset, 1);
+
+                /* Codec needs ~15ms to wake up */
+                msleep(15);
+        }
+
+        priv->gpio_nreset = gpio_nreset;
+
+        /* The TAS5086 always returns 0x03 in its TAS5086_DEV_ID register */
+        ret = regmap_read(priv->regmap, TAS5086_DEV_ID, &i);
+        if (ret < 0)
+                return ret;
+
+        if (i != 0x3) {
+                dev_err(dev,
+                        "Failed to identify TAS5086 codec (got %02x)\n", i);
+                return -ENODEV;
+        }
+
+        return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_tas5086,
+                &tas5086_dai, 1);
+}
+
+static int tas5086_i2c_remove(struct i2c_client *i2c)
+{
+        snd_soc_unregister_codec(&i2c->dev);
+        return 0;
+}
+
+static struct i2c_driver tas5086_i2c_driver = {
+        .driver = {
+                .name   = "tas5086",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(tas5086_dt_ids),
+        },
+        .id_table       = tas5086_i2c_id,
+        .probe          = tas5086_i2c_probe,
+        .remove         = tas5086_i2c_remove,
+};
+
+module_i2c_driver(tas5086_i2c_driver);
+
+MODULE_AUTHOR("Daniel Mack <zonque@gmail.com>");
+MODULE_DESCRIPTION("Texas Instruments TAS5086 ALSA SoC Codec Driver");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index ad2fee4bb4cd..8df2b6e1a1a6 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -342,7 +342,7 @@ static void byte_swap_64(u64 *data_in, u64 *data_out, u32 len)
                 data_out[i] = cpu_to_be64(le64_to_cpu(data_in[i]));
 }
 
-static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec)
+static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
 {
         struct spi_device *spi = to_spi_device(codec->dev);
         struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec);
@@ -361,8 +361,8 @@ static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec)
 
         ret = request_firmware(&fw, name, codec->dev);
         if (ret != 0) {
-                dev_err(codec->dev, "Failed to request application: %d\n",
-                        ret);
+                dev_err(codec->dev, "Failed to request application(%s): %d\n",
+                        name, ret);
                 return ret;
         }
 
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index f2ac38b61a1b..7fefd766b582 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -761,6 +761,8 @@ static bool wm2000_readable_reg(struct device *dev, unsigned int reg)
         case WM2000_REG_SYS_CTL2:
         case WM2000_REG_ANC_STAT:
         case WM2000_REG_IF_CTL:
+        case WM2000_REG_ANA_MIC_CTL:
+        case WM2000_REG_SPK_CTL:
                 return true;
         default:
                 return false;
@@ -771,7 +773,7 @@ static const struct regmap_config wm2000_regmap = {
         .reg_bits = 16,
         .val_bits = 8,
 
-        .max_register = WM2000_REG_IF_CTL,
+        .max_register = WM2000_REG_SPK_CTL,
         .readable_reg = wm2000_readable_reg,
 };
 
diff --git a/sound/soc/codecs/wm2000.h b/sound/soc/codecs/wm2000.h
index fb812cd9e77d..3870c0e1d246 100644
--- a/sound/soc/codecs/wm2000.h
+++ b/sound/soc/codecs/wm2000.h
@@ -30,6 +30,8 @@
 #define WM2000_REG_SYS_CTL2         0xf004
 #define WM2000_REG_ANC_STAT         0xf005
 #define WM2000_REG_IF_CTL           0xf006
+#define WM2000_REG_ANA_MIC_CTL      0xf028
+#define WM2000_REG_SPK_CTL          0xf034
 
 /* SPEECH_CLARITY */
 #define WM2000_SPEECH_CLARITY   0x01
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index ddc98f02ecbd..57ba315d0c84 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1565,7 +1565,7 @@ static int wm2200_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
-        ret = snd_soc_add_codec_controls(codec, wm_adsp_fw_controls, 2);
+        ret = snd_soc_add_codec_controls(codec, wm_adsp1_fw_controls, 2);
         if (ret != 0)
                 return ret;
 
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 15bc31f1abb1..e895d3939eef 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -36,9 +36,6 @@
 struct wm5102_priv {
         struct arizona_priv core;
         struct arizona_fll fll[2];
-
-        unsigned int spk_ena:2;
-        unsigned int spk_ena_pending:1;
 };
 
 static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0);
@@ -615,6 +612,26 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
+static const char *wm5102_osr_text[] = {
+        "Low power", "Normal", "High performance",
+};
+
+static const unsigned int wm5102_osr_val[] = {
+        0x0, 0x3, 0x5,
+};
+
+static const struct soc_enum wm5102_hpout_osr[] = {
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_OUTPUT_PATH_CONFIG_1L,
+                              ARIZONA_OUT1_OSR_SHIFT, 0x7, 3,
+                              wm5102_osr_text, wm5102_osr_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_OUTPUT_PATH_CONFIG_2L,
+                              ARIZONA_OUT2_OSR_SHIFT, 0x7, 3,
+                              wm5102_osr_text, wm5102_osr_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_OUTPUT_PATH_CONFIG_3L,
+                              ARIZONA_OUT3_OSR_SHIFT, 0x7, 3,
+                              wm5102_osr_text, wm5102_osr_val),
+};
+
 #define WM5102_NG_SRC(name, base) \
         SOC_SINGLE(name " NG HPOUT1L Switch",  base, 0, 1, 0), \
         SOC_SINGLE(name " NG HPOUT1R Switch",  base, 1, 1, 0), \
@@ -745,6 +762,9 @@ SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),
 SOC_ENUM("LHPF3 Mode", arizona_lhpf3_mode),
 SOC_ENUM("LHPF4 Mode", arizona_lhpf4_mode),
 
+SOC_VALUE_ENUM("ISRC1 FSL", arizona_isrc_fsl[0]),
+SOC_VALUE_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
+
 ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE),
 
@@ -761,6 +781,8 @@ ARIZONA_MIXER_CONTROLS("SPKOUTR", ARIZONA_OUT4RMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("SPKDAT1L", ARIZONA_OUT5LMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("SPKDAT1R", ARIZONA_OUT5RMIX_INPUT_1_SOURCE),
 
+SOC_SINGLE("Speaker High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_4L,
+           ARIZONA_OUT4_OSR_SHIFT, 1, 0),
 SOC_SINGLE("SPKDAT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_5L,
            ARIZONA_OUT5_OSR_SHIFT, 1, 0),
 
@@ -790,6 +812,10 @@ SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_5L,
                  ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_OUT5L_VOL_SHIFT,
                  0xbf, 0, digital_tlv),
 
+SOC_VALUE_ENUM("HPOUT1 OSR", wm5102_hpout_osr[0]),
+SOC_VALUE_ENUM("HPOUT2 OSR", wm5102_hpout_osr[1]),
+SOC_VALUE_ENUM("HPOUT3 OSR", wm5102_hpout_osr[2]),
+
 SOC_ENUM("Output Ramp Up", arizona_out_vi_ramp),
 SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
 
@@ -828,47 +854,6 @@ ARIZONA_MIXER_CONTROLS("AIF3TX1", ARIZONA_AIF3TX1MIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("AIF3TX2", ARIZONA_AIF3TX2MIX_INPUT_1_SOURCE),
 };
 
-static int wm5102_spk_ev(struct snd_soc_dapm_widget *w,
-                         struct snd_kcontrol *kcontrol,
-                         int event)
-{
-        struct snd_soc_codec *codec = w->codec;
-        struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
-        struct wm5102_priv *wm5102 = snd_soc_codec_get_drvdata(codec);
-
-        if (arizona->rev < 1)
-                return 0;
-
-        switch (event) {
-        case SND_SOC_DAPM_PRE_PMU:
-                if (!wm5102->spk_ena) {
-                        snd_soc_write(codec, 0x4f5, 0x25a);
-                        wm5102->spk_ena_pending = true;
-                }
-                break;
-        case SND_SOC_DAPM_POST_PMU:
-                if (wm5102->spk_ena_pending) {
-                        msleep(75);
-                        snd_soc_write(codec, 0x4f5, 0xda);
-                        wm5102->spk_ena_pending = false;
-                        wm5102->spk_ena++;
-                }
-                break;
-        case SND_SOC_DAPM_PRE_PMD:
-                wm5102->spk_ena--;
-                if (!wm5102->spk_ena)
-                        snd_soc_write(codec, 0x4f5, 0x25a);
-                break;
-        case SND_SOC_DAPM_POST_PMD:
-                if (!wm5102->spk_ena)
-                        snd_soc_write(codec, 0x4f5, 0x0da);
-                break;
-        }
-
-        return 0;
-}
-
-
 ARIZONA_MIXER_ENUMS(EQ1, ARIZONA_EQ1MIX_INPUT_1_SOURCE);
 ARIZONA_MIXER_ENUMS(EQ2, ARIZONA_EQ2MIX_INPUT_1_SOURCE);
 ARIZONA_MIXER_ENUMS(EQ3, ARIZONA_EQ3MIX_INPUT_1_SOURCE);
@@ -984,22 +969,28 @@ SND_SOC_DAPM_INPUT("IN3R"),
 
 SND_SOC_DAPM_PGA_E("IN1L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN1L_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN1R PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN1R_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN2L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN2L_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN2R PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN2R_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN3L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN3L_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN3R PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN3R_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 
 SND_SOC_DAPM_SUPPLY("MICBIAS1", ARIZONA_MIC_BIAS_CTRL_1,
                     ARIZONA_MICB1_ENA_SHIFT, 0, NULL, 0),
@@ -1146,12 +1137,6 @@ SND_SOC_DAPM_PGA_E("OUT2R", ARIZONA_OUTPUT_ENABLES_1,
 SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT3L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
                    SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
-SND_SOC_DAPM_PGA_E("OUT4L", ARIZONA_OUTPUT_ENABLES_1,
-                   ARIZONA_OUT4L_ENA_SHIFT, 0, NULL, 0, wm5102_spk_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
-SND_SOC_DAPM_PGA_E("OUT4R", ARIZONA_OUTPUT_ENABLES_1,
-                   ARIZONA_OUT4R_ENA_SHIFT, 0, NULL, 0, wm5102_spk_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT5L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
                    SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
@@ -1494,6 +1479,12 @@ static int wm5102_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
                 return arizona_set_fll(&wm5102->fll[0], source, Fref, Fout);
         case WM5102_FLL2:
                 return arizona_set_fll(&wm5102->fll[1], source, Fref, Fout);
+        case WM5102_FLL1_REFCLK:
+                return arizona_set_fll_refclk(&wm5102->fll[0], source, Fref,
+                                              Fout);
+        case WM5102_FLL2_REFCLK:
+                return arizona_set_fll_refclk(&wm5102->fll[1], source, Fref,
+                                              Fout);
         default:
                 return -EINVAL;
         }
@@ -1581,10 +1572,12 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
         if (ret != 0)
                 return ret;
 
-        ret = snd_soc_add_codec_controls(codec, wm_adsp_fw_controls, 1);
+        ret = snd_soc_add_codec_controls(codec, wm_adsp2_fw_controls, 2);
         if (ret != 0)
                 return ret;
 
+        arizona_init_spk(codec);
+
         snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");
 
         priv->core.arizona->dapm = &codec->dapm;
@@ -1604,13 +1597,6 @@ static int wm5102_codec_remove(struct snd_soc_codec *codec)
 #define WM5102_DIG_VU 0x0200
 
 static unsigned int wm5102_digital_vu[] = {
-        ARIZONA_ADC_DIGITAL_VOLUME_1L,
-        ARIZONA_ADC_DIGITAL_VOLUME_1R,
-        ARIZONA_ADC_DIGITAL_VOLUME_2L,
-        ARIZONA_ADC_DIGITAL_VOLUME_2R,
-        ARIZONA_ADC_DIGITAL_VOLUME_3L,
-        ARIZONA_ADC_DIGITAL_VOLUME_3R,
-
         ARIZONA_DAC_DIGITAL_VOLUME_1L,
         ARIZONA_DAC_DIGITAL_VOLUME_1R,
         ARIZONA_DAC_DIGITAL_VOLUME_2L,
@@ -1653,6 +1639,7 @@ static int wm5102_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, wm5102);
 
         wm5102->core.arizona = arizona;
+        wm5102->core.num_inputs = 6;
 
         wm5102->core.adsp[0].part = "wm5102";
         wm5102->core.adsp[0].num = 1;
@@ -1677,6 +1664,12 @@ static int wm5102_probe(struct platform_device *pdev)
                          ARIZONA_IRQ_FLL2_LOCK, ARIZONA_IRQ_FLL2_CLOCK_OK,
                          &wm5102->fll[1]);
 
+        /* SR2 fixed at 8kHz, SR3 fixed at 16kHz */
+        regmap_update_bits(arizona->regmap, ARIZONA_SAMPLE_RATE_2,
+                           ARIZONA_SAMPLE_RATE_2_MASK, 0x11);
+        regmap_update_bits(arizona->regmap, ARIZONA_SAMPLE_RATE_3,
+                           ARIZONA_SAMPLE_RATE_3_MASK, 0x12);
+
         for (i = 0; i < ARRAY_SIZE(wm5102_dai); i++)
                 arizona_init_dai(&wm5102->core, i);
 
diff --git a/sound/soc/codecs/wm5102.h b/sound/soc/codecs/wm5102.h
index d30477f3070c..adb38040f661 100644
--- a/sound/soc/codecs/wm5102.h
+++ b/sound/soc/codecs/wm5102.h
@@ -15,7 +15,9 @@
 
 #include "arizona.h"
 
-#define WM5102_FLL1 1
-#define WM5102_FLL2 2
+#define WM5102_FLL1        1
+#define WM5102_FLL2        2
+#define WM5102_FLL1_REFCLK 3
+#define WM5102_FLL2_REFCLK 4
 
 #endif
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 7841b42a819c..731884e04776 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -416,28 +416,36 @@ SND_SOC_DAPM_INPUT("IN4R"),
 
 SND_SOC_DAPM_PGA_E("IN1L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN1L_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN1R PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN1R_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN2L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN2L_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN2R PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN2R_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN3L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN3L_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN3R PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN3R_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN4L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN4L_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("IN4R PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN4R_ENA_SHIFT,
                    0, NULL, 0, arizona_in_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 
 SND_SOC_DAPM_SUPPLY("MICBIAS1", ARIZONA_MIC_BIAS_CTRL_1,
                     ARIZONA_MICB1_ENA_SHIFT, 0, NULL, 0),
@@ -569,12 +577,6 @@ SND_SOC_DAPM_PGA_E("OUT3L", ARIZONA_OUTPUT_ENABLES_1,
 SND_SOC_DAPM_PGA_E("OUT3R", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT3R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
                    SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
-SND_SOC_DAPM_PGA_E("OUT4L", ARIZONA_OUTPUT_ENABLES_1,
-                   ARIZONA_OUT4L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
-SND_SOC_DAPM_PGA_E("OUT4R", ARIZONA_OUTPUT_ENABLES_1,
-                   ARIZONA_OUT4R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
-                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
 SND_SOC_DAPM_PGA_E("OUT5L", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT5L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
                    SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
@@ -880,6 +882,12 @@ static int wm5110_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
                 return arizona_set_fll(&wm5110->fll[0], source, Fref, Fout);
         case WM5110_FLL2:
                 return arizona_set_fll(&wm5110->fll[1], source, Fref, Fout);
+        case WM5110_FLL1_REFCLK:
+                return arizona_set_fll_refclk(&wm5110->fll[0], source, Fref,
+                                              Fout);
+        case WM5110_FLL2_REFCLK:
+                return arizona_set_fll_refclk(&wm5110->fll[1], source, Fref,
+                                              Fout);
         default:
                 return -EINVAL;
         }
@@ -987,15 +995,6 @@ static int wm5110_codec_remove(struct snd_soc_codec *codec)
 #define WM5110_DIG_VU 0x0200
 
 static unsigned int wm5110_digital_vu[] = {
-        ARIZONA_ADC_DIGITAL_VOLUME_1L,
-        ARIZONA_ADC_DIGITAL_VOLUME_1R,
-        ARIZONA_ADC_DIGITAL_VOLUME_2L,
-        ARIZONA_ADC_DIGITAL_VOLUME_2R,
-        ARIZONA_ADC_DIGITAL_VOLUME_3L,
-        ARIZONA_ADC_DIGITAL_VOLUME_3R,
-        ARIZONA_ADC_DIGITAL_VOLUME_4L,
-        ARIZONA_ADC_DIGITAL_VOLUME_4R,
-
         ARIZONA_DAC_DIGITAL_VOLUME_1L,
         ARIZONA_DAC_DIGITAL_VOLUME_1R,
         ARIZONA_DAC_DIGITAL_VOLUME_2L,
@@ -1040,6 +1039,7 @@ static int wm5110_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, wm5110);
 
         wm5110->core.arizona = arizona;
+        wm5110->core.num_inputs = 8;
 
         for (i = 0; i < ARRAY_SIZE(wm5110->fll); i++)
                 wm5110->fll[i].vco_mult = 3;
diff --git a/sound/soc/codecs/wm5110.h b/sound/soc/codecs/wm5110.h
index 75e9351ccab0..e6c0cd4235c5 100644
--- a/sound/soc/codecs/wm5110.h
+++ b/sound/soc/codecs/wm5110.h
@@ -15,7 +15,9 @@
 
 #include "arizona.h"
 
-#define WM5110_FLL1 1
-#define WM5110_FLL2 2
+#define WM5110_FLL1        1
+#define WM5110_FLL2        2
+#define WM5110_FLL1_REFCLK 3
+#define WM5110_FLL2_REFCLK 4
 
 #endif
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index f8a31ad0b203..9d88437cdcd1 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -478,6 +478,8 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol,
 /* ALSA can only do steps of .01dB */
 static const DECLARE_TLV_DB_SCALE(digital_tlv, -7200, 75, 1);
 
+static const DECLARE_TLV_DB_SCALE(dac_boost_tlv, 0, 600, 0);
+
 static const DECLARE_TLV_DB_SCALE(digital_sidetone_tlv, -3600, 300, 0);
 static const DECLARE_TLV_DB_SCALE(out_tlv, -5700, 100, 0);
 
@@ -698,6 +700,8 @@ SOC_ENUM("DAC Mute Mode", mute_mode),
 SOC_SINGLE("DAC Mono Switch", WM8903_DAC_DIGITAL_1, 12, 1, 0),
 SOC_ENUM("DAC Companding Mode", dac_companding),
 SOC_SINGLE("DAC Companding Switch", WM8903_AUDIO_INTERFACE_0, 1, 1, 0),
+SOC_SINGLE_TLV("DAC Boost Volume", WM8903_AUDIO_INTERFACE_0, 9, 3, 0,
+               dac_boost_tlv),
 SOC_SINGLE_BOOL_EXT("Playback Deemphasis Switch", 0,
                     wm8903_get_deemph, wm8903_put_deemph),
 
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index a64b93425ae3..0a4ffdd1d2a7 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -204,6 +204,7 @@ static const DECLARE_TLV_DB_SCALE(adc_tlv, -9700, 50, 0);
 static const DECLARE_TLV_DB_SCALE(dac_tlv, -12700, 50, 1);
 static const DECLARE_TLV_DB_SCALE(bypass_tlv, -2100, 300, 0);
 static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);
+static const DECLARE_TLV_DB_SCALE(boost_tlv, -1200, 300, 1);
 
 static const struct snd_kcontrol_new wm8960_snd_controls[] = {
 SOC_DOUBLE_R_TLV("Capture Volume", WM8960_LINVOL, WM8960_RINVOL,
@@ -213,6 +214,15 @@ SOC_DOUBLE_R("Capture Volume ZC Switch", WM8960_LINVOL, WM8960_RINVOL,
 SOC_DOUBLE_R("Capture Switch", WM8960_LINVOL, WM8960_RINVOL,
         7, 1, 0),
 
+SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT3 Volume",
+               WM8960_INBMIX1, 4, 7, 0, boost_tlv),
+SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT2 Volume",
+               WM8960_INBMIX1, 1, 7, 0, boost_tlv),
+SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT3 Volume",
+               WM8960_INBMIX2, 4, 7, 0, boost_tlv),
+SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT2 Volume",
+               WM8960_INBMIX2, 1, 7, 0, boost_tlv),
+
 SOC_DOUBLE_R_TLV("Playback Volume", WM8960_LDAC, WM8960_RDAC,
                  0, 255, 0, dac_tlv),
 
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index c9bd445c4976..14094f558e03 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2209,7 +2209,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
                                 vmid_reference(codec);
                                 break;
                         case WM8958:
-                                if (wm8994->revision < 1)
+                                if (control->revision < 1)
                                         vmid_reference(codec);
                                 break;
                         default:
@@ -2244,7 +2244,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
                                 vmid_dereference(codec);
                                 break;
                         case WM8958:
-                                if (wm8994->revision < 1)
+                                if (control->revision < 1)
                                         vmid_dereference(codec);
                                 break;
                         default:
@@ -2268,10 +2268,26 @@ out:
          */
         if (max(wm8994->aifclk[0], wm8994->aifclk[1]) < 50000) {
                 dev_dbg(codec->dev, "Configuring AIFs for 128fs\n");
+
+                wm8994->aifdiv[0] = snd_soc_read(codec, WM8994_AIF1_RATE)
+                        & WM8994_AIF1CLK_RATE_MASK;
+                wm8994->aifdiv[1] = snd_soc_read(codec, WM8994_AIF2_RATE)
+                        & WM8994_AIF1CLK_RATE_MASK;
+
                 snd_soc_update_bits(codec, WM8994_AIF1_RATE,
                                     WM8994_AIF1CLK_RATE_MASK, 0x1);
                 snd_soc_update_bits(codec, WM8994_AIF2_RATE,
                                     WM8994_AIF2CLK_RATE_MASK, 0x1);
+        } else if (wm8994->aifdiv[0]) {
+                snd_soc_update_bits(codec, WM8994_AIF1_RATE,
+                                    WM8994_AIF1CLK_RATE_MASK,
+                                    wm8994->aifdiv[0]);
+                snd_soc_update_bits(codec, WM8994_AIF2_RATE,
+                                    WM8994_AIF2CLK_RATE_MASK,
+                                    wm8994->aifdiv[1]);
+
+                wm8994->aifdiv[0] = 0;
+                wm8994->aifdiv[1] = 0;
         }
 
         return 0;
@@ -2368,10 +2384,26 @@ static int wm8994_set_dai_sysclk(struct snd_soc_dai *dai,
          */
         if (max(wm8994->aifclk[0], wm8994->aifclk[1]) < 50000) {
                 dev_dbg(codec->dev, "Configuring AIFs for 128fs\n");
+
+                wm8994->aifdiv[0] = snd_soc_read(codec, WM8994_AIF1_RATE)
+                        & WM8994_AIF1CLK_RATE_MASK;
+                wm8994->aifdiv[1] = snd_soc_read(codec, WM8994_AIF2_RATE)
+                        & WM8994_AIF1CLK_RATE_MASK;
+
                 snd_soc_update_bits(codec, WM8994_AIF1_RATE,
                                     WM8994_AIF1CLK_RATE_MASK, 0x1);
                 snd_soc_update_bits(codec, WM8994_AIF2_RATE,
                                     WM8994_AIF2CLK_RATE_MASK, 0x1);
+        } else if (wm8994->aifdiv[0]) {
+                snd_soc_update_bits(codec, WM8994_AIF1_RATE,
+                                    WM8994_AIF1CLK_RATE_MASK,
+                                    wm8994->aifdiv[0]);
+                snd_soc_update_bits(codec, WM8994_AIF2_RATE,
+                                    WM8994_AIF2CLK_RATE_MASK,
+                                    wm8994->aifdiv[1]);
+
+                wm8994->aifdiv[0] = 0;
+                wm8994->aifdiv[1] = 0;
         }
 
         return 0;
@@ -2411,7 +2443,7 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         switch (control->type) {
                         case WM8958:
-                                if (wm8994->revision == 0) {
+                                if (control->revision == 0) {
                                         /* Optimise performance for rev A */
                                         snd_soc_update_bits(codec,
                                                             WM8958_CHARGE_PUMP_2,
@@ -2656,6 +2688,8 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_codec *codec = dai->codec;
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
+        struct wm8994 *control = wm8994->wm8994;
+        struct wm8994_pdata *pdata = &control->pdata;
         int aif1_reg;
         int aif2_reg;
         int bclk_reg;
@@ -2723,7 +2757,14 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
         }
 
         wm8994->channels[id] = params_channels(params);
-        switch (params_channels(params)) {
+        if (pdata->max_channels_clocked[id] &&
+            wm8994->channels[id] > pdata->max_channels_clocked[id]) {
+                dev_dbg(dai->dev, "Constraining channels to %d from %d\n",
+                        pdata->max_channels_clocked[id], wm8994->channels[id]);
+                wm8994->channels[id] = pdata->max_channels_clocked[id];
+        }
+
+        switch (wm8994->channels[id]) {
         case 1:
         case 2:
                 bclk_rate *= 2;
@@ -2745,7 +2786,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
         dev_dbg(dai->dev, "AIF%dCLK is %dHz, target BCLK %dHz\n",
                 dai->id, wm8994->aifclk[id], bclk_rate);
 
-        if (params_channels(params) == 1 &&
+        if (wm8994->channels[id] == 1 &&
             (snd_soc_read(codec, aif1_reg) & 0x18) == 0x18)
                 aif2 |= WM8994_AIF1_MONO;
 
@@ -3053,7 +3094,7 @@ static int wm8994_codec_resume(struct snd_soc_codec *codec)
         int i, ret;
         unsigned int val, mask;
 
-        if (wm8994->revision < 4) {
+        if (control->revision < 4) {
                 /* force a HW read */
                 ret = regmap_read(control->regmap,
                                   WM8994_POWER_MANAGEMENT_5, &val);
@@ -3870,7 +3911,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
         codec->dapm.idle_bias_off = 1;
 
         /* Set revision-specific configuration */
-        wm8994->revision = snd_soc_read(codec, WM8994_CHIP_REVISION);
         switch (control->type) {
         case WM8994:
                 /* Single ended line outputs should have VMID on. */
@@ -3878,7 +3918,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                     !control->pdata.lineout2_diff)
                         codec->dapm.idle_bias_off = 0;
 
-                switch (wm8994->revision) {
+                switch (control->revision) {
                 case 2:
                 case 3:
                         wm8994->hubs.dcs_codes_l = -5;
@@ -3897,7 +3937,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                 wm8994->hubs.dcs_readback_mode = 1;
                 wm8994->hubs.hp_startup_mode = 1;
 
-                switch (wm8994->revision) {
+                switch (control->revision) {
                 case 0:
                         break;
                 default:
@@ -4000,7 +4040,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 
         switch (control->type) {
         case WM1811:
-                if (control->cust_id > 1 || wm8994->revision > 1) {
+                if (control->cust_id > 1 || control->revision > 1) {
                         ret = wm8994_request_irq(wm8994->wm8994,
                                                  WM8994_IRQ_GPIO(6),
                                                  wm1811_jackdet_irq, "JACKDET",
@@ -4114,7 +4154,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
         case WM8994:
                 snd_soc_dapm_new_controls(dapm, wm8994_specific_dapm_widgets,
                                           ARRAY_SIZE(wm8994_specific_dapm_widgets));
-                if (wm8994->revision < 4) {
+                if (control->revision < 4) {
                         snd_soc_dapm_new_controls(dapm, wm8994_lateclk_revd_widgets,
                                                   ARRAY_SIZE(wm8994_lateclk_revd_widgets));
                         snd_soc_dapm_new_controls(dapm, wm8994_adc_revd_widgets,
@@ -4135,7 +4175,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                                      ARRAY_SIZE(wm8958_snd_controls));
                 snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets,
                                           ARRAY_SIZE(wm8958_dapm_widgets));
-                if (wm8994->revision < 1) {
+                if (control->revision < 1) {
                         snd_soc_dapm_new_controls(dapm, wm8994_lateclk_revd_widgets,
                                                   ARRAY_SIZE(wm8994_lateclk_revd_widgets));
                         snd_soc_dapm_new_controls(dapm, wm8994_adc_revd_widgets,
@@ -4174,7 +4214,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                 snd_soc_dapm_add_routes(dapm, wm8994_intercon,
                                         ARRAY_SIZE(wm8994_intercon));
 
-                if (wm8994->revision < 4) {
+                if (control->revision < 4) {
                         snd_soc_dapm_add_routes(dapm, wm8994_revd_intercon,
                                                 ARRAY_SIZE(wm8994_revd_intercon));
                         snd_soc_dapm_add_routes(dapm, wm8994_lateclk_revd_intercon,
@@ -4185,7 +4225,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                 }
                 break;
         case WM8958:
-                if (wm8994->revision < 1) {
+                if (control->revision < 1) {
                         snd_soc_dapm_add_routes(dapm, wm8994_intercon,
                                                 ARRAY_SIZE(wm8994_intercon));
                         snd_soc_dapm_add_routes(dapm, wm8994_revd_intercon,
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h
index 45f192702024..55ddf4d57d9b 100644
--- a/sound/soc/codecs/wm8994.h
+++ b/sound/soc/codecs/wm8994.h
@@ -79,6 +79,7 @@ struct wm8994_priv {
         int sysclk_rate[2];
         int mclk[2];
         int aifclk[2];
+        int aifdiv[2];
         int channels[2];
         struct wm8994_fll_config fll[2], fll_suspend[2];
         struct completion fll_locked[2];
@@ -146,8 +147,6 @@ struct wm8994_priv {
         wm1811_mic_id_cb mic_id_cb;
         void *mic_id_cb_data;
 
-        int revision;
-
         unsigned int aif1clk_enable:1;
         unsigned int aif2clk_enable:1;
 
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 9af1bddc4c62..3470b649c0b2 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -31,6 +31,7 @@
 
 #include <linux/mfd/arizona/registers.h>
 
+#include "arizona.h"
 #include "wm_adsp.h"
 
 #define adsp_crit(_dsp, fmt, ...) \
@@ -193,17 +194,25 @@ static void wm_adsp_buf_free(struct list_head *list)
 
 #define WM_ADSP_NUM_FW 4
 
+#define WM_ADSP_FW_MBC_VSS 0
+#define WM_ADSP_FW_TX      1
+#define WM_ADSP_FW_TX_SPK  2
+#define WM_ADSP_FW_RX_ANC  3
+
 static const char *wm_adsp_fw_text[WM_ADSP_NUM_FW] = {
-        "MBC/VSS", "Tx", "Tx Speaker", "Rx ANC"
+        [WM_ADSP_FW_MBC_VSS] = "MBC/VSS",
+        [WM_ADSP_FW_TX] =      "Tx",
+        [WM_ADSP_FW_TX_SPK] =  "Tx Speaker",
+        [WM_ADSP_FW_RX_ANC] =  "Rx ANC",
 };
 
 static struct {
         const char *file;
 } wm_adsp_fw[WM_ADSP_NUM_FW] = {
-        { .file = "mbc-vss" },
-        { .file = "tx" },
-        { .file = "tx-spk" },
-        { .file = "rx-anc" },
+        [WM_ADSP_FW_MBC_VSS] = { .file = "mbc-vss" },
+        [WM_ADSP_FW_TX] =      { .file = "tx" },
+        [WM_ADSP_FW_TX_SPK] =  { .file = "tx-spk" },
+        [WM_ADSP_FW_RX_ANC] =  { .file = "rx-anc" },
 };
 
 static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,
@@ -246,17 +255,52 @@ static const struct soc_enum wm_adsp_fw_enum[] = {
         SOC_ENUM_SINGLE(0, 3, ARRAY_SIZE(wm_adsp_fw_text), wm_adsp_fw_text),
 };
 
-const struct snd_kcontrol_new wm_adsp_fw_controls[] = {
+const struct snd_kcontrol_new wm_adsp1_fw_controls[] = {
+        SOC_ENUM_EXT("DSP1 Firmware", wm_adsp_fw_enum[0],
+                     wm_adsp_fw_get, wm_adsp_fw_put),
+        SOC_ENUM_EXT("DSP2 Firmware", wm_adsp_fw_enum[1],
+                     wm_adsp_fw_get, wm_adsp_fw_put),
+        SOC_ENUM_EXT("DSP3 Firmware", wm_adsp_fw_enum[2],
+                     wm_adsp_fw_get, wm_adsp_fw_put),
+};
+EXPORT_SYMBOL_GPL(wm_adsp1_fw_controls);
+
+#if IS_ENABLED(CONFIG_SND_SOC_ARIZONA)
+static const struct soc_enum wm_adsp2_rate_enum[] = {
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP1_CONTROL_1,
+                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP2_CONTROL_1,
+                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP3_CONTROL_1,
+                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DSP3_CONTROL_1,
+                              ARIZONA_DSP1_RATE_SHIFT, 0xf,
+                              ARIZONA_RATE_ENUM_SIZE,
+                              arizona_rate_text, arizona_rate_val),
+};
+
+const struct snd_kcontrol_new wm_adsp2_fw_controls[] = {
         SOC_ENUM_EXT("DSP1 Firmware", wm_adsp_fw_enum[0],
                      wm_adsp_fw_get, wm_adsp_fw_put),
+        SOC_ENUM("DSP1 Rate", wm_adsp2_rate_enum[0]),
         SOC_ENUM_EXT("DSP2 Firmware", wm_adsp_fw_enum[1],
                      wm_adsp_fw_get, wm_adsp_fw_put),
+        SOC_ENUM("DSP2 Rate", wm_adsp2_rate_enum[1]),
         SOC_ENUM_EXT("DSP3 Firmware", wm_adsp_fw_enum[2],
                      wm_adsp_fw_get, wm_adsp_fw_put),
+        SOC_ENUM("DSP3 Rate", wm_adsp2_rate_enum[2]),
         SOC_ENUM_EXT("DSP4 Firmware", wm_adsp_fw_enum[3],
                      wm_adsp_fw_get, wm_adsp_fw_put),
+        SOC_ENUM("DSP4 Rate", wm_adsp2_rate_enum[3]),
 };
-EXPORT_SYMBOL_GPL(wm_adsp_fw_controls);
+EXPORT_SYMBOL_GPL(wm_adsp2_fw_controls);
+#endif
 
 static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp,
                                                         int type)
@@ -549,13 +593,30 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                 buf_size = sizeof(adsp1_id);
 
                 algs = be32_to_cpu(adsp1_id.algs);
+                dsp->fw_id = be32_to_cpu(adsp1_id.fw.id);
                 adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n",
-                          be32_to_cpu(adsp1_id.fw.id),
+                          dsp->fw_id,
                           (be32_to_cpu(adsp1_id.fw.ver) & 0xff0000) >> 16,
                           (be32_to_cpu(adsp1_id.fw.ver) & 0xff00) >> 8,
                           be32_to_cpu(adsp1_id.fw.ver) & 0xff,
                           algs);
 
+                region = kzalloc(sizeof(*region), GFP_KERNEL);
+                if (!region)
+                        return -ENOMEM;
+                region->type = WMFW_ADSP1_ZM;
+                region->alg = be32_to_cpu(adsp1_id.fw.id);
+                region->base = be32_to_cpu(adsp1_id.zm);
+                list_add_tail(&region->list, &dsp->alg_regions);
+
+                region = kzalloc(sizeof(*region), GFP_KERNEL);
+                if (!region)
+                        return -ENOMEM;
+                region->type = WMFW_ADSP1_DM;
+                region->alg = be32_to_cpu(adsp1_id.fw.id);
+                region->base = be32_to_cpu(adsp1_id.dm);
+                list_add_tail(&region->list, &dsp->alg_regions);
+
                 pos = sizeof(adsp1_id) / 2;
                 term = pos + ((sizeof(*adsp1_alg) * algs) / 2);
                 break;
@@ -573,13 +634,38 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp)
                 buf_size = sizeof(adsp2_id);
 
                 algs = be32_to_cpu(adsp2_id.algs);
+                dsp->fw_id = be32_to_cpu(adsp2_id.fw.id);
                 adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n",
-                          be32_to_cpu(adsp2_id.fw.id),
+                          dsp->fw_id,
                           (be32_to_cpu(adsp2_id.fw.ver) & 0xff0000) >> 16,
                           (be32_to_cpu(adsp2_id.fw.ver) & 0xff00) >> 8,
                           be32_to_cpu(adsp2_id.fw.ver) & 0xff,
                           algs);
 
+                region = kzalloc(sizeof(*region), GFP_KERNEL);
+                if (!region)
+                        return -ENOMEM;
+                region->type = WMFW_ADSP2_XM;
+                region->alg = be32_to_cpu(adsp2_id.fw.id);
+                region->base = be32_to_cpu(adsp2_id.xm);
+                list_add_tail(&region->list, &dsp->alg_regions);
+
+                region = kzalloc(sizeof(*region), GFP_KERNEL);
+                if (!region)
+                        return -ENOMEM;
+                region->type = WMFW_ADSP2_YM;
+                region->alg = be32_to_cpu(adsp2_id.fw.id);
+                region->base = be32_to_cpu(adsp2_id.ym);
+                list_add_tail(&region->list, &dsp->alg_regions);
+
+                region = kzalloc(sizeof(*region), GFP_KERNEL);
+                if (!region)
+                        return -ENOMEM;
+                region->type = WMFW_ADSP2_ZM;
+                region->alg = be32_to_cpu(adsp2_id.fw.id);
+                region->base = be32_to_cpu(adsp2_id.zm);
+                list_add_tail(&region->list, &dsp->alg_regions);
+
                 pos = sizeof(adsp2_id) / 2;
                 term = pos + ((sizeof(*adsp2_alg) * algs) / 2);
                 break;
@@ -781,8 +867,24 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
                 case (WMFW_INFO_TEXT << 8):
                         break;
                 case (WMFW_ABSOLUTE << 8):
-                        region_name = "register";
-                        reg = offset;
+                        /*
+                         * Old files may use this for global
+                         * coefficients.
+                         */
+                        if (le32_to_cpu(blk->id) == dsp->fw_id &&
+                            offset == 0) {
+                                region_name = "global coefficients";
+                                mem = wm_adsp_find_region(dsp, type);
+                                if (!mem) {
+                                        adsp_err(dsp, "No ZM\n");
+                                        break;
+                                }
+                                reg = wm_adsp_region_to_reg(mem, 0);
+
+                        } else {
+                                region_name = "register";
+                                reg = offset;
+                        }
                         break;
 
                 case WMFW_ADSP1_DM:
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index cb8871a3ec00..fea514627526 100644
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -46,6 +46,8 @@ struct wm_adsp {
 
         struct list_head alg_regions;
 
+        int fw_id;
+
         const struct wm_adsp_region *mem;
         int num_mems;
 
@@ -65,7 +67,8 @@ struct wm_adsp {
         .shift = num, .event = wm_adsp2_event, \
         .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
 
-extern const struct snd_kcontrol_new wm_adsp_fw_controls[];
+extern const struct snd_kcontrol_new wm_adsp1_fw_controls[];
+extern const struct snd_kcontrol_new wm_adsp2_fw_controls[];
 
 int wm_adsp1_init(struct wm_adsp *adsp);
 int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs);
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 867ae97ddcec..f5d81b948759 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -199,11 +199,12 @@ static void wm_hubs_dcs_cache_set(struct snd_soc_codec *codec, u16 dcs_cfg)
         list_add_tail(&cache->list, &hubs->dcs_cache);
 }
 
-static void wm_hubs_read_dc_servo(struct snd_soc_codec *codec,
+static int wm_hubs_read_dc_servo(struct snd_soc_codec *codec,
                                   u16 *reg_l, u16 *reg_r)
 {
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
         u16 dcs_reg, reg;
+        int ret = 0;
 
         switch (hubs->dcs_readback_mode) {
         case 2:
@@ -236,8 +237,9 @@ static void wm_hubs_read_dc_servo(struct snd_soc_codec *codec,
                 break;
         default:
                 WARN(1, "Unknown DCS readback method\n");
-                return;
+                ret = -1;
         }
+        return ret;
 }
 
 /*
@@ -286,7 +288,8 @@ static void enable_dc_servo(struct snd_soc_codec *codec)
                                   WM8993_DCS_TRIG_STARTUP_1);
         }
 
-        wm_hubs_read_dc_servo(codec, &reg_l, &reg_r);
+        if (wm_hubs_read_dc_servo(codec, &reg_l, &reg_r) < 0)
+                return;
 
         dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r);
 
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 821831207180..ebe82947bab3 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -645,6 +645,10 @@ static struct snd_soc_dai_driver davinci_i2s_dai = {
 
 };
 
+static const struct snd_soc_component_driver davinci_i2s_component = {
+        .name           = "davinci-i2s",
+};
+
 static int davinci_i2s_probe(struct platform_device *pdev)
 {
         struct snd_platform_data *pdata = pdev->dev.platform_data;
@@ -727,20 +731,21 @@ static int davinci_i2s_probe(struct platform_device *pdev)
 
         dev_set_drvdata(&pdev->dev, dev);
 
-        ret = snd_soc_register_dai(&pdev->dev, &davinci_i2s_dai);
+        ret = snd_soc_register_component(&pdev->dev, &davinci_i2s_component,
+                                         &davinci_i2s_dai, 1);
         if (ret != 0)
                 goto err_release_clk;
 
         ret = davinci_soc_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         return 0;
 
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_release_clk:
         clk_disable(dev->clk);
         clk_put(dev->clk);
@@ -751,7 +756,7 @@ static int davinci_i2s_remove(struct platform_device *pdev)
 {
         struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         davinci_soc_platform_unregister(&pdev->dev);
 
         clk_disable(dev->clk);
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 9321e5c9d8c1..8b85049daab0 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -235,6 +235,8 @@
 #define DISMOD          (val)(val<<2)
 #define TXSTATE         BIT(4)
 #define RXSTATE         BIT(5)
+#define SRMOD_MASK      3
+#define SRMOD_INACTIVE  0
 
 /*
  * DAVINCI_MCASP_LBCTL_REG - Loop Back Control Register Bits
@@ -634,35 +636,43 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
          * callback, take it into account here. That allows us to for example
          * send 32 bits per channel to the codec, while only 16 of them carry
          * audio payload.
-         * The clock ratio is given for a full period of data (both left and
-         * right channels), so it has to be divided by 2.
+         * The clock ratio is given for a full period of data (for I2S format
+         * both left and right channels), so it has to be divided by number of
+         * tdm-slots (for I2S - divided by 2).
          */
         if (dev->bclk_lrclk_ratio)
-                word_length = dev->bclk_lrclk_ratio / 2;
+                word_length = dev->bclk_lrclk_ratio / dev->tdm_slots;
 
         /* mapping of the XSSZ bit-field as described in the datasheet */
         fmt = (word_length >> 1) - 1;
 
-        mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
-                                        RXSSZ(fmt), RXSSZ(0x0F));
-        mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
-                                        TXSSZ(fmt), TXSSZ(0x0F));
-        mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate),
-                                                        TXROT(7));
-        mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate),
-                                                        RXROT(7));
+        if (dev->op_mode != DAVINCI_MCASP_DIT_MODE) {
+                mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
+                                RXSSZ(fmt), RXSSZ(0x0F));
+                mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
+                                TXSSZ(fmt), TXSSZ(0x0F));
+                mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
+                                TXROT(rotate), TXROT(7));
+                mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
+                                RXROT(rotate), RXROT(7));
+                mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG,
+                                mask);
+        }
+
         mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask);
-        mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask);
 
         return 0;
 }
 
-static void davinci_hw_common_param(struct davinci_audio_dev *dev, int stream)
+static int davinci_hw_common_param(struct davinci_audio_dev *dev, int stream,
+                                    int channels)
 {
         int i;
         u8 tx_ser = 0;
         u8 rx_ser = 0;
-
+        u8 ser;
+        u8 slots = dev->tdm_slots;
+        u8 max_active_serializers = (channels + slots - 1) / slots;
         /* Default configuration */
         mcasp_set_bits(dev->base + DAVINCI_MCASP_PWREMUMGT_REG, MCASP_SOFT);
 
@@ -682,17 +692,33 @@ static void davinci_hw_common_param(struct davinci_audio_dev *dev, int stream)
         for (i = 0; i < dev->num_serializer; i++) {
                 mcasp_set_bits(dev->base + DAVINCI_MCASP_XRSRCTL_REG(i),
                                         dev->serial_dir[i]);
-                if (dev->serial_dir[i] == TX_MODE) {
+                if (dev->serial_dir[i] == TX_MODE &&
+                                        tx_ser < max_active_serializers) {
                         mcasp_set_bits(dev->base + DAVINCI_MCASP_PDIR_REG,
                                         AXR(i));
                         tx_ser++;
-                } else if (dev->serial_dir[i] == RX_MODE) {
+                } else if (dev->serial_dir[i] == RX_MODE &&
+                                        rx_ser < max_active_serializers) {
                         mcasp_clr_bits(dev->base + DAVINCI_MCASP_PDIR_REG,
                                         AXR(i));
                         rx_ser++;
+                } else {
+                        mcasp_mod_bits(dev->base + DAVINCI_MCASP_XRSRCTL_REG(i),
+                                        SRMOD_INACTIVE, SRMOD_MASK);
                 }
         }
 
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                ser = tx_ser;
+        else
+                ser = rx_ser;
+
+        if (ser < max_active_serializers) {
+                dev_warn(dev->dev, "stream has more channels (%d) than are "
+                        "enabled in mcasp (%d)\n", channels, ser * slots);
+                return -EINVAL;
+        }
+
         if (dev->txnumevt && stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 if (dev->txnumevt * tx_ser > 64)
                         dev->txnumevt = 1;
@@ -729,6 +755,8 @@ static void davinci_hw_common_param(struct davinci_audio_dev *dev, int stream)
                                 ((dev->rxnumevt * rx_ser) << 8), NUMEVT_MASK);
                 }
         }
+
+        return 0;
 }
 
 static void davinci_hw_param(struct davinci_audio_dev *dev, int stream)
@@ -772,12 +800,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream)
 /* S/PDIF */
 static void davinci_hw_dit_param(struct davinci_audio_dev *dev)
 {
-        /* Set the PDIR for Serialiser as output */
-        mcasp_set_bits(dev->base + DAVINCI_MCASP_PDIR_REG, AFSX);
-
-        /* TXMASK for 24 bits */
-        mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0x00FFFFFF);
-
         /* Set the TX format : 24 bit right rotation, 32 bit slot, Pad 0
            and LSB first */
         mcasp_set_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
@@ -812,12 +834,21 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
                                         &dev->dma_params[substream->stream];
         int word_length;
         u8 fifo_level;
+        u8 slots = dev->tdm_slots;
+        u8 active_serializers;
+        int channels;
+        struct snd_interval *pcm_channels = hw_param_interval(params,
+                                        SNDRV_PCM_HW_PARAM_CHANNELS);
+        channels = pcm_channels->min;
+
+        active_serializers = (channels + slots - 1) / slots;
 
-        davinci_hw_common_param(dev, substream->stream);
+        if (davinci_hw_common_param(dev, substream->stream, channels) == -EINVAL)
+                return -EINVAL;
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                fifo_level = dev->txnumevt;
+                fifo_level = dev->txnumevt * active_serializers;
         else
-                fifo_level = dev->rxnumevt;
+                fifo_level = dev->rxnumevt * active_serializers;
 
         if (dev->op_mode == DAVINCI_MCASP_DIT_MODE)
                 davinci_hw_dit_param(dev);
@@ -936,13 +967,13 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = {
                 .name           = "davinci-mcasp.0",
                 .playback       = {
                         .channels_min   = 2,
-                        .channels_max   = 2,
+                        .channels_max   = 32 * 16,
                         .rates          = DAVINCI_MCASP_RATES,
                         .formats        = DAVINCI_MCASP_PCM_FMTS,
                 },
                 .capture        = {
                         .channels_min   = 2,
-                        .channels_max   = 2,
+                        .channels_max   = 32 * 16,
                         .rates          = DAVINCI_MCASP_RATES,
                         .formats        = DAVINCI_MCASP_PCM_FMTS,
                 },
@@ -962,6 +993,10 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = {
 
 };
 
+static const struct snd_soc_component_driver davinci_mcasp_component = {
+        .name           = "davinci-mcasp",
+};
+
 static const struct of_device_id mcasp_dt_ids[] = {
         {
                 .compatible = "ti,dm646x-mcasp-audio",
@@ -1015,8 +1050,16 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
                 pdata->op_mode = val;
 
         ret = of_property_read_u32(np, "tdm-slots", &val);
-        if (ret >= 0)
+        if (ret >= 0) {
+                if (val < 2 || val > 32) {
+                        dev_err(&pdev->dev,
+                                "tdm-slots must be in rage [2-32]\n");
+                        ret = -EINVAL;
+                        goto nodata;
+                }
+
                 pdata->tdm_slots = val;
+        }
 
         ret = of_property_read_u32(np, "num-serializer", &val);
         if (ret >= 0)
@@ -1170,7 +1213,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 
         dma_data->channel = res->start;
         dev_set_drvdata(&pdev->dev, dev);
-        ret = snd_soc_register_dai(&pdev->dev, &davinci_mcasp_dai[pdata->op_mode]);
+        ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
+                                         &davinci_mcasp_dai[pdata->op_mode], 1);
 
         if (ret != 0)
                 goto err_release_clk;
@@ -1178,13 +1222,13 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         ret = davinci_soc_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         return 0;
 
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_release_clk:
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
@@ -1194,7 +1238,7 @@ err_release_clk:
 static int davinci_mcasp_remove(struct platform_device *pdev)
 {
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         davinci_soc_platform_unregister(&pdev->dev);
 
         pm_runtime_put_sync(&pdev->dev);
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 0edd3b5a37fd..a9ac0c11da71 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -38,7 +38,7 @@ struct davinci_audio_dev {
         u8      num_serializer;
         u8      *serial_dir;
         u8      version;
-        u8      bclk_lrclk_ratio;
+        u16     bclk_lrclk_ratio;
 
         /* McASP FIFO related */
         u8      txnumevt;
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index afab81f844ae..b2f27c2e5fdc 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -200,7 +200,7 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
                 src = dma_pos;
                 dst = prtd->params->dma_addr;
                 src_bidx = data_type;
-                dst_bidx = 0;
+                dst_bidx = 4;
                 src_cidx = data_type * fifo_level;
                 dst_cidx = 0;
         } else {
@@ -223,9 +223,10 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
                 edma_set_transfer_params(prtd->asp_link[0], acnt, count, 1, 0,
                                                         ASYNC);
         else
-                edma_set_transfer_params(prtd->asp_link[0], acnt, fifo_level,
-                                                        count, fifo_level,
-                                                        ABSYNC);
+                edma_set_transfer_params(prtd->asp_link[0], acnt,
+                                                fifo_level,
+                                                count, fifo_level,
+                                                ABSYNC);
 }
 
 static void davinci_pcm_dma_irq(unsigned link, u16 ch_status, void *data)
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c
index 07bde2e6f84e..30587c0cdbd2 100644
--- a/sound/soc/davinci/davinci-vcif.c
+++ b/sound/soc/davinci/davinci-vcif.c
@@ -204,6 +204,10 @@ static struct snd_soc_dai_driver davinci_vcif_dai = {
 
 };
 
+static const struct snd_soc_component_driver davinci_vcif_component = {
+        .name           = "davinci-vcif",
+};
+
 static int davinci_vcif_probe(struct platform_device *pdev)
 {
         struct davinci_vc *davinci_vc = pdev->dev.platform_data;
@@ -234,7 +238,8 @@ static int davinci_vcif_probe(struct platform_device *pdev)
 
         dev_set_drvdata(&pdev->dev, davinci_vcif_dev);
 
-        ret = snd_soc_register_dai(&pdev->dev, &davinci_vcif_dai);
+        ret = snd_soc_register_component(&pdev->dev, &davinci_vcif_component,
+                                         &davinci_vcif_dai, 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "could not register dai\n");
                 return ret;
@@ -243,7 +248,7 @@ static int davinci_vcif_probe(struct platform_device *pdev)
         ret = davinci_soc_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
-                snd_soc_unregister_dai(&pdev->dev);
+                snd_soc_unregister_component(&pdev->dev);
                 return ret;
         }
 
@@ -252,7 +257,7 @@ static int davinci_vcif_probe(struct platform_device *pdev)
 
 static int davinci_vcif_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         davinci_soc_platform_unregister(&pdev->dev);
 
         return 0;
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index deb30d59965e..593a3ea12d4c 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -297,6 +297,10 @@ static struct snd_soc_dai_ops dw_i2s_dai_ops = {
         .trigger        = dw_i2s_trigger,
 };
 
+static const struct snd_soc_component_driver dw_i2s_component = {
+        .name           = "dw-i2s",
+};
+
 #ifdef CONFIG_PM
 
 static int dw_i2s_suspend(struct snd_soc_dai *dai)
@@ -413,7 +417,8 @@ static int dw_i2s_probe(struct platform_device *pdev)
 
         dev->dev = &pdev->dev;
         dev_set_drvdata(&pdev->dev, dev);
-        ret = snd_soc_register_dai(&pdev->dev, dw_i2s_dai);
+        ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component,
+                                         dw_i2s_dai, 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "not able to register dai\n");
                 goto err_set_drvdata;
@@ -434,7 +439,7 @@ static int dw_i2s_remove(struct platform_device *pdev)
 {
         struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         dev_set_drvdata(&pdev->dev, NULL);
 
         clk_put(dev->clk);
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 3b98159d9645..3843a18d4e56 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -118,7 +118,7 @@ config SND_SOC_IMX_PCM_FIQ
 
 config SND_SOC_IMX_PCM_DMA
         bool
-        select SND_SOC_DMAENGINE_PCM
+        select SND_SOC_GENERIC_DMAENGINE_PCM
         select SND_SOC_IMX_PCM
 
 config SND_SOC_IMX_AUDMUX
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 7decbd9b2340..0f0bed6def9e 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -27,6 +27,7 @@
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include "fsl_ssi.h"
 #include "imx-pcm.h"
@@ -122,8 +123,10 @@ struct fsl_ssi_private {
         bool ssi_on_imx;
         struct clk *clk;
         struct platform_device *imx_pcm_pdev;
-        struct imx_pcm_dma_params dma_params_tx;
-        struct imx_pcm_dma_params dma_params_rx;
+        struct snd_dmaengine_dai_dma_data dma_params_tx;
+        struct snd_dmaengine_dai_dma_data dma_params_rx;
+        struct imx_dma_data filter_data_tx;
+        struct imx_dma_data filter_data_rx;
 
         struct {
                 unsigned int rfrc;
@@ -422,12 +425,6 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
                 ssi_private->second_stream = substream;
         }
 
-        if (ssi_private->ssi_on_imx)
-                snd_soc_dai_set_dma_data(dai, substream,
-                        (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-                                &ssi_private->dma_params_tx :
-                                &ssi_private->dma_params_rx);
-
         return 0;
 }
 
@@ -549,6 +546,18 @@ static void fsl_ssi_shutdown(struct snd_pcm_substream *substream,
         }
 }
 
+static int fsl_ssi_dai_probe(struct snd_soc_dai *dai)
+{
+        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(dai);
+
+        if (ssi_private->ssi_on_imx) {
+                dai->playback_dma_data = &ssi_private->dma_params_tx;
+                dai->capture_dma_data = &ssi_private->dma_params_rx;
+        }
+
+        return 0;
+}
+
 static const struct snd_soc_dai_ops fsl_ssi_dai_ops = {
         .startup        = fsl_ssi_startup,
         .hw_params      = fsl_ssi_hw_params,
@@ -558,6 +567,7 @@ static const struct snd_soc_dai_ops fsl_ssi_dai_ops = {
 
 /* Template for the CPU dai driver structure */
 static struct snd_soc_dai_driver fsl_ssi_dai_template = {
+        .probe = fsl_ssi_dai_probe,
         .playback = {
                 /* The SSI does not support monaural audio. */
                 .channels_min = 2,
@@ -574,6 +584,10 @@ static struct snd_soc_dai_driver fsl_ssi_dai_template = {
         .ops = &fsl_ssi_dai_ops,
 };
 
+static const struct snd_soc_component_driver fsl_ssi_component = {
+        .name           = "fsl-ssi",
+};
+
 /* Show the statistics of a flag only if its interrupt is enabled.  The
  * compiler will optimze this code to a no-op if the interrupt is not
  * enabled.
@@ -649,6 +663,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         const uint32_t *iprop;
         struct resource res;
         char name[64];
+        bool shared;
 
         /* SSIs that are not connected on the board should have a
          *      status = "disabled"
@@ -737,14 +752,18 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                  * We have burstsize be "fifo_depth - 2" to match the SSI
                  * watermark setting in fsl_ssi_startup().
                  */
-                ssi_private->dma_params_tx.burstsize =
+                ssi_private->dma_params_tx.maxburst =
                         ssi_private->fifo_depth - 2;
-                ssi_private->dma_params_rx.burstsize =
+                ssi_private->dma_params_rx.maxburst =
                         ssi_private->fifo_depth - 2;
-                ssi_private->dma_params_tx.dma_addr =
+                ssi_private->dma_params_tx.addr =
                         ssi_private->ssi_phys + offsetof(struct ccsr_ssi, stx0);
-                ssi_private->dma_params_rx.dma_addr =
+                ssi_private->dma_params_rx.addr =
                         ssi_private->ssi_phys + offsetof(struct ccsr_ssi, srx0);
+                ssi_private->dma_params_tx.filter_data =
+                        &ssi_private->filter_data_tx;
+                ssi_private->dma_params_rx.filter_data =
+                        &ssi_private->filter_data_rx;
                 /*
                  * TODO: This is a temporary solution and should be changed
                  * to use generic DMA binding later when the helplers get in.
@@ -755,14 +774,14 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "could not get dma events\n");
                         goto error_clk;
                 }
-                ssi_private->dma_params_tx.dma = dma_events[0];
-                ssi_private->dma_params_rx.dma = dma_events[1];
 
-                ssi_private->dma_params_tx.shared_peripheral =
-                                of_device_is_compatible(of_get_parent(np),
-                                                        "fsl,spba-bus");
-                ssi_private->dma_params_rx.shared_peripheral =
-                                ssi_private->dma_params_tx.shared_peripheral;
+                shared = of_device_is_compatible(of_get_parent(np),
+                            "fsl,spba-bus");
+
+                imx_pcm_dma_params_init_data(&ssi_private->filter_data_tx,
+                        dma_events[0], shared);
+                imx_pcm_dma_params_init_data(&ssi_private->filter_data_rx,
+                        dma_events[1], shared);
         }
 
         /* Initialize the the device_attribute structure */
@@ -782,7 +801,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         /* Register with ASoC */
         dev_set_drvdata(&pdev->dev, ssi_private);
 
-        ret = snd_soc_register_dai(&pdev->dev, &ssi_private->cpu_dai_drv);
+        ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
+                                         &ssi_private->cpu_dai_drv, 1);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
                 goto error_dev;
@@ -835,7 +855,7 @@ done:
 error_dai:
         if (ssi_private->ssi_on_imx)
                 platform_device_unregister(ssi_private->imx_pcm_pdev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
 error_dev:
         dev_set_drvdata(&pdev->dev, NULL);
@@ -873,7 +893,7 @@ static int fsl_ssi_remove(struct platform_device *pdev)
                 clk_disable_unprepare(ssi_private->clk);
                 clk_put(ssi_private->clk);
         }
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         device_remove_file(&pdev->dev, &ssi_private->dev_attr);
 
         free_irq(ssi_private->irq, ssi_private);
diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h
index 217300029b5b..e6b9a69e2a68 100644
--- a/sound/soc/fsl/fsl_ssi.h
+++ b/sound/soc/fsl/fsl_ssi.h
@@ -196,5 +196,13 @@ struct ccsr_ssi {
 #define CCSR_SSI_SOR_WAIT(x) (((x) & 3) << CCSR_SSI_SOR_WAIT_SHIFT)
 #define CCSR_SSI_SOR_SYNRST             0x00000001
 
+#define CCSR_SSI_SACNT_FRDIV(x)         (((x) & 0x3f) << 5)
+#define CCSR_SSI_SACNT_WR               0x00000010
+#define CCSR_SSI_SACNT_RD               0x00000008
+#define CCSR_SSI_SACNT_RDWR_MASK        0x00000018
+#define CCSR_SSI_SACNT_TIF              0x00000004
+#define CCSR_SSI_SACNT_FV               0x00000002
+#define CCSR_SSI_SACNT_AC97EN           0x00000001
+
 #endif
 
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 3f333e5b4673..47f046a8fdab 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -262,7 +262,7 @@ static int imx_audmux_probe(struct platform_device *pdev)
                 return PTR_ERR(pinctrl);
         }
 
-        audmux_clk = clk_get(&pdev->dev, "audmux");
+        audmux_clk = devm_clk_get(&pdev->dev, "audmux");
         if (IS_ERR(audmux_clk)) {
                 dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
                                 PTR_ERR(audmux_clk));
@@ -282,7 +282,6 @@ static int imx_audmux_remove(struct platform_device *pdev)
 {
         if (audmux_type == IMX31_AUDMUX)
                 audmux_debugfs_remove();
-        clk_put(audmux_clk);
 
         return 0;
 }
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index 500f8ce55d78..c246fb514930 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -11,74 +11,30 @@
  *  Free Software Foundation;  either version 2 of the  License, or (at your
  *  option) any later version.
  */
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/dma-mapping.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/slab.h>
 #include <linux/dmaengine.h>
 #include <linux/types.h>
 
 #include <sound/core.h>
-#include <sound/initval.h>
 #include <sound/pcm.h>
-#include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <linux/platform_data/dma-imx.h>
-
 #include "imx-pcm.h"
 
 static bool filter(struct dma_chan *chan, void *param)
 {
+        struct snd_dmaengine_dai_dma_data *dma_data = param;
+
         if (!imx_dma_is_general_purpose(chan))
                 return false;
 
-        chan->private = param;
+        chan->private = dma_data->filter_data;
 
         return true;
 }
 
-static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream);
-        struct imx_pcm_dma_params *dma_params;
-        struct dma_slave_config slave_config;
-        int ret;
-
-        dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
-        ret = snd_hwparams_to_dma_slave_config(substream, params, &slave_config);
-        if (ret)
-                return ret;
-
-        slave_config.device_fc = false;
-
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                slave_config.dst_addr = dma_params->dma_addr;
-                slave_config.dst_maxburst = dma_params->burstsize;
-        } else {
-                slave_config.src_addr = dma_params->dma_addr;
-                slave_config.src_maxburst = dma_params->burstsize;
-        }
-
-        ret = dmaengine_slave_config(chan, &slave_config);
-        if (ret)
-                return ret;
-
-        snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
-
-        return 0;
-}
-
-static struct snd_pcm_hardware snd_imx_hardware = {
+static const struct snd_pcm_hardware imx_pcm_hardware = {
         .info = SNDRV_PCM_INFO_INTERLEAVED |
                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
                 SNDRV_PCM_INFO_MMAP |
@@ -97,64 +53,22 @@ static struct snd_pcm_hardware snd_imx_hardware = {
         .fifo_size = 0,
 };
 
-static int snd_imx_open(struct snd_pcm_substream *substream)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct imx_pcm_dma_params *dma_params;
-        struct imx_dma_data *dma_data;
-        int ret;
-
-        snd_soc_set_runtime_hwparams(substream, &snd_imx_hardware);
-
-        dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
-        dma_data = kzalloc(sizeof(*dma_data), GFP_KERNEL);
-        if (!dma_data)
-                return -ENOMEM;
-
-        dma_data->peripheral_type = dma_params->shared_peripheral ?
-                                        IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI;
-        dma_data->priority = DMA_PRIO_HIGH;
-        dma_data->dma_request = dma_params->dma;
-
-        ret = snd_dmaengine_pcm_open(substream, filter, dma_data);
-        if (ret) {
-                kfree(dma_data);
-                return ret;
-        }
-
-        snd_dmaengine_pcm_set_data(substream, dma_data);
-
-        return 0;
-}
+static const struct snd_dmaengine_pcm_config imx_dmaengine_pcm_config = {
+        .pcm_hardware = &imx_pcm_hardware,
+        .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
+        .compat_filter_fn = filter,
+        .prealloc_buffer_size = IMX_SSI_DMABUF_SIZE,
+};
 
-static int snd_imx_close(struct snd_pcm_substream *substream)
+int imx_pcm_dma_init(struct platform_device *pdev)
 {
-        struct imx_dma_data *dma_data = snd_dmaengine_pcm_get_data(substream);
-
-        snd_dmaengine_pcm_close(substream);
-        kfree(dma_data);
-
-        return 0;
+        return snd_dmaengine_pcm_register(&pdev->dev, &imx_dmaengine_pcm_config,
+                SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
+                SND_DMAENGINE_PCM_FLAG_NO_DT |
+                SND_DMAENGINE_PCM_FLAG_COMPAT);
 }
 
-static struct snd_pcm_ops imx_pcm_ops = {
-        .open           = snd_imx_open,
-        .close          = snd_imx_close,
-        .ioctl          = snd_pcm_lib_ioctl,
-        .hw_params      = snd_imx_pcm_hw_params,
-        .trigger        = snd_dmaengine_pcm_trigger,
-        .pointer        = snd_dmaengine_pcm_pointer_no_residue,
-        .mmap           = snd_imx_pcm_mmap,
-};
-
-static struct snd_soc_platform_driver imx_soc_platform_mx2 = {
-        .ops            = &imx_pcm_ops,
-        .pcm_new        = imx_pcm_new,
-        .pcm_free       = imx_pcm_free,
-};
-
-int imx_pcm_dma_init(struct platform_device *pdev)
+void imx_pcm_dma_exit(struct platform_device *pdev)
 {
-        return snd_soc_register_platform(&pdev->dev, &imx_soc_platform_mx2);
+        snd_dmaengine_pcm_unregister(&pdev->dev);
 }
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 920f945cb2f4..670b96b0ce2f 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -34,7 +34,7 @@
 #include "imx-ssi.h"
 
 struct imx_pcm_runtime_data {
-        int period;
+        unsigned int period;
         int periods;
         unsigned long offset;
         unsigned long last_offset;
@@ -299,8 +299,8 @@ int imx_pcm_fiq_init(struct platform_device *pdev)
 
         imx_ssi_fiq_base = (unsigned long)ssi->base;
 
-        ssi->dma_params_tx.burstsize = 4;
-        ssi->dma_params_rx.burstsize = 6;
+        ssi->dma_params_tx.maxburst = 4;
+        ssi->dma_params_rx.maxburst = 6;
 
         ret = snd_soc_register_platform(&pdev->dev, &imx_soc_platform_fiq);
         if (ret)
diff --git a/sound/soc/fsl/imx-pcm.c b/sound/soc/fsl/imx-pcm.c
index 0d0625bfcb65..c49896442d8e 100644
--- a/sound/soc/fsl/imx-pcm.c
+++ b/sound/soc/fsl/imx-pcm.c
@@ -114,7 +114,11 @@ static int imx_pcm_probe(struct platform_device *pdev)
 
 static int imx_pcm_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_platform(&pdev->dev);
+        if (strcmp(pdev->id_entry->name, "imx-fiq-pcm-audio") == 0)
+                snd_soc_unregister_platform(&pdev->dev);
+        else
+                imx_pcm_dma_exit(pdev);
+
         return 0;
 }
 
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h
index 5ae13a13a353..b7fa0d75c687 100644
--- a/sound/soc/fsl/imx-pcm.h
+++ b/sound/soc/fsl/imx-pcm.h
@@ -13,17 +13,24 @@
 #ifndef _IMX_PCM_H
 #define _IMX_PCM_H
 
+#include <linux/platform_data/dma-imx.h>
+
 /*
  * Do not change this as the FIQ handler depends on this size
  */
 #define IMX_SSI_DMABUF_SIZE     (64 * 1024)
 
-struct imx_pcm_dma_params {
-        int dma;
-        unsigned long dma_addr;
-        int burstsize;
-        bool shared_peripheral; /* The peripheral is on SPBA bus */
-};
+static inline void
+imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data,
+        int dma, bool shared)
+{
+        dma_data->dma_request = dma;
+        dma_data->priority = DMA_PRIO_HIGH;
+        if (shared)
+                dma_data->peripheral_type = IMX_DMATYPE_SSI_SP;
+        else
+                dma_data->peripheral_type = IMX_DMATYPE_SSI;
+}
 
 int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,
                      struct vm_area_struct *vma);
@@ -32,11 +39,16 @@ void imx_pcm_free(struct snd_pcm *pcm);
 
 #ifdef CONFIG_SND_SOC_IMX_PCM_DMA
 int imx_pcm_dma_init(struct platform_device *pdev);
+void imx_pcm_dma_exit(struct platform_device *pdev);
 #else
 static inline int imx_pcm_dma_init(struct platform_device *pdev)
 {
         return -ENODEV;
 }
+
+static inline void imx_pcm_dma_exit(struct platform_device *pdev)
+{
+}
 #endif
 
 #ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index 424347e9b2d7..9584e78858df 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -148,7 +148,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
         data->dai.stream_name = "HiFi";
         data->dai.codec_dai_name = "sgtl5000";
         data->dai.codec_of_node = codec_np;
-        data->dai.cpu_dai_name = dev_name(&ssi_pdev->dev);
+        data->dai.cpu_of_node = ssi_np;
         data->dai.platform_name = "imx-pcm-audio";
         data->dai.init = &imx_sgtl5000_dai_init;
         data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 810c7eeb7b03..902fab02b851 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -232,23 +232,6 @@ static int imx_ssi_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
         return 0;
 }
 
-static int imx_ssi_startup(struct snd_pcm_substream *substream,
-                           struct snd_soc_dai *cpu_dai)
-{
-        struct imx_ssi *ssi = snd_soc_dai_get_drvdata(cpu_dai);
-        struct imx_pcm_dma_params *dma_data;
-
-        /* Tx/Rx config */
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                dma_data = &ssi->dma_params_tx;
-        else
-                dma_data = &ssi->dma_params_rx;
-
-        snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
-
-        return 0;
-}
-
 /*
  * Should only be called when port is inactive (i.e. SSIEN = 0),
  * although can be called multiple times by upper layers.
@@ -353,7 +336,6 @@ static int imx_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
 }
 
 static const struct snd_soc_dai_ops imx_ssi_pcm_dai_ops = {
-        .startup        = imx_ssi_startup,
         .hw_params      = imx_ssi_hw_params,
         .set_fmt        = imx_ssi_set_dai_fmt,
         .set_clkdiv     = imx_ssi_set_dai_clkdiv,
@@ -369,10 +351,14 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai)
 
         snd_soc_dai_set_drvdata(dai, ssi);
 
-        val = SSI_SFCSR_TFWM0(ssi->dma_params_tx.burstsize) |
-                SSI_SFCSR_RFWM0(ssi->dma_params_rx.burstsize);
+        val = SSI_SFCSR_TFWM0(ssi->dma_params_tx.maxburst) |
+                SSI_SFCSR_RFWM0(ssi->dma_params_rx.maxburst);
         writel(val, ssi->base + SSI_SFCSR);
 
+        /* Tx/Rx config */
+        dai->playback_dma_data = &ssi->dma_params_tx;
+        dai->capture_dma_data = &ssi->dma_params_rx;
+
         return 0;
 }
 
@@ -400,7 +386,7 @@ static struct snd_soc_dai_driver imx_ac97_dai = {
                 .stream_name = "AC97 Playback",
                 .channels_min = 2,
                 .channels_max = 2,
-                .rates = SNDRV_PCM_RATE_48000,
+                .rates = SNDRV_PCM_RATE_8000_48000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
         },
         .capture = {
@@ -413,6 +399,10 @@ static struct snd_soc_dai_driver imx_ac97_dai = {
         .ops = &imx_ssi_pcm_dai_ops,
 };
 
+static const struct snd_soc_component_driver imx_component = {
+        .name           = DRV_NAME,
+};
+
 static void setup_channel_to_ac97(struct imx_ssi *imx_ssi)
 {
         void __iomem *base = imx_ssi->base;
@@ -575,23 +565,31 @@ static int imx_ssi_probe(struct platform_device *pdev)
 
         writel(0x0, ssi->base + SSI_SIER);
 
-        ssi->dma_params_rx.dma_addr = res->start + SSI_SRX0;
-        ssi->dma_params_tx.dma_addr = res->start + SSI_STX0;
+        ssi->dma_params_rx.addr = res->start + SSI_SRX0;
+        ssi->dma_params_tx.addr = res->start + SSI_STX0;
+
+        ssi->dma_params_tx.maxburst = 6;
+        ssi->dma_params_rx.maxburst = 4;
 
-        ssi->dma_params_tx.burstsize = 6;
-        ssi->dma_params_rx.burstsize = 4;
+        ssi->dma_params_tx.filter_data = &ssi->filter_data_tx;
+        ssi->dma_params_rx.filter_data = &ssi->filter_data_rx;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx0");
-        if (res)
-                ssi->dma_params_tx.dma = res->start;
+        if (res) {
+                imx_pcm_dma_params_init_data(&ssi->filter_data_tx, res->start,
+                        false);
+        }
 
         res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx0");
-        if (res)
-                ssi->dma_params_rx.dma = res->start;
+        if (res) {
+                imx_pcm_dma_params_init_data(&ssi->filter_data_rx, res->start,
+                        false);
+        }
 
         platform_set_drvdata(pdev, ssi);
 
-        ret = snd_soc_register_dai(&pdev->dev, dai);
+        ret = snd_soc_register_component(&pdev->dev, &imx_component,
+                                         dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "register DAI failed\n");
                 goto failed_register;
@@ -632,7 +630,7 @@ failed_pdev_alloc:
 failed_pdev_fiq_add:
         platform_device_put(ssi->soc_platform_pdev_fiq);
 failed_pdev_fiq_alloc:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 failed_register:
         release_mem_region(res->start, resource_size(res));
 failed_get_resource:
@@ -650,7 +648,7 @@ static int imx_ssi_remove(struct platform_device *pdev)
         platform_device_unregister(ssi->soc_platform_pdev);
         platform_device_unregister(ssi->soc_platform_pdev_fiq);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         if (ssi->flags & IMX_SSI_USE_AC97)
                 ac97_ssi = NULL;
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
index dc114bdedce5..bb6b3dbb13fd 100644
--- a/sound/soc/fsl/imx-ssi.h
+++ b/sound/soc/fsl/imx-ssi.h
@@ -187,6 +187,7 @@
 
 #include <linux/dmaengine.h>
 #include <linux/platform_data/dma-imx.h>
+#include <sound/dmaengine_pcm.h>
 #include "imx-pcm.h"
 
 struct imx_ssi {
@@ -204,8 +205,10 @@ struct imx_ssi {
         void (*ac97_reset) (struct snd_ac97 *ac97);
         void (*ac97_warm_reset)(struct snd_ac97 *ac97);
 
-        struct imx_pcm_dma_params       dma_params_rx;
-        struct imx_pcm_dma_params       dma_params_tx;
+        struct snd_dmaengine_dai_dma_data dma_params_rx;
+        struct snd_dmaengine_dai_dma_data dma_params_tx;
+        struct imx_dma_data filter_data_tx;
+        struct imx_dma_data filter_data_rx;
 
         int enabled;
 
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index a4aec0488dd3..4141b35ef0bb 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -270,6 +270,9 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
         .ops = &psc_ac97_digital_ops,
 } };
 
+static const struct snd_soc_component_driver psc_ac97_component = {
+        .name           = DRV_NAME,
+};
 
 
 /* ---------------------------------------------------------------------
@@ -287,7 +290,8 @@ static int psc_ac97_of_probe(struct platform_device *op)
         if (rc != 0)
                 return rc;
 
-        rc = snd_soc_register_dais(&op->dev, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai));
+        rc = snd_soc_register_component(&op->dev, &psc_ac97_component,
+                                        psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai));
         if (rc != 0) {
                 dev_err(&op->dev, "Failed to register DAI\n");
                 return rc;
@@ -313,7 +317,7 @@ static int psc_ac97_of_probe(struct platform_device *op)
 static int psc_ac97_of_remove(struct platform_device *op)
 {
         mpc5200_audio_dma_destroy(op);
-        snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai));
+        snd_soc_unregister_component(&op->dev);
         return 0;
 }
 
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index b95b966f25a0..f4efaadb80a2 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -148,6 +148,10 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{
         .ops = &psc_i2s_dai_ops,
 } };
 
+static const struct snd_soc_component_driver psc_i2s_component = {
+        .name           = "mpc5200-i2s",
+};
+
 /* ---------------------------------------------------------------------
  * OF platform bus binding code:
  * - Probe/remove operations
@@ -163,7 +167,8 @@ static int psc_i2s_of_probe(struct platform_device *op)
         if (rc != 0)
                 return rc;
 
-        rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));
+        rc = snd_soc_register_component(&op->dev, &psc_i2s_component,
+                                        psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));
         if (rc != 0) {
                 pr_err("Failed to register DAI\n");
                 return rc;
@@ -208,7 +213,7 @@ static int psc_i2s_of_probe(struct platform_device *op)
 static int psc_i2s_of_remove(struct platform_device *op)
 {
         mpc5200_audio_dma_destroy(op);
-        snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai));
+        snd_soc_unregister_component(&op->dev);
         return 0;
 }
 
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 6cef491f4823..9a126441c5f3 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -425,6 +425,10 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
         .resume = jz4740_i2s_resume,
 };
 
+static const struct snd_soc_component_driver jz4740_i2s_component = {
+        .name           = "jz4740-i2s",
+};
+
 static int jz4740_i2s_dev_probe(struct platform_device *pdev)
 {
         struct jz4740_i2s *i2s;
@@ -469,7 +473,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev)
         }
 
         platform_set_drvdata(pdev, i2s);
-        ret = snd_soc_register_dai(&pdev->dev, &jz4740_i2s_dai);
+        ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component,
+                                         &jz4740_i2s_dai, 1);
 
         if (ret) {
                 dev_err(&pdev->dev, "Failed to register DAI\n");
@@ -496,7 +501,7 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev)
 {
         struct jz4740_i2s *i2s = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(i2s->clk_i2s);
         clk_put(i2s->clk_aic);
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index c74c89065493..befe68f59285 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -451,6 +451,10 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = {
         .ops = &kirkwood_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver kirkwood_i2s_component = {
+        .name           = DRV_NAME,
+};
+
 static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
 {
         struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data;
@@ -524,10 +528,11 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
                 priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_128;
         }
 
-        err = snd_soc_register_dai(&pdev->dev, soc_dai);
+        err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component,
+                                         soc_dai, 1);
         if (!err)
                 return 0;
-        dev_err(&pdev->dev, "snd_soc_register_dai failed\n");
+        dev_err(&pdev->dev, "snd_soc_register_component failed\n");
 
         if (!IS_ERR(priv->extclk)) {
                 clk_disable_unprepare(priv->extclk);
@@ -542,7 +547,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
 {
         struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         if (!IS_ERR(priv->extclk)) {
                 clk_disable_unprepare(priv->extclk);
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index a263cbed8624..392fc0b8f5b8 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -1,7 +1,7 @@
 /*
  *  sst_platform.c - Intel MID Platform driver
  *
- *  Copyright (C) 2010-2012 Intel Corp
+ *  Copyright (C) 2010-2013 Intel Corp
  *  Author: Vinod Koul <vinod.koul@intel.com>
  *  Author: Harsha Priya <priya.harsha@intel.com>
  *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -165,6 +165,10 @@ static struct snd_soc_dai_driver sst_platform_dai[] = {
 },
 };
 
+static const struct snd_soc_component_driver sst_component = {
+        .name           = "sst",
+};
+
 /* helper functions */
 static inline void sst_set_stream_status(struct sst_runtime_stream *stream,
                                         int state)
@@ -652,11 +656,21 @@ static int sst_platform_compr_get_codec_caps(struct snd_compr_stream *cstream,
         return stream->compr_ops->get_codec_caps(codec);
 }
 
+static int sst_platform_compr_set_metadata(struct snd_compr_stream *cstream,
+                                        struct snd_compr_metadata *metadata)
+{
+        struct sst_runtime_stream *stream  =
+                 cstream->runtime->private_data;
+
+        return stream->compr_ops->set_metadata(stream->id, metadata);
+}
+
 static struct snd_compr_ops sst_platform_compr_ops = {
 
         .open = sst_platform_compr_open,
         .free = sst_platform_compr_free,
         .set_params = sst_platform_compr_set_params,
+        .set_metadata = sst_platform_compr_set_metadata,
         .trigger = sst_platform_compr_trigger,
         .pointer = sst_platform_compr_pointer,
         .ack = sst_platform_compr_ack,
@@ -683,7 +697,7 @@ static int sst_platform_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        ret = snd_soc_register_dais(&pdev->dev,
+        ret = snd_soc_register_component(&pdev->dev, &sst_component,
                                 sst_platform_dai, ARRAY_SIZE(sst_platform_dai));
         if (ret) {
                 pr_err("registering cpu dais failed\n");
@@ -695,7 +709,7 @@ static int sst_platform_probe(struct platform_device *pdev)
 static int sst_platform_remove(struct platform_device *pdev)
 {
 
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai));
+        snd_soc_unregister_component(&pdev->dev);
         snd_soc_unregister_platform(&pdev->dev);
         pr_debug("sst_platform_remove success\n");
         return 0;
diff --git a/sound/soc/mid-x86/sst_platform.h b/sound/soc/mid-x86/sst_platform.h
index d61c5d514ffa..cacc9066ec52 100644
--- a/sound/soc/mid-x86/sst_platform.h
+++ b/sound/soc/mid-x86/sst_platform.h
@@ -124,6 +124,8 @@ struct compress_sst_ops {
         int (*close) (unsigned int str_id);
         int (*get_caps) (struct snd_compr_caps *caps);
         int (*get_codec_caps) (struct snd_compr_codec_caps *codec);
+        int (*set_metadata) (unsigned int str_id,
+                        struct snd_compr_metadata *mdata);
 
 };
 
diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
index b6fa77678d97..78d321cbe8b4 100644
--- a/sound/soc/mxs/Kconfig
+++ b/sound/soc/mxs/Kconfig
@@ -1,7 +1,7 @@
 menuconfig SND_MXS_SOC
         tristate "SoC Audio for Freescale MXS CPUs"
         depends on ARCH_MXS
-        select SND_SOC_DMAENGINE_PCM
+        select SND_SOC_GENERIC_DMAENGINE_PCM
         help
           Say Y or M if you want to add support for codecs attached to
           the MXS SAIF interface.
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
index 564b5b60319d..b41fffc056fb 100644
--- a/sound/soc/mxs/mxs-pcm.c
+++ b/sound/soc/mxs/mxs-pcm.c
@@ -18,38 +18,24 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <linux/clk.h>
-#include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/dma-mapping.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/dmaengine.h>
-#include <linux/fsl/mxs-dma.h>
 
 #include <sound/core.h>
-#include <sound/initval.h>
 #include <sound/pcm.h>
-#include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
 #include "mxs-pcm.h"
 
-struct mxs_pcm_dma_data {
-        struct mxs_dma_data dma_data;
-        struct mxs_pcm_dma_params *dma_params;
-};
-
-static struct snd_pcm_hardware snd_mxs_hardware = {
+static const struct snd_pcm_hardware snd_mxs_hardware = {
         .info                   = SNDRV_PCM_INFO_MMAP |
                                   SNDRV_PCM_INFO_MMAP_VALID |
                                   SNDRV_PCM_INFO_PAUSE |
                                   SNDRV_PCM_INFO_RESUME |
-                                  SNDRV_PCM_INFO_INTERLEAVED,
+                                  SNDRV_PCM_INFO_INTERLEAVED |
+                                  SNDRV_PCM_INFO_HALF_DUPLEX,
         .formats                = SNDRV_PCM_FMTBIT_S16_LE |
                                   SNDRV_PCM_FMTBIT_S20_3LE |
                                   SNDRV_PCM_FMTBIT_S24_LE,
@@ -61,13 +47,11 @@ static struct snd_pcm_hardware snd_mxs_hardware = {
         .periods_max            = 52,
         .buffer_bytes_max       = 64 * 1024,
         .fifo_size              = 32,
-
 };
 
 static bool filter(struct dma_chan *chan, void *param)
 {
-        struct mxs_pcm_dma_data *pcm_dma_data = param;
-        struct mxs_pcm_dma_params *dma_params = pcm_dma_data->dma_params;
+        struct mxs_pcm_dma_params *dma_params = param;
 
         if (!mxs_dma_is_apbx(chan))
                 return false;
@@ -75,160 +59,30 @@ static bool filter(struct dma_chan *chan, void *param)
         if (chan->chan_id != dma_params->chan_num)
                 return false;
 
-        chan->private = &pcm_dma_data->dma_data;
+        chan->private = &dma_params->dma_data;
 
         return true;
 }
 
-static int snd_mxs_pcm_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *params)
-{
-        snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
-
-        return 0;
-}
-
-static int snd_mxs_open(struct snd_pcm_substream *substream)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct mxs_pcm_dma_data *pcm_dma_data;
-        int ret;
-
-        pcm_dma_data = kzalloc(sizeof(*pcm_dma_data), GFP_KERNEL);
-        if (pcm_dma_data == NULL)
-                return -ENOMEM;
-
-        pcm_dma_data->dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-        pcm_dma_data->dma_data.chan_irq = pcm_dma_data->dma_params->chan_irq;
-
-        ret = snd_dmaengine_pcm_open(substream, filter, pcm_dma_data);
-        if (ret) {
-                kfree(pcm_dma_data);
-                return ret;
-        }
-
-        snd_soc_set_runtime_hwparams(substream, &snd_mxs_hardware);
-
-        snd_dmaengine_pcm_set_data(substream, pcm_dma_data);
-
-        return 0;
-}
-
-static int snd_mxs_close(struct snd_pcm_substream *substream)
-{
-        struct mxs_pcm_dma_data *pcm_dma_data = snd_dmaengine_pcm_get_data(substream);
-
-        snd_dmaengine_pcm_close(substream);
-        kfree(pcm_dma_data);
-
-        return 0;
-}
-
-static int snd_mxs_pcm_mmap(struct snd_pcm_substream *substream,
-                struct vm_area_struct *vma)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-
-        return dma_mmap_writecombine(substream->pcm->card->dev, vma,
-                                        runtime->dma_area,
-                                        runtime->dma_addr,
-                                        runtime->dma_bytes);
-}
-
-static struct snd_pcm_ops mxs_pcm_ops = {
-        .open           = snd_mxs_open,
-        .close          = snd_mxs_close,
-        .ioctl          = snd_pcm_lib_ioctl,
-        .hw_params      = snd_mxs_pcm_hw_params,
-        .trigger        = snd_dmaengine_pcm_trigger,
-        .pointer        = snd_dmaengine_pcm_pointer_no_residue,
-        .mmap           = snd_mxs_pcm_mmap,
-};
-
-static int mxs_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
-{
-        struct snd_pcm_substream *substream = pcm->streams[stream].substream;
-        struct snd_dma_buffer *buf = &substream->dma_buffer;
-        size_t size = snd_mxs_hardware.buffer_bytes_max;
-
-        buf->dev.type = SNDRV_DMA_TYPE_DEV;
-        buf->dev.dev = pcm->card->dev;
-        buf->private_data = NULL;
-        buf->area = dma_alloc_writecombine(pcm->card->dev, size,
-                                           &buf->addr, GFP_KERNEL);
-        if (!buf->area)
-                return -ENOMEM;
-        buf->bytes = size;
-
-        return 0;
-}
-
-static u64 mxs_pcm_dmamask = DMA_BIT_MASK(32);
-static int mxs_pcm_new(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_card *card = rtd->card->snd_card;
-        struct snd_pcm *pcm = rtd->pcm;
-        int ret = 0;
-
-        if (!card->dev->dma_mask)
-                card->dev->dma_mask = &mxs_pcm_dmamask;
-        if (!card->dev->coherent_dma_mask)
-                card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
-
-        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
-                ret = mxs_pcm_preallocate_dma_buffer(pcm,
-                        SNDRV_PCM_STREAM_PLAYBACK);
-                if (ret)
-                        goto out;
-        }
-
-        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
-                ret = mxs_pcm_preallocate_dma_buffer(pcm,
-                        SNDRV_PCM_STREAM_CAPTURE);
-                if (ret)
-                        goto out;
-        }
-
-out:
-        return ret;
-}
-
-static void mxs_pcm_free(struct snd_pcm *pcm)
-{
-        struct snd_pcm_substream *substream;
-        struct snd_dma_buffer *buf;
-        int stream;
-
-        for (stream = 0; stream < 2; stream++) {
-                substream = pcm->streams[stream].substream;
-                if (!substream)
-                        continue;
-
-                buf = &substream->dma_buffer;
-                if (!buf->area)
-                        continue;
-
-                dma_free_writecombine(pcm->card->dev, buf->bytes,
-                                      buf->area, buf->addr);
-                buf->area = NULL;
-        }
-}
-
-static struct snd_soc_platform_driver mxs_soc_platform = {
-        .ops            = &mxs_pcm_ops,
-        .pcm_new        = mxs_pcm_new,
-        .pcm_free       = mxs_pcm_free,
+static const struct snd_dmaengine_pcm_config mxs_dmaengine_pcm_config = {
+        .pcm_hardware = &snd_mxs_hardware,
+        .compat_filter_fn = filter,
+        .prealloc_buffer_size = 64 * 1024,
 };
 
 int mxs_pcm_platform_register(struct device *dev)
 {
-        return snd_soc_register_platform(dev, &mxs_soc_platform);
+        return snd_dmaengine_pcm_register(dev, &mxs_dmaengine_pcm_config,
+                SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
+                SND_DMAENGINE_PCM_FLAG_NO_DT |
+                SND_DMAENGINE_PCM_FLAG_COMPAT |
+                SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX);
 }
 EXPORT_SYMBOL_GPL(mxs_pcm_platform_register);
 
 void mxs_pcm_platform_unregister(struct device *dev)
 {
-        snd_soc_unregister_platform(dev);
+        snd_dmaengine_pcm_unregister(dev);
 }
 EXPORT_SYMBOL_GPL(mxs_pcm_platform_unregister);
 
diff --git a/sound/soc/mxs/mxs-pcm.h b/sound/soc/mxs/mxs-pcm.h
index 35ba2ca42384..3aa918f9ed3e 100644
--- a/sound/soc/mxs/mxs-pcm.h
+++ b/sound/soc/mxs/mxs-pcm.h
@@ -19,8 +19,10 @@
 #ifndef _MXS_PCM_H
 #define _MXS_PCM_H
 
+#include <linux/fsl/mxs-dma.h>
+
 struct mxs_pcm_dma_params {
-        int chan_irq;
+        struct mxs_dma_data dma_data;
         int chan_num;
 };
 
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 41a6136e3535..d31dc52fa862 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -370,7 +370,6 @@ static int mxs_saif_startup(struct snd_pcm_substream *substream,
                            struct snd_soc_dai *cpu_dai)
 {
         struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai);
-        snd_soc_dai_set_dma_data(cpu_dai, substream, &saif->dma_param);
 
         /* clear error status to 0 for each re-open */
         saif->fifo_underrun = 0;
@@ -606,6 +605,8 @@ static int mxs_saif_dai_probe(struct snd_soc_dai *dai)
         struct mxs_saif *saif = dev_get_drvdata(dai->dev);
 
         snd_soc_dai_set_drvdata(dai, saif);
+        dai->playback_dma_data = &saif->dma_param;
+        dai->capture_dma_data = &saif->dma_param;
 
         return 0;
 }
@@ -628,6 +629,10 @@ static struct snd_soc_dai_driver mxs_saif_dai = {
         .ops = &mxs_saif_dai_ops,
 };
 
+static const struct snd_soc_component_driver mxs_saif_component = {
+        .name           = "mxs-saif",
+};
+
 static irqreturn_t mxs_saif_irq(int irq, void *dev_id)
 {
         struct mxs_saif *saif = dev_id;
@@ -754,9 +759,9 @@ static int mxs_saif_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        saif->dma_param.chan_irq = platform_get_irq(pdev, 1);
-        if (saif->dma_param.chan_irq < 0) {
-                ret = saif->dma_param.chan_irq;
+        saif->dma_param.dma_data.chan_irq = platform_get_irq(pdev, 1);
+        if (saif->dma_param.dma_data.chan_irq < 0) {
+                ret = saif->dma_param.dma_data.chan_irq;
                 dev_err(&pdev->dev, "failed to get dma irq resource: %d\n",
                         ret);
                 return ret;
@@ -764,7 +769,8 @@ static int mxs_saif_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, saif);
 
-        ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai);
+        ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
+                                         &mxs_saif_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "register DAI failed\n");
                 return ret;
@@ -779,7 +785,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
         return 0;
 
 failed_pdev_alloc:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         return ret;
 }
@@ -787,7 +793,7 @@ failed_pdev_alloc:
 static int mxs_saif_remove(struct platform_device *pdev)
 {
         mxs_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         return 0;
 }
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index 0418467a4848..fe3285ceaf5b 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -314,6 +314,10 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = {
         .ops = &nuc900_ac97_dai_ops,
 };
 
+static const struct snd_soc_component_driver nuc900_ac97_component = {
+        .name           = "nuc900-ac97",
+};
+
 static int nuc900_ac97_drvprobe(struct platform_device *pdev)
 {
         struct nuc900_audio *nuc900_audio;
@@ -361,7 +365,8 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
 
         nuc900_ac97_data = nuc900_audio;
 
-        ret = snd_soc_register_dai(&pdev->dev, &nuc900_ac97_dai);
+        ret = snd_soc_register_component(&pdev->dev, &nuc900_ac97_component,
+                                         &nuc900_ac97_dai, 1);
         if (ret)
                 goto out3;
 
@@ -384,7 +389,7 @@ out0:
 
 static int nuc900_ac97_drvremove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(nuc900_ac97_data->clk);
         iounmap(nuc900_ac97_data->mmio);
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index c1900b2a6f28..994dcf345975 100644
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -28,7 +28,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #include "../codecs/tlv320aic23.h"
 
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 2600447fa74f..629446482a91 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -36,7 +36,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 #include "../codecs/cx20442.h"
 
 
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 285c8368cb47..eb68c7db1cf3 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -1018,9 +1018,10 @@ int omap_mcbsp_init(struct platform_device *pdev)
                 return -ENODEV;
         }
         /* RX DMA request number, and port address configuration */
-        mcbsp->dma_data[1].name = "Audio Capture";
-        mcbsp->dma_data[1].dma_req = res->start;
-        mcbsp->dma_data[1].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 1);
+        mcbsp->dma_req[1] = res->start;
+        mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];
+        mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp, 1);
+        mcbsp->dma_data[1].maxburst = 4;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
         if (!res) {
@@ -1028,9 +1029,10 @@ int omap_mcbsp_init(struct platform_device *pdev)
                 return -ENODEV;
         }
         /* TX DMA request number, and port address configuration */
-        mcbsp->dma_data[0].name = "Audio Playback";
-        mcbsp->dma_data[0].dma_req = res->start;
-        mcbsp->dma_data[0].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 0);
+        mcbsp->dma_req[0] = res->start;
+        mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];
+        mcbsp->dma_data[0].addr = omap_mcbsp_dma_reg_params(mcbsp, 0);
+        mcbsp->dma_data[0].maxburst = 4;
 
         mcbsp->fclk = clk_get(&pdev->dev, "fck");
         if (IS_ERR(mcbsp->fclk)) {
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
index f93e0b0af303..96d1b086bcf8 100644
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -24,14 +24,14 @@
 #ifndef __ASOC_MCBSP_H
 #define __ASOC_MCBSP_H
 
-#include "omap-pcm.h"
-
 #ifdef CONFIG_ARCH_OMAP1
 #define mcbsp_omap1()   1
 #else
 #define mcbsp_omap1()   0
 #endif
 
+#include <sound/dmaengine_pcm.h>
+
 /* McBSP register numbers. Register address offset = num * reg_step */
 enum {
         /* Common registers */
@@ -312,7 +312,8 @@ struct omap_mcbsp {
         struct omap_mcbsp_platform_data *pdata;
         struct omap_mcbsp_st_data *st_data;
         struct omap_mcbsp_reg_cfg cfg_regs;
-        struct omap_pcm_dma_data dma_data[2];
+        struct snd_dmaengine_dai_dma_data dma_data[2];
+        unsigned int dma_req[2];
         int dma_op_mode;
         u16 max_tx_thres;
         u16 max_rx_thres;
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index ee7cd53aa3ee..5e8d640d314f 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -34,7 +34,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define N810_HEADSET_AMP_GPIO   10
 #define N810_SPEAKER_AMP_GPIO   101
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index e7d93fa412a9..70cd5c7b2e14 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -34,7 +34,6 @@
 
 #include "omap-dmic.h"
 #include "omap-mcpdm.h"
-#include "omap-pcm.h"
 #include "../codecs/twl6040.h"
 
 struct abe_twl6040 {
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index ba49ccd9eed9..2ad0370146fd 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -39,8 +39,8 @@
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
-#include "omap-pcm.h"
 #include "omap-dmic.h"
 
 struct omap_dmic {
@@ -55,13 +55,9 @@ struct omap_dmic {
         u32 ch_enabled;
         bool active;
         struct mutex mutex;
-};
 
-/*
- * Stream DMA parameters
- */
-static struct omap_pcm_dma_data omap_dmic_dai_dma_params = {
-        .name           = "DMIC capture",
+        struct snd_dmaengine_dai_dma_data dma_data;
+        unsigned int dma_req;
 };
 
 static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val)
@@ -118,7 +114,7 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
 
         mutex_unlock(&dmic->mutex);
 
-        snd_soc_dai_set_dma_data(dai, substream, &omap_dmic_dai_dma_params);
+        snd_soc_dai_set_dma_data(dai, substream, &dmic->dma_data);
         return ret;
 }
 
@@ -203,7 +199,7 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream,
                                     struct snd_soc_dai *dai)
 {
         struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai);
-        struct omap_pcm_dma_data *dma_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
         int channels;
 
         dmic->clk_div = omap_dmic_select_divider(dmic, params_rate(params));
@@ -230,7 +226,7 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream,
 
         /* packet size is threshold * channels */
         dma_data = snd_soc_dai_get_dma_data(dai, substream);
-        dma_data->packet_size = dmic->threshold * channels;
+        dma_data->maxburst = dmic->threshold * channels;
 
         return 0;
 }
@@ -448,6 +444,10 @@ static struct snd_soc_dai_driver omap_dmic_dai = {
         .ops = &omap_dmic_dai_ops,
 };
 
+static const struct snd_soc_component_driver omap_dmic_component = {
+        .name           = "omap-dmic",
+};
+
 static int asoc_dmic_probe(struct platform_device *pdev)
 {
         struct omap_dmic *dmic;
@@ -476,7 +476,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
                 ret = -ENODEV;
                 goto err_put_clk;
         }
-        omap_dmic_dai_dma_params.port_addr = res->start + OMAP_DMIC_DATA_REG;
+        dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG;
 
         res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
         if (!res) {
@@ -484,7 +484,9 @@ static int asoc_dmic_probe(struct platform_device *pdev)
                 ret = -ENODEV;
                 goto err_put_clk;
         }
-        omap_dmic_dai_dma_params.dma_req = res->start;
+
+        dmic->dma_req = res->start;
+        dmic->dma_data.filter_data = &dmic->dma_req;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
         if (!res) {
@@ -493,21 +495,12 @@ static int asoc_dmic_probe(struct platform_device *pdev)
                 goto err_put_clk;
         }
 
-        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     resource_size(res), pdev->name)) {
-                dev_err(dmic->dev, "memory region already claimed\n");
-                ret = -ENODEV;
-                goto err_put_clk;
-        }
-
-        dmic->io_base = devm_ioremap(&pdev->dev, res->start,
-                                     resource_size(res));
-        if (!dmic->io_base) {
-                ret = -ENOMEM;
-                goto err_put_clk;
-        }
+        dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(dmic->io_base))
+                return PTR_ERR(dmic->io_base);
 
-        ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai);
+        ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component,
+                                         &omap_dmic_dai, 1);
         if (ret)
                 goto err_put_clk;
 
@@ -522,7 +515,7 @@ static int asoc_dmic_remove(struct platform_device *pdev)
 {
         struct omap_dmic *dmic = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         clk_put(dmic->fclk);
 
         return 0;
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index 32fa840c493e..ced3b88b44d4 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -32,15 +32,16 @@
 #include <sound/soc.h>
 #include <sound/asound.h>
 #include <sound/asoundef.h>
+#include <sound/dmaengine_pcm.h>
 #include <video/omapdss.h>
 
-#include "omap-pcm.h"
 #include "omap-hdmi.h"
 
 #define DRV_NAME "omap-hdmi-audio-dai"
 
 struct hdmi_priv {
-        struct omap_pcm_dma_data dma_params;
+        struct snd_dmaengine_dai_dma_data dma_data;
+        unsigned int dma_req;
         struct omap_dss_audio dss_audio;
         struct snd_aes_iec958 iec;
         struct snd_cea_861_aud_if cea;
@@ -68,7 +69,7 @@ static int omap_hdmi_dai_startup(struct snd_pcm_substream *substream,
                 return -ENODEV;
         }
 
-        snd_soc_dai_set_dma_data(dai, substream, &priv->dma_params);
+        snd_soc_dai_set_dma_data(dai, substream, &priv->dma_data);
 
         return 0;
 }
@@ -88,25 +89,20 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream,
         struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai);
         struct snd_aes_iec958 *iec = &priv->iec;
         struct snd_cea_861_aud_if *cea = &priv->cea;
-        struct omap_pcm_dma_data *dma_data;
         int err = 0;
 
-        dma_data = snd_soc_dai_get_dma_data(dai, substream);
-
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
-                dma_data->packet_size = 16;
+                priv->dma_data.maxburst = 16;
                 break;
         case SNDRV_PCM_FORMAT_S24_LE:
-                dma_data->packet_size = 32;
+                priv->dma_data.maxburst = 32;
                 break;
         default:
                 dev_err(dai->dev, "format not supported!\n");
                 return -EINVAL;
         }
 
-        dma_data->data_type = 32;
-
         /*
          * fill the IEC-60958 channel status word
          */
@@ -264,6 +260,10 @@ static struct snd_soc_dai_driver omap_hdmi_dai = {
         .ops = &omap_hdmi_dai_ops,
 };
 
+static const struct snd_soc_component_driver omap_hdmi_component = {
+        .name           = DRV_NAME,
+};
+
 static int omap_hdmi_probe(struct platform_device *pdev)
 {
         int ret;
@@ -283,8 +283,7 @@ static int omap_hdmi_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        hdmi_data->dma_params.port_addr =  hdmi_rsrc->start
-                + OMAP_HDMI_AUDIO_DMA_PORT;
+        hdmi_data->dma_data.addr = hdmi_rsrc->start + OMAP_HDMI_AUDIO_DMA_PORT;
 
         hdmi_rsrc = platform_get_resource(pdev, IORESOURCE_DMA, 0);
         if (!hdmi_rsrc) {
@@ -292,8 +291,9 @@ static int omap_hdmi_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        hdmi_data->dma_params.dma_req =  hdmi_rsrc->start;
-        hdmi_data->dma_params.name = "HDMI playback";
+        hdmi_data->dma_req = hdmi_rsrc->start;
+        hdmi_data->dma_data.filter_data = &hdmi_data->dma_req;
+        hdmi_data->dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 
         /*
          * TODO: We assume that there is only one DSS HDMI device. Future
@@ -321,7 +321,8 @@ static int omap_hdmi_probe(struct platform_device *pdev)
         }
 
         dev_set_drvdata(&pdev->dev, hdmi_data);
-        ret = snd_soc_register_dai(&pdev->dev, &omap_hdmi_dai);
+        ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component,
+                                         &omap_hdmi_dai, 1);
 
         return ret;
 }
@@ -330,7 +331,7 @@ static int omap_hdmi_remove(struct platform_device *pdev)
 {
         struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         if (hdmi_data == NULL) {
                 dev_err(&pdev->dev, "cannot obtain HDMi data\n");
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 8d2defd6fdbe..eadbfb6b5000 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -33,11 +33,11 @@
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define OMAP_MCBSP_RATES        (SNDRV_PCM_RATE_8000_96000)
 
@@ -62,24 +62,22 @@ enum {
  * Stream DMA parameters. DMA request line and port address are set runtime
  * since they are different between OMAP1 and later OMAPs
  */
-static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream)
+static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream,
+                unsigned int packet_size)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
-        struct omap_pcm_dma_data *dma_data;
         int words;
 
-        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
         /*
          * Configure McBSP threshold based on either:
          * packet_size, when the sDMA is in packet mode, or based on the
          * period size in THRESHOLD mode, otherwise use McBSP threshold = 1
          * for mono streams.
          */
-        if (dma_data->packet_size)
-                words = dma_data->packet_size;
+        if (packet_size)
+                words = packet_size;
         else
                 words = 1;
 
@@ -226,7 +224,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
 {
         struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
         struct omap_mcbsp_reg_cfg *regs = &mcbsp->cfg_regs;
-        struct omap_pcm_dma_data *dma_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
         int wlen, channels, wpf;
         int pkt_size = 0;
         unsigned int format, div, framesize, master;
@@ -245,7 +243,6 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
         if (mcbsp->pdata->buffer_size) {
-                dma_data->set_threshold = omap_mcbsp_set_threshold;
                 if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {
                         int period_words, max_thrsh;
                         int divider = 0;
@@ -276,9 +273,10 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                         /* Use packet mode for non mono streams */
                         pkt_size = channels;
                 }
+                omap_mcbsp_set_threshold(substream, pkt_size);
         }
 
-        dma_data->packet_size = pkt_size;
+        dma_data->maxburst = pkt_size;
 
         if (mcbsp->configured) {
                 /* McBSP already configured by another stream */
@@ -586,6 +584,10 @@ static struct snd_soc_dai_driver omap_mcbsp_dai = {
         .ops = &mcbsp_dai_ops,
 };
 
+static const struct snd_soc_component_driver omap_mcbsp_component = {
+        .name           = "omap-mcbsp",
+};
+
 static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_info *uinfo)
 {
@@ -793,7 +795,8 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
 
         ret = omap_mcbsp_init(pdev);
         if (!ret)
-                return snd_soc_register_dai(&pdev->dev, &omap_mcbsp_dai);
+                return snd_soc_register_component(&pdev->dev, &omap_mcbsp_component,
+                                                  &omap_mcbsp_dai, 1);
 
         return ret;
 }
@@ -802,7 +805,7 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
 {
         struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)
                 mcbsp->pdata->ops->free(mcbsp->id);
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 5ca11bdac21e..eb05c7ed6d05 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -39,11 +39,14 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include "omap-mcpdm.h"
-#include "omap-pcm.h"
 
-#define OMAP44XX_MCPDM_L3_BASE          0x49032000
+struct mcpdm_link_config {
+        u32 link_mask; /* channel mask for the direction */
+        u32 threshold; /* FIFO threshold */
+};
 
 struct omap_mcpdm {
         struct device *dev;
@@ -53,29 +56,22 @@ struct omap_mcpdm {
 
         struct mutex mutex;
 
-        /* channel data */
-        u32 dn_channels;
-        u32 up_channels;
-
-        /* McPDM FIFO thresholds */
-        u32 dn_threshold;
-        u32 up_threshold;
+        /* Playback/Capture configuration */
+        struct mcpdm_link_config config[2];
 
         /* McPDM dn offsets for rx1, and 2 channels */
         u32 dn_rx_offset;
+
+        /* McPDM needs to be restarted due to runtime reconfiguration */
+        bool restart;
+
+        struct snd_dmaengine_dai_dma_data dma_data[2];
+        unsigned int dma_req[2];
 };
 
 /*
  * Stream DMA parameters
  */
-static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = {
-        {
-                .name = "Audio playback",
-        },
-        {
-                .name = "Audio capture",
-        },
-};
 
 static inline void omap_mcpdm_write(struct omap_mcpdm *mcpdm, u16 reg, u32 val)
 {
@@ -130,11 +126,12 @@ static void omap_mcpdm_reg_dump(struct omap_mcpdm *mcpdm) {}
 static void omap_mcpdm_start(struct omap_mcpdm *mcpdm)
 {
         u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+        u32 link_mask = mcpdm->config[0].link_mask | mcpdm->config[1].link_mask;
 
         ctrl |= (MCPDM_SW_DN_RST | MCPDM_SW_UP_RST);
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl);
 
-        ctrl |= mcpdm->dn_channels | mcpdm->up_channels;
+        ctrl |= link_mask;
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl);
 
         ctrl &= ~(MCPDM_SW_DN_RST | MCPDM_SW_UP_RST);
@@ -148,11 +145,12 @@ static void omap_mcpdm_start(struct omap_mcpdm *mcpdm)
 static void omap_mcpdm_stop(struct omap_mcpdm *mcpdm)
 {
         u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+        u32 link_mask = MCPDM_PDM_DN_MASK | MCPDM_PDM_UP_MASK;
 
         ctrl |= (MCPDM_SW_DN_RST | MCPDM_SW_UP_RST);
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl);
 
-        ctrl &= ~(mcpdm->dn_channels | mcpdm->up_channels);
+        ctrl &= ~(link_mask);
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl);
 
         ctrl &= ~(MCPDM_SW_DN_RST | MCPDM_SW_UP_RST);
@@ -188,8 +186,10 @@ static void omap_mcpdm_open_streams(struct omap_mcpdm *mcpdm)
                 omap_mcpdm_write(mcpdm, MCPDM_REG_DN_OFFSET, dn_offset);
         }
 
-        omap_mcpdm_write(mcpdm, MCPDM_REG_FIFO_CTRL_DN, mcpdm->dn_threshold);
-        omap_mcpdm_write(mcpdm, MCPDM_REG_FIFO_CTRL_UP, mcpdm->up_threshold);
+        omap_mcpdm_write(mcpdm, MCPDM_REG_FIFO_CTRL_DN,
+                         mcpdm->config[SNDRV_PCM_STREAM_PLAYBACK].threshold);
+        omap_mcpdm_write(mcpdm, MCPDM_REG_FIFO_CTRL_UP,
+                         mcpdm->config[SNDRV_PCM_STREAM_CAPTURE].threshold);
 
         omap_mcpdm_write(mcpdm, MCPDM_REG_DMAENABLE_SET,
                         MCPDM_DMA_DN_ENABLE | MCPDM_DMA_UP_ENABLE);
@@ -267,7 +267,7 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
         mutex_unlock(&mcpdm->mutex);
 
         snd_soc_dai_set_dma_data(dai, substream,
-                                 &omap_mcpdm_dai_dma_params[substream->stream]);
+                                 &mcpdm->dma_data[substream->stream]);
 
         return 0;
 }
@@ -283,6 +283,8 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
                 if (omap_mcpdm_active(mcpdm)) {
                         omap_mcpdm_stop(mcpdm);
                         omap_mcpdm_close_streams(mcpdm);
+                        mcpdm->config[0].link_mask = 0;
+                        mcpdm->config[1].link_mask = 0;
                 }
         }
 
@@ -295,7 +297,8 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
 {
         struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);
         int stream = substream->stream;
-        struct omap_pcm_dma_data *dma_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
+        u32 threshold;
         int channels;
         int link_mask = 0;
 
@@ -325,16 +328,32 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
 
         dma_data = snd_soc_dai_get_dma_data(dai, substream);
 
+        threshold = mcpdm->config[stream].threshold;
         /* Configure McPDM channels, and DMA packet size */
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                mcpdm->dn_channels = link_mask << 3;
-                dma_data->packet_size =
-                        (MCPDM_DN_THRES_MAX - mcpdm->dn_threshold) * channels;
+                link_mask <<= 3;
+
+                /* If capture is not running assume a stereo stream to come */
+                if (!mcpdm->config[!stream].link_mask)
+                        mcpdm->config[!stream].link_mask = 0x3;
+
+                dma_data->maxburst =
+                                (MCPDM_DN_THRES_MAX - threshold) * channels;
         } else {
-                mcpdm->up_channels = link_mask << 0;
-                dma_data->packet_size = mcpdm->up_threshold * channels;
+                /* If playback is not running assume a stereo stream to come */
+                if (!mcpdm->config[!stream].link_mask)
+                        mcpdm->config[!stream].link_mask = (0x3 << 3);
+
+                dma_data->maxburst = threshold * channels;
         }
 
+        /* Check if we need to restart McPDM with this stream */
+        if (mcpdm->config[stream].link_mask &&
+            mcpdm->config[stream].link_mask != link_mask)
+                mcpdm->restart = true;
+
+        mcpdm->config[stream].link_mask = link_mask;
+
         return 0;
 }
 
@@ -346,6 +365,11 @@ static int omap_mcpdm_prepare(struct snd_pcm_substream *substream,
         if (!omap_mcpdm_active(mcpdm)) {
                 omap_mcpdm_start(mcpdm);
                 omap_mcpdm_reg_dump(mcpdm);
+        } else if (mcpdm->restart) {
+                omap_mcpdm_stop(mcpdm);
+                omap_mcpdm_start(mcpdm);
+                mcpdm->restart = false;
+                omap_mcpdm_reg_dump(mcpdm);
         }
 
         return 0;
@@ -369,7 +393,7 @@ static int omap_mcpdm_probe(struct snd_soc_dai *dai)
         pm_runtime_get_sync(mcpdm->dev);
         omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, 0x00);
 
-        ret = request_irq(mcpdm->irq, omap_mcpdm_irq_handler,
+        ret = devm_request_irq(mcpdm->dev, mcpdm->irq, omap_mcpdm_irq_handler,
                                 0, "McPDM", (void *)mcpdm);
 
         pm_runtime_put_sync(mcpdm->dev);
@@ -380,8 +404,9 @@ static int omap_mcpdm_probe(struct snd_soc_dai *dai)
         }
 
         /* Configure McPDM threshold values */
-        mcpdm->dn_threshold = 2;
-        mcpdm->up_threshold = MCPDM_UP_THRES_MAX - 3;
+        mcpdm->config[SNDRV_PCM_STREAM_PLAYBACK].threshold = 2;
+        mcpdm->config[SNDRV_PCM_STREAM_CAPTURE].threshold =
+                                                        MCPDM_UP_THRES_MAX - 3;
         return ret;
 }
 
@@ -389,7 +414,6 @@ static int omap_mcpdm_remove(struct snd_soc_dai *dai)
 {
         struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);
 
-        free_irq(mcpdm->irq, (void *)mcpdm);
         pm_runtime_disable(mcpdm->dev);
 
         return 0;
@@ -420,6 +444,10 @@ static struct snd_soc_dai_driver omap_mcpdm_dai = {
         .ops = &omap_mcpdm_dai_ops,
 };
 
+static const struct snd_soc_component_driver omap_mcpdm_component = {
+        .name           = "omap-mcpdm",
+};
+
 void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd,
                                     u8 rx1, u8 rx2)
 {
@@ -446,33 +474,30 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
         if (res == NULL)
                 return -ENOMEM;
 
-        omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA;
-        omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA;
+        mcpdm->dma_data[0].addr = res->start + MCPDM_REG_DN_DATA;
+        mcpdm->dma_data[1].addr = res->start + MCPDM_REG_UP_DATA;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link");
         if (!res)
                 return -ENODEV;
 
-        omap_mcpdm_dai_dma_params[0].dma_req = res->start;
+        mcpdm->dma_req[0] = res->start;
+        mcpdm->dma_data[0].filter_data = &mcpdm->dma_req[0];
 
         res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "up_link");
         if (!res)
                 return -ENODEV;
 
-        omap_mcpdm_dai_dma_params[1].dma_req = res->start;
+        mcpdm->dma_req[1] = res->start;
+        mcpdm->dma_data[1].filter_data = &mcpdm->dma_req[1];
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
         if (res == NULL)
                 return -ENOMEM;
 
-        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     resource_size(res), "McPDM"))
-                return -EBUSY;
-
-        mcpdm->io_base = devm_ioremap(&pdev->dev, res->start,
-                                      resource_size(res));
-        if (!mcpdm->io_base)
-                return -ENOMEM;
+        mcpdm->io_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(mcpdm->io_base))
+                return PTR_ERR(mcpdm->io_base);
 
         mcpdm->irq = platform_get_irq(pdev, 0);
         if (mcpdm->irq < 0)
@@ -480,12 +505,13 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
 
         mcpdm->dev = &pdev->dev;
 
-        return snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai);
+        return snd_soc_register_component(&pdev->dev, &omap_mcpdm_component,
+                                          &omap_mcpdm_dai, 1);
 }
 
 static int asoc_mcpdm_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index c722c2ef9665..c28e042f2208 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -32,8 +32,6 @@
 #include <sound/dmaengine_pcm.h>
 #include <sound/soc.h>
 
-#include "omap-pcm.h"
-
 #ifdef CONFIG_ARCH_OMAP1
 #define pcm_omap1510()  cpu_is_omap1510()
 #else
@@ -56,25 +54,6 @@ static const struct snd_pcm_hardware omap_pcm_hardware = {
         .buffer_bytes_max       = 128 * 1024,
 };
 
-static int omap_pcm_get_dma_buswidth(int num_bits)
-{
-        int buswidth;
-
-        switch (num_bits) {
-        case 16:
-                buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;
-                break;
-        case 32:
-                buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;
-                break;
-        default:
-                buswidth = -EINVAL;
-                break;
-        }
-        return buswidth;
-}
-
-
 /* this may get called several times by oss emulation */
 static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
                               struct snd_pcm_hw_params *params)
@@ -105,20 +84,9 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
         if (err)
                 return err;
 
-        /* Override the *_dma addr_width if requested by the DAI driver */
-        if (dma_data->data_type) {
-                int buswidth = omap_pcm_get_dma_buswidth(dma_data->data_type);
-
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        config.dst_addr_width = buswidth;
-                else
-                        config.src_addr_width = buswidth;
-        }
-
-        config.src_addr = dma_data->port_addr;
-        config.dst_addr = dma_data->port_addr;
-        config.src_maxburst = dma_data->packet_size;
-        config.dst_maxburst = dma_data->packet_size;
+        snd_dmaengine_pcm_set_config_from_dai_data(substream,
+                        snd_soc_dai_get_dma_data(rtd->cpu_dai, substream),
+                        &config);
 
         return dmaengine_slave_config(chan, &config);
 }
@@ -129,37 +97,6 @@ static int omap_pcm_hw_free(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct omap_pcm_dma_data *dma_data;
-        int ret = 0;
-
-        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-        case SNDRV_PCM_TRIGGER_RESUME:
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                /* Configure McBSP internal buffer usage */
-                if (dma_data->set_threshold)
-                        dma_data->set_threshold(substream);
-                break;
-
-        case SNDRV_PCM_TRIGGER_STOP:
-        case SNDRV_PCM_TRIGGER_SUSPEND:
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                break;
-        default:
-                ret = -EINVAL;
-        }
-
-        if (ret == 0)
-                ret = snd_dmaengine_pcm_trigger(substream, cmd);
-
-        return ret;
-}
-
 static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)
 {
         snd_pcm_uframes_t offset;
@@ -175,20 +112,15 @@ static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)
 static int omap_pcm_open(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct omap_pcm_dma_data *dma_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
 
         snd_soc_set_runtime_hwparams(substream, &omap_pcm_hardware);
 
         dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
-        return snd_dmaengine_pcm_open(substream, omap_dma_filter_fn,
-                                      &dma_data->dma_req);
-}
-
-static int omap_pcm_close(struct snd_pcm_substream *substream)
-{
-        snd_dmaengine_pcm_close(substream);
-        return 0;
+        return snd_dmaengine_pcm_open_request_chan(substream,
+                                                   omap_dma_filter_fn,
+                                                   dma_data->filter_data);
 }
 
 static int omap_pcm_mmap(struct snd_pcm_substream *substream,
@@ -204,11 +136,11 @@ static int omap_pcm_mmap(struct snd_pcm_substream *substream,
 
 static struct snd_pcm_ops omap_pcm_ops = {
         .open           = omap_pcm_open,
-        .close          = omap_pcm_close,
+        .close          = snd_dmaengine_pcm_close_release_chan,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = omap_pcm_hw_params,
         .hw_free        = omap_pcm_hw_free,
-        .trigger        = omap_pcm_trigger,
+        .trigger        = snd_dmaengine_pcm_trigger,
         .pointer        = omap_pcm_pointer,
         .mmap           = omap_pcm_mmap,
 };
diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h
deleted file mode 100644
index cabe74c4068b..000000000000
--- a/sound/soc/omap/omap-pcm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * omap-pcm.h
- *
- * Copyright (C) 2008 Nokia Corporation
- *
- * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
- *          Peter Ujfalusi <peter.ujfalusi@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef __OMAP_PCM_H__
-#define __OMAP_PCM_H__
-
-struct snd_pcm_substream;
-
-struct omap_pcm_dma_data {
-        char            *name;          /* stream identifier */
-        int             dma_req;        /* DMA request line */
-        unsigned long   port_addr;      /* transmit/receive register */
-        void (*set_threshold)(struct snd_pcm_substream *substream);
-        int             data_type;      /* 8, 16, 32 (bits) or 0 to let omap-pcm
-                                         * to decide the sDMA data type */
-        int             packet_size;    /* packet size only in PACKET mode */
-};
-
-#endif
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index fd98509d0f49..2a9324f794d8 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -43,7 +43,6 @@
 #include <sound/jack.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 struct omap_twl4030 {
         int jack_detect;        /* board can detect jack events */
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 805512f2555a..cf604a2faa18 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -34,7 +34,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define OMAP3_PANDORA_DAC_POWER_GPIO    118
 #define OMAP3_PANDORA_AMP_POWER_GPIO    14
@@ -80,12 +79,18 @@ static int omap3pandora_hw_params(struct snd_pcm_substream *substream,
 static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *k, int event)
 {
+        int ret;
+
         /*
          * The PCM1773 DAC datasheet requires 1ms delay between switching
          * VCC power on/off and /PD pin high/low
          */
         if (SND_SOC_DAPM_EVENT_ON(event)) {
-                regulator_enable(omap3pandora_dac_reg);
+                ret = regulator_enable(omap3pandora_dac_reg);
+                if (ret) {
+                        dev_err(w->dapm->dev, "Failed to power DAC: %d\n", ret);
+                        return ret;
+                }
                 mdelay(1);
                 gpio_set_value(OMAP3_PANDORA_DAC_POWER_GPIO, 1);
         } else {
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 06ef8d67ed1c..d03e57da7708 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -33,7 +33,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 #include "../codecs/tlv320aic23.h"
 
 #define CODEC_CLOCK     12000000
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 3cd525748975..249cd230ad8f 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -37,7 +37,6 @@
 #include <asm/mach-types.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define RX51_TVOUT_SEL_GPIO             40
 #define RX51_JACK_DETECT_GPIO           177
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
index 190eb0bccf5f..349930015264 100644
--- a/sound/soc/pxa/mmp-pcm.c
+++ b/sound/soc/pxa/mmp-pcm.c
@@ -118,9 +118,8 @@ static int mmp_pcm_open(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct platform_device *pdev = to_platform_device(rtd->platform->dev);
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct mmp_dma_data *dma_data;
+        struct mmp_dma_data dma_data;
         struct resource *r;
-        int ret;
 
         r = platform_get_resource(pdev, IORESOURCE_DMA, substream->stream);
         if (!r)
@@ -128,33 +127,12 @@ static int mmp_pcm_open(struct snd_pcm_substream *substream)
 
         snd_soc_set_runtime_hwparams(substream,
                                 &mmp_pcm_hardware[substream->stream]);
-        dma_data = devm_kzalloc(&pdev->dev,
-                        sizeof(struct mmp_dma_data), GFP_KERNEL);
-        if (dma_data == NULL)
-                return -ENOMEM;
 
-        dma_data->dma_res = r;
-        dma_data->ssp_id = cpu_dai->id;
+        dma_data.dma_res = r;
+        dma_data.ssp_id = cpu_dai->id;
 
-        ret = snd_dmaengine_pcm_open(substream, filter, dma_data);
-        if (ret) {
-                devm_kfree(&pdev->dev, dma_data);
-                return ret;
-        }
-
-        snd_dmaengine_pcm_set_data(substream, dma_data);
-        return 0;
-}
-
-static int mmp_pcm_close(struct snd_pcm_substream *substream)
-{
-        struct mmp_dma_data *dma_data = snd_dmaengine_pcm_get_data(substream);
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct platform_device *pdev = to_platform_device(rtd->platform->dev);
-
-        snd_dmaengine_pcm_close(substream);
-        devm_kfree(&pdev->dev, dma_data);
-        return 0;
+        return snd_dmaengine_pcm_open_request_chan(substream, filter,
+                    &dma_data);
 }
 
 static int mmp_pcm_mmap(struct snd_pcm_substream *substream,
@@ -171,7 +149,7 @@ static int mmp_pcm_mmap(struct snd_pcm_substream *substream,
 
 struct snd_pcm_ops mmp_pcm_ops = {
         .open           = mmp_pcm_open,
-        .close          = mmp_pcm_close,
+        .close          = snd_dmaengine_pcm_close_release_chan,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = mmp_pcm_hw_params,
         .trigger        = snd_dmaengine_pcm_trigger,
diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c
index 9140c4abafbc..a64779980177 100644
--- a/sound/soc/pxa/mmp-sspa.c
+++ b/sound/soc/pxa/mmp-sspa.c
@@ -405,6 +405,10 @@ struct snd_soc_dai_driver mmp_sspa_dai = {
         .ops = &mmp_sspa_dai_ops,
 };
 
+static const struct snd_soc_component_driver mmp_sspa_component = {
+        .name           = "mmp-sspa",
+};
+
 static int asoc_mmp_sspa_probe(struct platform_device *pdev)
 {
         struct sspa_priv *priv;
@@ -450,7 +454,8 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev)
         priv->dai_fmt = (unsigned int) -1;
         platform_set_drvdata(pdev, priv);
 
-        return snd_soc_register_dai(&pdev->dev, &mmp_sspa_dai);
+        return snd_soc_register_component(&pdev->dev, &mmp_sspa_component,
+                                          &mmp_sspa_dai, 1);
 }
 
 static int asoc_mmp_sspa_remove(struct platform_device *pdev)
@@ -460,7 +465,7 @@ static int asoc_mmp_sspa_remove(struct platform_device *pdev)
         clk_disable(priv->audio_clk);
         clk_put(priv->audio_clk);
         clk_put(priv->sysclk);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index d3eb0c2eec77..6f4dd7543e82 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -794,14 +794,19 @@ static struct snd_soc_dai_driver pxa_ssp_dai = {
                 .ops = &pxa_ssp_dai_ops,
 };
 
+static const struct snd_soc_component_driver pxa_ssp_component = {
+        .name           = "pxa-ssp",
+};
+
 static int asoc_ssp_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_dai(&pdev->dev, &pxa_ssp_dai);
+        return snd_soc_register_component(&pdev->dev, &pxa_ssp_component,
+                                          &pxa_ssp_dai, 1);
 }
 
 static int asoc_ssp_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 4b0a009bd683..57ea8e6c5488 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -47,6 +47,7 @@ struct snd_ac97_bus_ops soc_ac97_ops = {
         .warm_reset     = pxa2xx_ac97_warm_reset,
         .reset  = pxa2xx_ac97_cold_reset,
 };
+EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
         .name                   = "AC97 PCM Stereo out",
@@ -232,7 +233,9 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = {
 },
 };
 
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
+static const struct snd_soc_component_driver pxa_ac97_component = {
+        .name           = "pxa-ac97",
+};
 
 static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
 {
@@ -245,13 +248,13 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
          * driver to do interesting things with the clocking to get us up
          * and running.
          */
-        return snd_soc_register_dais(&pdev->dev, pxa_ac97_dai_driver,
-                        ARRAY_SIZE(pxa_ac97_dai_driver));
+        return snd_soc_register_component(&pdev->dev, &pxa_ac97_component,
+                                          pxa_ac97_dai_driver, ARRAY_SIZE(pxa_ac97_dai_driver));
 }
 
 static int pxa2xx_ac97_dev_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai_driver));
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 6b1a06f67564..f7ca71664112 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -360,14 +360,19 @@ static struct snd_soc_dai_driver pxa_i2s_dai = {
         .symmetric_rates = 1,
 };
 
+static const struct snd_soc_component_driver pxa_i2s_component = {
+        .name           = "pxa-i2s",
+};
+
 static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_dai(&pdev->dev, &pxa_i2s_dai);
+        return snd_soc_register_component(&pdev->dev, &pxa_i2s_component,
+                                          &pxa_i2s_dai, 1);
 }
 
 static int pxa2xx_i2s_drv_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c
index fee4d477a49c..73bb99f0109a 100644
--- a/sound/soc/s6000/s6000-i2s.c
+++ b/sound/soc/s6000/s6000-i2s.c
@@ -436,6 +436,10 @@ static struct snd_soc_dai_driver s6000_i2s_dai = {
         .ops = &s6000_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver s6000_i2s_component = {
+        .name           = "s6000-i2s",
+};
+
 static int s6000_i2s_probe(struct platform_device *pdev)
 {
         struct s6000_i2s_dev *dev;
@@ -543,7 +547,8 @@ static int s6000_i2s_probe(struct platform_device *pdev)
                          S6_I2S_INT_UNDERRUN |
                          S6_I2S_INT_OVERRUN);
 
-        ret = snd_soc_register_dai(&pdev->dev, &s6000_i2s_dai);
+        ret = snd_soc_register_component(&pdev->dev, &s6000_i2s_component,
+                                         &s6000_i2s_dai, 1);
         if (ret)
                 goto err_release_dev;
 
@@ -572,7 +577,7 @@ static void s6000_i2s_remove(struct platform_device *pdev)
         struct resource *region;
         void __iomem *mmio = dev->scbbase;
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         s6000_i2s_stop_channel(dev, 0);
         s6000_i2s_stop_channel(dev, 1);
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 90e7e6653233..475fb0d8b3c6 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -35,11 +35,10 @@ config SND_SAMSUNG_I2S
         tristate
 
 config SND_SOC_SAMSUNG_NEO1973_WM8753
-        tristate "Audio support for Openmoko Neo1973 Smartphones (GTA01/GTA02)"
-        depends on SND_SOC_SAMSUNG && (MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02)
+        tristate "Audio support for Openmoko Neo1973 Smartphones (GTA02)"
+        depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA02
         select SND_S3C24XX_I2S
         select SND_SOC_WM8753
-        select SND_SOC_LM4857 if MACH_NEO1973_GTA01
         select SND_SOC_DFBMCS320
         help
           Say Y here to enable audio support for the Openmoko Neo1973
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 0df3c5644cfa..cb88ead98917 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -20,7 +20,7 @@
 #include <sound/soc.h>
 
 #include <mach/dma.h>
-#include <plat/regs-ac97.h>
+#include "regs-ac97.h"
 #include <linux/platform_data/asoc-s3c.h>
 
 #include "dma.h"
@@ -370,6 +370,10 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = {
         },
 };
 
+static const struct snd_soc_component_driver s3c_ac97_component = {
+        .name           = "s3c-ac97",
+};
+
 static int s3c_ac97_probe(struct platform_device *pdev)
 {
         struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res;
@@ -457,8 +461,8 @@ static int s3c_ac97_probe(struct platform_device *pdev)
                 goto err4;
         }
 
-        ret = snd_soc_register_dais(&pdev->dev, s3c_ac97_dai,
-                        ARRAY_SIZE(s3c_ac97_dai));
+        ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
+                                         s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));
         if (ret)
                 goto err5;
 
@@ -470,7 +474,7 @@ static int s3c_ac97_probe(struct platform_device *pdev)
 
         return 0;
 err6:
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai));
+        snd_soc_unregister_component(&pdev->dev);
 err5:
         free_irq(irq_res->start, NULL);
 err4:
@@ -490,7 +494,7 @@ static int s3c_ac97_remove(struct platform_device *pdev)
         struct resource *mem_res, *irq_res;
 
         asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai));
+        snd_soc_unregister_component(&pdev->dev);
 
         irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (irq_res)
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index d37ede58e0a8..415ad81999c4 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -218,6 +218,10 @@ static struct snd_soc_dai_driver voice_dai = {
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
 };
 
+static const struct snd_soc_component_driver voice_component = {
+        .name           = "goni-voice",
+};
+
 static struct snd_soc_ops goni_voice_ops = {
         .hw_params = goni_voice_hw_params,
 };
@@ -270,7 +274,8 @@ static int __init goni_init(void)
                 return -ENOMEM;
 
         /* register voice DAI here */
-        ret = snd_soc_register_dai(&goni_snd_device->dev, &voice_dai);
+        ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component,
+                                         &voice_dai, 1);
         if (ret) {
                 platform_device_put(goni_snd_device);
                 return ret;
@@ -280,7 +285,7 @@ static int __init goni_init(void)
         ret = platform_device_add(goni_snd_device);
 
         if (ret) {
-                snd_soc_unregister_dai(&goni_snd_device->dev);
+                snd_soc_unregister_component(&goni_snd_device->dev);
                 platform_device_put(goni_snd_device);
         }
 
@@ -289,7 +294,7 @@ static int __init goni_init(void)
 
 static void __exit goni_exit(void)
 {
-        snd_soc_unregister_dai(&goni_snd_device->dev);
+        snd_soc_unregister_component(&goni_snd_device->dev);
         platform_device_unregister(goni_snd_device);
 }
 
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index 15a3817aa5c8..fa91376e323d 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -20,7 +20,7 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 
-#include <plat/regs-iis.h>
+#include "regs-iis.h"
 #include <asm/mach-types.h>
 
 #include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 6bbeb0bf1a73..82ebb1a51479 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -963,6 +963,10 @@ static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {
         .delay = i2s_delay,
 };
 
+static const struct snd_soc_component_driver samsung_i2s_component = {
+        .name           = "samsung-i2s",
+};
+
 #define SAMSUNG_I2S_RATES       SNDRV_PCM_RATE_8000_96000
 
 #define SAMSUNG_I2S_FMTS        (SNDRV_PCM_FMTBIT_S8 | \
@@ -1114,8 +1118,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "Unable to get drvdata\n");
                         return -EFAULT;
                 }
-                snd_soc_register_dai(&sec_dai->pdev->dev,
-                        &sec_dai->i2s_dai_drv);
+                snd_soc_register_component(&sec_dai->pdev->dev,
+                                           &samsung_i2s_component,
+                                           &sec_dai->i2s_dai_drv, 1);
                 asoc_dma_platform_register(&pdev->dev);
                 return 0;
         }
@@ -1244,7 +1249,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 }
         }
 
-        snd_soc_register_dai(&pri_dai->pdev->dev, &pri_dai->i2s_dai_drv);
+        snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component,
+                                   &pri_dai->i2s_dai_drv, 1);
 
         pm_runtime_enable(&pdev->dev);
 
@@ -1283,7 +1289,7 @@ static int samsung_i2s_remove(struct platform_device *pdev)
         i2s->sec_dai = NULL;
 
         asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         return 0;
 }
@@ -1298,7 +1304,7 @@ static struct platform_device_id samsung_i2s_driver_ids[] = {
         },
         {},
 };
-MODULE_DEVICE_TABLE(platform, samsung-i2s-driver-ids);
+MODULE_DEVICE_TABLE(platform, samsung_i2s_driver_ids);
 
 #ifdef CONFIG_OF
 static struct samsung_i2s_dai_data samsung_i2s_dai_data_array[] = {
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
index a07950b0c8ce..6e5fed30aa27 100644
--- a/sound/soc/samsung/idma.c
+++ b/sound/soc/samsung/idma.c
@@ -68,6 +68,8 @@ static struct idma_info {
         dma_addr_t      lp_tx_addr;
 } idma;
 
+static int idma_irq;
+
 static void idma_getpos(dma_addr_t *src)
 {
         *src = idma.lp_tx_addr +
@@ -305,7 +307,7 @@ static int idma_open(struct snd_pcm_substream *substream)
         if (prtd == NULL)
                 return -ENOMEM;
 
-        ret = request_irq(IRQ_I2S0, iis_irq, 0, "i2s", prtd);
+        ret = request_irq(idma_irq, iis_irq, 0, "i2s", prtd);
         if (ret < 0) {
                 pr_err("fail to claim i2s irq , ret = %d\n", ret);
                 kfree(prtd);
@@ -324,7 +326,7 @@ static int idma_close(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct idma_ctrl *prtd = runtime->private_data;
 
-        free_irq(IRQ_I2S0, prtd);
+        free_irq(idma_irq, prtd);
 
         if (!prtd)
                 pr_err("idma_close called with prtd == NULL\n");
@@ -409,6 +411,7 @@ void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr)
         idma.regs = regs;
         idma.lp_tx_addr = addr;
 }
+EXPORT_SYMBOL_GPL(idma_reg_addr_init);
 
 static struct snd_soc_platform_driver asoc_idma_platform = {
         .ops = &idma_ops,
@@ -418,6 +421,10 @@ static struct snd_soc_platform_driver asoc_idma_platform = {
 
 static int asoc_idma_platform_probe(struct platform_device *pdev)
 {
+        idma_irq = platform_get_irq(pdev, 0);
+        if (idma_irq < 0)
+                return idma_irq;
+
         return snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
 }
 
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index a301d8cfaa34..e591c386917a 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -21,8 +21,7 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <plat/regs-iis.h>
-#include <mach/gta02.h>
+#include "regs-iis.h"
 
 #include "../codecs/wm8753.h"
 #include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index 13bab79ad93d..1566afe9ef52 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -490,6 +490,10 @@ static struct snd_soc_dai_driver s3c_pcm_dai[] = {
         },
 };
 
+static const struct snd_soc_component_driver s3c_pcm_component = {
+        .name           = "s3c-pcm",
+};
+
 static int s3c_pcm_dev_probe(struct platform_device *pdev)
 {
         struct s3c_pcm_info *pcm;
@@ -583,7 +587,8 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
 
         pm_runtime_enable(&pdev->dev);
 
-        ret = snd_soc_register_dai(&pdev->dev, &s3c_pcm_dai[pdev->id]);
+        ret = snd_soc_register_component(&pdev->dev, &s3c_pcm_component,
+                                         &s3c_pcm_dai[pdev->id], 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret);
                 goto err5;
@@ -598,7 +603,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
         return 0;
 
 err6:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 err5:
         clk_disable_unprepare(pcm->pclk);
         clk_put(pcm->pclk);
@@ -619,7 +624,7 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev)
         struct resource *mem_res;
 
         asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         pm_runtime_disable(&pdev->dev);
 
diff --git a/sound/soc/samsung/regs-ac97.h b/sound/soc/samsung/regs-ac97.h
new file mode 100644
index 000000000000..c3878f7acb83
--- /dev/null
+++ b/sound/soc/samsung/regs-ac97.h
@@ -0,0 +1,67 @@
+/* arch/arm/mach-s3c2410/include/mach/regs-ac97.h
+ *
+ * Copyright (c) 2006 Simtec Electronics <linux@simtec.co.uk>
+ *              http://www.simtec.co.uk/products/SWLINUX/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * S3C2440 AC97 Controller
+*/
+
+#ifndef __ASM_ARCH_REGS_AC97_H
+#define __ASM_ARCH_REGS_AC97_H __FILE__
+
+#define S3C_AC97_GLBCTRL                                (0x00)
+
+#define S3C_AC97_GLBCTRL_CODECREADYIE                   (1<<22)
+#define S3C_AC97_GLBCTRL_PCMOUTURIE                     (1<<21)
+#define S3C_AC97_GLBCTRL_PCMINORIE                      (1<<20)
+#define S3C_AC97_GLBCTRL_MICINORIE                      (1<<19)
+#define S3C_AC97_GLBCTRL_PCMOUTTIE                      (1<<18)
+#define S3C_AC97_GLBCTRL_PCMINTIE                       (1<<17)
+#define S3C_AC97_GLBCTRL_MICINTIE                       (1<<16)
+#define S3C_AC97_GLBCTRL_PCMOUTTM_OFF                   (0<<12)
+#define S3C_AC97_GLBCTRL_PCMOUTTM_PIO                   (1<<12)
+#define S3C_AC97_GLBCTRL_PCMOUTTM_DMA                   (2<<12)
+#define S3C_AC97_GLBCTRL_PCMOUTTM_MASK                  (3<<12)
+#define S3C_AC97_GLBCTRL_PCMINTM_OFF                    (0<<10)
+#define S3C_AC97_GLBCTRL_PCMINTM_PIO                    (1<<10)
+#define S3C_AC97_GLBCTRL_PCMINTM_DMA                    (2<<10)
+#define S3C_AC97_GLBCTRL_PCMINTM_MASK                   (3<<10)
+#define S3C_AC97_GLBCTRL_MICINTM_OFF                    (0<<8)
+#define S3C_AC97_GLBCTRL_MICINTM_PIO                    (1<<8)
+#define S3C_AC97_GLBCTRL_MICINTM_DMA                    (2<<8)
+#define S3C_AC97_GLBCTRL_MICINTM_MASK                   (3<<8)
+#define S3C_AC97_GLBCTRL_TRANSFERDATAENABLE             (1<<3)
+#define S3C_AC97_GLBCTRL_ACLINKON                       (1<<2)
+#define S3C_AC97_GLBCTRL_WARMRESET                      (1<<1)
+#define S3C_AC97_GLBCTRL_COLDRESET                      (1<<0)
+
+#define S3C_AC97_GLBSTAT                                (0x04)
+
+#define S3C_AC97_GLBSTAT_CODECREADY                     (1<<22)
+#define S3C_AC97_GLBSTAT_PCMOUTUR                       (1<<21)
+#define S3C_AC97_GLBSTAT_PCMINORI                       (1<<20)
+#define S3C_AC97_GLBSTAT_MICINORI                       (1<<19)
+#define S3C_AC97_GLBSTAT_PCMOUTTI                       (1<<18)
+#define S3C_AC97_GLBSTAT_PCMINTI                        (1<<17)
+#define S3C_AC97_GLBSTAT_MICINTI                        (1<<16)
+#define S3C_AC97_GLBSTAT_MAINSTATE_IDLE                 (0<<0)
+#define S3C_AC97_GLBSTAT_MAINSTATE_INIT                 (1<<0)
+#define S3C_AC97_GLBSTAT_MAINSTATE_READY                (2<<0)
+#define S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE               (3<<0)
+#define S3C_AC97_GLBSTAT_MAINSTATE_LP                   (4<<0)
+#define S3C_AC97_GLBSTAT_MAINSTATE_WARM                 (5<<0)
+
+#define S3C_AC97_CODEC_CMD                              (0x08)
+
+#define S3C_AC97_CODEC_CMD_READ                         (1<<23)
+
+#define S3C_AC97_STAT                                   (0x0c)
+#define S3C_AC97_PCM_ADDR                               (0x10)
+#define S3C_AC97_PCM_DATA                               (0x18)
+#define S3C_AC97_MIC_DATA                               (0x1C)
+
+#endif /* __ASM_ARCH_REGS_AC97_H */
diff --git a/sound/soc/samsung/regs-iis.h b/sound/soc/samsung/regs-iis.h
new file mode 100644
index 000000000000..a18d35e7a735
--- /dev/null
+++ b/sound/soc/samsung/regs-iis.h
@@ -0,0 +1,70 @@
+/* arch/arm/plat-samsung/include/plat/regs-iis.h
+ *
+ * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
+ *                    http://www.simtec.co.uk/products/SWLINUX/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * S3C2410 IIS register definition
+*/
+
+#ifndef __ASM_ARCH_REGS_IIS_H
+#define __ASM_ARCH_REGS_IIS_H
+
+#define S3C2410_IISCON                  (0x00)
+
+#define S3C2410_IISCON_LRINDEX          (1 << 8)
+#define S3C2410_IISCON_TXFIFORDY        (1 << 7)
+#define S3C2410_IISCON_RXFIFORDY        (1 << 6)
+#define S3C2410_IISCON_TXDMAEN          (1 << 5)
+#define S3C2410_IISCON_RXDMAEN          (1 << 4)
+#define S3C2410_IISCON_TXIDLE           (1 << 3)
+#define S3C2410_IISCON_RXIDLE           (1 << 2)
+#define S3C2410_IISCON_PSCEN            (1 << 1)
+#define S3C2410_IISCON_IISEN            (1 << 0)
+
+#define S3C2410_IISMOD                  (0x04)
+
+#define S3C2440_IISMOD_MPLL             (1 << 9)
+#define S3C2410_IISMOD_SLAVE            (1 << 8)
+#define S3C2410_IISMOD_NOXFER           (0 << 6)
+#define S3C2410_IISMOD_RXMODE           (1 << 6)
+#define S3C2410_IISMOD_TXMODE           (2 << 6)
+#define S3C2410_IISMOD_TXRXMODE         (3 << 6)
+#define S3C2410_IISMOD_LR_LLOW          (0 << 5)
+#define S3C2410_IISMOD_LR_RLOW          (1 << 5)
+#define S3C2410_IISMOD_IIS              (0 << 4)
+#define S3C2410_IISMOD_MSB              (1 << 4)
+#define S3C2410_IISMOD_8BIT             (0 << 3)
+#define S3C2410_IISMOD_16BIT            (1 << 3)
+#define S3C2410_IISMOD_BITMASK          (1 << 3)
+#define S3C2410_IISMOD_256FS            (0 << 2)
+#define S3C2410_IISMOD_384FS            (1 << 2)
+#define S3C2410_IISMOD_16FS             (0 << 0)
+#define S3C2410_IISMOD_32FS             (1 << 0)
+#define S3C2410_IISMOD_48FS             (2 << 0)
+#define S3C2410_IISMOD_FS_MASK          (3 << 0)
+
+#define S3C2410_IISPSR                  (0x08)
+
+#define S3C2410_IISPSR_INTMASK          (31 << 5)
+#define S3C2410_IISPSR_INTSHIFT         (5)
+#define S3C2410_IISPSR_EXTMASK          (31 << 0)
+#define S3C2410_IISPSR_EXTSHFIT         (0)
+
+#define S3C2410_IISFCON                 (0x0c)
+
+#define S3C2410_IISFCON_TXDMA           (1 << 15)
+#define S3C2410_IISFCON_RXDMA           (1 << 14)
+#define S3C2410_IISFCON_TXENABLE        (1 << 13)
+#define S3C2410_IISFCON_RXENABLE        (1 << 12)
+#define S3C2410_IISFCON_TXMASK          (0x3f << 6)
+#define S3C2410_IISFCON_TXSHIFT         (6)
+#define S3C2410_IISFCON_RXMASK          (0x3f)
+#define S3C2410_IISFCON_RXSHIFT         (0)
+
+#define S3C2410_IISFIFO                 (0x10)
+
+#endif /* __ASM_ARCH_REGS_IIS_H */
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index a5826ea9cad6..704460a37005 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -24,7 +24,7 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 
-#include <plat/regs-iis.h>
+#include "regs-iis.h"
 #include <asm/mach-types.h>
 
 #include "s3c24xx-i2s.h"
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 7a73380b3560..20e98d1dded2 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -731,8 +731,9 @@ static int s3c2412_i2s_resume(struct snd_soc_dai *dai)
 #define s3c2412_i2s_resume  NULL
 #endif
 
-int s3c_i2sv2_register_dai(struct device *dev, int id,
-                struct snd_soc_dai_driver *drv)
+int s3c_i2sv2_register_component(struct device *dev, int id,
+                           struct snd_soc_component_driver *cmp_drv,
+                           struct snd_soc_dai_driver *dai_drv)
 {
         struct snd_soc_dai_ops *ops = drv->ops;
 
@@ -750,8 +751,8 @@ int s3c_i2sv2_register_dai(struct device *dev, int id,
         drv->suspend = s3c2412_i2s_suspend;
         drv->resume = s3c2412_i2s_resume;
 
-        return snd_soc_register_dai(dev, drv);
+        return snd_soc_register_component(dev, cmp_drv, dai_drv, 1);
 }
-EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai);
+EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component);
 
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/s3c-i2s-v2.h b/sound/soc/samsung/s3c-i2s-v2.h
index f8297d9bb8a3..90abab364b49 100644
--- a/sound/soc/samsung/s3c-i2s-v2.h
+++ b/sound/soc/samsung/s3c-i2s-v2.h
@@ -92,7 +92,7 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai,
                            unsigned long base);
 
 /**
- * s3c_i2sv2_register_dai - register dai with soc core
+ * s3c_i2sv2_register_component - register component and dai with soc core
  * @dev: DAI device
  * @id: DAI ID
  * @drv: The driver structure to register
@@ -100,7 +100,8 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai,
  * Fill in any missing fields and then register the given dai with the
  * soc core.
  */
-extern int s3c_i2sv2_register_dai(struct device *dev, int id,
-                struct snd_soc_dai_driver *drv);
+extern int s3c_i2sv2_register_component(struct device *dev, int id,
+                                        struct snd_soc_component_driver *cmp_drv,
+                                        struct snd_soc_dai_driver *dai_drv);
 
 #endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 221337716393..47e23864ea72 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -160,11 +160,17 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = {
         .ops = &s3c2412_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver s3c2412_i2s_component = {
+        .name           = "s3c2412-i2s",
+};
+
 static int s3c2412_iis_dev_probe(struct platform_device *pdev)
 {
         int ret = 0;
 
-        ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
+        ret = s3c_i2sv2_register_component(&pdev->dev, -1,
+                                           &s3c2412_i2s_component,
+                                           &s3c2412_i2s_dai);
         if (ret) {
                 pr_err("failed to register the dai\n");
                 return ret;
@@ -178,14 +184,14 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev)
 
         return 0;
 err:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return ret;
 }
 
 static int s3c2412_iis_dev_remove(struct platform_device *pdev)
 {
         asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 13f6dd1ceb00..8b3414551a62 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -24,7 +24,7 @@
 #include <sound/pcm_params.h>
 
 #include <mach/dma.h>
-#include <plat/regs-iis.h>
+#include "regs-iis.h"
 
 #include "dma.h"
 #include "s3c24xx-i2s.h"
@@ -465,11 +465,16 @@ static struct snd_soc_dai_driver s3c24xx_i2s_dai = {
         .ops = &s3c24xx_i2s_dai_ops,
 };
 
+static const struct snd_soc_component_driver s3c24xx_i2s_component = {
+        .name           = "s3c24xx-i2s",
+};
+
 static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
 {
         int ret = 0;
 
-        ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai);
+        ret = snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component,
+                                         &s3c24xx_i2s_dai, 1);
         if (ret) {
                 pr_err("failed to register the dai\n");
                 return ret;
@@ -483,14 +488,14 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
 
         return 0;
 err:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return ret;
 }
 
 static int s3c24xx_iis_dev_remove(struct platform_device *pdev)
 {
         asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c
index 333e1b7f06c7..1b7b52b0af97 100644
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
@@ -18,7 +18,7 @@
 #include <sound/soc.h>
 #include <sound/s3c24xx_uda134x.h>
 
-#include <plat/regs-iis.h>
+#include "regs-iis.h"
 
 #include "s3c24xx-i2s.h"
 
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index 5008e5bd6ed8..2e5ebb2f1982 100644
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -357,6 +357,10 @@ static struct snd_soc_dai_driver samsung_spdif_dai = {
         .resume = spdif_resume,
 };
 
+static const struct snd_soc_component_driver samsung_spdif_component = {
+        .name           = "samsung-spdif",
+};
+
 static int spdif_probe(struct platform_device *pdev)
 {
         struct s3c_audio_pdata *spdif_pdata;
@@ -424,7 +428,8 @@ static int spdif_probe(struct platform_device *pdev)
 
         dev_set_drvdata(&pdev->dev, spdif);
 
-        ret = snd_soc_register_dai(&pdev->dev, &samsung_spdif_dai);
+        ret = snd_soc_register_component(&pdev->dev, &samsung_spdif_component,
+                                         &samsung_spdif_dai, 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "fail to register dai\n");
                 goto err4;
@@ -445,7 +450,7 @@ static int spdif_probe(struct platform_device *pdev)
 
         return 0;
 err5:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 err4:
         iounmap(spdif->regs);
 err3:
@@ -466,7 +471,7 @@ static int spdif_remove(struct platform_device *pdev)
         struct resource *mem_res;
 
         asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         iounmap(spdif->regs);
 
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index c724026a246f..f830c41f97dd 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -296,7 +296,6 @@ struct fsi_core {
 
 struct fsi_master {
         void __iomem *base;
-        int irq;
         struct fsi_priv fsia;
         struct fsi_priv fsib;
         const struct fsi_core *core;
@@ -1886,6 +1885,10 @@ static struct snd_soc_platform_driver fsi_soc_platform = {
         .pcm_free       = fsi_pcm_free,
 };
 
+static const struct snd_soc_component_driver fsi_soc_component = {
+        .name           = "fsi",
+};
+
 /*
  *              platform function
  */
@@ -2002,7 +2005,6 @@ static int fsi_probe(struct platform_device *pdev)
         }
 
         /* master setting */
-        master->irq             = irq;
         master->core            = core;
         spin_lock_init(&master->lock);
 
@@ -2046,10 +2048,10 @@ static int fsi_probe(struct platform_device *pdev)
                 goto exit_fsib;
         }
 
-        ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai,
-                                    ARRAY_SIZE(fsi_soc_dai));
+        ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component,
+                                    fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai));
         if (ret < 0) {
-                dev_err(&pdev->dev, "cannot snd dai register\n");
+                dev_err(&pdev->dev, "cannot snd component register\n");
                 goto exit_snd_soc;
         }
 
@@ -2074,7 +2076,7 @@ static int fsi_remove(struct platform_device *pdev)
 
         pm_runtime_disable(&pdev->dev);
 
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai));
+        snd_soc_unregister_component(&pdev->dev);
         snd_soc_unregister_platform(&pdev->dev);
 
         fsi_stream_remove(&master->fsia);
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index 4cc2d64ef476..af19f77b7bf0 100644
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -310,15 +310,19 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = {
 #endif
 };
 
+static const struct snd_soc_component_driver sh4_hac_component = {
+        .name           = "sh4-hac",
+};
+
 static int hac_soc_platform_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_dais(&pdev->dev, sh4_hac_dai,
-                        ARRAY_SIZE(sh4_hac_dai));
+        return snd_soc_register_component(&pdev->dev, &sh4_hac_component,
+                                          sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai));
 }
 
 static int hac_soc_platform_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_hac_dai));
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
index 8526e1edaf45..5014a884afee 100644
--- a/sound/soc/sh/migor.c
+++ b/sound/soc/sh/migor.c
@@ -153,7 +153,7 @@ static int migor_dai_init(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_dai_link migor_dai = {
         .name = "wm8978",
         .stream_name = "WM8978",
-        .cpu_dai_name = "siu-i2s-dai",
+        .cpu_dai_name = "siu-pcm-audio",
         .codec_dai_name = "wm8978-hifi",
         .platform_name = "siu-pcm-audio",
         .codec_name = "wm8978.0-001a",
diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c
index 34facdc9e4ac..9dc24ffa892a 100644
--- a/sound/soc/sh/siu_dai.c
+++ b/sound/soc/sh/siu_dai.c
@@ -726,6 +726,10 @@ static struct snd_soc_dai_driver siu_i2s_dai = {
         .ops = &siu_dai_ops,
 };
 
+static const struct snd_soc_component_driver siu_i2s_component = {
+        .name           = "siu-i2s",
+};
+
 static int siu_probe(struct platform_device *pdev)
 {
         const struct firmware *fw_entry;
@@ -783,7 +787,8 @@ static int siu_probe(struct platform_device *pdev)
         dev_set_drvdata(&pdev->dev, info);
 
         /* register using ARRAY version so we can keep dai name */
-        ret = snd_soc_register_dais(&pdev->dev, &siu_i2s_dai, 1);
+        ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component,
+                                         &siu_i2s_dai, 1);
         if (ret < 0)
                 goto edaiinit;
 
@@ -796,7 +801,7 @@ static int siu_probe(struct platform_device *pdev)
         return ret;
 
 esocregp:
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 edaiinit:
         iounmap(info->reg);
 emapreg:
@@ -823,7 +828,7 @@ static int siu_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
 
         snd_soc_unregister_platform(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         iounmap(info->reg);
         iounmap(info->yram);
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index c8e73a703934..e889405ebd38 100644
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -379,15 +379,19 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = {
 #endif
 };
 
+static const struct snd_soc_component_driver sh4_ssi_component = {
+        .name           = "sh4-ssi",
+};
+
 static int sh4_soc_dai_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_dais(&pdev->dev, sh4_ssi_dai,
-                        ARRAY_SIZE(sh4_ssi_dai));
+        return snd_soc_register_component(&pdev->dev, &sh4_ssi_component,
+                                          sh4_ssi_dai, ARRAY_SIZE(sh4_ssi_dai));
 }
 
 static int sh4_soc_dai_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index ed0bfb0ddb96..3853f7eb3f28 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -315,7 +315,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
 }
 
 static int soc_compr_copy(struct snd_compr_stream *cstream,
-                          const char __user *buf, size_t count)
+                          char __user *buf, size_t count)
 {
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
@@ -330,11 +330,38 @@ static int soc_compr_copy(struct snd_compr_stream *cstream,
         return ret;
 }
 
+static int sst_compr_set_metadata(struct snd_compr_stream *cstream,
+                                struct snd_compr_metadata *metadata)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->set_metadata)
+                ret = platform->driver->compr_ops->set_metadata(cstream, metadata);
+
+        return ret;
+}
+
+static int sst_compr_get_metadata(struct snd_compr_stream *cstream,
+                                struct snd_compr_metadata *metadata)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->get_metadata)
+                ret = platform->driver->compr_ops->get_metadata(cstream, metadata);
+
+        return ret;
+}
 /* ASoC Compress operations */
 static struct snd_compr_ops soc_compr_ops = {
         .open           = soc_compr_open,
         .free           = soc_compr_free,
         .set_params     = soc_compr_set_params,
+        .set_metadata   = sst_compr_set_metadata,
+        .get_metadata   = sst_compr_get_metadata,
         .get_params     = soc_compr_get_params,
         .trigger        = soc_compr_trigger,
         .pointer        = soc_compr_pointer,
@@ -357,7 +384,14 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
         /* check client and interface hw capabilities */
         snprintf(new_name, sizeof(new_name), "%s %s-%d",
                         rtd->dai_link->stream_name, codec_dai->name, num);
-        direction = SND_COMPRESS_PLAYBACK;
+
+        if (codec_dai->driver->playback.channels_min)
+                direction = SND_COMPRESS_PLAYBACK;
+        else if (codec_dai->driver->capture.channels_min)
+                direction = SND_COMPRESS_CAPTURE;
+        else
+                return -EINVAL;
+
         compr = kzalloc(sizeof(*compr), GFP_KERNEL);
         if (compr == NULL) {
                 snd_printk(KERN_ERR "Cannot allocate compr\n");
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ff4b45a5d796..d56bbea6e75e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -58,6 +58,7 @@ static DEFINE_MUTEX(client_mutex);
 static LIST_HEAD(dai_list);
 static LIST_HEAD(platform_list);
 static LIST_HEAD(codec_list);
+static LIST_HEAD(component_list);
 
 /*
  * This is a timeout to do a DAPM powerdown after a stream is closed().
@@ -3740,7 +3741,7 @@ static inline char *fmt_multiple_name(struct device *dev,
  *
  * @dai: DAI to register
  */
-int snd_soc_register_dai(struct device *dev,
+static int snd_soc_register_dai(struct device *dev,
                 struct snd_soc_dai_driver *dai_drv)
 {
         struct snd_soc_codec *codec;
@@ -3787,14 +3788,13 @@ int snd_soc_register_dai(struct device *dev,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_register_dai);
 
 /**
  * snd_soc_unregister_dai - Unregister a DAI from the ASoC core
  *
  * @dai: DAI to unregister
  */
-void snd_soc_unregister_dai(struct device *dev)
+static void snd_soc_unregister_dai(struct device *dev)
 {
         struct snd_soc_dai *dai;
 
@@ -3813,7 +3813,6 @@ found:
         kfree(dai->name);
         kfree(dai);
 }
-EXPORT_SYMBOL_GPL(snd_soc_unregister_dai);
 
 /**
  * snd_soc_register_dais - Register multiple DAIs with the ASoC core
@@ -3821,7 +3820,7 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dai);
  * @dai: Array of DAIs to register
  * @count: Number of DAIs
  */
-int snd_soc_register_dais(struct device *dev,
+static int snd_soc_register_dais(struct device *dev,
                 struct snd_soc_dai_driver *dai_drv, size_t count)
 {
         struct snd_soc_codec *codec;
@@ -3885,7 +3884,6 @@ err:
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(snd_soc_register_dais);
 
 /**
  * snd_soc_unregister_dais - Unregister multiple DAIs from the ASoC core
@@ -3893,31 +3891,23 @@ EXPORT_SYMBOL_GPL(snd_soc_register_dais);
  * @dai: Array of DAIs to unregister
  * @count: Number of DAIs
  */
-void snd_soc_unregister_dais(struct device *dev, size_t count)
+static void snd_soc_unregister_dais(struct device *dev, size_t count)
 {
         int i;
 
         for (i = 0; i < count; i++)
                 snd_soc_unregister_dai(dev);
 }
-EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);
 
 /**
- * snd_soc_register_platform - Register a platform with the ASoC core
- *
- * @platform: platform to register
+ * snd_soc_add_platform - Add a platform to the ASoC core
+ * @dev: The parent device for the platform
+ * @platform: The platform to add
+ * @platform_driver: The driver for the platform
  */
-int snd_soc_register_platform(struct device *dev,
-                struct snd_soc_platform_driver *platform_drv)
+int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
+                const struct snd_soc_platform_driver *platform_drv)
 {
-        struct snd_soc_platform *platform;
-
-        dev_dbg(dev, "ASoC: platform register %s\n", dev_name(dev));
-
-        platform = kzalloc(sizeof(struct snd_soc_platform), GFP_KERNEL);
-        if (platform == NULL)
-                return -ENOMEM;
-
         /* create platform component name */
         platform->name = fmt_single_name(dev, &platform->id);
         if (platform->name == NULL) {
@@ -3940,30 +3930,76 @@ int snd_soc_register_platform(struct device *dev,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_register_platform);
+EXPORT_SYMBOL_GPL(snd_soc_add_platform);
 
 /**
- * snd_soc_unregister_platform - Unregister a platform from the ASoC core
+ * snd_soc_register_platform - Register a platform with the ASoC core
  *
- * @platform: platform to unregister
+ * @platform: platform to register
  */
-void snd_soc_unregister_platform(struct device *dev)
+int snd_soc_register_platform(struct device *dev,
+                const struct snd_soc_platform_driver *platform_drv)
 {
         struct snd_soc_platform *platform;
+        int ret;
 
-        list_for_each_entry(platform, &platform_list, list) {
-                if (dev == platform->dev)
-                        goto found;
-        }
-        return;
+        dev_dbg(dev, "ASoC: platform register %s\n", dev_name(dev));
 
-found:
+        platform = kzalloc(sizeof(struct snd_soc_platform), GFP_KERNEL);
+        if (platform == NULL)
+                return -ENOMEM;
+
+        ret = snd_soc_add_platform(dev, platform, platform_drv);
+        if (ret)
+                kfree(platform);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_register_platform);
+
+/**
+ * snd_soc_remove_platform - Remove a platform from the ASoC core
+ * @platform: the platform to remove
+ */
+void snd_soc_remove_platform(struct snd_soc_platform *platform)
+{
         mutex_lock(&client_mutex);
         list_del(&platform->list);
         mutex_unlock(&client_mutex);
 
-        dev_dbg(dev, "ASoC: Unregistered platform '%s'\n", platform->name);
+        dev_dbg(platform->dev, "ASoC: Unregistered platform '%s'\n",
+                platform->name);
         kfree(platform->name);
+}
+EXPORT_SYMBOL_GPL(snd_soc_remove_platform);
+
+struct snd_soc_platform *snd_soc_lookup_platform(struct device *dev)
+{
+        struct snd_soc_platform *platform;
+
+        list_for_each_entry(platform, &platform_list, list) {
+                if (dev == platform->dev)
+                        return platform;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_lookup_platform);
+
+/**
+ * snd_soc_unregister_platform - Unregister a platform from the ASoC core
+ *
+ * @platform: platform to unregister
+ */
+void snd_soc_unregister_platform(struct device *dev)
+{
+        struct snd_soc_platform *platform;
+
+        platform = snd_soc_lookup_platform(dev);
+        if (!platform)
+                return;
+
+        snd_soc_remove_platform(platform);
         kfree(platform);
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_platform);
@@ -4024,8 +4060,8 @@ int snd_soc_register_codec(struct device *dev,
         /* create CODEC component name */
         codec->name = fmt_single_name(dev, &codec->id);
         if (codec->name == NULL) {
-                kfree(codec);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto fail_codec;
         }
 
         if (codec_drv->compress_type)
@@ -4064,7 +4100,7 @@ int snd_soc_register_codec(struct device *dev,
                                                       reg_size, GFP_KERNEL);
                         if (!codec->reg_def_copy) {
                                 ret = -ENOMEM;
-                                goto fail;
+                                goto fail_codec_name;
                         }
                 }
         }
@@ -4088,18 +4124,22 @@ int snd_soc_register_codec(struct device *dev,
         mutex_unlock(&client_mutex);
 
         /* register any DAIs */
-        if (num_dai) {
-                ret = snd_soc_register_dais(dev, dai_drv, num_dai);
-                if (ret < 0)
-                        dev_err(codec->dev, "ASoC: Failed to regster"
-                                " DAIs: %d\n", ret);
+        ret = snd_soc_register_dais(dev, dai_drv, num_dai);
+        if (ret < 0) {
+                dev_err(codec->dev, "ASoC: Failed to regster DAIs: %d\n", ret);
+                goto fail_codec_name;
         }
 
         dev_dbg(codec->dev, "ASoC: Registered codec '%s'\n", codec->name);
         return 0;
 
-fail:
+fail_codec_name:
+        mutex_lock(&client_mutex);
+        list_del(&codec->list);
+        mutex_unlock(&client_mutex);
+
         kfree(codec->name);
+fail_codec:
         kfree(codec);
         return ret;
 }
@@ -4113,7 +4153,6 @@ EXPORT_SYMBOL_GPL(snd_soc_register_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)
@@ -4122,9 +4161,7 @@ void snd_soc_unregister_codec(struct device *dev)
         return;
 
 found:
-        if (codec->num_dai)
-                for (i = 0; i < codec->num_dai; i++)
-                        snd_soc_unregister_dai(dev);
+        snd_soc_unregister_dais(dev, codec->num_dai);
 
         mutex_lock(&client_mutex);
         list_del(&codec->list);
@@ -4139,6 +4176,92 @@ found:
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
 
+
+/**
+ * snd_soc_register_component - Register a component with the ASoC core
+ *
+ */
+int snd_soc_register_component(struct device *dev,
+                         const struct snd_soc_component_driver *cmpnt_drv,
+                         struct snd_soc_dai_driver *dai_drv,
+                         int num_dai)
+{
+        struct snd_soc_component *cmpnt;
+        int ret;
+
+        dev_dbg(dev, "component register %s\n", dev_name(dev));
+
+        cmpnt = devm_kzalloc(dev, sizeof(*cmpnt), GFP_KERNEL);
+        if (!cmpnt) {
+                dev_err(dev, "ASoC: Failed to allocate memory\n");
+                return -ENOMEM;
+        }
+
+        cmpnt->name = fmt_single_name(dev, &cmpnt->id);
+        if (!cmpnt->name) {
+                dev_err(dev, "ASoC: Failed to simplifying name\n");
+                return -ENOMEM;
+        }
+
+        cmpnt->dev      = dev;
+        cmpnt->driver   = cmpnt_drv;
+        cmpnt->num_dai  = num_dai;
+
+        /*
+         * snd_soc_register_dai()  uses fmt_single_name(), and
+         * snd_soc_register_dais() uses fmt_multiple_name()
+         * for dai->name which is used for name based matching
+         */
+        if (1 == num_dai)
+                ret = snd_soc_register_dai(dev, dai_drv);
+        else
+                ret = snd_soc_register_dais(dev, dai_drv, num_dai);
+        if (ret < 0) {
+                dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret);
+                goto error_component_name;
+        }
+
+        mutex_lock(&client_mutex);
+        list_add(&cmpnt->list, &component_list);
+        mutex_unlock(&client_mutex);
+
+        dev_dbg(cmpnt->dev, "ASoC: Registered component '%s'\n", cmpnt->name);
+
+        return ret;
+
+error_component_name:
+        kfree(cmpnt->name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_register_component);
+
+/**
+ * snd_soc_unregister_component - Unregister a component from the ASoC core
+ *
+ */
+void snd_soc_unregister_component(struct device *dev)
+{
+        struct snd_soc_component *cmpnt;
+
+        list_for_each_entry(cmpnt, &component_list, list) {
+                if (dev == cmpnt->dev)
+                        goto found;
+        }
+        return;
+
+found:
+        snd_soc_unregister_dais(dev, cmpnt->num_dai);
+
+        mutex_lock(&client_mutex);
+        list_del(&cmpnt->list);
+        mutex_unlock(&client_mutex);
+
+        dev_dbg(dev, "ASoC: Unregistered component '%s'\n", cmpnt->name);
+        kfree(cmpnt->name);
+}
+EXPORT_SYMBOL_GPL(snd_soc_unregister_component);
+
 /* Retrieve a card's name from device tree */
 int snd_soc_of_parse_card_name(struct snd_soc_card *card,
                                const char *propname)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d6d9ba2e6916..21779a6a781a 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -504,17 +504,27 @@ static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
         return 0;
 }
 
-/* create new dapm mixer control */
-static int dapm_new_mixer(struct snd_soc_dapm_widget *w)
+/*
+ * Determine if a kcontrol is shared. If it is, look it up. If it isn't,
+ * create it. Either way, add the widget into the control's widget list
+ */
+static int dapm_create_or_share_mixmux_kcontrol(struct snd_soc_dapm_widget *w,
+        int kci, struct snd_soc_dapm_path *path)
 {
         struct snd_soc_dapm_context *dapm = w->dapm;
-        int i, ret = 0;
-        size_t name_len, prefix_len;
-        struct snd_soc_dapm_path *path;
         struct snd_card *card = dapm->card->snd_card;
         const char *prefix;
+        size_t prefix_len;
+        int shared;
+        struct snd_kcontrol *kcontrol;
         struct snd_soc_dapm_widget_list *wlist;
+        int wlistentries;
         size_t wlistsize;
+        bool wname_in_long_name, kcname_in_long_name;
+        size_t name_len;
+        char *long_name;
+        const char *name;
+        int ret;
 
         if (dapm->codec)
                 prefix = dapm->codec->name_prefix;
@@ -526,103 +536,141 @@ static int dapm_new_mixer(struct snd_soc_dapm_widget *w)
         else
                 prefix_len = 0;
 
-        /* add kcontrol */
-        for (i = 0; i < w->num_kcontrols; i++) {
+        shared = dapm_is_shared_kcontrol(dapm, w, &w->kcontrol_news[kci],
+                                         &kcontrol);
 
-                /* match name */
-                list_for_each_entry(path, &w->sources, list_sink) {
+        if (kcontrol) {
+                wlist = kcontrol->private_data;
+                wlistentries = wlist->num_widgets + 1;
+        } else {
+                wlist = NULL;
+                wlistentries = 1;
+        }
 
-                        /* mixer/mux paths name must match control name */
-                        if (path->name != (char *)w->kcontrol_news[i].name)
-                                continue;
+        wlistsize = sizeof(struct snd_soc_dapm_widget_list) +
+                        wlistentries * sizeof(struct snd_soc_dapm_widget *);
+        wlist = krealloc(wlist, wlistsize, GFP_KERNEL);
+        if (wlist == NULL) {
+                dev_err(dapm->dev, "ASoC: can't allocate widget list for %s\n",
+                        w->name);
+                return -ENOMEM;
+        }
+        wlist->num_widgets = wlistentries;
+        wlist->widgets[wlistentries - 1] = w;
 
-                        if (w->kcontrols[i]) {
-                                path->kcontrol = w->kcontrols[i];
-                                continue;
+        if (!kcontrol) {
+                if (shared) {
+                        wname_in_long_name = false;
+                        kcname_in_long_name = true;
+                } else {
+                        switch (w->id) {
+                        case snd_soc_dapm_switch:
+                        case snd_soc_dapm_mixer:
+                                wname_in_long_name = true;
+                                kcname_in_long_name = true;
+                                break;
+                        case snd_soc_dapm_mixer_named_ctl:
+                                wname_in_long_name = false;
+                                kcname_in_long_name = true;
+                                break;
+                        case snd_soc_dapm_mux:
+                        case snd_soc_dapm_virt_mux:
+                        case snd_soc_dapm_value_mux:
+                                wname_in_long_name = true;
+                                kcname_in_long_name = false;
+                                break;
+                        default:
+                                kfree(wlist);
+                                return -EINVAL;
                         }
+                }
+
+                if (wname_in_long_name && kcname_in_long_name) {
+                        name_len = strlen(w->name) - prefix_len + 1 +
+                                   strlen(w->kcontrol_news[kci].name) + 1;
 
-                        wlistsize = sizeof(struct snd_soc_dapm_widget_list) +
-                                    sizeof(struct snd_soc_dapm_widget *),
-                        wlist = kzalloc(wlistsize, GFP_KERNEL);
-                        if (wlist == NULL) {
-                                dev_err(dapm->dev,
-                                        "ASoC: can't allocate widget list for %s\n",
-                                        w->name);
+                        long_name = kmalloc(name_len, GFP_KERNEL);
+                        if (long_name == NULL) {
+                                kfree(wlist);
                                 return -ENOMEM;
                         }
-                        wlist->num_widgets = 1;
-                        wlist->widgets[0] = w;
-
-                        /* add dapm control with long name.
-                         * for dapm_mixer this is the concatenation of the
-                         * mixer and kcontrol name.
-                         * for dapm_mixer_named_ctl this is simply the
-                         * kcontrol name.
+
+                        /*
+                         * The control will get a prefix from the control
+                         * creation process but we're also using the same
+                         * prefix for widgets so cut the prefix off the
+                         * front of the widget name.
                          */
-                        name_len = strlen(w->kcontrol_news[i].name) + 1;
-                        if (w->id != snd_soc_dapm_mixer_named_ctl)
-                                name_len += 1 + strlen(w->name);
+                        snprintf(long_name, name_len, "%s %s",
+                                 w->name + prefix_len,
+                                 w->kcontrol_news[kci].name);
+                        long_name[name_len - 1] = '\0';
+
+                        name = long_name;
+                } else if (wname_in_long_name) {
+                        long_name = NULL;
+                        name = w->name + prefix_len;
+                } else {
+                        long_name = NULL;
+                        name = w->kcontrol_news[kci].name;
+                }
 
-                        path->long_name = kmalloc(name_len, GFP_KERNEL);
+                kcontrol = snd_soc_cnew(&w->kcontrol_news[kci], wlist, name,
+                                        prefix);
+                ret = snd_ctl_add(card, kcontrol);
+                if (ret < 0) {
+                        dev_err(dapm->dev,
+                                "ASoC: failed to add widget %s dapm kcontrol %s: %d\n",
+                                w->name, name, ret);
+                        kfree(wlist);
+                        kfree(long_name);
+                        return ret;
+                }
 
-                        if (path->long_name == NULL) {
-                                kfree(wlist);
-                                return -ENOMEM;
-                        }
+                path->long_name = long_name;
+        }
 
-                        switch (w->id) {
-                        default:
-                                /* The control will get a prefix from
-                                 * the control creation process but
-                                 * we're also using the same prefix
-                                 * for widgets so cut the prefix off
-                                 * the front of the widget name.
-                                 */
-                                snprintf((char *)path->long_name, name_len,
-                                         "%s %s", w->name + prefix_len,
-                                         w->kcontrol_news[i].name);
-                                break;
-                        case snd_soc_dapm_mixer_named_ctl:
-                                snprintf((char *)path->long_name, name_len,
-                                         "%s", w->kcontrol_news[i].name);
-                                break;
-                        }
+        kcontrol->private_data = wlist;
+        w->kcontrols[kci] = kcontrol;
+        path->kcontrol = kcontrol;
 
-                        ((char *)path->long_name)[name_len - 1] = '\0';
+        return 0;
+}
 
-                        path->kcontrol = snd_soc_cnew(&w->kcontrol_news[i],
-                                                      wlist, path->long_name,
-                                                      prefix);
-                        ret = snd_ctl_add(card, path->kcontrol);
-                        if (ret < 0) {
-                                dev_err(dapm->dev, "ASoC: failed to add widget"
-                                        " %s dapm kcontrol %s: %d\n",
-                                        w->name, path->long_name, ret);
-                                kfree(wlist);
-                                kfree(path->long_name);
-                                path->long_name = NULL;
-                                return ret;
+/* create new dapm mixer control */
+static int dapm_new_mixer(struct snd_soc_dapm_widget *w)
+{
+        int i, ret;
+        struct snd_soc_dapm_path *path;
+
+        /* add kcontrol */
+        for (i = 0; i < w->num_kcontrols; i++) {
+                /* match name */
+                list_for_each_entry(path, &w->sources, list_sink) {
+                        /* mixer/mux paths name must match control name */
+                        if (path->name != (char *)w->kcontrol_news[i].name)
+                                continue;
+
+                        if (w->kcontrols[i]) {
+                                path->kcontrol = w->kcontrols[i];
+                                continue;
                         }
-                        w->kcontrols[i] = path->kcontrol;
+
+                        ret = dapm_create_or_share_mixmux_kcontrol(w, i, path);
+                        if (ret < 0)
+                                return ret;
                 }
         }
-        return ret;
+
+        return 0;
 }
 
 /* create new dapm mux control */
 static int dapm_new_mux(struct snd_soc_dapm_widget *w)
 {
         struct snd_soc_dapm_context *dapm = w->dapm;
-        struct snd_soc_dapm_path *path = NULL;
-        struct snd_kcontrol *kcontrol;
-        struct snd_card *card = dapm->card->snd_card;
-        const char *prefix;
-        size_t prefix_len;
+        struct snd_soc_dapm_path *path;
         int ret;
-        struct snd_soc_dapm_widget_list *wlist;
-        int shared, wlistentries;
-        size_t wlistsize;
-        const char *name;
 
         if (w->num_kcontrols != 1) {
                 dev_err(dapm->dev,
@@ -631,65 +679,19 @@ static int dapm_new_mux(struct snd_soc_dapm_widget *w)
                 return -EINVAL;
         }
 
-        shared = dapm_is_shared_kcontrol(dapm, w, &w->kcontrol_news[0],
-                                         &kcontrol);
-        if (kcontrol) {
-                wlist = kcontrol->private_data;
-                wlistentries = wlist->num_widgets + 1;
-        } else {
-                wlist = NULL;
-                wlistentries = 1;
-        }
-        wlistsize = sizeof(struct snd_soc_dapm_widget_list) +
-                wlistentries * sizeof(struct snd_soc_dapm_widget *),
-        wlist = krealloc(wlist, wlistsize, GFP_KERNEL);
-        if (wlist == NULL) {
-                dev_err(dapm->dev,
-                        "ASoC: can't allocate widget list for %s\n", w->name);
-                return -ENOMEM;
-        }
-        wlist->num_widgets = wlistentries;
-        wlist->widgets[wlistentries - 1] = w;
-
-        if (!kcontrol) {
-                if (dapm->codec)
-                        prefix = dapm->codec->name_prefix;
-                else
-                        prefix = NULL;
-
-                if (shared) {
-                        name = w->kcontrol_news[0].name;
-                        prefix_len = 0;
-                } else {
-                        name = w->name;
-                        if (prefix)
-                                prefix_len = strlen(prefix) + 1;
-                        else
-                                prefix_len = 0;
-                }
-
-                /*
-                 * The control will get a prefix from the control creation
-                 * process but we're also using the same prefix for widgets so
-                 * cut the prefix off the front of the widget name.
-                 */
-                kcontrol = snd_soc_cnew(&w->kcontrol_news[0], wlist,
-                                        name + prefix_len, prefix);
-                ret = snd_ctl_add(card, kcontrol);
-                if (ret < 0) {
-                        dev_err(dapm->dev, "ASoC: failed to add kcontrol %s: %d\n",
-                                w->name, ret);
-                        kfree(wlist);
-                        return ret;
-                }
+        path = list_first_entry(&w->sources, struct snd_soc_dapm_path,
+                                list_sink);
+        if (!path) {
+                dev_err(dapm->dev, "ASoC: mux %s has no paths\n", w->name);
+                return -EINVAL;
         }
 
-        kcontrol->private_data = wlist;
-
-        w->kcontrols[0] = kcontrol;
+        ret = dapm_create_or_share_mixmux_kcontrol(w, 0, path);
+        if (ret < 0)
+                return ret;
 
         list_for_each_entry(path, &w->sources, list_sink)
-                path->kcontrol = kcontrol;
+                path->kcontrol = w->kcontrols[0];
 
         return 0;
 }
@@ -705,14 +707,33 @@ static int dapm_new_pga(struct snd_soc_dapm_widget *w)
 }
 
 /* reset 'walked' bit for each dapm path */
-static inline void dapm_clear_walk(struct snd_soc_dapm_context *dapm)
+static void dapm_clear_walk_output(struct snd_soc_dapm_context *dapm,
+                                   struct list_head *sink)
 {
         struct snd_soc_dapm_path *p;
 
-        list_for_each_entry(p, &dapm->card->paths, list)
-                p->walked = 0;
+        list_for_each_entry(p, sink, list_source) {
+                if (p->walked) {
+                        p->walked = 0;
+                        dapm_clear_walk_output(dapm, &p->sink->sinks);
+                }
+        }
 }
 
+static void dapm_clear_walk_input(struct snd_soc_dapm_context *dapm,
+                                  struct list_head *source)
+{
+        struct snd_soc_dapm_path *p;
+
+        list_for_each_entry(p, source, list_sink) {
+                if (p->walked) {
+                        p->walked = 0;
+                        dapm_clear_walk_input(dapm, &p->source->sources);
+                }
+        }
+}
+
+
 /* We implement power down on suspend by checking the power state of
  * the ALSA card - when we are suspending the ALSA state for the card
  * is set to D3.
@@ -995,13 +1016,17 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
         dapm_reset(card);
 
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 paths = is_connected_output_ep(dai->playback_widget, list);
-        else
+                dapm_clear_walk_output(&card->dapm,
+                                       &dai->playback_widget->sinks);
+        } else {
                 paths = is_connected_input_ep(dai->capture_widget, list);
+                dapm_clear_walk_input(&card->dapm,
+                                      &dai->capture_widget->sources);
+        }
 
         trace_snd_soc_dapm_connected(paths, stream);
-        dapm_clear_walk(&card->dapm);
         mutex_unlock(&card->dapm_mutex);
 
         return paths;
@@ -1104,9 +1129,9 @@ static int dapm_generic_check_power(struct snd_soc_dapm_widget *w)
         DAPM_UPDATE_STAT(w, power_checks);
 
         in = is_connected_input_ep(w, NULL);
-        dapm_clear_walk(w->dapm);
+        dapm_clear_walk_input(w->dapm, &w->sources);
         out = is_connected_output_ep(w, NULL);
-        dapm_clear_walk(w->dapm);
+        dapm_clear_walk_output(w->dapm, &w->sinks);
         return out != 0 && in != 0;
 }
 
@@ -1129,7 +1154,7 @@ static int dapm_adc_check_power(struct snd_soc_dapm_widget *w)
 
         if (w->active) {
                 in = is_connected_input_ep(w, NULL);
-                dapm_clear_walk(w->dapm);
+                dapm_clear_walk_input(w->dapm, &w->sources);
                 return in != 0;
         } else {
                 return dapm_generic_check_power(w);
@@ -1145,7 +1170,7 @@ static int dapm_dac_check_power(struct snd_soc_dapm_widget *w)
 
         if (w->active) {
                 out = is_connected_output_ep(w, NULL);
-                dapm_clear_walk(w->dapm);
+                dapm_clear_walk_output(w->dapm, &w->sinks);
                 return out != 0;
         } else {
                 return dapm_generic_check_power(w);
@@ -1177,8 +1202,6 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w)
                         return 1;
         }
 
-        dapm_clear_walk(w->dapm);
-
         return 0;
 }
 
@@ -1759,9 +1782,9 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
                 return -ENOMEM;
 
         in = is_connected_input_ep(w, NULL);
-        dapm_clear_walk(w->dapm);
+        dapm_clear_walk_input(w->dapm, &w->sources);
         out = is_connected_output_ep(w, NULL);
-        dapm_clear_walk(w->dapm);
+        dapm_clear_walk_output(w->dapm, &w->sinks);
 
         ret = snprintf(buf, PAGE_SIZE, "%s: %s%s  in %d out %d",
                        w->name, w->power ? "On" : "Off",
@@ -3137,7 +3160,6 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
                 break;
         }
 
-        dapm->n_widgets++;
         w->dapm = dapm;
         w->codec = dapm->codec;
         w->platform = dapm->platform;
diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c
index 111b7d921e89..aa924d9b7986 100644
--- a/sound/soc/soc-dmaengine-pcm.c
+++ b/sound/soc/soc-dmaengine-pcm.c
@@ -33,8 +33,6 @@ struct dmaengine_pcm_runtime_data {
         dma_cookie_t cookie;
 
         unsigned int pos;
-
-        void *data;
 };
 
 static inline struct dmaengine_pcm_runtime_data *substream_to_prtd(
@@ -43,33 +41,6 @@ static inline struct dmaengine_pcm_runtime_data *substream_to_prtd(
         return substream->runtime->private_data;
 }
 
-/**
- * snd_dmaengine_pcm_set_data - Set dmaengine substream private data
- * @substream: PCM substream
- * @data: Data to set
- */
-void snd_dmaengine_pcm_set_data(struct snd_pcm_substream *substream, void *data)
-{
-        struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
-
-        prtd->data = data;
-}
-EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_set_data);
-
-/**
- * snd_dmaengine_pcm_get_data - Get dmaeinge substream private data
- * @substream: PCM substream
- *
- * Returns the data previously set with snd_dmaengine_pcm_set_data
- */
-void *snd_dmaengine_pcm_get_data(struct snd_pcm_substream *substream)
-{
-        struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
-
-        return prtd->data;
-}
-EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_get_data);
-
 struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream)
 {
         struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
@@ -118,10 +89,49 @@ int snd_hwparams_to_dma_slave_config(const struct snd_pcm_substream *substream,
                 slave_config->src_addr_width = buswidth;
         }
 
+        slave_config->device_fc = false;
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hwparams_to_dma_slave_config);
 
+/**
+ * snd_dmaengine_pcm_set_config_from_dai_data() - Initializes a dma slave config
+ *  using DAI DMA data.
+ * @substream: PCM substream
+ * @dma_data: DAI DMA data
+ * @slave_config: DMA slave configuration
+ *
+ * Initializes the {dst,src}_addr, {dst,src}_maxburst, {dst,src}_addr_width and
+ * slave_id fields of the DMA slave config from the same fields of the DAI DMA
+ * data struct. The src and dst fields will be initialized depending on the
+ * direction of the substream. If the substream is a playback stream the dst
+ * fields will be initialized, if it is a capture stream the src fields will be
+ * initialized. The {dst,src}_addr_width field will only be initialized if the
+ * addr_width field of the DAI DMA data struct is not equal to
+ * DMA_SLAVE_BUSWIDTH_UNDEFINED.
+ */
+void snd_dmaengine_pcm_set_config_from_dai_data(
+        const struct snd_pcm_substream *substream,
+        const struct snd_dmaengine_dai_dma_data *dma_data,
+        struct dma_slave_config *slave_config)
+{
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                slave_config->dst_addr = dma_data->addr;
+                slave_config->dst_maxburst = dma_data->maxburst;
+                if (dma_data->addr_width != DMA_SLAVE_BUSWIDTH_UNDEFINED)
+                        slave_config->dst_addr_width = dma_data->addr_width;
+        } else {
+                slave_config->src_addr = dma_data->addr;
+                slave_config->src_maxburst = dma_data->maxburst;
+                if (dma_data->addr_width != DMA_SLAVE_BUSWIDTH_UNDEFINED)
+                        slave_config->src_addr_width = dma_data->addr_width;
+        }
+
+        slave_config->slave_id = dma_data->slave_id;
+}
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_set_config_from_dai_data);
+
 static void dmaengine_pcm_dma_complete(void *arg)
 {
         struct snd_pcm_substream *substream = arg;
@@ -244,44 +254,48 @@ snd_pcm_uframes_t snd_dmaengine_pcm_pointer(struct snd_pcm_substream *substream)
 }
 EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_pointer);
 
-static int dmaengine_pcm_request_channel(struct dmaengine_pcm_runtime_data *prtd,
-        dma_filter_fn filter_fn, void *filter_data)
+/**
+ * snd_dmaengine_pcm_request_channel - Request channel for the dmaengine PCM
+ * @filter_fn: Filter function used to request the DMA channel
+ * @filter_data: Data passed to the DMA filter function
+ *
+ * Returns NULL or the requested DMA channel.
+ *
+ * This function request a DMA channel for usage with dmaengine PCM.
+ */
+struct dma_chan *snd_dmaengine_pcm_request_channel(dma_filter_fn filter_fn,
+        void *filter_data)
 {
         dma_cap_mask_t mask;
 
         dma_cap_zero(mask);
         dma_cap_set(DMA_SLAVE, mask);
         dma_cap_set(DMA_CYCLIC, mask);
-        prtd->dma_chan = dma_request_channel(mask, filter_fn, filter_data);
 
-        if (!prtd->dma_chan)
-                return -ENXIO;
-
-        return 0;
+        return dma_request_channel(mask, filter_fn, filter_data);
 }
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_request_channel);
 
 /**
  * snd_dmaengine_pcm_open - Open a dmaengine based PCM substream
  * @substream: PCM substream
- * @filter_fn: Filter function used to request the DMA channel
- * @filter_data: Data passed to the DMA filter function
+ * @chan: DMA channel to use for data transfers
  *
  * Returns 0 on success, a negative error code otherwise.
  *
- * This function will request a DMA channel using the passed filter function and
- * data. The function should usually be called from the pcm open callback.
- *
- * Note that this function will use private_data field of the substream's
- * runtime. So it is not availabe to your pcm driver implementation. If you need
- * to keep additional data attached to a substream use
- * snd_dmaengine_pcm_{set,get}_data.
+ * The function should usually be called from the pcm open callback. Note that
+ * this function will use private_data field of the substream's runtime. So it
+ * is not availabe to your pcm driver implementation.
  */
 int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream,
-        dma_filter_fn filter_fn, void *filter_data)
+        struct dma_chan *chan)
 {
         struct dmaengine_pcm_runtime_data *prtd;
         int ret;
 
+        if (!chan)
+                return -ENXIO;
+
         ret = snd_pcm_hw_constraint_integer(substream->runtime,
                                             SNDRV_PCM_HW_PARAM_PERIODS);
         if (ret < 0)
@@ -291,11 +305,7 @@ int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream,
         if (!prtd)
                 return -ENOMEM;
 
-        ret = dmaengine_pcm_request_channel(prtd, filter_fn, filter_data);
-        if (ret < 0) {
-                kfree(prtd);
-                return ret;
-        }
+        prtd->dma_chan = chan;
 
         substream->runtime->private_data = prtd;
 
@@ -304,6 +314,27 @@ int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream,
 EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open);
 
 /**
+ * snd_dmaengine_pcm_open_request_chan - Open a dmaengine based PCM substream and request channel
+ * @substream: PCM substream
+ * @filter_fn: Filter function used to request the DMA channel
+ * @filter_data: Data passed to the DMA filter function
+ *
+ * Returns 0 on success, a negative error code otherwise.
+ *
+ * This function will request a DMA channel using the passed filter function and
+ * data. The function should usually be called from the pcm open callback. Note
+ * that this function will use private_data field of the substream's runtime. So
+ * it is not availabe to your pcm driver implementation.
+ */
+int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream,
+        dma_filter_fn filter_fn, void *filter_data)
+{
+        return snd_dmaengine_pcm_open(substream,
+                    snd_dmaengine_pcm_request_channel(filter_fn, filter_data));
+}
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);
+
+/**
  * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream
  * @substream: PCM substream
  */
@@ -311,11 +342,26 @@ int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream)
 {
         struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
 
-        dma_release_channel(prtd->dma_chan);
         kfree(prtd);
 
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close);
 
+/**
+ * snd_dmaengine_pcm_release_chan_close - Close a dmaengine based PCM substream and release channel
+ * @substream: PCM substream
+ *
+ * Releases the DMA channel associated with the PCM substream.
+ */
+int snd_dmaengine_pcm_close_release_chan(struct snd_pcm_substream *substream)
+{
+        struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
+
+        dma_release_channel(prtd->dma_chan);
+
+        return snd_dmaengine_pcm_close(substream);
+}
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close_release_chan);
+
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
new file mode 100644
index 000000000000..e29ec3cd84b1
--- /dev/null
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -0,0 +1,300 @@
+/*
+ *  Copyright (C) 2013, Analog Devices Inc.
+ *      Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under  the terms of the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/dmaengine.h>
+#include <linux/slab.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+
+#include <sound/dmaengine_pcm.h>
+
+struct dmaengine_pcm {
+        struct dma_chan *chan[SNDRV_PCM_STREAM_CAPTURE + 1];
+        const struct snd_dmaengine_pcm_config *config;
+        struct snd_soc_platform platform;
+        unsigned int flags;
+};
+
+static struct dmaengine_pcm *soc_platform_to_pcm(struct snd_soc_platform *p)
+{
+        return container_of(p, struct dmaengine_pcm, platform);
+}
+
+/**
+ * snd_dmaengine_pcm_prepare_slave_config() - Generic prepare_slave_config callback
+ * @substream: PCM substream
+ * @params: hw_params
+ * @slave_config: DMA slave config to prepare
+ *
+ * This function can be used as a generic prepare_slave_config callback for
+ * platforms which make use of the snd_dmaengine_dai_dma_data struct for their
+ * DAI DMA data. Internally the function will first call
+ * snd_hwparams_to_dma_slave_config to fill in the slave config based on the
+ * hw_params, followed by snd_dmaengine_set_config_from_dai_data to fill in the
+ * remaining fields based on the DAI DMA data.
+ */
+int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream,
+        struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_dmaengine_dai_dma_data *dma_data;
+        int ret;
+
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
+        ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config);
+        if (ret)
+                return ret;
+
+        snd_dmaengine_pcm_set_config_from_dai_data(substream, dma_data,
+                slave_config);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_prepare_slave_config);
+
+static int dmaengine_pcm_hw_params(struct snd_pcm_substream *substream,
+        struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
+        struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream);
+        struct dma_slave_config slave_config;
+        int ret;
+
+        if (pcm->config->prepare_slave_config) {
+                ret = pcm->config->prepare_slave_config(substream, params,
+                                &slave_config);
+                if (ret)
+                        return ret;
+
+                ret = dmaengine_slave_config(chan, &slave_config);
+                if (ret)
+                        return ret;
+        }
+
+        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+}
+
+static int dmaengine_pcm_open(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
+        struct dma_chan *chan = pcm->chan[substream->stream];
+        int ret;
+
+        ret = snd_soc_set_runtime_hwparams(substream,
+                                pcm->config->pcm_hardware);
+        if (ret)
+                return ret;
+
+        return snd_dmaengine_pcm_open(substream, chan);
+}
+
+static struct device *dmaengine_dma_dev(struct dmaengine_pcm *pcm,
+        struct snd_pcm_substream *substream)
+{
+        if (!pcm->chan[substream->stream])
+                return NULL;
+
+        return pcm->chan[substream->stream]->device->dev;
+}
+
+static void dmaengine_pcm_free(struct snd_pcm *pcm)
+{
+        snd_pcm_lib_preallocate_free_for_all(pcm);
+}
+
+static struct dma_chan *dmaengine_pcm_compat_request_channel(
+        struct snd_soc_pcm_runtime *rtd,
+        struct snd_pcm_substream *substream)
+{
+        struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
+
+        if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
+                return pcm->chan[0];
+
+        if (pcm->config->compat_request_channel)
+                return pcm->config->compat_request_channel(rtd, substream);
+
+        return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn,
+                snd_soc_dai_get_dma_data(rtd->cpu_dai, substream));
+}
+
+static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
+{
+        struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
+        const struct snd_dmaengine_pcm_config *config = pcm->config;
+        struct snd_pcm_substream *substream;
+        unsigned int i;
+        int ret;
+
+        for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
+                substream = rtd->pcm->streams[i].substream;
+                if (!substream)
+                        continue;
+
+                if (!pcm->chan[i] && (pcm->flags & SND_DMAENGINE_PCM_FLAG_COMPAT)) {
+                        pcm->chan[i] = dmaengine_pcm_compat_request_channel(rtd,
+                                substream);
+                }
+
+                if (!pcm->chan[i]) {
+                        dev_err(rtd->platform->dev,
+                                "Missing dma channel for stream: %d\n", i);
+                        ret = -EINVAL;
+                        goto err_free;
+                }
+
+                ret = snd_pcm_lib_preallocate_pages(substream,
+                                SNDRV_DMA_TYPE_DEV,
+                                dmaengine_dma_dev(pcm, substream),
+                                config->prealloc_buffer_size,
+                                config->pcm_hardware->buffer_bytes_max);
+                if (ret)
+                        goto err_free;
+        }
+
+        return 0;
+
+err_free:
+        dmaengine_pcm_free(rtd->pcm);
+        return ret;
+}
+
+static const struct snd_pcm_ops dmaengine_pcm_ops = {
+        .open           = dmaengine_pcm_open,
+        .close          = snd_dmaengine_pcm_close,
+        .ioctl          = snd_pcm_lib_ioctl,
+        .hw_params      = dmaengine_pcm_hw_params,
+        .hw_free        = snd_pcm_lib_free_pages,
+        .trigger        = snd_dmaengine_pcm_trigger,
+        .pointer        = snd_dmaengine_pcm_pointer,
+};
+
+static const struct snd_soc_platform_driver dmaengine_pcm_platform = {
+        .ops            = &dmaengine_pcm_ops,
+        .pcm_new        = dmaengine_pcm_new,
+        .pcm_free       = dmaengine_pcm_free,
+        .probe_order    = SND_SOC_COMP_ORDER_LATE,
+};
+
+static const struct snd_pcm_ops dmaengine_no_residue_pcm_ops = {
+        .open           = dmaengine_pcm_open,
+        .close          = snd_dmaengine_pcm_close,
+        .ioctl          = snd_pcm_lib_ioctl,
+        .hw_params      = dmaengine_pcm_hw_params,
+        .hw_free        = snd_pcm_lib_free_pages,
+        .trigger        = snd_dmaengine_pcm_trigger,
+        .pointer        = snd_dmaengine_pcm_pointer_no_residue,
+};
+
+static const struct snd_soc_platform_driver dmaengine_no_residue_pcm_platform = {
+        .ops            = &dmaengine_no_residue_pcm_ops,
+        .pcm_new        = dmaengine_pcm_new,
+        .pcm_free       = dmaengine_pcm_free,
+        .probe_order    = SND_SOC_COMP_ORDER_LATE,
+};
+
+static const char * const dmaengine_pcm_dma_channel_names[] = {
+        [SNDRV_PCM_STREAM_PLAYBACK] = "tx",
+        [SNDRV_PCM_STREAM_CAPTURE] = "rx",
+};
+
+static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
+        struct device *dev)
+{
+        unsigned int i;
+
+        if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !dev->of_node)
+                return;
+
+        if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
+                pcm->chan[0] = dma_request_slave_channel(dev, "rx-tx");
+                pcm->chan[1] = pcm->chan[0];
+        } else {
+                for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
+                        pcm->chan[i] = dma_request_slave_channel(dev,
+                                        dmaengine_pcm_dma_channel_names[i]);
+                }
+        }
+}
+
+/**
+ * snd_dmaengine_pcm_register - Register a dmaengine based PCM device
+ * @dev: The parent device for the PCM device
+ * @config: Platform specific PCM configuration
+ * @flags: Platform specific quirks
+ */
+int snd_dmaengine_pcm_register(struct device *dev,
+        const struct snd_dmaengine_pcm_config *config, unsigned int flags)
+{
+        struct dmaengine_pcm *pcm;
+
+        pcm = kzalloc(sizeof(*pcm), GFP_KERNEL);
+        if (!pcm)
+                return -ENOMEM;
+
+        pcm->config = config;
+        pcm->flags = flags;
+
+        dmaengine_pcm_request_chan_of(pcm, dev);
+
+        if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)
+                return snd_soc_add_platform(dev, &pcm->platform,
+                                &dmaengine_no_residue_pcm_platform);
+        else
+                return snd_soc_add_platform(dev, &pcm->platform,
+                                &dmaengine_pcm_platform);
+}
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_register);
+
+/**
+ * snd_dmaengine_pcm_unregister - Removes a dmaengine based PCM device
+ * @dev: Parent device the PCM was register with
+ *
+ * Removes a dmaengine based PCM device previously registered with
+ * snd_dmaengine_pcm_register.
+ */
+void snd_dmaengine_pcm_unregister(struct device *dev)
+{
+        struct snd_soc_platform *platform;
+        struct dmaengine_pcm *pcm;
+        unsigned int i;
+
+        platform = snd_soc_lookup_platform(dev);
+        if (!platform)
+                return;
+
+        pcm = soc_platform_to_pcm(platform);
+
+        for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
+                if (pcm->chan[i]) {
+                        dma_release_channel(pcm->chan[i]);
+                        if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX)
+                                break;
+                }
+        }
+
+        snd_soc_remove_platform(platform);
+        kfree(pcm);
+}
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_unregister);
+
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 29183ef2b93d..8ca9ecc5ac57 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -158,10 +158,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
                 return -EINVAL;
         }
 
-        if (IS_ERR(codec->control_data))
-                return PTR_ERR(codec->control_data);
-
-        return 0;
+        return PTR_RET(codec->control_data);
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
 #else
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index fe4541df498c..4b3be6c3c91e 100644
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -90,8 +90,33 @@ static struct snd_soc_platform_driver dummy_platform = {
 };
 
 static struct snd_soc_codec_driver dummy_codec;
+
+#define STUB_RATES      SNDRV_PCM_RATE_8000_192000
+#define STUB_FORMATS    (SNDRV_PCM_FMTBIT_S8 | \
+                        SNDRV_PCM_FMTBIT_U8 | \
+                        SNDRV_PCM_FMTBIT_S16_LE | \
+                        SNDRV_PCM_FMTBIT_U16_LE | \
+                        SNDRV_PCM_FMTBIT_S24_LE | \
+                        SNDRV_PCM_FMTBIT_U24_LE | \
+                        SNDRV_PCM_FMTBIT_S32_LE | \
+                        SNDRV_PCM_FMTBIT_U32_LE | \
+                        SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
 static struct snd_soc_dai_driver dummy_dai = {
         .name = "snd-soc-dummy-dai",
+        .playback = {
+                .stream_name    = "Playback",
+                .channels_min   = 1,
+                .channels_max   = 384,
+                .rates          = STUB_RATES,
+                .formats        = STUB_FORMATS,
+        },
+        .capture = {
+                .stream_name    = "Capture",
+                .channels_min   = 1,
+                .channels_max   = 384,
+                .rates = STUB_RATES,
+                .formats = STUB_FORMATS,
+         },
 };
 
 static int snd_soc_dummy_probe(struct platform_device *pdev)
diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c
index c7c4b20395bb..14d57e89bcba 100644
--- a/sound/soc/spear/spdif_in.c
+++ b/sound/soc/spear/spdif_in.c
@@ -170,6 +170,10 @@ struct snd_soc_dai_driver spdif_in_dai = {
         .ops = &spdif_in_dai_ops,
 };
 
+static const struct snd_soc_component_driver spdif_in_component = {
+        .name           = "spdif-in",
+};
+
 static irqreturn_t spdif_in_irq(int irq, void *arg)
 {
         struct spdif_in_dev *host = (struct spdif_in_dev *)arg;
@@ -258,7 +262,8 @@ static int spdif_in_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &spdif_in_dai);
+        ret = snd_soc_register_component(&pdev->dev, &spdif_in_component,
+                                         &spdif_in_dai, 1);
         if (ret != 0) {
                 clk_put(host->clk);
                 return ret;
@@ -271,7 +276,7 @@ static int spdif_in_remove(struct platform_device *pdev)
 {
         struct spdif_in_dev *host = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         dev_set_drvdata(&pdev->dev, NULL);
 
         clk_put(host->clk);
diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
index 5eac4cda2fd7..1e3c3dda3598 100644
--- a/sound/soc/spear/spdif_out.c
+++ b/sound/soc/spear/spdif_out.c
@@ -270,6 +270,10 @@ static struct snd_soc_dai_driver spdif_out_dai = {
         .ops = &spdif_out_dai_ops,
 };
 
+static const struct snd_soc_component_driver spdif_out_component = {
+        .name           = "spdif-out",
+};
+
 static int spdif_out_probe(struct platform_device *pdev)
 {
         struct spdif_out_dev *host;
@@ -314,7 +318,8 @@ static int spdif_out_probe(struct platform_device *pdev)
 
         dev_set_drvdata(&pdev->dev, host);
 
-        ret = snd_soc_register_dai(&pdev->dev, &spdif_out_dai);
+        ret = snd_soc_register_component(&pdev->dev, &spdif_out_component,
+                                         &spdif_out_dai, 1);
         if (ret != 0) {
                 clk_put(host->clk);
                 return ret;
@@ -327,7 +332,7 @@ static int spdif_out_remove(struct platform_device *pdev)
 {
         struct spdif_out_dev *host = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         dev_set_drvdata(&pdev->dev, NULL);
 
         clk_put(host->clk);
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c
index 5e7aebe1e664..2fbd4899d8ef 100644
--- a/sound/soc/spear/spear_pcm.c
+++ b/sound/soc/spear/spear_pcm.c
@@ -25,7 +25,7 @@
 #include <sound/soc.h>
 #include <sound/spear_dma.h>
 
-struct snd_pcm_hardware spear_pcm_hardware = {
+static struct snd_pcm_hardware spear_pcm_hardware = {
         .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
                  SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
                  SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
@@ -64,21 +64,8 @@ static int spear_pcm_open(struct snd_pcm_substream *substream)
         if (ret)
                 return ret;
 
-        ret = snd_dmaengine_pcm_open(substream, dma_data->filter, dma_data);
-        if (ret)
-                return ret;
-
-        snd_dmaengine_pcm_set_data(substream, dma_data);
-
-        return 0;
-}
-
-static int spear_pcm_close(struct snd_pcm_substream *substream)
-{
-
-        snd_dmaengine_pcm_close(substream);
-
-        return 0;
+        return snd_dmaengine_pcm_open_request_chan(substream, dma_data->filter,
+                                dma_data);
 }
 
 static int spear_pcm_mmap(struct snd_pcm_substream *substream,
@@ -93,7 +80,7 @@ static int spear_pcm_mmap(struct snd_pcm_substream *substream,
 
 static struct snd_pcm_ops spear_pcm_ops = {
         .open           = spear_pcm_open,
-        .close          = spear_pcm_close,
+        .close          = snd_dmaengine_pcm_close_release_chan,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = spear_pcm_hw_params,
         .hw_free        = spear_pcm_hw_free,
@@ -178,7 +165,7 @@ static int spear_pcm_new(struct snd_soc_pcm_runtime *rtd)
         return 0;
 }
 
-struct snd_soc_platform_driver spear_soc_platform = {
+static struct snd_soc_platform_driver spear_soc_platform = {
         .ops            =       &spear_pcm_ops,
         .pcm_new        =       spear_pcm_new,
         .pcm_free       =       spear_pcm_free,
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index dbc27ce1d4de..b1c9d573da05 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -2,7 +2,7 @@ config SND_SOC_TEGRA
         tristate "SoC Audio for the Tegra System-on-Chip"
         depends on ARCH_TEGRA && TEGRA20_APB_DMA
         select REGMAP_MMIO
-        select SND_SOC_DMAENGINE_PCM if TEGRA20_APB_DMA
+        select SND_SOC_GENERIC_DMAENGINE_PCM if TEGRA20_APB_DMA
         help
           Say Y or M here if you want support for SoC audio on Tegra.
 
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 336dcdd3e8a4..2f70ea7f6618 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -35,6 +35,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include "tegra_asoc_utils.h"
 #include "tegra20_ac97.h"
@@ -248,6 +249,10 @@ static struct snd_soc_dai_driver tegra20_ac97_dai = {
         .ops = &tegra20_ac97_dai_ops,
 };
 
+static const struct snd_soc_component_driver tegra20_ac97_component = {
+        .name           = DRV_NAME,
+};
+
 static bool tegra20_ac97_wr_rd_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -389,16 +394,17 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
         }
 
         ac97->capture_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_RX1;
-        ac97->capture_dma_data.wrap = 4;
-        ac97->capture_dma_data.width = 32;
-        ac97->capture_dma_data.req_sel = of_dma[1];
+        ac97->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+        ac97->capture_dma_data.maxburst = 4;
+        ac97->capture_dma_data.slave_id = of_dma[1];
 
         ac97->playback_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_TX1;
-        ac97->playback_dma_data.wrap = 4;
-        ac97->playback_dma_data.width = 32;
-        ac97->playback_dma_data.req_sel = of_dma[1];
+        ac97->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+        ac97->capture_dma_data.maxburst = 4;
+        ac97->capture_dma_data.slave_id = of_dma[0];
 
-        ret = snd_soc_register_dais(&pdev->dev, &tegra20_ac97_dai, 1);
+        ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
+                                         &tegra20_ac97_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -408,7 +414,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
         ret = tegra_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev);
@@ -434,8 +440,8 @@ err_asoc_utils_fini:
         tegra_asoc_utils_fini(&ac97->util_data);
 err_unregister_pcm:
         tegra_pcm_platform_unregister(&pdev->dev);
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_clk_put:
         clk_put(ac97->clk_ac97);
 err:
@@ -447,7 +453,7 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev)
         struct tegra20_ac97 *ac97 = dev_get_drvdata(&pdev->dev);
 
         tegra_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         tegra_asoc_utils_fini(&ac97->util_data);
 
diff --git a/sound/soc/tegra/tegra20_ac97.h b/sound/soc/tegra/tegra20_ac97.h
index dddc6828004e..4acb3aaba29b 100644
--- a/sound/soc/tegra/tegra20_ac97.h
+++ b/sound/soc/tegra/tegra20_ac97.h
@@ -85,8 +85,8 @@
 
 struct tegra20_ac97 {
         struct clk *clk_ac97;
-        struct tegra_pcm_dma_params capture_dma_data;
-        struct tegra_pcm_dma_params playback_dma_data;
+        struct snd_dmaengine_dai_dma_data capture_dma_data;
+        struct snd_dmaengine_dai_dma_data playback_dma_data;
         struct regmap *regmap;
         int reset_gpio;
         int sync_gpio;
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index caa772de5a18..52af7f6fb37f 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -41,6 +41,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include "tegra20_i2s.h"
 
@@ -276,6 +277,10 @@ static const struct snd_soc_dai_driver tegra20_i2s_dai_template = {
         .symmetric_rates = 1,
 };
 
+static const struct snd_soc_component_driver tegra20_i2s_component = {
+        .name           = DRV_NAME,
+};
+
 static bool tegra20_i2s_wr_rd_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -403,14 +408,14 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
         }
 
         i2s->capture_dma_data.addr = mem->start + TEGRA20_I2S_FIFO2;
-        i2s->capture_dma_data.wrap = 4;
-        i2s->capture_dma_data.width = 32;
-        i2s->capture_dma_data.req_sel = dma_ch;
+        i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+        i2s->capture_dma_data.maxburst = 4;
+        i2s->capture_dma_data.slave_id = dma_ch;
 
         i2s->playback_dma_data.addr = mem->start + TEGRA20_I2S_FIFO1;
-        i2s->playback_dma_data.wrap = 4;
-        i2s->playback_dma_data.width = 32;
-        i2s->playback_dma_data.req_sel = dma_ch;
+        i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+        i2s->playback_dma_data.maxburst = 4;
+        i2s->playback_dma_data.slave_id = dma_ch;
 
         pm_runtime_enable(&pdev->dev);
         if (!pm_runtime_enabled(&pdev->dev)) {
@@ -419,7 +424,8 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
                         goto err_pm_disable;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &i2s->dai);
+        ret = snd_soc_register_component(&pdev->dev, &tegra20_i2s_component,
+                                         &i2s->dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -429,13 +435,13 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
         ret = tegra_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         return 0;
 
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_suspend:
         if (!pm_runtime_status_suspended(&pdev->dev))
                 tegra20_i2s_runtime_suspend(&pdev->dev);
@@ -456,7 +462,7 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev)
                 tegra20_i2s_runtime_suspend(&pdev->dev);
 
         tegra_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(i2s->clk_i2s);
 
diff --git a/sound/soc/tegra/tegra20_i2s.h b/sound/soc/tegra/tegra20_i2s.h
index 729958713cd4..fa6c29cc12b9 100644
--- a/sound/soc/tegra/tegra20_i2s.h
+++ b/sound/soc/tegra/tegra20_i2s.h
@@ -155,8 +155,8 @@
 struct tegra20_i2s {
         struct snd_soc_dai_driver dai;
         struct clk *clk_i2s;
-        struct tegra_pcm_dma_params capture_dma_data;
-        struct tegra_pcm_dma_params playback_dma_data;
+        struct snd_dmaengine_dai_dma_data capture_dma_data;
+        struct snd_dmaengine_dai_dma_data playback_dma_data;
         struct regmap *regmap;
 };
 
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 04771d14d343..5eaa12cdc6eb 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -32,6 +32,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include "tegra20_spdif.h"
 
@@ -182,6 +183,10 @@ static struct snd_soc_dai_driver tegra20_spdif_dai = {
         .ops = &tegra20_spdif_dai_ops,
 };
 
+static const struct snd_soc_component_driver tegra20_spdif_component = {
+        .name           = DRV_NAME,
+};
+
 static bool tegra20_spdif_wr_rd_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -318,9 +323,9 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
         }
 
         spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT;
-        spdif->playback_dma_data.wrap = 4;
-        spdif->playback_dma_data.width = 32;
-        spdif->playback_dma_data.req_sel = dmareq->start;
+        spdif->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+        spdif->capture_dma_data.maxburst = 4;
+        spdif->playback_dma_data.slave_id = dmareq->start;
 
         pm_runtime_enable(&pdev->dev);
         if (!pm_runtime_enabled(&pdev->dev)) {
@@ -329,7 +334,8 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
                         goto err_pm_disable;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &tegra20_spdif_dai);
+        ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component,
+                                   &tegra20_spdif_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -339,13 +345,13 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
         ret = tegra_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         return 0;
 
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_suspend:
         if (!pm_runtime_status_suspended(&pdev->dev))
                 tegra20_spdif_runtime_suspend(&pdev->dev);
@@ -366,7 +372,7 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev)
                 tegra20_spdif_runtime_suspend(&pdev->dev);
 
         tegra_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(spdif->clk_spdif_out);
 
diff --git a/sound/soc/tegra/tegra20_spdif.h b/sound/soc/tegra/tegra20_spdif.h
index b48d699fd583..85a9aefcc287 100644
--- a/sound/soc/tegra/tegra20_spdif.h
+++ b/sound/soc/tegra/tegra20_spdif.h
@@ -462,8 +462,8 @@
 
 struct tegra20_spdif {
         struct clk *clk_spdif_out;
-        struct tegra_pcm_dma_params capture_dma_data;
-        struct tegra_pcm_dma_params playback_dma_data;
+        struct snd_dmaengine_dai_dma_data capture_dma_data;
+        struct snd_dmaengine_dai_dma_data playback_dma_data;
         struct regmap *regmap;
 };
 
diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index e5cfb4ac41ba..23e592f453fa 100644
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -95,8 +95,8 @@ static int tegra30_ahub_runtime_resume(struct device *dev)
 }
 
 int tegra30_ahub_allocate_rx_fifo(enum tegra30_ahub_rxcif *rxcif,
-                                  unsigned long *fiforeg,
-                                  unsigned long *reqsel)
+                                  dma_addr_t *fiforeg,
+                                  unsigned int *reqsel)
 {
         int channel;
         u32 reg, val;
@@ -178,8 +178,8 @@ int tegra30_ahub_free_rx_fifo(enum tegra30_ahub_rxcif rxcif)
 EXPORT_SYMBOL_GPL(tegra30_ahub_free_rx_fifo);
 
 int tegra30_ahub_allocate_tx_fifo(enum tegra30_ahub_txcif *txcif,
-                                  unsigned long *fiforeg,
-                                  unsigned long *reqsel)
+                                  dma_addr_t *fiforeg,
+                                  unsigned int *reqsel)
 {
         int channel;
         u32 reg, val;
@@ -287,16 +287,27 @@ int tegra30_ahub_unset_rx_cif_source(enum tegra30_ahub_rxcif rxcif)
 }
 EXPORT_SYMBOL_GPL(tegra30_ahub_unset_rx_cif_source);
 
-static const char * const configlink_clocks[] = {
-        "i2s0",
-        "i2s1",
-        "i2s2",
-        "i2s3",
-        "i2s4",
-        "dam0",
-        "dam1",
-        "dam2",
-        "spdif_in",
+#define CLK_LIST_MASK_TEGRA30   BIT(0)
+#define CLK_LIST_MASK_TEGRA114  BIT(1)
+
+#define CLK_LIST_MASK_TEGRA30_OR_LATER \
+                (CLK_LIST_MASK_TEGRA30 | CLK_LIST_MASK_TEGRA114)
+
+static const struct {
+        const char *clk_name;
+        u32 clk_list_mask;
+} configlink_clocks[] = {
+        { "i2s0", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "i2s1", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "i2s2", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "i2s3", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "i2s4", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "dam0", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "dam1", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "dam2", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "spdif_in", CLK_LIST_MASK_TEGRA30_OR_LATER },
+        { "amx", CLK_LIST_MASK_TEGRA114 },
+        { "adx", CLK_LIST_MASK_TEGRA114 },
 };
 
 #define LAST_REG(name) \
@@ -424,8 +435,24 @@ static const struct regmap_config tegra30_ahub_ahub_regmap_config = {
         .cache_type = REGCACHE_RBTREE,
 };
 
+static struct tegra30_ahub_soc_data soc_data_tegra30 = {
+        .clk_list_mask = CLK_LIST_MASK_TEGRA30,
+};
+
+static struct tegra30_ahub_soc_data soc_data_tegra114 = {
+        .clk_list_mask = CLK_LIST_MASK_TEGRA114,
+};
+
+static const struct of_device_id tegra30_ahub_of_match[] = {
+        { .compatible = "nvidia,tegra114-ahub", .data = &soc_data_tegra114 },
+        { .compatible = "nvidia,tegra30-ahub",  .data = &soc_data_tegra30 },
+        {},
+};
+
 static int tegra30_ahub_probe(struct platform_device *pdev)
 {
+        const struct of_device_id *match;
+        const struct tegra30_ahub_soc_data *soc_data;
         struct clk *clk;
         int i;
         struct resource *res0, *res1, *region;
@@ -436,16 +463,24 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
         if (ahub)
                 return -ENODEV;
 
+        match = of_match_device(tegra30_ahub_of_match, &pdev->dev);
+        if (!match)
+                return -EINVAL;
+        soc_data = match->data;
+
         /*
          * The AHUB hosts a register bus: the "configlink". For this to
          * operate correctly, all devices on this bus must be out of reset.
          * Ensure that here.
          */
         for (i = 0; i < ARRAY_SIZE(configlink_clocks); i++) {
-                clk = clk_get(&pdev->dev, configlink_clocks[i]);
+                if (!(configlink_clocks[i].clk_list_mask &
+                                        soc_data->clk_list_mask))
+                        continue;
+                clk = clk_get(&pdev->dev, configlink_clocks[i].clk_name);
                 if (IS_ERR(clk)) {
                         dev_err(&pdev->dev, "Can't get clock %s\n",
-                                configlink_clocks[i]);
+                                configlink_clocks[i].clk_name);
                         ret = PTR_ERR(clk);
                         goto err;
                 }
@@ -592,11 +627,6 @@ static int tegra30_ahub_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct of_device_id tegra30_ahub_of_match[] = {
-        { .compatible = "nvidia,tegra30-ahub", },
-        {},
-};
-
 static const struct dev_pm_ops tegra30_ahub_pm_ops = {
         SET_RUNTIME_PM_OPS(tegra30_ahub_runtime_suspend,
                            tegra30_ahub_runtime_resume, NULL)
diff --git a/sound/soc/tegra/tegra30_ahub.h b/sound/soc/tegra/tegra30_ahub.h
index e690e2eecc92..09766cdc45ca 100644
--- a/sound/soc/tegra/tegra30_ahub.h
+++ b/sound/soc/tegra/tegra30_ahub.h
@@ -451,15 +451,15 @@ enum tegra30_ahub_rxcif {
 };
 
 extern int tegra30_ahub_allocate_rx_fifo(enum tegra30_ahub_rxcif *rxcif,
-                                         unsigned long *fiforeg,
-                                         unsigned long *reqsel);
+                                         dma_addr_t *fiforeg,
+                                         unsigned int *reqsel);
 extern int tegra30_ahub_enable_rx_fifo(enum tegra30_ahub_rxcif rxcif);
 extern int tegra30_ahub_disable_rx_fifo(enum tegra30_ahub_rxcif rxcif);
 extern int tegra30_ahub_free_rx_fifo(enum tegra30_ahub_rxcif rxcif);
 
 extern int tegra30_ahub_allocate_tx_fifo(enum tegra30_ahub_txcif *txcif,
-                                         unsigned long *fiforeg,
-                                         unsigned long *reqsel);
+                                         dma_addr_t *fiforeg,
+                                         unsigned int *reqsel);
 extern int tegra30_ahub_enable_tx_fifo(enum tegra30_ahub_txcif txcif);
 extern int tegra30_ahub_disable_tx_fifo(enum tegra30_ahub_txcif txcif);
 extern int tegra30_ahub_free_tx_fifo(enum tegra30_ahub_txcif txcif);
@@ -468,7 +468,23 @@ extern int tegra30_ahub_set_rx_cif_source(enum tegra30_ahub_rxcif rxcif,
                                           enum tegra30_ahub_txcif txcif);
 extern int tegra30_ahub_unset_rx_cif_source(enum tegra30_ahub_rxcif rxcif);
 
+struct tegra30_ahub_soc_data {
+        u32 clk_list_mask;
+        /*
+         * FIXME: There are many more differences in HW, such as:
+         * - More APBIF channels.
+         * - Extra separate chunks of register address space to represent
+         *   the extra APBIF channels.
+         * - More units connected to the AHUB, so that tegra30_ahub_[rt]xcif
+         *   need expansion, coupled with there being more defined bits in
+         *   the AHUB routing registers.
+         * However, the driver doesn't support those new features yet, so we
+         * don't represent them here yet.
+         */
+};
+
 struct tegra30_ahub {
+        const struct tegra30_ahub_soc_data *soc_data;
         struct device *dev;
         struct clk *clk_d_audio;
         struct clk *clk_apbif;
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index f4e1ce82750a..31d092d83c71 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -38,6 +38,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 #include "tegra30_ahub.h"
 #include "tegra30_i2s.h"
@@ -80,17 +81,17 @@ static int tegra30_i2s_startup(struct snd_pcm_substream *substream,
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 ret = tegra30_ahub_allocate_tx_fifo(&i2s->playback_fifo_cif,
                                         &i2s->playback_dma_data.addr,
-                                        &i2s->playback_dma_data.req_sel);
-                i2s->playback_dma_data.wrap = 4;
-                i2s->playback_dma_data.width = 32;
+                                        &i2s->playback_dma_data.slave_id);
+                i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+                i2s->playback_dma_data.maxburst = 4;
                 tegra30_ahub_set_rx_cif_source(i2s->playback_i2s_cif,
                                                i2s->playback_fifo_cif);
         } else {
                 ret = tegra30_ahub_allocate_rx_fifo(&i2s->capture_fifo_cif,
                                         &i2s->capture_dma_data.addr,
-                                        &i2s->capture_dma_data.req_sel);
-                i2s->capture_dma_data.wrap = 4;
-                i2s->capture_dma_data.width = 32;
+                                        &i2s->capture_dma_data.slave_id);
+                i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+                i2s->capture_dma_data.maxburst = 4;
                 tegra30_ahub_set_rx_cif_source(i2s->capture_fifo_cif,
                                                i2s->capture_i2s_cif);
         }
@@ -336,6 +337,10 @@ static const struct snd_soc_dai_driver tegra30_i2s_dai_template = {
         .symmetric_rates = 1,
 };
 
+static const struct snd_soc_component_driver tegra30_i2s_component = {
+        .name           = DRV_NAME,
+};
+
 static bool tegra30_i2s_wr_rd_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -464,7 +469,8 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
                         goto err_pm_disable;
         }
 
-        ret = snd_soc_register_dai(&pdev->dev, &i2s->dai);
+        ret = snd_soc_register_component(&pdev->dev, &tegra30_i2s_component,
+                                   &i2s->dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                 ret = -ENOMEM;
@@ -474,13 +480,13 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
         ret = tegra_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_dai;
+                goto err_unregister_component;
         }
 
         return 0;
 
-err_unregister_dai:
-        snd_soc_unregister_dai(&pdev->dev);
+err_unregister_component:
+        snd_soc_unregister_component(&pdev->dev);
 err_suspend:
         if (!pm_runtime_status_suspended(&pdev->dev))
                 tegra30_i2s_runtime_suspend(&pdev->dev);
@@ -501,7 +507,7 @@ static int tegra30_i2s_platform_remove(struct platform_device *pdev)
                 tegra30_i2s_runtime_suspend(&pdev->dev);
 
         tegra_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(i2s->clk_i2s);
 
diff --git a/sound/soc/tegra/tegra30_i2s.h b/sound/soc/tegra/tegra30_i2s.h
index a294d942b9f7..bea23afe3b9f 100644
--- a/sound/soc/tegra/tegra30_i2s.h
+++ b/sound/soc/tegra/tegra30_i2s.h
@@ -231,10 +231,10 @@ struct tegra30_i2s {
         struct clk *clk_i2s;
         enum tegra30_ahub_txcif capture_i2s_cif;
         enum tegra30_ahub_rxcif capture_fifo_cif;
-        struct tegra_pcm_dma_params capture_dma_data;
+        struct snd_dmaengine_dai_dma_data capture_dma_data;
         enum tegra30_ahub_rxcif playback_i2s_cif;
         enum tegra30_ahub_txcif playback_fifo_cif;
-        struct tegra_pcm_dma_params playback_dma_data;
+        struct snd_dmaengine_dai_dma_data playback_dma_data;
         struct regmap *regmap;
 };
 
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index c80adb9da472..48d05d9e1002 100644
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -161,20 +161,13 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
                         sizeof(struct tegra_alc5632), GFP_KERNEL);
         if (!alc5632) {
                 dev_err(&pdev->dev, "Can't allocate tegra_alc5632\n");
-                ret = -ENOMEM;
-                goto err;
+                return -ENOMEM;
         }
 
         card->dev = &pdev->dev;
         platform_set_drvdata(pdev, card);
         snd_soc_card_set_drvdata(card, alc5632);
 
-        if (!(pdev->dev.of_node)) {
-                dev_err(&pdev->dev, "Must be instantiated using device tree\n");
-                ret = -EINVAL;
-                goto err;
-        }
-
         alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);
         if (alc5632->gpio_hp_det == -EPROBE_DEFER)
                 return -EPROBE_DEFER;
@@ -197,11 +190,11 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        tegra_alc5632_dai.cpu_of_node = of_parse_phandle(
-                        pdev->dev.of_node, "nvidia,i2s-controller", 0);
+        tegra_alc5632_dai.cpu_of_node = of_parse_phandle(np,
+                        "nvidia,i2s-controller", 0);
         if (!tegra_alc5632_dai.cpu_of_node) {
                 dev_err(&pdev->dev,
-                "Property 'nvidia,i2s-controller' missing or invalid\n");
+                        "Property 'nvidia,i2s-controller' missing or invalid\n");
                 ret = -EINVAL;
                 goto err;
         }
diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index ba419f86384d..24fb001be7f4 100644
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -43,8 +43,10 @@ int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate,
         case 88200:
                 if (data->soc == TEGRA_ASOC_UTILS_SOC_TEGRA20)
                         new_baseclock = 56448000;
-                else
+                else if (data->soc == TEGRA_ASOC_UTILS_SOC_TEGRA30)
                         new_baseclock = 564480000;
+                else
+                        new_baseclock = 282240000;
                 break;
         case 8000:
         case 16000:
@@ -54,8 +56,10 @@ int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate,
         case 96000:
                 if (data->soc == TEGRA_ASOC_UTILS_SOC_TEGRA20)
                         new_baseclock = 73728000;
-                else
+                else if (data->soc == TEGRA_ASOC_UTILS_SOC_TEGRA30)
                         new_baseclock = 552960000;
+                else
+                        new_baseclock = 368640000;
                 break;
         default:
                 return -EINVAL;
@@ -169,6 +173,7 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
                           struct device *dev)
 {
         int ret;
+        bool new_clocks = false;
 
         data->dev = dev;
 
@@ -176,28 +181,37 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
                 data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
         else if (of_machine_is_compatible("nvidia,tegra30"))
                 data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30;
-        else if (!dev->of_node)
-                /* non-DT is always Tegra20 */
-                data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
-        else
-                /* DT boot, but unknown SoC */
+        else if (of_machine_is_compatible("nvidia,tegra114")) {
+                data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA114;
+                new_clocks = true;
+        } else {
+                dev_err(data->dev, "SoC unknown to Tegra ASoC utils\n");
                 return -EINVAL;
+        }
 
-        data->clk_pll_a = clk_get_sys(NULL, "pll_a");
+        if (new_clocks)
+                data->clk_pll_a = clk_get(dev, "pll_a");
+        else
+                data->clk_pll_a = clk_get_sys(NULL, "pll_a");
         if (IS_ERR(data->clk_pll_a)) {
                 dev_err(data->dev, "Can't retrieve clk pll_a\n");
                 ret = PTR_ERR(data->clk_pll_a);
                 goto err;
         }
 
-        data->clk_pll_a_out0 = clk_get_sys(NULL, "pll_a_out0");
+        if (new_clocks)
+                data->clk_pll_a_out0 = clk_get(dev, "pll_a_out0");
+        else
+                data->clk_pll_a_out0 = clk_get_sys(NULL, "pll_a_out0");
         if (IS_ERR(data->clk_pll_a_out0)) {
                 dev_err(data->dev, "Can't retrieve clk pll_a_out0\n");
                 ret = PTR_ERR(data->clk_pll_a_out0);
                 goto err_put_pll_a;
         }
 
-        if (data->soc == TEGRA_ASOC_UTILS_SOC_TEGRA20)
+        if (new_clocks)
+                data->clk_cdev1 = clk_get(dev, "mclk");
+        else if (data->soc == TEGRA_ASOC_UTILS_SOC_TEGRA20)
                 data->clk_cdev1 = clk_get_sys(NULL, "cdev1");
         else
                 data->clk_cdev1 = clk_get_sys("extern1", NULL);
diff --git a/sound/soc/tegra/tegra_asoc_utils.h b/sound/soc/tegra/tegra_asoc_utils.h
index 974c9f8830f9..19fdcafed32f 100644
--- a/sound/soc/tegra/tegra_asoc_utils.h
+++ b/sound/soc/tegra/tegra_asoc_utils.h
@@ -29,6 +29,7 @@ struct device;
 enum tegra_asoc_utils_soc {
         TEGRA_ASOC_UTILS_SOC_TEGRA20,
         TEGRA_ASOC_UTILS_SOC_TEGRA30,
+        TEGRA_ASOC_UTILS_SOC_TEGRA114,
 };
 
 struct tegra_asoc_utils_data {
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
index 5e2c55c5b255..f056f632557c 100644
--- a/sound/soc/tegra/tegra_pcm.c
+++ b/sound/soc/tegra/tegra_pcm.c
@@ -29,9 +29,7 @@
  *
  */
 
-#include <linux/dma-mapping.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -55,191 +53,24 @@ static const struct snd_pcm_hardware tegra_pcm_hardware = {
         .fifo_size              = 4,
 };
 
-static int tegra_pcm_open(struct snd_pcm_substream *substream)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct device *dev = rtd->platform->dev;
-        int ret;
-
-        /* Set HW params now that initialization is complete */
-        snd_soc_set_runtime_hwparams(substream, &tegra_pcm_hardware);
-
-        ret = snd_dmaengine_pcm_open(substream, NULL, NULL);
-        if (ret) {
-                dev_err(dev, "dmaengine pcm open failed with err %d\n", ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int tegra_pcm_close(struct snd_pcm_substream *substream)
-{
-        snd_dmaengine_pcm_close(substream);
-        return 0;
-}
-
-static int tegra_pcm_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct device *dev = rtd->platform->dev;
-        struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream);
-        struct tegra_pcm_dma_params *dmap;
-        struct dma_slave_config slave_config;
-        int ret;
-
-        dmap = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
-        ret = snd_hwparams_to_dma_slave_config(substream, params,
-                                                &slave_config);
-        if (ret) {
-                dev_err(dev, "hw params config failed with err %d\n", ret);
-                return ret;
-        }
-
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-                slave_config.dst_addr = dmap->addr;
-                slave_config.dst_maxburst = 4;
-        } else {
-                slave_config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-                slave_config.src_addr = dmap->addr;
-                slave_config.src_maxburst = 4;
-        }
-        slave_config.slave_id = dmap->req_sel;
-
-        ret = dmaengine_slave_config(chan, &slave_config);
-        if (ret < 0) {
-                dev_err(dev, "dma slave config failed with err %d\n", ret);
-                return ret;
-        }
-
-        snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
-        return 0;
-}
-
-static int tegra_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-        snd_pcm_set_runtime_buffer(substream, NULL);
-        return 0;
-}
-
-static int tegra_pcm_mmap(struct snd_pcm_substream *substream,
-                                struct vm_area_struct *vma)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-
-        return dma_mmap_writecombine(substream->pcm->card->dev, vma,
-                                        runtime->dma_area,
-                                        runtime->dma_addr,
-                                        runtime->dma_bytes);
-}
-
-static struct snd_pcm_ops tegra_pcm_ops = {
-        .open           = tegra_pcm_open,
-        .close          = tegra_pcm_close,
-        .ioctl          = snd_pcm_lib_ioctl,
-        .hw_params      = tegra_pcm_hw_params,
-        .hw_free        = tegra_pcm_hw_free,
-        .trigger        = snd_dmaengine_pcm_trigger,
-        .pointer        = snd_dmaengine_pcm_pointer,
-        .mmap           = tegra_pcm_mmap,
-};
-
-static int tegra_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
-{
-        struct snd_pcm_substream *substream = pcm->streams[stream].substream;
-        struct snd_dma_buffer *buf = &substream->dma_buffer;
-        size_t size = tegra_pcm_hardware.buffer_bytes_max;
-
-        buf->area = dma_alloc_writecombine(pcm->card->dev, size,
-                                                &buf->addr, GFP_KERNEL);
-        if (!buf->area)
-                return -ENOMEM;
-
-        buf->dev.type = SNDRV_DMA_TYPE_DEV;
-        buf->dev.dev = pcm->card->dev;
-        buf->private_data = NULL;
-        buf->bytes = size;
-
-        return 0;
-}
-
-static void tegra_pcm_deallocate_dma_buffer(struct snd_pcm *pcm, int stream)
-{
-        struct snd_pcm_substream *substream;
-        struct snd_dma_buffer *buf;
-
-        substream = pcm->streams[stream].substream;
-        if (!substream)
-                return;
-
-        buf = &substream->dma_buffer;
-        if (!buf->area)
-                return;
-
-        dma_free_writecombine(pcm->card->dev, buf->bytes,
-                                buf->area, buf->addr);
-        buf->area = NULL;
-}
-
-static u64 tegra_dma_mask = DMA_BIT_MASK(32);
-
-static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_card *card = rtd->card->snd_card;
-        struct snd_pcm *pcm = rtd->pcm;
-        int ret = 0;
-
-        if (!card->dev->dma_mask)
-                card->dev->dma_mask = &tegra_dma_mask;
-        if (!card->dev->coherent_dma_mask)
-                card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
-
-        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
-                ret = tegra_pcm_preallocate_dma_buffer(pcm,
-                                                SNDRV_PCM_STREAM_PLAYBACK);
-                if (ret)
-                        goto err;
-        }
-
-        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
-                ret = tegra_pcm_preallocate_dma_buffer(pcm,
-                                                SNDRV_PCM_STREAM_CAPTURE);
-                if (ret)
-                        goto err_free_play;
-        }
-
-        return 0;
-
-err_free_play:
-        tegra_pcm_deallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK);
-err:
-        return ret;
-}
-
-static void tegra_pcm_free(struct snd_pcm *pcm)
-{
-        tegra_pcm_deallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE);
-        tegra_pcm_deallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK);
-}
-
-static struct snd_soc_platform_driver tegra_pcm_platform = {
-        .ops            = &tegra_pcm_ops,
-        .pcm_new        = tegra_pcm_new,
-        .pcm_free       = tegra_pcm_free,
+static const struct snd_dmaengine_pcm_config tegra_dmaengine_pcm_config = {
+        .pcm_hardware = &tegra_pcm_hardware,
+        .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
+        .compat_filter_fn = NULL,
+        .prealloc_buffer_size = PAGE_SIZE * 8,
 };
 
 int tegra_pcm_platform_register(struct device *dev)
 {
-        return snd_soc_register_platform(dev, &tegra_pcm_platform);
+        return snd_dmaengine_pcm_register(dev, &tegra_dmaengine_pcm_config,
+                        SND_DMAENGINE_PCM_FLAG_NO_DT |
+                        SND_DMAENGINE_PCM_FLAG_COMPAT);
 }
 EXPORT_SYMBOL_GPL(tegra_pcm_platform_register);
 
 void tegra_pcm_platform_unregister(struct device *dev)
 {
-        snd_soc_unregister_platform(dev);
+        return snd_dmaengine_pcm_unregister(dev);
 }
 EXPORT_SYMBOL_GPL(tegra_pcm_platform_unregister);
 
diff --git a/sound/soc/tegra/tegra_pcm.h b/sound/soc/tegra/tegra_pcm.h
index bc8b46af928e..68ad901714a9 100644
--- a/sound/soc/tegra/tegra_pcm.h
+++ b/sound/soc/tegra/tegra_pcm.h
@@ -31,13 +31,6 @@
 #ifndef __TEGRA_PCM_H__
 #define __TEGRA_PCM_H__
 
-struct tegra_pcm_dma_params {
-        unsigned long addr;
-        unsigned long wrap;
-        unsigned long width;
-        unsigned long req_sel;
-};
-
 int tegra_pcm_platform_register(struct device *dev);
 void tegra_pcm_platform_unregister(struct device *dev);
 
diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index c8ef88a67c59..f87fc53e9b8c 100644
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -124,6 +124,7 @@ static struct snd_soc_card snd_soc_tegra_wm8753 = {
 
 static int tegra_wm8753_driver_probe(struct platform_device *pdev)
 {
+        struct device_node *np = pdev->dev.of_node;
         struct snd_soc_card *card = &snd_soc_tegra_wm8753;
         struct tegra_wm8753 *machine;
         int ret;
@@ -132,8 +133,7 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev)
                                GFP_KERNEL);
         if (!machine) {
                 dev_err(&pdev->dev, "Can't allocate tegra_wm8753 struct\n");
-                ret = -ENOMEM;
-                goto err;
+                return -ENOMEM;
         }
 
         card->dev = &pdev->dev;
@@ -148,8 +148,8 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev)
         if (ret)
                 goto err;
 
-        tegra_wm8753_dai.codec_of_node = of_parse_phandle(
-                        pdev->dev.of_node, "nvidia,audio-codec", 0);
+        tegra_wm8753_dai.codec_of_node = of_parse_phandle(np,
+                        "nvidia,audio-codec", 0);
         if (!tegra_wm8753_dai.codec_of_node) {
                 dev_err(&pdev->dev,
                         "Property 'nvidia,audio-codec' missing or invalid\n");
@@ -157,8 +157,8 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        tegra_wm8753_dai.cpu_of_node = of_parse_phandle(
-                        pdev->dev.of_node, "nvidia,i2s-controller", 0);
+        tegra_wm8753_dai.cpu_of_node = of_parse_phandle(np,
+                        "nvidia,i2s-controller", 0);
         if (!tegra_wm8753_dai.cpu_of_node) {
                 dev_err(&pdev->dev,
                         "Property 'nvidia,i2s-controller' missing or invalid\n");
@@ -166,8 +166,7 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        tegra_wm8753_dai.platform_of_node =
-                                tegra_wm8753_dai.cpu_of_node;
+        tegra_wm8753_dai.platform_of_node = tegra_wm8753_dai.cpu_of_node;
 
         ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
         if (ret)
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index bbd79bf56303..4ac73730d79a 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -39,7 +39,6 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/tegra_wm8903.h>
 
 #include "../codecs/wm8903.h"
 
@@ -48,7 +47,11 @@
 #define DRV_NAME "tegra-snd-wm8903"
 
 struct tegra_wm8903 {
-        struct tegra_wm8903_platform_data pdata;
+        int gpio_spkr_en;
+        int gpio_hp_det;
+        int gpio_hp_mute;
+        int gpio_int_mic_en;
+        int gpio_ext_mic_en;
         struct tegra_asoc_utils_data util_data;
 };
 
@@ -129,12 +132,11 @@ static int tegra_wm8903_event_int_spk(struct snd_soc_dapm_widget *w,
         struct snd_soc_dapm_context *dapm = w->dapm;
         struct snd_soc_card *card = dapm->card;
         struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
-        struct tegra_wm8903_platform_data *pdata = &machine->pdata;
 
-        if (!gpio_is_valid(pdata->gpio_spkr_en))
+        if (!gpio_is_valid(machine->gpio_spkr_en))
                 return 0;
 
-        gpio_set_value_cansleep(pdata->gpio_spkr_en,
+        gpio_set_value_cansleep(machine->gpio_spkr_en,
                                 SND_SOC_DAPM_EVENT_ON(event));
 
         return 0;
@@ -146,12 +148,11 @@ static int tegra_wm8903_event_hp(struct snd_soc_dapm_widget *w,
         struct snd_soc_dapm_context *dapm = w->dapm;
         struct snd_soc_card *card = dapm->card;
         struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
-        struct tegra_wm8903_platform_data *pdata = &machine->pdata;
 
-        if (!gpio_is_valid(pdata->gpio_hp_mute))
+        if (!gpio_is_valid(machine->gpio_hp_mute))
                 return 0;
 
-        gpio_set_value_cansleep(pdata->gpio_hp_mute,
+        gpio_set_value_cansleep(machine->gpio_hp_mute,
                                 !SND_SOC_DAPM_EVENT_ON(event));
 
         return 0;
@@ -163,17 +164,6 @@ static const struct snd_soc_dapm_widget tegra_wm8903_dapm_widgets[] = {
         SND_SOC_DAPM_MIC("Mic Jack", NULL),
 };
 
-static const struct snd_soc_dapm_route harmony_audio_map[] = {
-        {"Headphone Jack", NULL, "HPOUTR"},
-        {"Headphone Jack", NULL, "HPOUTL"},
-        {"Int Spk", NULL, "ROP"},
-        {"Int Spk", NULL, "RON"},
-        {"Int Spk", NULL, "LOP"},
-        {"Int Spk", NULL, "LON"},
-        {"Mic Jack", NULL, "MICBIAS"},
-        {"IN1L", NULL, "Mic Jack"},
-};
-
 static const struct snd_kcontrol_new tegra_wm8903_controls[] = {
         SOC_DAPM_PIN_SWITCH("Int Spk"),
 };
@@ -185,10 +175,9 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct snd_soc_card *card = codec->card;
         struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
-        struct tegra_wm8903_platform_data *pdata = &machine->pdata;
 
-        if (gpio_is_valid(pdata->gpio_hp_det)) {
-                tegra_wm8903_hp_jack_gpio.gpio = pdata->gpio_hp_det;
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det;
                 snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
                                 &tegra_wm8903_hp_jack);
                 snd_soc_jack_add_pins(&tegra_wm8903_hp_jack,
@@ -226,9 +215,6 @@ static int tegra_wm8903_remove(struct snd_soc_card *card)
 static struct snd_soc_dai_link tegra_wm8903_dai = {
         .name = "WM8903",
         .stream_name = "WM8903 PCM",
-        .codec_name = "wm8903.0-001a",
-        .platform_name = "tegra20-i2s.0",
-        .cpu_dai_name = "tegra20-i2s.0",
         .codec_dai_name = "wm8903-hifi",
         .init = tegra_wm8903_init,
         .ops = &tegra_wm8903_ops,
@@ -257,96 +243,25 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)
         struct device_node *np = pdev->dev.of_node;
         struct snd_soc_card *card = &snd_soc_tegra_wm8903;
         struct tegra_wm8903 *machine;
-        struct tegra_wm8903_platform_data *pdata;
         int ret;
 
-        if (!pdev->dev.platform_data && !pdev->dev.of_node) {
-                dev_err(&pdev->dev, "No platform data supplied\n");
-                return -EINVAL;
-        }
-
         machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm8903),
                                GFP_KERNEL);
         if (!machine) {
                 dev_err(&pdev->dev, "Can't allocate tegra_wm8903 struct\n");
-                ret = -ENOMEM;
-                goto err;
+                return -ENOMEM;
         }
-        pdata = &machine->pdata;
 
         card->dev = &pdev->dev;
         platform_set_drvdata(pdev, card);
         snd_soc_card_set_drvdata(card, machine);
 
-        if (pdev->dev.platform_data) {
-                memcpy(pdata, card->dev->platform_data, sizeof(*pdata));
-        } else if (np) {
-                pdata->gpio_spkr_en = of_get_named_gpio(np,
-                                                "nvidia,spkr-en-gpios", 0);
-                if (pdata->gpio_spkr_en == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-
-                pdata->gpio_hp_mute = of_get_named_gpio(np,
-                                                "nvidia,hp-mute-gpios", 0);
-                if (pdata->gpio_hp_mute == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-
-                pdata->gpio_hp_det = of_get_named_gpio(np,
-                                                "nvidia,hp-det-gpios", 0);
-                if (pdata->gpio_hp_det == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-
-                pdata->gpio_int_mic_en = of_get_named_gpio(np,
-                                                "nvidia,int-mic-en-gpios", 0);
-                if (pdata->gpio_int_mic_en == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-
-                pdata->gpio_ext_mic_en = of_get_named_gpio(np,
-                                                "nvidia,ext-mic-en-gpios", 0);
-                if (pdata->gpio_ext_mic_en == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-        }
-
-        if (np) {
-                ret = snd_soc_of_parse_card_name(card, "nvidia,model");
-                if (ret)
-                        goto err;
-
-                ret = snd_soc_of_parse_audio_routing(card,
-                                                     "nvidia,audio-routing");
-                if (ret)
-                        goto err;
-
-                tegra_wm8903_dai.codec_name = NULL;
-                tegra_wm8903_dai.codec_of_node = of_parse_phandle(np,
-                                "nvidia,audio-codec", 0);
-                if (!tegra_wm8903_dai.codec_of_node) {
-                        dev_err(&pdev->dev,
-                                "Property 'nvidia,audio-codec' missing or invalid\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
-
-                tegra_wm8903_dai.cpu_dai_name = NULL;
-                tegra_wm8903_dai.cpu_of_node = of_parse_phandle(np,
-                                "nvidia,i2s-controller", 0);
-                if (!tegra_wm8903_dai.cpu_of_node) {
-                        dev_err(&pdev->dev,
-                                "Property 'nvidia,i2s-controller' missing or invalid\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
-
-                tegra_wm8903_dai.platform_name = NULL;
-                tegra_wm8903_dai.platform_of_node =
-                                        tegra_wm8903_dai.cpu_of_node;
-        } else {
-                card->dapm_routes = harmony_audio_map;
-                card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map);
-        }
-
-        if (gpio_is_valid(pdata->gpio_spkr_en)) {
-                ret = devm_gpio_request_one(&pdev->dev, pdata->gpio_spkr_en,
+        machine->gpio_spkr_en = of_get_named_gpio(np, "nvidia,spkr-en-gpios",
+                                                  0);
+        if (machine->gpio_spkr_en == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+        if (gpio_is_valid(machine->gpio_spkr_en)) {
+                ret = devm_gpio_request_one(&pdev->dev, machine->gpio_spkr_en,
                                             GPIOF_OUT_INIT_LOW, "spkr_en");
                 if (ret) {
                         dev_err(card->dev, "cannot get spkr_en gpio\n");
@@ -354,8 +269,12 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)
                 }
         }
 
-        if (gpio_is_valid(pdata->gpio_hp_mute)) {
-                ret = devm_gpio_request_one(&pdev->dev, pdata->gpio_hp_mute,
+        machine->gpio_hp_mute = of_get_named_gpio(np, "nvidia,hp-mute-gpios",
+                                                  0);
+        if (machine->gpio_hp_mute == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+        if (gpio_is_valid(machine->gpio_hp_mute)) {
+                ret = devm_gpio_request_one(&pdev->dev, machine->gpio_hp_mute,
                                             GPIOF_OUT_INIT_HIGH, "hp_mute");
                 if (ret) {
                         dev_err(card->dev, "cannot get hp_mute gpio\n");
@@ -363,9 +282,18 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)
                 }
         }
 
-        if (gpio_is_valid(pdata->gpio_int_mic_en)) {
+        machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);
+        if (machine->gpio_hp_det == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+
+        machine->gpio_int_mic_en = of_get_named_gpio(np,
+                                                "nvidia,int-mic-en-gpios", 0);
+        if (machine->gpio_int_mic_en == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+        if (gpio_is_valid(machine->gpio_int_mic_en)) {
                 /* Disable int mic; enable signal is active-high */
-                ret = devm_gpio_request_one(&pdev->dev, pdata->gpio_int_mic_en,
+                ret = devm_gpio_request_one(&pdev->dev,
+                                            machine->gpio_int_mic_en,
                                             GPIOF_OUT_INIT_LOW, "int_mic_en");
                 if (ret) {
                         dev_err(card->dev, "cannot get int_mic_en gpio\n");
@@ -373,9 +301,14 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)
                 }
         }
 
-        if (gpio_is_valid(pdata->gpio_ext_mic_en)) {
+        machine->gpio_ext_mic_en = of_get_named_gpio(np,
+                                                "nvidia,ext-mic-en-gpios", 0);
+        if (machine->gpio_ext_mic_en == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+        if (gpio_is_valid(machine->gpio_ext_mic_en)) {
                 /* Enable ext mic; enable signal is active-low */
-                ret = devm_gpio_request_one(&pdev->dev, pdata->gpio_ext_mic_en,
+                ret = devm_gpio_request_one(&pdev->dev,
+                                            machine->gpio_ext_mic_en,
                                             GPIOF_OUT_INIT_LOW, "ext_mic_en");
                 if (ret) {
                         dev_err(card->dev, "cannot get ext_mic_en gpio\n");
@@ -383,6 +316,34 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)
                 }
         }
 
+        ret = snd_soc_of_parse_card_name(card, "nvidia,model");
+        if (ret)
+                goto err;
+
+        ret = snd_soc_of_parse_audio_routing(card, "nvidia,audio-routing");
+        if (ret)
+                goto err;
+
+        tegra_wm8903_dai.codec_of_node = of_parse_phandle(np,
+                                                "nvidia,audio-codec", 0);
+        if (!tegra_wm8903_dai.codec_of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'nvidia,audio-codec' missing or invalid\n");
+                ret = -EINVAL;
+                goto err;
+        }
+
+        tegra_wm8903_dai.cpu_of_node = of_parse_phandle(np,
+                        "nvidia,i2s-controller", 0);
+        if (!tegra_wm8903_dai.cpu_of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'nvidia,i2s-controller' missing or invalid\n");
+                ret = -EINVAL;
+                goto err;
+        }
+
+        tegra_wm8903_dai.platform_of_node = tegra_wm8903_dai.cpu_of_node;
+
         ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
         if (ret)
                 goto err;
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index 68d42403d9b5..5e119630b0e0 100644
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -55,7 +55,7 @@ static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_dai_link tegra_wm9712_dai = {
         .name = "AC97 HiFi",
         .stream_name = "AC97 HiFi",
-        .cpu_dai_name = "tegra-ac97-pcm",
+        .cpu_dai_name = "tegra20-ac97",
         .codec_dai_name = "wm9712-hifi",
         .codec_name = "wm9712-codec",
         .init = tegra_wm9712_init,
@@ -79,11 +79,6 @@ static int tegra_wm9712_driver_probe(struct platform_device *pdev)
         struct tegra_wm9712 *machine;
         int ret;
 
-        if (!pdev->dev.of_node) {
-                dev_err(&pdev->dev, "No platform data supplied\n");
-                return -EINVAL;
-        }
-
         machine = devm_kzalloc(&pdev->dev, sizeof(struct tegra_wm9712),
                                GFP_KERNEL);
         if (!machine) {
diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index 7fcf6c2297db..05c68aab5cf0 100644
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -97,9 +97,6 @@ static const struct snd_soc_dapm_route trimslice_audio_map[] = {
 static struct snd_soc_dai_link trimslice_tlv320aic23_dai = {
         .name = "TLV320AIC23",
         .stream_name = "AIC23",
-        .codec_name = "tlv320aic23-codec.2-001a",
-        .platform_name = "tegra20-i2s.0",
-        .cpu_dai_name = "tegra20-i2s.0",
         .codec_dai_name = "tlv320aic23-hifi",
         .ops = &trimslice_asoc_ops,
         .dai_fmt = SND_SOC_DAIFMT_I2S |
@@ -122,6 +119,7 @@ static struct snd_soc_card snd_soc_trimslice = {
 
 static int tegra_snd_trimslice_probe(struct platform_device *pdev)
 {
+        struct device_node *np = pdev->dev.of_node;
         struct snd_soc_card *card = &snd_soc_trimslice;
         struct tegra_trimslice *trimslice;
         int ret;
@@ -130,44 +128,38 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev)
                                  GFP_KERNEL);
         if (!trimslice) {
                 dev_err(&pdev->dev, "Can't allocate tegra_trimslice\n");
-                ret = -ENOMEM;
+                return -ENOMEM;
+        }
+
+        card->dev = &pdev->dev;
+        platform_set_drvdata(pdev, card);
+        snd_soc_card_set_drvdata(card, trimslice);
+
+        trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(np,
+                        "nvidia,audio-codec", 0);
+        if (!trimslice_tlv320aic23_dai.codec_of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'nvidia,audio-codec' missing or invalid\n");
+                ret = -EINVAL;
                 goto err;
         }
 
-        if (pdev->dev.of_node) {
-                trimslice_tlv320aic23_dai.codec_name = NULL;
-                trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(
-                                pdev->dev.of_node, "nvidia,audio-codec", 0);
-                if (!trimslice_tlv320aic23_dai.codec_of_node) {
-                        dev_err(&pdev->dev,
-                                "Property 'nvidia,audio-codec' missing or invalid\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
-
-                trimslice_tlv320aic23_dai.cpu_dai_name = NULL;
-                trimslice_tlv320aic23_dai.cpu_of_node = of_parse_phandle(
-                                pdev->dev.of_node, "nvidia,i2s-controller", 0);
-                if (!trimslice_tlv320aic23_dai.cpu_of_node) {
-                        dev_err(&pdev->dev,
-                                "Property 'nvidia,i2s-controller' missing or invalid\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
-
-                trimslice_tlv320aic23_dai.platform_name = NULL;
-                trimslice_tlv320aic23_dai.platform_of_node =
-                                trimslice_tlv320aic23_dai.cpu_of_node;
+        trimslice_tlv320aic23_dai.cpu_of_node = of_parse_phandle(np,
+                        "nvidia,i2s-controller", 0);
+        if (!trimslice_tlv320aic23_dai.cpu_of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'nvidia,i2s-controller' missing or invalid\n");
+                ret = -EINVAL;
+                goto err;
         }
 
+        trimslice_tlv320aic23_dai.platform_of_node =
+                        trimslice_tlv320aic23_dai.cpu_of_node;
+
         ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);
         if (ret)
                 goto err;
 
-        card->dev = &pdev->dev;
-        platform_set_drvdata(pdev, card);
-        snd_soc_card_set_drvdata(card, trimslice);
-
         ret = snd_soc_register_card(card);
         if (ret) {
                 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c
index 16ab69635e2e..8a2840304d28 100644
--- a/sound/soc/txx9/txx9aclc-ac97.c
+++ b/sound/soc/txx9/txx9aclc-ac97.c
@@ -170,6 +170,10 @@ static struct snd_soc_dai_driver txx9aclc_ac97_dai = {
         },
 };
 
+static const struct snd_soc_component_driver txx9aclc_ac97_component = {
+        .name           = "txx9aclc-ac97",
+};
+
 static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
 {
         struct txx9aclc_plat_drvdata *drvdata;
@@ -205,12 +209,13 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
         if (err < 0)
                 return err;
 
-        return snd_soc_register_dai(&pdev->dev, &txx9aclc_ac97_dai);
+        return snd_soc_register_component(&pdev->dev, &txx9aclc_ac97_component,
+                                          &txx9aclc_ac97_dai, 1);
 }
 
 static int txx9aclc_ac97_dev_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/ux500/Kconfig b/sound/soc/ux500/Kconfig
index 6b799c0e88df..aa5011894c74 100644
--- a/sound/soc/ux500/Kconfig
+++ b/sound/soc/ux500/Kconfig
@@ -16,7 +16,7 @@ config SND_SOC_UX500_PLAT_MSP_I2S
 config SND_SOC_UX500_PLAT_DMA
         tristate "Platform - DB8500 (DMA)"
         depends on SND_SOC_UX500
-        select SND_SOC_DMAENGINE_PCM
+        select SND_SOC_GENERIC_DMAENGINE_PCM
         help
                 Say Y if you want to enable the Ux500 platform-driver.
 
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 54028cf76511..7d5fc1328523 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -766,6 +766,11 @@ static struct snd_soc_dai_driver ux500_msp_dai_drv[UX500_NBR_OF_DAI] = {
         },
 };
 
+static const struct snd_soc_component_driver ux500_msp_component = {
+        .name           = "ux500-msp",
+};
+
+
 static int ux500_msp_drv_probe(struct platform_device *pdev)
 {
         struct ux500_msp_i2s_drvdata *drvdata;
@@ -823,8 +828,8 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
         }
         dev_set_drvdata(&pdev->dev, drvdata);
 
-        ret = snd_soc_register_dai(&pdev->dev,
-                                &ux500_msp_dai_drv[drvdata->msp->id]);
+        ret = snd_soc_register_component(&pdev->dev, &ux500_msp_component,
+                                         &ux500_msp_dai_drv[drvdata->msp->id], 1);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n",
                         __func__, drvdata->msp->id);
@@ -842,7 +847,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev)
         return 0;
 
 err_reg_plat:
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(ux500_msp_dai_drv));
+        snd_soc_unregister_component(&pdev->dev);
 err_init_msp:
         clk_put(drvdata->clk);
 err_clk:
@@ -859,7 +864,7 @@ static int ux500_msp_drv_remove(struct platform_device *pdev)
 
         ux500_pcm_unregister_platform(pdev);
 
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(ux500_msp_dai_drv));
+        snd_soc_unregister_component(&pdev->dev);
 
         devm_regulator_put(drvdata->reg_vape);
         prcmu_qos_remove_requirement(PRCMU_QOS_APE_OPP, "ux500_msp_i2s");
diff --git a/sound/soc/ux500/ux500_msp_dai.h b/sound/soc/ux500/ux500_msp_dai.h
index 9c778d9c3838..f53104359f15 100644
--- a/sound/soc/ux500/ux500_msp_dai.h
+++ b/sound/soc/ux500/ux500_msp_dai.h
@@ -35,13 +35,8 @@
 #define FRAME_PER_8_SLOTS                               138
 #define FRAME_PER_16_SLOTS                              277
 
-#ifndef CONFIG_SND_SOC_UX500_AB5500
 #define UX500_MSP_INTERNAL_CLOCK_FREQ  40000000
 #define UX500_MSP1_INTERNAL_CLOCK_FREQ UX500_MSP_INTERNAL_CLOCK_FREQ
-#else
-#define UX500_MSP_INTERNAL_CLOCK_FREQ 13000000
-#define UX500_MSP1_INTERNAL_CLOCK_FREQ (UX500_MSP_INTERNAL_CLOCK_FREQ * 2)
-#endif
 
 #define UX500_MSP_MIN_CHANNELS          1
 #define UX500_MSP_MAX_CHANNELS          8
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h
index 437f0c032c58..e5cd105c90f9 100644
--- a/sound/soc/ux500/ux500_msp_i2s.h
+++ b/sound/soc/ux500/ux500_msp_i2s.h
@@ -541,6 +541,7 @@ struct ux500_msp_dma_params {
         struct stedma40_chan_cfg *dma_cfg;
 };
 
+struct msp_i2s_platform_data;
 int ux500_msp_i2s_init_msp(struct platform_device *pdev,
                         struct ux500_msp **msp_p,
                         struct msp_i2s_platform_data *platform_data);
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
index 846fa82a58d0..b6e5ae277299 100644
--- a/sound/soc/ux500/ux500_pcm.c
+++ b/sound/soc/ux500/ux500_pcm.c
@@ -28,28 +28,19 @@
 #include "ux500_msp_i2s.h"
 #include "ux500_pcm.h"
 
-static struct snd_pcm_hardware ux500_pcm_hw_playback = {
-        .info = SNDRV_PCM_INFO_INTERLEAVED |
-                SNDRV_PCM_INFO_MMAP |
-                SNDRV_PCM_INFO_RESUME |
-                SNDRV_PCM_INFO_PAUSE,
-        .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                SNDRV_PCM_FMTBIT_U16_LE |
-                SNDRV_PCM_FMTBIT_S16_BE |
-                SNDRV_PCM_FMTBIT_U16_BE,
-        .rates = SNDRV_PCM_RATE_KNOT,
-        .rate_min = UX500_PLATFORM_MIN_RATE_PLAYBACK,
-        .rate_max = UX500_PLATFORM_MAX_RATE_PLAYBACK,
-        .channels_min = UX500_PLATFORM_MIN_CHANNELS,
-        .channels_max = UX500_PLATFORM_MAX_CHANNELS,
-        .buffer_bytes_max = UX500_PLATFORM_BUFFER_BYTES_MAX,
-        .period_bytes_min = UX500_PLATFORM_PERIODS_BYTES_MIN,
-        .period_bytes_max = UX500_PLATFORM_PERIODS_BYTES_MAX,
-        .periods_min = UX500_PLATFORM_PERIODS_MIN,
-        .periods_max = UX500_PLATFORM_PERIODS_MAX,
-};
+#define UX500_PLATFORM_MIN_RATE 8000
+#define UX500_PLATFORM_MAX_RATE 48000
+
+#define UX500_PLATFORM_MIN_CHANNELS 1
+#define UX500_PLATFORM_MAX_CHANNELS 8
 
-static struct snd_pcm_hardware ux500_pcm_hw_capture = {
+#define UX500_PLATFORM_PERIODS_BYTES_MIN        128
+#define UX500_PLATFORM_PERIODS_BYTES_MAX        (64 * PAGE_SIZE)
+#define UX500_PLATFORM_PERIODS_MIN              2
+#define UX500_PLATFORM_PERIODS_MAX              48
+#define UX500_PLATFORM_BUFFER_BYTES_MAX         (2048 * PAGE_SIZE)
+
+static const struct snd_pcm_hardware ux500_pcm_hw = {
         .info = SNDRV_PCM_INFO_INTERLEAVED |
                 SNDRV_PCM_INFO_MMAP |
                 SNDRV_PCM_INFO_RESUME |
@@ -59,8 +50,8 @@ static struct snd_pcm_hardware ux500_pcm_hw_capture = {
                 SNDRV_PCM_FMTBIT_S16_BE |
                 SNDRV_PCM_FMTBIT_U16_BE,
         .rates = SNDRV_PCM_RATE_KNOT,
-        .rate_min = UX500_PLATFORM_MIN_RATE_CAPTURE,
-        .rate_max = UX500_PLATFORM_MAX_RATE_CAPTURE,
+        .rate_min = UX500_PLATFORM_MIN_RATE,
+        .rate_max = UX500_PLATFORM_MAX_RATE,
         .channels_min = UX500_PLATFORM_MIN_CHANNELS,
         .channels_max = UX500_PLATFORM_MAX_CHANNELS,
         .buffer_bytes_max = UX500_PLATFORM_BUFFER_BYTES_MAX,
@@ -70,64 +61,23 @@ static struct snd_pcm_hardware ux500_pcm_hw_capture = {
         .periods_max = UX500_PLATFORM_PERIODS_MAX,
 };
 
-static void ux500_pcm_dma_hw_free(struct device *dev,
-                                struct snd_pcm_substream *substream)
+static struct dma_chan *ux500_pcm_request_chan(struct snd_soc_pcm_runtime *rtd,
+        struct snd_pcm_substream *substream)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_dma_buffer *buf = runtime->dma_buffer_p;
-
-        if (runtime->dma_area == NULL)
-                return;
-
-        if (buf != &substream->dma_buffer) {
-                dma_free_coherent(buf->dev.dev, buf->bytes, buf->area,
-                                buf->addr);
-                kfree(runtime->dma_buffer_p);
-        }
-
-        snd_pcm_set_runtime_buffer(substream, NULL);
-}
-
-static int ux500_pcm_open(struct snd_pcm_substream *substream)
-{
-        int stream_id = substream->pstr->stream;
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *dai = rtd->cpu_dai;
         struct device *dev = dai->dev;
-        int ret;
-        struct ux500_msp_dma_params *dma_params;
         u16 per_data_width, mem_data_width;
         struct stedma40_chan_cfg *dma_cfg;
+        struct ux500_msp_dma_params *dma_params;
 
         dev_dbg(dev, "%s: MSP %d (%s): Enter.\n", __func__, dai->id,
                 snd_pcm_stream_str(substream));
 
-        dev_dbg(dev, "%s: Set runtime hwparams.\n", __func__);
-        if (stream_id == SNDRV_PCM_STREAM_PLAYBACK)
-                snd_soc_set_runtime_hwparams(substream,
-                                        &ux500_pcm_hw_playback);
-        else
-                snd_soc_set_runtime_hwparams(substream,
-                                        &ux500_pcm_hw_capture);
-
-        /* ensure that buffer size is a multiple of period size */
-        ret = snd_pcm_hw_constraint_integer(runtime,
-                                        SNDRV_PCM_HW_PARAM_PERIODS);
-        if (ret < 0) {
-                dev_err(dev, "%s: Error: snd_pcm_hw_constraints failed (%d)\n",
-                        __func__, ret);
-                return ret;
-        }
-
-        dev_dbg(dev, "%s: Set hw-struct for %s.\n", __func__,
-                snd_pcm_stream_str(substream));
-        runtime->hw = (stream_id == SNDRV_PCM_STREAM_PLAYBACK) ?
-                ux500_pcm_hw_playback : ux500_pcm_hw_capture;
+        dma_params = snd_soc_dai_get_dma_data(dai, substream);
+        dma_cfg = dma_params->dma_cfg;
 
         mem_data_width = STEDMA40_HALFWORD_WIDTH;
 
-        dma_params = snd_soc_dai_get_dma_data(dai, substream);
         switch (dma_params->data_size) {
         case 32:
                 per_data_width = STEDMA40_WORD_WIDTH;
@@ -140,13 +90,8 @@ static int ux500_pcm_open(struct snd_pcm_substream *substream)
                 break;
         default:
                 per_data_width = STEDMA40_WORD_WIDTH;
-                dev_warn(rtd->platform->dev,
-                        "%s: Unknown data-size (%d)! Assuming 32 bits.\n",
-                        __func__, dma_params->data_size);
         }
 
-        dma_cfg = dma_params->dma_cfg;
-
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 dma_cfg->src_info.data_width = mem_data_width;
                 dma_cfg->dst_info.data_width = per_data_width;
@@ -155,137 +100,24 @@ static int ux500_pcm_open(struct snd_pcm_substream *substream)
                 dma_cfg->dst_info.data_width = mem_data_width;
         }
 
-
-        ret = snd_dmaengine_pcm_open(substream, stedma40_filter, dma_cfg);
-        if (ret) {
-                dev_dbg(dai->dev,
-                        "%s: ERROR: snd_dmaengine_pcm_open failed (%d)!\n",
-                        __func__, ret);
-                return ret;
-        }
-
-        snd_dmaengine_pcm_set_data(substream, dma_cfg);
-
-        return 0;
-}
-
-static int ux500_pcm_close(struct snd_pcm_substream *substream)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *dai = rtd->cpu_dai;
-
-        dev_dbg(dai->dev, "%s: Enter\n", __func__);
-
-        snd_dmaengine_pcm_close(substream);
-
-        return 0;
-}
-
-static int ux500_pcm_hw_params(struct snd_pcm_substream *substream,
-                        struct snd_pcm_hw_params *hw_params)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_dma_buffer *buf = runtime->dma_buffer_p;
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        int ret = 0;
-        int size;
-
-        dev_dbg(rtd->platform->dev, "%s: Enter\n", __func__);
-
-        size = params_buffer_bytes(hw_params);
-
-        if (buf) {
-                if (buf->bytes >= size)
-                        goto out;
-                ux500_pcm_dma_hw_free(NULL, substream);
-        }
-
-        if (substream->dma_buffer.area != NULL &&
-                substream->dma_buffer.bytes >= size) {
-                buf = &substream->dma_buffer;
-        } else {
-                buf = kmalloc(sizeof(struct snd_dma_buffer), GFP_KERNEL);
-                if (!buf)
-                        goto nomem;
-
-                buf->dev.type = SNDRV_DMA_TYPE_DEV;
-                buf->dev.dev = NULL;
-                buf->area = dma_alloc_coherent(NULL, size, &buf->addr,
-                                        GFP_KERNEL);
-                buf->bytes = size;
-                buf->private_data = NULL;
-
-                if (!buf->area)
-                        goto free;
-        }
-        snd_pcm_set_runtime_buffer(substream, buf);
-        ret = 1;
- out:
-        runtime->dma_bytes = size;
-        return ret;
-
- free:
-        kfree(buf);
- nomem:
-        return -ENOMEM;
+        return snd_dmaengine_pcm_request_channel(stedma40_filter, dma_cfg);
 }
 
-static int ux500_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-
-        dev_dbg(rtd->platform->dev, "%s: Enter\n", __func__);
-
-        ux500_pcm_dma_hw_free(NULL, substream);
-
-        return 0;
-}
-
-static int ux500_pcm_mmap(struct snd_pcm_substream *substream,
-                        struct vm_area_struct *vma)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-
-        dev_dbg(rtd->platform->dev, "%s: Enter.\n", __func__);
-
-        return dma_mmap_coherent(NULL, vma, runtime->dma_area,
-                                runtime->dma_addr, runtime->dma_bytes);
-}
-
-static struct snd_pcm_ops ux500_pcm_ops = {
-        .open           = ux500_pcm_open,
-        .close          = ux500_pcm_close,
-        .ioctl          = snd_pcm_lib_ioctl,
-        .hw_params      = ux500_pcm_hw_params,
-        .hw_free        = ux500_pcm_hw_free,
-        .trigger        = snd_dmaengine_pcm_trigger,
-        .pointer        = snd_dmaengine_pcm_pointer_no_residue,
-        .mmap           = ux500_pcm_mmap
-};
-
-int ux500_pcm_new(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_pcm *pcm = rtd->pcm;
-
-        dev_dbg(rtd->platform->dev, "%s: Enter (id = '%s').\n", __func__,
-                pcm->id);
-
-        pcm->info_flags = 0;
-
-        return 0;
-}
-
-static struct snd_soc_platform_driver ux500_pcm_soc_drv = {
-        .ops            = &ux500_pcm_ops,
-        .pcm_new        = ux500_pcm_new,
+static const struct snd_dmaengine_pcm_config ux500_dmaengine_pcm_config = {
+        .pcm_hardware = &ux500_pcm_hw,
+        .compat_request_channel = ux500_pcm_request_chan,
+        .prealloc_buffer_size = 128 * 1024,
 };
 
 int ux500_pcm_register_platform(struct platform_device *pdev)
 {
         int ret;
 
-        ret = snd_soc_register_platform(&pdev->dev, &ux500_pcm_soc_drv);
+        ret = snd_dmaengine_pcm_register(&pdev->dev,
+                        &ux500_dmaengine_pcm_config,
+                        SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
+                        SND_DMAENGINE_PCM_FLAG_COMPAT |
+                        SND_DMAENGINE_PCM_FLAG_NO_DT);
         if (ret < 0) {
                 dev_err(&pdev->dev,
                         "%s: ERROR: Failed to register platform '%s' (%d)!\n",
@@ -299,8 +131,7 @@ EXPORT_SYMBOL_GPL(ux500_pcm_register_platform);
 
 int ux500_pcm_unregister_platform(struct platform_device *pdev)
 {
-        snd_soc_unregister_platform(&pdev->dev);
-
+        snd_dmaengine_pcm_unregister(&pdev->dev);
         return 0;
 }
 EXPORT_SYMBOL_GPL(ux500_pcm_unregister_platform);
diff --git a/sound/soc/ux500/ux500_pcm.h b/sound/soc/ux500/ux500_pcm.h
index 76d344476afc..d76e1aff6458 100644
--- a/sound/soc/ux500/ux500_pcm.h
+++ b/sound/soc/ux500/ux500_pcm.h
@@ -18,20 +18,6 @@
 
 #include <linux/workqueue.h>
 
-#define UX500_PLATFORM_MIN_RATE_PLAYBACK 8000
-#define UX500_PLATFORM_MAX_RATE_PLAYBACK 48000
-#define UX500_PLATFORM_MIN_RATE_CAPTURE 8000
-#define UX500_PLATFORM_MAX_RATE_CAPTURE 48000
-
-#define UX500_PLATFORM_MIN_CHANNELS 1
-#define UX500_PLATFORM_MAX_CHANNELS 8
-
-#define UX500_PLATFORM_PERIODS_BYTES_MIN        128
-#define UX500_PLATFORM_PERIODS_BYTES_MAX        (64 * PAGE_SIZE)
-#define UX500_PLATFORM_PERIODS_MIN              2
-#define UX500_PLATFORM_PERIODS_MAX              48
-#define UX500_PLATFORM_BUFFER_BYTES_MAX         (2048 * PAGE_SIZE)
-
 int ux500_pcm_register_platform(struct platform_device *pdev);
 int ux500_pcm_unregister_platform(struct platform_device *pdev);