Merge tag 'asoc-v3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.20

More updates for v3.20:

 - Lots of refactoring from Lars-Peter Clausen, moving drivers to more
   data driven initialization and rationalizing a lot of DAPM usage.
 - Much improved handling of CDCLK clocks on Samsung I2S controllers.
 - Lots of driver specific cleanups and feature improvements.
 - CODEC support for TI PCM514x and TLV320AIC3104 devices.
 - Board support for Tegra systems with Realtek RT5677.

Conflicts:
	sound/soc/intel/sst-mfld-platform-pcm.c

168 files changed, 4971 insertions, 2074 deletions

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index db05e04d0070..ffd656012ab8 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1015,6 +1015,60 @@ int snd_interval_list(struct snd_interval *i, unsigned int count,
 
 EXPORT_SYMBOL(snd_interval_list);
 
+/**
+ * snd_interval_ranges - refine the interval value from the list of ranges
+ * @i: the interval value to refine
+ * @count: the number of elements in the list of ranges
+ * @ranges: the ranges list
+ * @mask: the bit-mask to evaluate
+ *
+ * Refines the interval value from the list of ranges.
+ * When mask is non-zero, only the elements corresponding to bit 1 are
+ * evaluated.
+ *
+ * Return: Positive if the value is changed, zero if it's not changed, or a
+ * negative error code.
+ */
+int snd_interval_ranges(struct snd_interval *i, unsigned int count,
+                        const struct snd_interval *ranges, unsigned int mask)
+{
+        unsigned int k;
+        struct snd_interval range_union;
+        struct snd_interval range;
+
+        if (!count) {
+                snd_interval_none(i);
+                return -EINVAL;
+        }
+        snd_interval_any(&range_union);
+        range_union.min = UINT_MAX;
+        range_union.max = 0;
+        for (k = 0; k < count; k++) {
+                if (mask && !(mask & (1 << k)))
+                        continue;
+                snd_interval_copy(&range, &ranges[k]);
+                if (snd_interval_refine(&range, i) < 0)
+                        continue;
+                if (snd_interval_empty(&range))
+                        continue;
+
+                if (range.min < range_union.min) {
+                        range_union.min = range.min;
+                        range_union.openmin = 1;
+                }
+                if (range.min == range_union.min && !range.openmin)
+                        range_union.openmin = 0;
+                if (range.max > range_union.max) {
+                        range_union.max = range.max;
+                        range_union.openmax = 1;
+                }
+                if (range.max == range_union.max && !range.openmax)
+                        range_union.openmax = 0;
+        }
+        return snd_interval_refine(i, &range_union);
+}
+EXPORT_SYMBOL(snd_interval_ranges);
+
 static int snd_interval_step(struct snd_interval *i, unsigned int step)
 {
         unsigned int n;
@@ -1221,6 +1275,37 @@ int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
 
 EXPORT_SYMBOL(snd_pcm_hw_constraint_list);
 
+static int snd_pcm_hw_rule_ranges(struct snd_pcm_hw_params *params,
+                                  struct snd_pcm_hw_rule *rule)
+{
+        struct snd_pcm_hw_constraint_ranges *r = rule->private;
+        return snd_interval_ranges(hw_param_interval(params, rule->var),
+                                   r->count, r->ranges, r->mask);
+}
+
+
+/**
+ * snd_pcm_hw_constraint_ranges - apply list of range constraints to a parameter
+ * @runtime: PCM runtime instance
+ * @cond: condition bits
+ * @var: hw_params variable to apply the list of range constraints
+ * @r: ranges
+ *
+ * Apply the list of range constraints to an interval parameter.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
+ */
+int snd_pcm_hw_constraint_ranges(struct snd_pcm_runtime *runtime,
+                                 unsigned int cond,
+                                 snd_pcm_hw_param_t var,
+                                 const struct snd_pcm_hw_constraint_ranges *r)
+{
+        return snd_pcm_hw_rule_add(runtime, cond, var,
+                                   snd_pcm_hw_rule_ranges, (void *)r,
+                                   var, -1);
+}
+EXPORT_SYMBOL(snd_pcm_hw_constraint_ranges);
+
 static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params,
                                    struct snd_pcm_hw_rule *rule)
 {
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 7d5d6444a837..dcc79aa0236b 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -55,6 +55,7 @@ source "sound/soc/spear/Kconfig"
 source "sound/soc/tegra/Kconfig"
 source "sound/soc/txx9/Kconfig"
 source "sound/soc/ux500/Kconfig"
+source "sound/soc/xtensa/Kconfig"
 
 # Supported codecs
 source "sound/soc/codecs/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 865e090c8061..5b3c8f67c8db 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -36,3 +36,4 @@ obj-$(CONFIG_SND_SOC)	+= spear/
 obj-$(CONFIG_SND_SOC)   += tegra/
 obj-$(CONFIG_SND_SOC)   += txx9/
 obj-$(CONFIG_SND_SOC)   += ux500/
+obj-$(CONFIG_SND_SOC)   += xtensa/
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index fb3878312bf8..1579e994acf8 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -45,7 +45,7 @@ config SND_ATMEL_SOC_WM8904
 
 config SND_AT91_SOC_SAM9X5_WM8731
         tristate "SoC Audio support for WM8731-based at91sam9x5 board"
-        depends on ATMEL_SSC && SND_ATMEL_SOC && SOC_AT91SAM9X5
+        depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC
         select SND_ATMEL_SOC_SSC
         select SND_ATMEL_SOC_DMA
         select SND_SOC_WM8731
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c
index 33fb3bb133df..b8e7bad05eb1 100644
--- a/sound/soc/atmel/atmel-pcm-dma.c
+++ b/sound/soc/atmel/atmel-pcm-dma.c
@@ -105,13 +105,11 @@ static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream,
                 return ret;
         }
 
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                slave_config->dst_addr = ssc->phybase + SSC_THR;
-                slave_config->dst_maxburst = 1;
-        } else {
-                slave_config->src_addr = ssc->phybase + SSC_RHR;
-                slave_config->src_maxburst = 1;
-        }
+        slave_config->dst_addr = ssc->phybase + SSC_THR;
+        slave_config->dst_maxburst = 1;
+
+        slave_config->src_addr = ssc->phybase + SSC_RHR;
+        slave_config->src_maxburst = 1;
 
         prtd->dma_intr_handler = atmel_pcm_dma_irq;
 
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 99ff35e2a25d..fb0b7e8b08ff 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -204,6 +204,13 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream,
         pr_debug("atmel_ssc_startup: SSC_SR=0x%u\n",
                 ssc_readl(ssc_p->ssc->regs, SR));
 
+        /* Enable PMC peripheral clock for this SSC */
+        pr_debug("atmel_ssc_dai: Starting clock\n");
+        clk_enable(ssc_p->ssc->clk);
+
+        /* Reset the SSC to keep it at a clean status */
+        ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));
+
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 dir = 0;
                 dir_mask = SSC_DIR_MASK_PLAYBACK;
@@ -250,11 +257,6 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream,
         dma_params = ssc_p->dma_params[dir];
 
         if (dma_params != NULL) {
-                ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_disable);
-                pr_debug("atmel_ssc_shutdown: %s disabled SSC_SR=0x%08x\n",
-                        (dir ? "receive" : "transmit"),
-                        ssc_readl(ssc_p->ssc->regs, SR));
-
                 dma_params->ssc = NULL;
                 dma_params->substream = NULL;
                 ssc_p->dma_params[dir] = NULL;
@@ -266,10 +268,6 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream,
         ssc_p->dir_mask &= ~dir_mask;
         if (!ssc_p->dir_mask) {
                 if (ssc_p->initialized) {
-                        /* Shutdown the SSC clock. */
-                        pr_debug("atmel_ssc_dai: Stopping clock\n");
-                        clk_disable(ssc_p->ssc->clk);
-
                         free_irq(ssc_p->ssc->irq, ssc_p);
                         ssc_p->initialized = 0;
                 }
@@ -280,6 +278,10 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream,
                 ssc_p->cmr_div = ssc_p->tcmr_period = ssc_p->rcmr_period = 0;
         }
         spin_unlock_irq(&ssc_p->lock);
+
+        /* Shutdown the SSC clock. */
+        pr_debug("atmel_ssc_dai: Stopping clock\n");
+        clk_disable(ssc_p->ssc->clk);
 }
 
 
@@ -348,7 +350,6 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
         struct atmel_pcm_dma_params *dma_params;
         int dir, channels, bits;
         u32 tfmr, rfmr, tcmr, rcmr;
-        int start_event;
         int ret;
         int fslen, fslen_ext;
 
@@ -451,25 +452,10 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 break;
 
         case SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM:
-                /*
-                 * I2S 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.
-                 *
-                 *  For single channel data, one sample is transferred
-                 * on the falling edge of the LRC clock.
-                 * For two channel data, one sample is
-                 * transferred on both edges of the LRC clock.
-                 */
-                start_event = ((channels == 1)
-                                ? SSC_START_FALLING_RF
-                                : SSC_START_EDGE_RF);
-
+                /* I2S format, CODEC supplies BCLK and LRC clocks. */
                 rcmr =    SSC_BF(RCMR_PERIOD, 0)
                         | SSC_BF(RCMR_STTDLY, START_DELAY)
-                        | SSC_BF(RCMR_START, start_event)
+                        | SSC_BF(RCMR_START, SSC_START_FALLING_RF)
                         | SSC_BF(RCMR_CKI, SSC_CKI_RISING)
                         | SSC_BF(RCMR_CKO, SSC_CKO_NONE)
                         | SSC_BF(RCMR_CKS, ssc->clk_from_rk_pin ?
@@ -478,14 +464,14 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 rfmr =    SSC_BF(RFMR_FSEDGE, SSC_FSEDGE_POSITIVE)
                         | SSC_BF(RFMR_FSOS, SSC_FSOS_NONE)
                         | SSC_BF(RFMR_FSLEN, 0)
-                        | SSC_BF(RFMR_DATNB, 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, start_event)
+                        | SSC_BF(TCMR_START, SSC_START_FALLING_RF)
                         | SSC_BF(TCMR_CKI, SSC_CKI_FALLING)
                         | SSC_BF(TCMR_CKO, SSC_CKO_NONE)
                         | SSC_BF(TCMR_CKS, ssc->clk_from_rk_pin ?
@@ -495,7 +481,55 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                         | SSC_BF(TFMR_FSDEN, 0)
                         | SSC_BF(TFMR_FSOS, SSC_FSOS_NONE)
                         | SSC_BF(TFMR_FSLEN, 0)
-                        | SSC_BF(TFMR_DATNB, 0)
+                        | SSC_BF(TFMR_DATNB, (channels - 1))
+                        | SSC_BIT(TFMR_MSBF)
+                        | SSC_BF(TFMR_DATDEF, 0)
+                        | SSC_BF(TFMR_DATLEN, (bits - 1));
+                break;
+
+        case SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFS:
+                /* I2S format, CODEC supplies BCLK, SSC supplies LRCLK. */
+                if (bits > 16 && !ssc->pdata->has_fslen_ext) {
+                        dev_err(dai->dev,
+                                "sample size %d is too large for SSC device\n",
+                                bits);
+                        return -EINVAL;
+                }
+
+                fslen_ext = (bits - 1) / 16;
+                fslen = (bits - 1) % 16;
+
+                rcmr =    SSC_BF(RCMR_PERIOD, ssc_p->rcmr_period)
+                        | SSC_BF(RCMR_STTDLY, START_DELAY)
+                        | SSC_BF(RCMR_START, SSC_START_FALLING_RF)
+                        | SSC_BF(RCMR_CKI, SSC_CKI_RISING)
+                        | SSC_BF(RCMR_CKO, SSC_CKO_NONE)
+                        | SSC_BF(RCMR_CKS, ssc->clk_from_rk_pin ?
+                                           SSC_CKS_PIN : SSC_CKS_CLOCK);
+
+                rfmr =    SSC_BF(RFMR_FSLEN_EXT, fslen_ext)
+                        | SSC_BF(RFMR_FSEDGE, SSC_FSEDGE_POSITIVE)
+                        | SSC_BF(RFMR_FSOS, SSC_FSOS_NEGATIVE)
+                        | SSC_BF(RFMR_FSLEN, fslen)
+                        | 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, ssc_p->tcmr_period)
+                        | SSC_BF(TCMR_STTDLY, START_DELAY)
+                        | SSC_BF(TCMR_START, SSC_START_FALLING_RF)
+                        | SSC_BF(TCMR_CKI, SSC_CKI_FALLING)
+                        | SSC_BF(TCMR_CKO, SSC_CKO_NONE)
+                        | SSC_BF(TCMR_CKS, ssc->clk_from_rk_pin ?
+                                           SSC_CKS_CLOCK : SSC_CKS_PIN);
+
+                tfmr =    SSC_BF(TFMR_FSLEN_EXT, fslen_ext)
+                        | SSC_BF(TFMR_FSEDGE, SSC_FSEDGE_NEGATIVE)
+                        | SSC_BF(TFMR_FSDEN, 0)
+                        | SSC_BF(TFMR_FSOS, SSC_FSOS_NEGATIVE)
+                        | SSC_BF(TFMR_FSLEN, fslen)
+                        | SSC_BF(TFMR_DATNB, (channels - 1))
                         | SSC_BIT(TFMR_MSBF)
                         | SSC_BF(TFMR_DATDEF, 0)
                         | SSC_BF(TFMR_DATLEN, (bits - 1));
@@ -512,7 +546,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 rcmr =    SSC_BF(RCMR_PERIOD, ssc_p->rcmr_period)
                         | SSC_BF(RCMR_STTDLY, 1)
                         | SSC_BF(RCMR_START, SSC_START_RISING_RF)
-                        | SSC_BF(RCMR_CKI, SSC_CKI_RISING)
+                        | SSC_BF(RCMR_CKI, SSC_CKI_FALLING)
                         | SSC_BF(RCMR_CKO, SSC_CKO_NONE)
                         | SSC_BF(RCMR_CKS, SSC_CKS_DIV);
 
@@ -527,7 +561,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 tcmr =    SSC_BF(TCMR_PERIOD, ssc_p->tcmr_period)
                         | SSC_BF(TCMR_STTDLY, 1)
                         | SSC_BF(TCMR_START, SSC_START_RISING_RF)
-                        | SSC_BF(TCMR_CKI, SSC_CKI_RISING)
+                        | SSC_BF(TCMR_CKI, SSC_CKI_FALLING)
                         | SSC_BF(TCMR_CKO, SSC_CKO_CONTINUOUS)
                         | SSC_BF(TCMR_CKS, SSC_CKS_DIV);
 
@@ -545,10 +579,6 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 /*
                  * 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.
@@ -556,7 +586,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 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_CKI, SSC_CKI_FALLING)
                         | SSC_BF(RCMR_CKO, SSC_CKO_NONE)
                         | SSC_BF(RCMR_CKS, ssc->clk_from_rk_pin ?
                                            SSC_CKS_PIN : SSC_CKS_CLOCK);
@@ -597,23 +627,17 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                         rcmr, rfmr, tcmr, tfmr);
 
         if (!ssc_p->initialized) {
-
-                /* Enable PMC peripheral clock for this SSC */
-                pr_debug("atmel_ssc_dai: Starting clock\n");
-                clk_enable(ssc_p->ssc->clk);
-
-                /* Reset the SSC and its PDC registers */
-                ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));
-
-                ssc_writel(ssc_p->ssc->regs, PDC_RPR, 0);
-                ssc_writel(ssc_p->ssc->regs, PDC_RCR, 0);
-                ssc_writel(ssc_p->ssc->regs, PDC_RNPR, 0);
-                ssc_writel(ssc_p->ssc->regs, PDC_RNCR, 0);
-
-                ssc_writel(ssc_p->ssc->regs, PDC_TPR, 0);
-                ssc_writel(ssc_p->ssc->regs, PDC_TCR, 0);
-                ssc_writel(ssc_p->ssc->regs, PDC_TNPR, 0);
-                ssc_writel(ssc_p->ssc->regs, PDC_TNCR, 0);
+                if (!ssc_p->ssc->pdata->use_dma) {
+                        ssc_writel(ssc_p->ssc->regs, PDC_RPR, 0);
+                        ssc_writel(ssc_p->ssc->regs, PDC_RCR, 0);
+                        ssc_writel(ssc_p->ssc->regs, PDC_RNPR, 0);
+                        ssc_writel(ssc_p->ssc->regs, PDC_RNCR, 0);
+
+                        ssc_writel(ssc_p->ssc->regs, PDC_TPR, 0);
+                        ssc_writel(ssc_p->ssc->regs, PDC_TCR, 0);
+                        ssc_writel(ssc_p->ssc->regs, PDC_TNPR, 0);
+                        ssc_writel(ssc_p->ssc->regs, PDC_TNCR, 0);
+                }
 
                 ret = request_irq(ssc_p->ssc->irq, atmel_ssc_interrupt, 0,
                                 ssc_p->name, ssc_p);
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 66b66d0e7514..f5ad214663f9 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -47,7 +47,6 @@
 #include <sound/soc.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 
 #include "../codecs/wm8731.h"
 #include "atmel-pcm.h"
@@ -64,33 +63,6 @@
 
 static struct clk *mclk;
 
-static int at91sam9g20ek_hw_params(struct snd_pcm_substream *substream,
-        struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        int ret;
-
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
-        /* set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-static struct snd_soc_ops at91sam9g20ek_ops = {
-        .hw_params = at91sam9g20ek_hw_params,
-};
-
 static int at91sam9g20ek_set_bias_level(struct snd_soc_card *card,
                                         struct snd_soc_dapm_context *dapm,
                                         enum snd_soc_bias_level level)
@@ -173,7 +145,8 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = {
         .init = at91sam9g20ek_wm8731_init,
         .platform_name = "at91rm9200_ssc.0",
         .codec_name = "wm8731.0-001b",
-        .ops = &at91sam9g20ek_ops,
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBM_CFM,
 };
 
 static struct snd_soc_card snd_soc_at91sam9g20ek = {
diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c
index a747ac0b399f..c75995f2779c 100644
--- a/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@ -91,27 +91,12 @@ static int db1200_i2s_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        int ret;
 
         /* WM8731 has its own 12MHz crystal */
         snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
                                 12000000, SND_SOC_CLOCK_IN);
 
-        /* codec is bitclock and lrclk master */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_LEFT_J |
-                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                goto out;
-
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_LEFT_J |
-                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                goto out;
-
-        ret = 0;
-out:
-        return ret;
+        return 0;
 }
 
 static struct snd_soc_ops db1200_i2s_wm8731_ops = {
@@ -125,6 +110,8 @@ static struct snd_soc_dai_link db1200_i2s_dai = {
         .cpu_dai_name   = "au1xpsc_i2s.1",
         .platform_name  = "au1xpsc-pcm.1",
         .codec_name     = "wm8731.0-001b",
+        .dai_fmt        = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF |
+                          SND_SOC_DAIFMT_CBM_CFM,
         .ops            = &db1200_i2s_wm8731_ops,
 };
 
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c
index b06b8d8128c6..dd94fea72d5d 100644
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
@@ -315,11 +315,6 @@ static struct snd_pcm_ops au1xpsc_pcm_ops = {
         .pointer        = au1xpsc_pcm_pointer,
 };
 
-static void au1xpsc_pcm_free_dma_buffers(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_card *card = rtd->card->snd_card;
@@ -335,7 +330,6 @@ static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_platform_driver au1xpsc_soc_platform = {
         .ops            = &au1xpsc_pcm_ops,
         .pcm_new        = au1xpsc_pcm_new,
-        .pcm_free       = au1xpsc_pcm_free_dma_buffers,
 };
 
 static int au1xpsc_pcm_drvprobe(struct platform_device *pdev)
diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c
index 6ffaaff469c7..24cc7f40d87a 100644
--- a/sound/soc/au1x/dma.c
+++ b/sound/soc/au1x/dma.c
@@ -287,11 +287,6 @@ static struct snd_pcm_ops alchemy_pcm_ops = {
         .pointer                = alchemy_pcm_pointer,
 };
 
-static void alchemy_pcm_free_dma_buffers(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int alchemy_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_pcm *pcm = rtd->pcm;
@@ -305,7 +300,6 @@ static int alchemy_pcm_new(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_platform_driver alchemy_pcm_soc_platform = {
         .ops            = &alchemy_pcm_ops,
         .pcm_new        = alchemy_pcm_new,
-        .pcm_free       = alchemy_pcm_free_dma_buffers,
 };
 
 static int alchemy_pcm_drvprobe(struct platform_device *pdev)
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index a2bf27f4baab..a0f265327fdf 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -386,7 +386,7 @@ static int snd_soc_put_volsw_2r_out(struct snd_kcontrol *kcontrol,
 static int pm860x_rsync_event(struct snd_soc_dapm_widget *w,
                               struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         /*
          * In order to avoid current on the load, mute power-on and power-off
@@ -403,7 +403,7 @@ static int pm860x_rsync_event(struct snd_soc_dapm_widget *w,
 static int pm860x_dac_event(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         unsigned int dac = 0;
         int data;
 
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 8349f982a586..3190eed43c38 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -525,7 +525,7 @@ config SND_SOC_RT5677
 
 config SND_SOC_RT5677_SPI
         tristate
-        default SND_SOC_RT5677
+        default SND_SOC_RT5677 && SPI
 
 #Freescale sgtl5000 codec
 config SND_SOC_SGTL5000
@@ -580,7 +580,9 @@ config SND_SOC_SSM4567
         depends on I2C
 
 config SND_SOC_STA32X
-        tristate
+        tristate "STA326, STA328 and STA329 speaker amplifier"
+        depends on I2C
+        select REGMAP_I2C
 
 config SND_SOC_STA350
         tristate "STA350 speaker amplifier"
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c
index 387530b0b0fd..17c953595660 100644
--- a/sound/soc/codecs/ad193x.c
+++ b/sound/soc/codecs/ad193x.c
@@ -333,8 +333,8 @@ static int ad193x_codec_probe(struct snd_soc_codec *codec)
         regmap_write(ad193x->regmap, AD193X_DAC_CHNL_MUTE, 0x0);
         /* de-emphasis: 48kHz, powedown dac */
         regmap_write(ad193x->regmap, AD193X_DAC_CTRL2, 0x1A);
-        /* powerdown dac, dac in tdm mode */
-        regmap_write(ad193x->regmap, AD193X_DAC_CTRL0, 0x41);
+        /* dac in tdm mode */
+        regmap_write(ad193x->regmap, AD193X_DAC_CTRL0, 0x40);
         /* high-pass filter enable */
         regmap_write(ad193x->regmap, AD193X_ADC_CTRL0, 0x3);
         /* sata delay=1, adc aux mode */
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 686cacb0e835..632e89f793a7 100644
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -163,7 +163,7 @@ static const struct snd_kcontrol_new ak4671_snd_controls[] = {
 static int ak4671_out2_event(struct snd_soc_dapm_widget *w,
                 struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index bdf8c5ac8ca4..0e357996864b 100644
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -55,18 +55,20 @@ static inline int alc5623_reset(struct snd_soc_codec *codec)
 static int amp_mixer_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
         /* to power-on/off class-d amp generators/speaker */
         /* need to write to 'index-46h' register :        */
         /* so write index num (here 0x46) to reg 0x6a     */
         /* and then 0xffff/0 to reg 0x6c                  */
-        snd_soc_write(w->codec, ALC5623_HID_CTRL_INDEX, 0x46);
+        snd_soc_write(codec, ALC5623_HID_CTRL_INDEX, 0x46);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
-                snd_soc_write(w->codec, ALC5623_HID_CTRL_DATA, 0xFFFF);
+                snd_soc_write(codec, ALC5623_HID_CTRL_DATA, 0xFFFF);
                 break;
         case SND_SOC_DAPM_POST_PMD:
-                snd_soc_write(w->codec, ALC5623_HID_CTRL_DATA, 0);
+                snd_soc_write(codec, ALC5623_HID_CTRL_DATA, 0);
                 break;
         }
 
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index d1fdbc266631..db3283abbe18 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -116,18 +116,20 @@ static inline int alc5632_reset(struct regmap *map)
 static int amp_mixer_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
         /* to power-on/off class-d amp generators/speaker */
         /* need to write to 'index-46h' register :        */
         /* so write index num (here 0x46) to reg 0x6a     */
         /* and then 0xffff/0 to reg 0x6c                  */
-        snd_soc_write(w->codec, ALC5632_HID_CTRL_INDEX, 0x46);
+        snd_soc_write(codec, ALC5632_HID_CTRL_INDEX, 0x46);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
-                snd_soc_write(w->codec, ALC5632_HID_CTRL_DATA, 0xFFFF);
+                snd_soc_write(codec, ALC5632_HID_CTRL_DATA, 0xFFFF);
                 break;
         case SND_SOC_DAPM_POST_PMD:
-                snd_soc_write(w->codec, ALC5632_HID_CTRL_DATA, 0);
+                snd_soc_write(codec, ALC5632_HID_CTRL_DATA, 0);
                 break;
         }
 
@@ -1066,7 +1068,7 @@ static int alc5632_probe(struct snd_soc_codec *codec)
         return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_device_alc5632 = {
+static const struct snd_soc_codec_driver soc_codec_device_alc5632 = {
         .probe = alc5632_probe,
         .resume = alc5632_resume,
         .set_bias_level = alc5632_set_bias_level,
@@ -1080,7 +1082,7 @@ static struct snd_soc_codec_driver soc_codec_device_alc5632 = {
         .num_dapm_routes = ARRAY_SIZE(alc5632_dapm_routes),
 };
 
-static struct regmap_config alc5632_regmap = {
+static const struct regmap_config alc5632_regmap = {
         .reg_bits = 8,
         .val_bits = 16,
 
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 9550d7433ad0..29202610dd0d 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -84,7 +84,7 @@ 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 snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
         struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
         bool manual_ena = false;
@@ -692,7 +692,8 @@ static void arizona_in_set_vu(struct snd_soc_codec *codec, int ena)
 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);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
         unsigned int reg;
 
         if (w->shift % 2)
@@ -705,25 +706,25 @@ int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
                 priv->in_pending++;
                 break;
         case SND_SOC_DAPM_POST_PMU:
-                snd_soc_update_bits(w->codec, reg, ARIZONA_IN1L_MUTE, 0);
+                snd_soc_update_bits(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);
+                        arizona_in_set_vu(codec, 1);
                 }
                 break;
         case SND_SOC_DAPM_PRE_PMD:
-                snd_soc_update_bits(w->codec, reg,
+                snd_soc_update_bits(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);
+                reg = snd_soc_read(codec, ARIZONA_INPUT_ENABLES);
                 if (reg == 0)
-                        arizona_in_set_vu(w->codec, 0);
+                        arizona_in_set_vu(codec, 0);
         }
 
         return 0;
@@ -734,7 +735,25 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol,
                    int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+
         switch (event) {
+        case SND_SOC_DAPM_PRE_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:
+                        priv->out_up_pending++;
+                        priv->out_up_delay += 17;
+                        break;
+                default:
+                        break;
+                }
+                break;
         case SND_SOC_DAPM_POST_PMU:
                 switch (w->shift) {
                 case ARIZONA_OUT1L_ENA_SHIFT:
@@ -743,13 +762,50 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w,
                 case ARIZONA_OUT2R_ENA_SHIFT:
                 case ARIZONA_OUT3L_ENA_SHIFT:
                 case ARIZONA_OUT3R_ENA_SHIFT:
-                        msleep(17);
+                        priv->out_up_pending--;
+                        if (!priv->out_up_pending) {
+                                msleep(priv->out_up_delay);
+                                priv->out_up_delay = 0;
+                        }
                         break;
 
                 default:
                         break;
                 }
                 break;
+        case SND_SOC_DAPM_PRE_PMD:
+                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:
+                        priv->out_down_pending++;
+                        priv->out_down_delay++;
+                        break;
+                default:
+                        break;
+                }
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                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:
+                        priv->out_down_pending--;
+                        if (!priv->out_down_pending) {
+                                msleep(priv->out_down_delay);
+                                priv->out_down_delay = 0;
+                        }
+                        break;
+                default:
+                        break;
+                }
+                break;
         }
 
         return 0;
@@ -760,7 +816,8 @@ int arizona_hp_ev(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol,
                    int event)
 {
-        struct arizona_priv *priv = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
         struct arizona *arizona = priv->arizona;
         unsigned int mask = 1 << w->shift;
         unsigned int val;
@@ -772,6 +829,9 @@ int arizona_hp_ev(struct snd_soc_dapm_widget *w,
         case SND_SOC_DAPM_PRE_PMD:
                 val = 0;
                 break;
+        case SND_SOC_DAPM_PRE_PMU:
+        case SND_SOC_DAPM_POST_PMD:
+                return arizona_out_ev(w, kcontrol, event);
         default:
                 return -EINVAL;
         }
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 942cfb197b6d..11ff899b0272 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -77,6 +77,11 @@ struct arizona_priv {
         int num_inputs;
         unsigned int in_pending;
 
+        unsigned int out_up_pending;
+        unsigned int out_up_delay;
+        unsigned int out_down_pending;
+        unsigned int out_down_delay;
+
         unsigned int spk_ena:2;
         unsigned int spk_ena_pending:1;
 };
diff --git a/sound/soc/codecs/bt-sco.c b/sound/soc/codecs/bt-sco.c
index 5075bf0a7276..e7238b8904bc 100644
--- a/sound/soc/codecs/bt-sco.c
+++ b/sound/soc/codecs/bt-sco.c
@@ -86,5 +86,5 @@ static struct platform_driver bt_sco_driver = {
 module_platform_driver(bt_sco_driver);
 
 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
-MODULE_DESCRIPTION("ASoC generic bluethooth sco link driver");
+MODULE_DESCRIPTION("ASoC generic bluetooth sco link driver");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c
index ec55c590afd0..f2b8aad21274 100644
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
@@ -264,7 +264,7 @@ static int cs35l32_codec_set_sysclk(struct snd_soc_codec *codec,
                         CS35L32_MCLK_DIV2_MASK | CS35L32_MCLK_RATIO_MASK, val);
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_cs35l32 = {
+static const struct snd_soc_codec_driver soc_codec_dev_cs35l32 = {
         .set_sysclk = cs35l32_codec_set_sysclk,
 
         .dapm_widgets = cs35l32_dapm_widgets,
@@ -288,7 +288,7 @@ static const struct reg_default cs35l32_monitor_patch[] = {
         { 0x00, 0x00 },
 };
 
-static struct regmap_config cs35l32_regmap = {
+static const struct regmap_config cs35l32_regmap = {
         .reg_bits = 8,
         .val_bits = 8,
 
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 35fbef743fbe..1589e7a881d8 100644
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -1103,7 +1103,7 @@ static int cs42l52_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_cs42l52 = {
+static const struct snd_soc_codec_driver soc_codec_dev_cs42l52 = {
         .probe = cs42l52_probe,
         .remove = cs42l52_remove,
         .set_bias_level = cs42l52_set_bias_level,
@@ -1130,7 +1130,7 @@ static const struct reg_default cs42l52_threshold_patch[] = {
 
 };
 
-static struct regmap_config cs42l52_regmap = {
+static const struct regmap_config cs42l52_regmap = {
         .reg_bits = 8,
         .val_bits = 8,
 
diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c
index 2ddc7ac10ad7..cbc654fe48c7 100644
--- a/sound/soc/codecs/cs42l56.c
+++ b/sound/soc/codecs/cs42l56.c
@@ -1164,7 +1164,7 @@ static int cs42l56_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {
+static const struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {
         .probe = cs42l56_probe,
         .remove = cs42l56_remove,
         .set_bias_level = cs42l56_set_bias_level,
@@ -1179,7 +1179,7 @@ static struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {
         .num_controls = ARRAY_SIZE(cs42l56_snd_controls),
 };
 
-static struct regmap_config cs42l56_regmap = {
+static const struct regmap_config cs42l56_regmap = {
         .reg_bits = 8,
         .val_bits = 8,
 
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 7c55537c69cf..8ecedba79606 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1347,7 +1347,7 @@ static int cs42l73_probe(struct snd_soc_codec *codec)
         return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {
+static const struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {
         .probe = cs42l73_probe,
         .set_bias_level = cs42l73_set_bias_level,
         .suspend_bias_off = true,
@@ -1361,7 +1361,7 @@ static struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {
         .num_controls = ARRAY_SIZE(cs42l73_snd_controls),
 };
 
-static struct regmap_config cs42l73_regmap = {
+static const struct regmap_config cs42l73_regmap = {
         .reg_bits = 8,
         .val_bits = 8,
 
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index 61b2f9a2eef1..ffe96175a8a5 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -609,7 +609,7 @@ static const struct snd_kcontrol_new da732x_snd_controls[] = {
 static int da732x_adc_event(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -663,7 +663,7 @@ static int da732x_adc_event(struct snd_soc_dapm_widget *w,
 static int da732x_out_pga_event(struct snd_soc_dapm_widget *w,
                                 struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index c1e441c2c8af..2ffb9a0570dc 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -328,16 +328,16 @@ static int mc13783_set_tdm_slot_dac(struct snd_soc_dai *dai,
         }
 
         switch (rx_mask) {
-        case 0xfffffffc:
+        case 0x03:
                 val |= SSI_NETWORK_DAC_RXSLOT_0_1;
                 break;
-        case 0xfffffff3:
+        case 0x0c:
                 val |= SSI_NETWORK_DAC_RXSLOT_2_3;
                 break;
-        case 0xffffffcf:
+        case 0x30:
                 val |= SSI_NETWORK_DAC_RXSLOT_4_5;
                 break;
-        case 0xffffff3f:
+        case 0xc0:
                 val |= SSI_NETWORK_DAC_RXSLOT_6_7;
                 break;
         default:
@@ -360,7 +360,7 @@ static int mc13783_set_tdm_slot_codec(struct snd_soc_dai *dai,
         if (slots != 4)
                 return -EINVAL;
 
-        if (tx_mask != 0xfffffffc)
+        if (tx_mask != 0x3)
                 return -EINVAL;
 
         val |= (0x00 << 2);     /* primary timeslot RX/TX(?) is 0 */
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index 7e73fa4b3183..8fb445f33f6f 100644
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -32,7 +32,7 @@ static int pcm3008_dac_ev(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *kcontrol,
                           int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct pcm3008_setup_data *setup = codec->dev->platform_data;
 
         gpio_set_value_cansleep(setup->pdda_pin,
@@ -45,7 +45,7 @@ static int pcm3008_adc_ev(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *kcontrol,
                           int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct pcm3008_setup_data *setup = codec->dev->platform_data;
 
         gpio_set_value_cansleep(setup->pdad_pin,
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index 30c673cdc12e..9974f201a08f 100644
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -21,12 +21,19 @@
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
+#include <linux/gcd.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
+#include <sound/pcm_params.h>
 #include <sound/tlv.h>
 
 #include "pcm512x.h"
 
+#define DIV_ROUND_DOWN_ULL(ll, d) \
+        ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; })
+#define DIV_ROUND_CLOSEST_ULL(ll, d) \
+        ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; })
+
 #define PCM512x_NUM_SUPPLIES 3
 static const char * const pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = {
         "AVDD",
@@ -39,6 +46,14 @@ struct pcm512x_priv {
         struct clk *sclk;
         struct regulator_bulk_data supplies[PCM512x_NUM_SUPPLIES];
         struct notifier_block supply_nb[PCM512x_NUM_SUPPLIES];
+        int fmt;
+        int pll_in;
+        int pll_out;
+        int pll_r;
+        int pll_j;
+        int pll_d;
+        int pll_p;
+        unsigned long real_pll;
 };
 
 /*
@@ -69,6 +84,7 @@ static const struct reg_default pcm512x_reg_defaults[] = {
         { PCM512x_MUTE,              0x00 },
         { PCM512x_DSP,               0x00 },
         { PCM512x_PLL_REF,           0x00 },
+        { PCM512x_DAC_REF,           0x00 },
         { PCM512x_DAC_ROUTING,       0x11 },
         { PCM512x_DSP_PROGRAM,       0x01 },
         { PCM512x_CLKDET,            0x00 },
@@ -87,6 +103,25 @@ static const struct reg_default pcm512x_reg_defaults[] = {
         { PCM512x_ANALOG_GAIN_BOOST, 0x00 },
         { PCM512x_VCOM_CTRL_1,       0x00 },
         { PCM512x_VCOM_CTRL_2,       0x01 },
+        { PCM512x_BCLK_LRCLK_CFG,    0x00 },
+        { PCM512x_MASTER_MODE,       0x7c },
+        { PCM512x_GPIO_DACIN,        0x00 },
+        { PCM512x_GPIO_PLLIN,        0x00 },
+        { PCM512x_SYNCHRONIZE,       0x10 },
+        { PCM512x_PLL_COEFF_0,       0x00 },
+        { PCM512x_PLL_COEFF_1,       0x00 },
+        { PCM512x_PLL_COEFF_2,       0x00 },
+        { PCM512x_PLL_COEFF_3,       0x00 },
+        { PCM512x_PLL_COEFF_4,       0x00 },
+        { PCM512x_DSP_CLKDIV,        0x00 },
+        { PCM512x_DAC_CLKDIV,        0x00 },
+        { PCM512x_NCP_CLKDIV,        0x00 },
+        { PCM512x_OSR_CLKDIV,        0x00 },
+        { PCM512x_MASTER_CLKDIV_1,   0x00 },
+        { PCM512x_MASTER_CLKDIV_2,   0x00 },
+        { PCM512x_FS_SPEED_MODE,     0x00 },
+        { PCM512x_IDAC_1,            0x01 },
+        { PCM512x_IDAC_2,            0x00 },
 };
 
 static bool pcm512x_readable(struct device *dev, unsigned int reg)
@@ -103,6 +138,10 @@ static bool pcm512x_readable(struct device *dev, unsigned int reg)
         case PCM512x_DSP_GPIO_INPUT:
         case PCM512x_MASTER_MODE:
         case PCM512x_PLL_REF:
+        case PCM512x_DAC_REF:
+        case PCM512x_GPIO_DACIN:
+        case PCM512x_GPIO_PLLIN:
+        case PCM512x_SYNCHRONIZE:
         case PCM512x_PLL_COEFF_0:
         case PCM512x_PLL_COEFF_1:
         case PCM512x_PLL_COEFF_2:
@@ -143,6 +182,7 @@ static bool pcm512x_readable(struct device *dev, unsigned int reg)
         case PCM512x_RATE_DET_2:
         case PCM512x_RATE_DET_3:
         case PCM512x_RATE_DET_4:
+        case PCM512x_CLOCK_STATUS:
         case PCM512x_ANALOG_MUTE_DET:
         case PCM512x_GPIN:
         case PCM512x_DIGITAL_MUTE_DET:
@@ -154,6 +194,8 @@ static bool pcm512x_readable(struct device *dev, unsigned int reg)
         case PCM512x_VCOM_CTRL_1:
         case PCM512x_VCOM_CTRL_2:
         case PCM512x_CRAM_CTRL:
+        case PCM512x_FLEX_A:
+        case PCM512x_FLEX_B:
                 return true;
         default:
                 /* There are 256 raw register addresses */
@@ -170,6 +212,7 @@ static bool pcm512x_volatile(struct device *dev, unsigned int reg)
         case PCM512x_RATE_DET_2:
         case PCM512x_RATE_DET_3:
         case PCM512x_RATE_DET_4:
+        case PCM512x_CLOCK_STATUS:
         case PCM512x_ANALOG_MUTE_DET:
         case PCM512x_GPIN:
         case PCM512x_DIGITAL_MUTE_DET:
@@ -277,7 +320,7 @@ SOC_ENUM("Auto Mute Time Right", pcm512x_autom_r),
 SOC_SINGLE("Auto Mute Mono Switch", PCM512x_DIGITAL_MUTE_3,
            PCM512x_ACTL_SHIFT, 1, 0),
 SOC_DOUBLE("Auto Mute Switch", PCM512x_DIGITAL_MUTE_3, PCM512x_AMLE_SHIFT,
-           PCM512x_AMLR_SHIFT, 1, 0),
+           PCM512x_AMRE_SHIFT, 1, 0),
 
 SOC_ENUM("Volume Ramp Down Rate", pcm512x_vndf),
 SOC_ENUM("Volume Ramp Down Step", pcm512x_vnds),
@@ -303,6 +346,136 @@ static const struct snd_soc_dapm_route pcm512x_dapm_routes[] = {
         { "OUTR", NULL, "DACR" },
 };
 
+static const u32 pcm512x_dai_rates[] = {
+        8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000,
+        88200, 96000, 176400, 192000, 384000,
+};
+
+static const struct snd_pcm_hw_constraint_list constraints_slave = {
+        .count = ARRAY_SIZE(pcm512x_dai_rates),
+        .list  = pcm512x_dai_rates,
+};
+
+static int pcm512x_hw_rule_rate(struct snd_pcm_hw_params *params,
+                                struct snd_pcm_hw_rule *rule)
+{
+        struct snd_interval ranges[2];
+        int frame_size;
+
+        frame_size = snd_soc_params_to_frame_size(params);
+        if (frame_size < 0)
+                return frame_size;
+
+        switch (frame_size) {
+        case 32:
+                /* No hole when the frame size is 32. */
+                return 0;
+        case 48:
+        case 64:
+                /* There is only one hole in the range of supported
+                 * rates, but it moves with the frame size.
+                 */
+                memset(ranges, 0, sizeof(ranges));
+                ranges[0].min = 8000;
+                ranges[0].max = 25000000 / frame_size / 2;
+                ranges[1].min = DIV_ROUND_UP(16000000, frame_size);
+                ranges[1].max = 384000;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return snd_interval_ranges(hw_param_interval(params, rule->var),
+                                   ARRAY_SIZE(ranges), ranges, 0);
+}
+
+static int pcm512x_dai_startup_master(struct snd_pcm_substream *substream,
+                                      struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
+        struct device *dev = dai->dev;
+        struct snd_pcm_hw_constraint_ratnums *constraints_no_pll;
+        struct snd_ratnum *rats_no_pll;
+
+        if (IS_ERR(pcm512x->sclk)) {
+                dev_err(dev, "Need SCLK for master mode: %ld\n",
+                        PTR_ERR(pcm512x->sclk));
+                return PTR_ERR(pcm512x->sclk);
+        }
+
+        if (pcm512x->pll_out)
+                return snd_pcm_hw_rule_add(substream->runtime, 0,
+                                           SNDRV_PCM_HW_PARAM_RATE,
+                                           pcm512x_hw_rule_rate,
+                                           NULL,
+                                           SNDRV_PCM_HW_PARAM_FRAME_BITS,
+                                           SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+
+        constraints_no_pll = devm_kzalloc(dev, sizeof(*constraints_no_pll),
+                                          GFP_KERNEL);
+        if (!constraints_no_pll)
+                return -ENOMEM;
+        constraints_no_pll->nrats = 1;
+        rats_no_pll = devm_kzalloc(dev, sizeof(*rats_no_pll), GFP_KERNEL);
+        if (!rats_no_pll)
+                return -ENOMEM;
+        constraints_no_pll->rats = rats_no_pll;
+        rats_no_pll->num = clk_get_rate(pcm512x->sclk) / 64;
+        rats_no_pll->den_min = 1;
+        rats_no_pll->den_max = 128;
+        rats_no_pll->den_step = 1;
+
+        return snd_pcm_hw_constraint_ratnums(substream->runtime, 0,
+                                             SNDRV_PCM_HW_PARAM_RATE,
+                                             constraints_no_pll);
+}
+
+static int pcm512x_dai_startup_slave(struct snd_pcm_substream *substream,
+                                     struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
+        struct device *dev = dai->dev;
+        struct regmap *regmap = pcm512x->regmap;
+
+        if (IS_ERR(pcm512x->sclk)) {
+                dev_info(dev, "No SCLK, using BCLK: %ld\n",
+                         PTR_ERR(pcm512x->sclk));
+
+                /* Disable reporting of missing SCLK as an error */
+                regmap_update_bits(regmap, PCM512x_ERROR_DETECT,
+                                   PCM512x_IDCH, PCM512x_IDCH);
+
+                /* Switch PLL input to BCLK */
+                regmap_update_bits(regmap, PCM512x_PLL_REF,
+                                   PCM512x_SREF, PCM512x_SREF_BCK);
+        }
+
+        return snd_pcm_hw_constraint_list(substream->runtime, 0,
+                                          SNDRV_PCM_HW_PARAM_RATE,
+                                          &constraints_slave);
+}
+
+static int pcm512x_dai_startup(struct snd_pcm_substream *substream,
+                               struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
+
+        switch (pcm512x->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+        case SND_SOC_DAIFMT_CBM_CFS:
+                return pcm512x_dai_startup_master(substream, dai);
+
+        case SND_SOC_DAIFMT_CBS_CFS:
+                return pcm512x_dai_startup_slave(substream, dai);
+
+        default:
+                return -EINVAL;
+        }
+}
+
 static int pcm512x_set_bias_level(struct snd_soc_codec *codec,
                                   enum snd_soc_bias_level level)
 {
@@ -340,17 +513,717 @@ static int pcm512x_set_bias_level(struct snd_soc_codec *codec,
         return 0;
 }
 
+static unsigned long pcm512x_find_sck(struct snd_soc_dai *dai,
+                                      unsigned long bclk_rate)
+{
+        struct device *dev = dai->dev;
+        unsigned long sck_rate;
+        int pow2;
+
+        /* 64 MHz <= pll_rate <= 100 MHz, VREF mode */
+        /* 16 MHz <= sck_rate <=  25 MHz, VREF mode */
+
+        /* select sck_rate as a multiple of bclk_rate but still with
+         * as many factors of 2 as possible, as that makes it easier
+         * to find a fast DAC rate
+         */
+        pow2 = 1 << fls((25000000 - 16000000) / bclk_rate);
+        for (; pow2; pow2 >>= 1) {
+                sck_rate = rounddown(25000000, bclk_rate * pow2);
+                if (sck_rate >= 16000000)
+                        break;
+        }
+        if (!pow2) {
+                dev_err(dev, "Impossible to generate a suitable SCK\n");
+                return 0;
+        }
+
+        dev_dbg(dev, "sck_rate %lu\n", sck_rate);
+        return sck_rate;
+}
+
+/* pll_rate = pllin_rate * R * J.D / P
+ * 1 <= R <= 16
+ * 1 <= J <= 63
+ * 0 <= D <= 9999
+ * 1 <= P <= 15
+ * 64 MHz <= pll_rate <= 100 MHz
+ * if D == 0
+ *     1 MHz <= pllin_rate / P <= 20 MHz
+ * else if D > 0
+ *     6.667 MHz <= pllin_rate / P <= 20 MHz
+ *     4 <= J <= 11
+ *     R = 1
+ */
+static int pcm512x_find_pll_coeff(struct snd_soc_dai *dai,
+                                  unsigned long pllin_rate,
+                                  unsigned long pll_rate)
+{
+        struct device *dev = dai->dev;
+        struct snd_soc_codec *codec = dai->codec;
+        struct pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
+        unsigned long common;
+        int R, J, D, P;
+        unsigned long K; /* 10000 * J.D */
+        unsigned long num;
+        unsigned long den;
+
+        common = gcd(pll_rate, pllin_rate);
+        dev_dbg(dev, "pll %lu pllin %lu common %lu\n",
+                pll_rate, pllin_rate, common);
+        num = pll_rate / common;
+        den = pllin_rate / common;
+
+        /* pllin_rate / P (or here, den) cannot be greater than 20 MHz */
+        if (pllin_rate / den > 20000000 && num < 8) {
+                num *= 20000000 / (pllin_rate / den);
+                den *= 20000000 / (pllin_rate / den);
+        }
+        dev_dbg(dev, "num / den = %lu / %lu\n", num, den);
+
+        P = den;
+        if (den <= 15 && num <= 16 * 63
+            && 1000000 <= pllin_rate / P && pllin_rate / P <= 20000000) {
+                /* Try the case with D = 0 */
+                D = 0;
+                /* factor 'num' into J and R, such that R <= 16 and J <= 63 */
+                for (R = 16; R; R--) {
+                        if (num % R)
+                                continue;
+                        J = num / R;
+                        if (J == 0 || J > 63)
+                                continue;
+
+                        dev_dbg(dev, "R * J / P = %d * %d / %d\n", R, J, P);
+                        pcm512x->real_pll = pll_rate;
+                        goto done;
+                }
+                /* no luck */
+        }
+
+        R = 1;
+
+        if (num > 0xffffffffUL / 10000)
+                goto fallback;
+
+        /* Try to find an exact pll_rate using the D > 0 case */
+        common = gcd(10000 * num, den);
+        num = 10000 * num / common;
+        den /= common;
+        dev_dbg(dev, "num %lu den %lu common %lu\n", num, den, common);
+
+        for (P = den; P <= 15; P++) {
+                if (pllin_rate / P < 6667000 || 200000000 < pllin_rate / P)
+                        continue;
+                if (num * P % den)
+                        continue;
+                K = num * P / den;
+                /* J == 12 is ok if D == 0 */
+                if (K < 40000 || K > 120000)
+                        continue;
+
+                J = K / 10000;
+                D = K % 10000;
+                dev_dbg(dev, "J.D / P = %d.%04d / %d\n", J, D, P);
+                pcm512x->real_pll = pll_rate;
+                goto done;
+        }
+
+        /* Fall back to an approximate pll_rate */
+
+fallback:
+        /* find smallest possible P */
+        P = DIV_ROUND_UP(pllin_rate, 20000000);
+        if (!P)
+                P = 1;
+        else if (P > 15) {
+                dev_err(dev, "Need a slower clock as pll-input\n");
+                return -EINVAL;
+        }
+        if (pllin_rate / P < 6667000) {
+                dev_err(dev, "Need a faster clock as pll-input\n");
+                return -EINVAL;
+        }
+        K = DIV_ROUND_CLOSEST_ULL(10000ULL * pll_rate * P, pllin_rate);
+        if (K < 40000)
+                K = 40000;
+        /* J == 12 is ok if D == 0 */
+        if (K > 120000)
+                K = 120000;
+        J = K / 10000;
+        D = K % 10000;
+        dev_dbg(dev, "J.D / P ~ %d.%04d / %d\n", J, D, P);
+        pcm512x->real_pll = DIV_ROUND_DOWN_ULL((u64)K * pllin_rate, 10000 * P);
+
+done:
+        pcm512x->pll_r = R;
+        pcm512x->pll_j = J;
+        pcm512x->pll_d = D;
+        pcm512x->pll_p = P;
+        return 0;
+}
+
+static unsigned long pcm512x_pllin_dac_rate(struct snd_soc_dai *dai,
+                                            unsigned long osr_rate,
+                                            unsigned long pllin_rate)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
+        unsigned long dac_rate;
+
+        if (!pcm512x->pll_out)
+                return 0; /* no PLL to bypass, force SCK as DAC input */
+
+        if (pllin_rate % osr_rate)
+                return 0; /* futile, quit early */
+
+        /* run DAC no faster than 6144000 Hz */
+        for (dac_rate = rounddown(6144000, osr_rate);
+             dac_rate;
+             dac_rate -= osr_rate) {
+
+                if (pllin_rate / dac_rate > 128)
+                        return 0; /* DAC divider would be too big */
+
+                if (!(pllin_rate % dac_rate))
+                        return dac_rate;
+
+                dac_rate -= osr_rate;
+        }
+
+        return 0;
+}
+
+static int pcm512x_set_dividers(struct snd_soc_dai *dai,
+                                struct snd_pcm_hw_params *params)
+{
+        struct device *dev = dai->dev;
+        struct snd_soc_codec *codec = dai->codec;
+        struct pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
+        unsigned long pllin_rate = 0;
+        unsigned long pll_rate;
+        unsigned long sck_rate;
+        unsigned long mck_rate;
+        unsigned long bclk_rate;
+        unsigned long sample_rate;
+        unsigned long osr_rate;
+        unsigned long dacsrc_rate;
+        int bclk_div;
+        int lrclk_div;
+        int dsp_div;
+        int dac_div;
+        unsigned long dac_rate;
+        int ncp_div;
+        int osr_div;
+        int ret;
+        int idac;
+        int fssp;
+        int gpio;
+
+        lrclk_div = snd_soc_params_to_frame_size(params);
+        if (lrclk_div == 0) {
+                dev_err(dev, "No LRCLK?\n");
+                return -EINVAL;
+        }
+
+        if (!pcm512x->pll_out) {
+                sck_rate = clk_get_rate(pcm512x->sclk);
+                bclk_div = params->rate_den * 64 / lrclk_div;
+                bclk_rate = DIV_ROUND_CLOSEST(sck_rate, bclk_div);
+
+                mck_rate = sck_rate;
+        } else {
+                ret = snd_soc_params_to_bclk(params);
+                if (ret < 0) {
+                        dev_err(dev, "Failed to find suitable BCLK: %d\n", ret);
+                        return ret;
+                }
+                if (ret == 0) {
+                        dev_err(dev, "No BCLK?\n");
+                        return -EINVAL;
+                }
+                bclk_rate = ret;
+
+                pllin_rate = clk_get_rate(pcm512x->sclk);
+
+                sck_rate = pcm512x_find_sck(dai, bclk_rate);
+                if (!sck_rate)
+                        return -EINVAL;
+                pll_rate = 4 * sck_rate;
+
+                ret = pcm512x_find_pll_coeff(dai, pllin_rate, pll_rate);
+                if (ret != 0)
+                        return ret;
+
+                ret = regmap_write(pcm512x->regmap,
+                                   PCM512x_PLL_COEFF_0, pcm512x->pll_p - 1);
+                if (ret != 0) {
+                        dev_err(dev, "Failed to write PLL P: %d\n", ret);
+                        return ret;
+                }
+
+                ret = regmap_write(pcm512x->regmap,
+                                   PCM512x_PLL_COEFF_1, pcm512x->pll_j);
+                if (ret != 0) {
+                        dev_err(dev, "Failed to write PLL J: %d\n", ret);
+                        return ret;
+                }
+
+                ret = regmap_write(pcm512x->regmap,
+                                   PCM512x_PLL_COEFF_2, pcm512x->pll_d >> 8);
+                if (ret != 0) {
+                        dev_err(dev, "Failed to write PLL D msb: %d\n", ret);
+                        return ret;
+                }
+
+                ret = regmap_write(pcm512x->regmap,
+                                   PCM512x_PLL_COEFF_3, pcm512x->pll_d & 0xff);
+                if (ret != 0) {
+                        dev_err(dev, "Failed to write PLL D lsb: %d\n", ret);
+                        return ret;
+                }
+
+                ret = regmap_write(pcm512x->regmap,
+                                   PCM512x_PLL_COEFF_4, pcm512x->pll_r - 1);
+                if (ret != 0) {
+                        dev_err(dev, "Failed to write PLL R: %d\n", ret);
+                        return ret;
+                }
+
+                mck_rate = pcm512x->real_pll;
+
+                bclk_div = DIV_ROUND_CLOSEST(sck_rate, bclk_rate);
+        }
+
+        if (bclk_div > 128) {
+                dev_err(dev, "Failed to find BCLK divider\n");
+                return -EINVAL;
+        }
+
+        /* the actual rate */
+        sample_rate = sck_rate / bclk_div / lrclk_div;
+        osr_rate = 16 * sample_rate;
+
+        /* run DSP no faster than 50 MHz */
+        dsp_div = mck_rate > 50000000 ? 2 : 1;
+
+        dac_rate = pcm512x_pllin_dac_rate(dai, osr_rate, pllin_rate);
+        if (dac_rate) {
+                /* the desired clock rate is "compatible" with the pll input
+                 * clock, so use that clock as dac input instead of the pll
+                 * output clock since the pll will introduce jitter and thus
+                 * noise.
+                 */
+                dev_dbg(dev, "using pll input as dac input\n");
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_DAC_REF,
+                                         PCM512x_SDAC, PCM512x_SDAC_GPIO);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to set gpio as dacref: %d\n", ret);
+                        return ret;
+                }
+
+                gpio = PCM512x_GREF_GPIO1 + pcm512x->pll_in - 1;
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_GPIO_DACIN,
+                                         PCM512x_GREF, gpio);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to set gpio %d as dacin: %d\n",
+                                pcm512x->pll_in, ret);
+                        return ret;
+                }
+
+                dacsrc_rate = pllin_rate;
+        } else {
+                /* run DAC no faster than 6144000 Hz */
+                unsigned long dac_mul = 6144000 / osr_rate;
+                unsigned long sck_mul = sck_rate / osr_rate;
+
+                for (; dac_mul; dac_mul--) {
+                        if (!(sck_mul % dac_mul))
+                                break;
+                }
+                if (!dac_mul) {
+                        dev_err(dev, "Failed to find DAC rate\n");
+                        return -EINVAL;
+                }
+
+                dac_rate = dac_mul * osr_rate;
+                dev_dbg(dev, "dac_rate %lu sample_rate %lu\n",
+                        dac_rate, sample_rate);
+
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_DAC_REF,
+                                         PCM512x_SDAC, PCM512x_SDAC_SCK);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to set sck as dacref: %d\n", ret);
+                        return ret;
+                }
+
+                dacsrc_rate = sck_rate;
+        }
+
+        dac_div = DIV_ROUND_CLOSEST(dacsrc_rate, dac_rate);
+        if (dac_div > 128) {
+                dev_err(dev, "Failed to find DAC divider\n");
+                return -EINVAL;
+        }
+
+        ncp_div = DIV_ROUND_CLOSEST(dacsrc_rate / dac_div, 1536000);
+        if (ncp_div > 128 || dacsrc_rate / dac_div / ncp_div > 2048000) {
+                /* run NCP no faster than 2048000 Hz, but why? */
+                ncp_div = DIV_ROUND_UP(dacsrc_rate / dac_div, 2048000);
+                if (ncp_div > 128) {
+                        dev_err(dev, "Failed to find NCP divider\n");
+                        return -EINVAL;
+                }
+        }
+
+        osr_div = DIV_ROUND_CLOSEST(dac_rate, osr_rate);
+        if (osr_div > 128) {
+                dev_err(dev, "Failed to find OSR divider\n");
+                return -EINVAL;
+        }
+
+        idac = mck_rate / (dsp_div * sample_rate);
+
+        ret = regmap_write(pcm512x->regmap, PCM512x_DSP_CLKDIV, dsp_div - 1);
+        if (ret != 0) {
+                dev_err(dev, "Failed to write DSP divider: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_write(pcm512x->regmap, PCM512x_DAC_CLKDIV, dac_div - 1);
+        if (ret != 0) {
+                dev_err(dev, "Failed to write DAC divider: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_write(pcm512x->regmap, PCM512x_NCP_CLKDIV, ncp_div - 1);
+        if (ret != 0) {
+                dev_err(dev, "Failed to write NCP divider: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_write(pcm512x->regmap, PCM512x_OSR_CLKDIV, osr_div - 1);
+        if (ret != 0) {
+                dev_err(dev, "Failed to write OSR divider: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_write(pcm512x->regmap,
+                           PCM512x_MASTER_CLKDIV_1, bclk_div - 1);
+        if (ret != 0) {
+                dev_err(dev, "Failed to write BCLK divider: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_write(pcm512x->regmap,
+                           PCM512x_MASTER_CLKDIV_2, lrclk_div - 1);
+        if (ret != 0) {
+                dev_err(dev, "Failed to write LRCLK divider: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_write(pcm512x->regmap, PCM512x_IDAC_1, idac >> 8);
+        if (ret != 0) {
+                dev_err(dev, "Failed to write IDAC msb divider: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_write(pcm512x->regmap, PCM512x_IDAC_2, idac & 0xff);
+        if (ret != 0) {
+                dev_err(dev, "Failed to write IDAC lsb divider: %d\n", ret);
+                return ret;
+        }
+
+        if (sample_rate <= 48000)
+                fssp = PCM512x_FSSP_48KHZ;
+        else if (sample_rate <= 96000)
+                fssp = PCM512x_FSSP_96KHZ;
+        else if (sample_rate <= 192000)
+                fssp = PCM512x_FSSP_192KHZ;
+        else
+                fssp = PCM512x_FSSP_384KHZ;
+        ret = regmap_update_bits(pcm512x->regmap, PCM512x_FS_SPEED_MODE,
+                                 PCM512x_FSSP, fssp);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to set fs speed: %d\n", ret);
+                return ret;
+        }
+
+        dev_dbg(codec->dev, "DSP divider %d\n", dsp_div);
+        dev_dbg(codec->dev, "DAC divider %d\n", dac_div);
+        dev_dbg(codec->dev, "NCP divider %d\n", ncp_div);
+        dev_dbg(codec->dev, "OSR divider %d\n", osr_div);
+        dev_dbg(codec->dev, "BCK divider %d\n", bclk_div);
+        dev_dbg(codec->dev, "LRCK divider %d\n", lrclk_div);
+        dev_dbg(codec->dev, "IDAC %d\n", idac);
+        dev_dbg(codec->dev, "1<<FSSP %d\n", 1 << fssp);
+
+        return 0;
+}
+
+static int pcm512x_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 pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
+        int alen;
+        int gpio;
+        int clock_output;
+        int master_mode;
+        int ret;
+
+        dev_dbg(codec->dev, "hw_params %u Hz, %u channels\n",
+                params_rate(params),
+                params_channels(params));
+
+        switch (snd_pcm_format_width(params_format(params))) {
+        case 16:
+                alen = PCM512x_ALEN_16;
+                break;
+        case 20:
+                alen = PCM512x_ALEN_20;
+                break;
+        case 24:
+                alen = PCM512x_ALEN_24;
+                break;
+        case 32:
+                alen = PCM512x_ALEN_32;
+                break;
+        default:
+                dev_err(codec->dev, "Bad frame size: %d\n",
+                        snd_pcm_format_width(params_format(params)));
+                return -EINVAL;
+        }
+
+        switch (pcm512x->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBS_CFS:
+                ret = regmap_update_bits(pcm512x->regmap,
+                                         PCM512x_BCLK_LRCLK_CFG,
+                                         PCM512x_BCKP
+                                         | PCM512x_BCKO | PCM512x_LRKO,
+                                         0);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to enable slave mode: %d\n", ret);
+                        return ret;
+                }
+
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_ERROR_DETECT,
+                                         PCM512x_DCAS, 0);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to enable clock divider autoset: %d\n",
+                                ret);
+                        return ret;
+                }
+                return 0;
+        case SND_SOC_DAIFMT_CBM_CFM:
+                clock_output = PCM512x_BCKO | PCM512x_LRKO;
+                master_mode = PCM512x_RLRK | PCM512x_RBCK;
+                break;
+        case SND_SOC_DAIFMT_CBM_CFS:
+                clock_output = PCM512x_BCKO;
+                master_mode = PCM512x_RBCK;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        ret = regmap_update_bits(pcm512x->regmap, PCM512x_I2S_1,
+                                 PCM512x_ALEN, alen);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to set frame size: %d\n", ret);
+                return ret;
+        }
+
+        if (pcm512x->pll_out) {
+                ret = regmap_write(pcm512x->regmap, PCM512x_FLEX_A, 0x11);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Failed to set FLEX_A: %d\n", ret);
+                        return ret;
+                }
+
+                ret = regmap_write(pcm512x->regmap, PCM512x_FLEX_B, 0xff);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Failed to set FLEX_B: %d\n", ret);
+                        return ret;
+                }
+
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_ERROR_DETECT,
+                                         PCM512x_IDFS | PCM512x_IDBK
+                                         | PCM512x_IDSK | PCM512x_IDCH
+                                         | PCM512x_IDCM | PCM512x_DCAS
+                                         | PCM512x_IPLK,
+                                         PCM512x_IDFS | PCM512x_IDBK
+                                         | PCM512x_IDSK | PCM512x_IDCH
+                                         | PCM512x_DCAS);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to ignore auto-clock failures: %d\n",
+                                ret);
+                        return ret;
+                }
+        } else {
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_ERROR_DETECT,
+                                         PCM512x_IDFS | PCM512x_IDBK
+                                         | PCM512x_IDSK | PCM512x_IDCH
+                                         | PCM512x_IDCM | PCM512x_DCAS
+                                         | PCM512x_IPLK,
+                                         PCM512x_IDFS | PCM512x_IDBK
+                                         | PCM512x_IDSK | PCM512x_IDCH
+                                         | PCM512x_DCAS | PCM512x_IPLK);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to ignore auto-clock failures: %d\n",
+                                ret);
+                        return ret;
+                }
+
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_PLL_EN,
+                                         PCM512x_PLLE, 0);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Failed to disable pll: %d\n", ret);
+                        return ret;
+                }
+        }
+
+        ret = pcm512x_set_dividers(dai, params);
+        if (ret != 0)
+                return ret;
+
+        if (pcm512x->pll_out) {
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_PLL_REF,
+                                         PCM512x_SREF, PCM512x_SREF_GPIO);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to set gpio as pllref: %d\n", ret);
+                        return ret;
+                }
+
+                gpio = PCM512x_GREF_GPIO1 + pcm512x->pll_in - 1;
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_GPIO_PLLIN,
+                                         PCM512x_GREF, gpio);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to set gpio %d as pllin: %d\n",
+                                pcm512x->pll_in, ret);
+                        return ret;
+                }
+
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_PLL_EN,
+                                         PCM512x_PLLE, PCM512x_PLLE);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Failed to enable pll: %d\n", ret);
+                        return ret;
+                }
+        }
+
+        ret = regmap_update_bits(pcm512x->regmap, PCM512x_BCLK_LRCLK_CFG,
+                                 PCM512x_BCKP | PCM512x_BCKO | PCM512x_LRKO,
+                                 clock_output);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to enable clock output: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_update_bits(pcm512x->regmap, PCM512x_MASTER_MODE,
+                                 PCM512x_RLRK | PCM512x_RBCK,
+                                 master_mode);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to enable master mode: %d\n", ret);
+                return ret;
+        }
+
+        if (pcm512x->pll_out) {
+                gpio = PCM512x_G1OE << (pcm512x->pll_out - 1);
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_GPIO_EN,
+                                         gpio, gpio);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Failed to enable gpio %d: %d\n",
+                                pcm512x->pll_out, ret);
+                        return ret;
+                }
+
+                gpio = PCM512x_GPIO_OUTPUT_1 + pcm512x->pll_out - 1;
+                ret = regmap_update_bits(pcm512x->regmap, gpio,
+                                         PCM512x_GxSL, PCM512x_GxSL_PLLCK);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Failed to output pll on %d: %d\n",
+                                ret, pcm512x->pll_out);
+                        return ret;
+                }
+
+                gpio = PCM512x_G1OE << (4 - 1);
+                ret = regmap_update_bits(pcm512x->regmap, PCM512x_GPIO_EN,
+                                         gpio, gpio);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Failed to enable gpio %d: %d\n",
+                                4, ret);
+                        return ret;
+                }
+
+                gpio = PCM512x_GPIO_OUTPUT_1 + 4 - 1;
+                ret = regmap_update_bits(pcm512x->regmap, gpio,
+                                         PCM512x_GxSL, PCM512x_GxSL_PLLLK);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to output pll lock on %d: %d\n",
+                                ret, 4);
+                        return ret;
+                }
+        }
+
+        ret = regmap_update_bits(pcm512x->regmap, PCM512x_SYNCHRONIZE,
+                                 PCM512x_RQSY, PCM512x_RQSY_HALT);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to halt clocks: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_update_bits(pcm512x->regmap, PCM512x_SYNCHRONIZE,
+                                 PCM512x_RQSY, PCM512x_RQSY_RESUME);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to resume clocks: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int pcm512x_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct pcm512x_priv *pcm512x = snd_soc_codec_get_drvdata(codec);
+
+        pcm512x->fmt = fmt;
+
+        return 0;
+}
+
+static const struct snd_soc_dai_ops pcm512x_dai_ops = {
+        .startup = pcm512x_dai_startup,
+        .hw_params = pcm512x_hw_params,
+        .set_fmt = pcm512x_set_fmt,
+};
+
 static struct snd_soc_dai_driver pcm512x_dai = {
         .name = "pcm512x-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 2,
                 .channels_max = 2,
-                .rates = SNDRV_PCM_RATE_8000_192000,
+                .rates = SNDRV_PCM_RATE_CONTINUOUS,
+                .rate_min = 8000,
+                .rate_max = 384000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE |
                            SNDRV_PCM_FMTBIT_S24_LE |
                            SNDRV_PCM_FMTBIT_S32_LE
         },
+        .ops = &pcm512x_dai_ops,
 };
 
 static struct snd_soc_codec_driver pcm512x_codec_driver = {
@@ -448,21 +1321,9 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)
         }
 
         pcm512x->sclk = devm_clk_get(dev, NULL);
-        if (IS_ERR(pcm512x->sclk)) {
-                if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
-
-                dev_info(dev, "No SCLK, using BCLK: %ld\n",
-                         PTR_ERR(pcm512x->sclk));
-
-                /* Disable reporting of missing SCLK as an error */
-                regmap_update_bits(regmap, PCM512x_ERROR_DETECT,
-                                   PCM512x_IDCH, PCM512x_IDCH);
-
-                /* Switch PLL input to BCLK */
-                regmap_update_bits(regmap, PCM512x_PLL_REF,
-                                   PCM512x_SREF, PCM512x_SREF);
-        } else {
+        if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+        if (!IS_ERR(pcm512x->sclk)) {
                 ret = clk_prepare_enable(pcm512x->sclk);
                 if (ret != 0) {
                         dev_err(dev, "Failed to enable SCLK: %d\n", ret);
@@ -483,6 +1344,43 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap)
         pm_runtime_enable(dev);
         pm_runtime_idle(dev);
 
+#ifdef CONFIG_OF
+        if (dev->of_node) {
+                const struct device_node *np = dev->of_node;
+                u32 val;
+
+                if (of_property_read_u32(np, "pll-in", &val) >= 0) {
+                        if (val > 6) {
+                                dev_err(dev, "Invalid pll-in\n");
+                                ret = -EINVAL;
+                                goto err_clk;
+                        }
+                        pcm512x->pll_in = val;
+                }
+
+                if (of_property_read_u32(np, "pll-out", &val) >= 0) {
+                        if (val > 6) {
+                                dev_err(dev, "Invalid pll-out\n");
+                                ret = -EINVAL;
+                                goto err_clk;
+                        }
+                        pcm512x->pll_out = val;
+                }
+
+                if (!pcm512x->pll_in != !pcm512x->pll_out) {
+                        dev_err(dev,
+                                "Error: both pll-in and pll-out, or none\n");
+                        ret = -EINVAL;
+                        goto err_clk;
+                }
+                if (pcm512x->pll_in && pcm512x->pll_in == pcm512x->pll_out) {
+                        dev_err(dev, "Error: pll-in == pll-out\n");
+                        ret = -EINVAL;
+                        goto err_clk;
+                }
+        }
+#endif
+
         ret = snd_soc_register_codec(dev, &pcm512x_codec_driver,
                                     &pcm512x_dai, 1);
         if (ret != 0) {
diff --git a/sound/soc/codecs/pcm512x.h b/sound/soc/codecs/pcm512x.h
index 6ee76aaca09a..b7c310207223 100644
--- a/sound/soc/codecs/pcm512x.h
+++ b/sound/soc/codecs/pcm512x.h
@@ -37,6 +37,10 @@
 #define PCM512x_DSP_GPIO_INPUT    (PCM512x_PAGE_BASE(0) +  10)
 #define PCM512x_MASTER_MODE       (PCM512x_PAGE_BASE(0) +  12)
 #define PCM512x_PLL_REF           (PCM512x_PAGE_BASE(0) +  13)
+#define PCM512x_DAC_REF           (PCM512x_PAGE_BASE(0) +  14)
+#define PCM512x_GPIO_DACIN        (PCM512x_PAGE_BASE(0) +  16)
+#define PCM512x_GPIO_PLLIN        (PCM512x_PAGE_BASE(0) +  18)
+#define PCM512x_SYNCHRONIZE       (PCM512x_PAGE_BASE(0) +  19)
 #define PCM512x_PLL_COEFF_0       (PCM512x_PAGE_BASE(0) +  20)
 #define PCM512x_PLL_COEFF_1       (PCM512x_PAGE_BASE(0) +  21)
 #define PCM512x_PLL_COEFF_2       (PCM512x_PAGE_BASE(0) +  22)
@@ -77,6 +81,7 @@
 #define PCM512x_RATE_DET_2        (PCM512x_PAGE_BASE(0) +  92)
 #define PCM512x_RATE_DET_3        (PCM512x_PAGE_BASE(0) +  93)
 #define PCM512x_RATE_DET_4        (PCM512x_PAGE_BASE(0) +  94)
+#define PCM512x_CLOCK_STATUS      (PCM512x_PAGE_BASE(0) +  95)
 #define PCM512x_ANALOG_MUTE_DET   (PCM512x_PAGE_BASE(0) + 108)
 #define PCM512x_GPIN              (PCM512x_PAGE_BASE(0) + 119)
 #define PCM512x_DIGITAL_MUTE_DET  (PCM512x_PAGE_BASE(0) + 120)
@@ -91,7 +96,10 @@
 
 #define PCM512x_CRAM_CTRL         (PCM512x_PAGE_BASE(44) +  1)
 
-#define PCM512x_MAX_REGISTER      (PCM512x_PAGE_BASE(44) +  1)
+#define PCM512x_FLEX_A            (PCM512x_PAGE_BASE(253) + 63)
+#define PCM512x_FLEX_B            (PCM512x_PAGE_BASE(253) + 64)
+
+#define PCM512x_MAX_REGISTER      (PCM512x_PAGE_BASE(253) + 64)
 
 /* Page 0, Register 1 - reset */
 #define PCM512x_RSTR (1 << 0)
@@ -108,8 +116,8 @@
 #define PCM512x_RQML_SHIFT 4
 
 /* Page 0, Register 4 - PLL */
-#define PCM512x_PLCE       (1 << 0)
-#define PCM512x_RLCE_SHIFT 0
+#define PCM512x_PLLE       (1 << 0)
+#define PCM512x_PLLE_SHIFT 0
 #define PCM512x_PLCK       (1 << 4)
 #define PCM512x_PLCK_SHIFT 4
 
@@ -119,8 +127,66 @@
 #define PCM512x_DEMP       (1 << 4)
 #define PCM512x_DEMP_SHIFT 4
 
+/* Page 0, Register 8 - GPIO output enable */
+#define PCM512x_G1OE       (1 << 0)
+#define PCM512x_G2OE       (1 << 1)
+#define PCM512x_G3OE       (1 << 2)
+#define PCM512x_G4OE       (1 << 3)
+#define PCM512x_G5OE       (1 << 4)
+#define PCM512x_G6OE       (1 << 5)
+
+/* Page 0, Register 9 - BCK, LRCLK configuration */
+#define PCM512x_LRKO       (1 << 0)
+#define PCM512x_LRKO_SHIFT 0
+#define PCM512x_BCKO       (1 << 4)
+#define PCM512x_BCKO_SHIFT 4
+#define PCM512x_BCKP       (1 << 5)
+#define PCM512x_BCKP_SHIFT 5
+
+/* Page 0, Register 12 - Master mode BCK, LRCLK reset */
+#define PCM512x_RLRK       (1 << 0)
+#define PCM512x_RLRK_SHIFT 0
+#define PCM512x_RBCK       (1 << 1)
+#define PCM512x_RBCK_SHIFT 1
+
 /* Page 0, Register 13 - PLL reference */
-#define PCM512x_SREF (1 << 4)
+#define PCM512x_SREF        (7 << 4)
+#define PCM512x_SREF_SHIFT  4
+#define PCM512x_SREF_SCK    (0 << 4)
+#define PCM512x_SREF_BCK    (1 << 4)
+#define PCM512x_SREF_GPIO   (3 << 4)
+
+/* Page 0, Register 14 - DAC reference */
+#define PCM512x_SDAC        (7 << 4)
+#define PCM512x_SDAC_SHIFT  4
+#define PCM512x_SDAC_MCK    (0 << 4)
+#define PCM512x_SDAC_PLL    (1 << 4)
+#define PCM512x_SDAC_SCK    (3 << 4)
+#define PCM512x_SDAC_BCK    (4 << 4)
+#define PCM512x_SDAC_GPIO   (5 << 4)
+
+/* Page 0, Register 16, 18 - GPIO source for DAC, PLL */
+#define PCM512x_GREF        (7 << 0)
+#define PCM512x_GREF_SHIFT  0
+#define PCM512x_GREF_GPIO1  (0 << 0)
+#define PCM512x_GREF_GPIO2  (1 << 0)
+#define PCM512x_GREF_GPIO3  (2 << 0)
+#define PCM512x_GREF_GPIO4  (3 << 0)
+#define PCM512x_GREF_GPIO5  (4 << 0)
+#define PCM512x_GREF_GPIO6  (5 << 0)
+
+/* Page 0, Register 19 - synchronize */
+#define PCM512x_RQSY        (1 << 0)
+#define PCM512x_RQSY_RESUME (0 << 0)
+#define PCM512x_RQSY_HALT   (1 << 0)
+
+/* Page 0, Register 34 - fs speed mode */
+#define PCM512x_FSSP        (3 << 0)
+#define PCM512x_FSSP_SHIFT  0
+#define PCM512x_FSSP_48KHZ  (0 << 0)
+#define PCM512x_FSSP_96KHZ  (1 << 0)
+#define PCM512x_FSSP_192KHZ (2 << 0)
+#define PCM512x_FSSP_384KHZ (3 << 0)
 
 /* Page 0, Register 37 - Error detection */
 #define PCM512x_IPLK (1 << 0)
@@ -131,6 +197,20 @@
 #define PCM512x_IDBK (1 << 5)
 #define PCM512x_IDFS (1 << 6)
 
+/* Page 0, Register 40 - I2S configuration */
+#define PCM512x_ALEN       (3 << 0)
+#define PCM512x_ALEN_SHIFT 0
+#define PCM512x_ALEN_16    (0 << 0)
+#define PCM512x_ALEN_20    (1 << 0)
+#define PCM512x_ALEN_24    (2 << 0)
+#define PCM512x_ALEN_32    (3 << 0)
+#define PCM512x_AFMT       (3 << 4)
+#define PCM512x_AFMT_SHIFT 4
+#define PCM512x_AFMT_I2S   (0 << 4)
+#define PCM512x_AFMT_DSP   (1 << 4)
+#define PCM512x_AFMT_RTJ   (2 << 4)
+#define PCM512x_AFMT_LTJ   (3 << 4)
+
 /* Page 0, Register 42 - DAC routing */
 #define PCM512x_AUPR_SHIFT 0
 #define PCM512x_AUPL_SHIFT 4
@@ -152,7 +232,26 @@
 /* Page 0, Register 65 - Digital mute enables */
 #define PCM512x_ACTL_SHIFT 2
 #define PCM512x_AMLE_SHIFT 1
-#define PCM512x_AMLR_SHIFT 0
+#define PCM512x_AMRE_SHIFT 0
+
+/* Page 0, Register 80-85, GPIO output selection */
+#define PCM512x_GxSL       (31 << 0)
+#define PCM512x_GxSL_SHIFT 0
+#define PCM512x_GxSL_OFF   (0 << 0)
+#define PCM512x_GxSL_DSP   (1 << 0)
+#define PCM512x_GxSL_REG   (2 << 0)
+#define PCM512x_GxSL_AMUTB (3 << 0)
+#define PCM512x_GxSL_AMUTL (4 << 0)
+#define PCM512x_GxSL_AMUTR (5 << 0)
+#define PCM512x_GxSL_CLKI  (6 << 0)
+#define PCM512x_GxSL_SDOUT (7 << 0)
+#define PCM512x_GxSL_ANMUL (8 << 0)
+#define PCM512x_GxSL_ANMUR (9 << 0)
+#define PCM512x_GxSL_PLLLK (10 << 0)
+#define PCM512x_GxSL_CPCLK (11 << 0)
+#define PCM512x_GxSL_UV0_7 (14 << 0)
+#define PCM512x_GxSL_UV0_3 (15 << 0)
+#define PCM512x_GxSL_PLLCK (16 << 0)
 
 /* Page 1, Register 2 - analog volume control */
 #define PCM512x_RAGN_SHIFT 0
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index 1d1c7f8a9af2..8104d2285602 100644
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -403,7 +403,8 @@ EXPORT_SYMBOL_GPL(rt286_mic_detect);
 static int is_mclk_mode(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
-        struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(source->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
+        struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(codec);
 
         if (rt286->clk_id == RT286_SCLK_S_MCLK)
                 return 1;
@@ -417,6 +418,8 @@ static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, 0, 1000, 0);
 static const struct snd_kcontrol_new rt286_snd_controls[] = {
         SOC_DOUBLE_R_TLV("DAC0 Playback Volume", RT286_DACL_GAIN,
                             RT286_DACR_GAIN, 0, 0x7f, 0, out_vol_tlv),
+        SOC_DOUBLE_R("ADC0 Capture Switch", RT286_ADCL_GAIN,
+                            RT286_ADCR_GAIN, 7, 1, 1),
         SOC_DOUBLE_R_TLV("ADC0 Capture Volume", RT286_ADCL_GAIN,
                             RT286_ADCR_GAIN, 0, 0x7f, 0, out_vol_tlv),
         SOC_SINGLE_TLV("AMIC Volume", RT286_MIC_GAIN,
@@ -500,7 +503,7 @@ SOC_DAPM_ENUM("SPO source", rt286_spo_enum);
 static int rt286_spk_event(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -522,7 +525,7 @@ static int rt286_spk_event(struct snd_soc_dapm_widget *w,
 static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w,
                                   struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -538,36 +541,10 @@ static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
-static int rt286_adc_event(struct snd_soc_dapm_widget *w,
-                             struct snd_kcontrol *kcontrol, int event)
-{
-        struct snd_soc_codec *codec = w->codec;
-        unsigned int nid;
-
-        nid = (w->reg >> 20) & 0xff;
-
-        switch (event) {
-        case SND_SOC_DAPM_POST_PMU:
-                snd_soc_update_bits(codec,
-                        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, nid, 0),
-                        0x7080, 0x7000);
-                break;
-        case SND_SOC_DAPM_PRE_PMD:
-                snd_soc_update_bits(codec,
-                        VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, nid, 0),
-                        0x7080, 0x7080);
-                break;
-        default:
-                return 0;
-        }
-
-        return 0;
-}
-
 static int rt286_vref_event(struct snd_soc_dapm_widget *w,
                              struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
@@ -585,7 +562,7 @@ static int rt286_vref_event(struct snd_soc_dapm_widget *w,
 static int rt286_ldo2_event(struct snd_soc_dapm_widget *w,
                              struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -604,7 +581,7 @@ static int rt286_ldo2_event(struct snd_soc_dapm_widget *w,
 static int rt286_mic1_event(struct snd_soc_dapm_widget *w,
                              struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
@@ -667,12 +644,10 @@ static const struct snd_soc_dapm_widget rt286_dapm_widgets[] = {
         SND_SOC_DAPM_ADC("ADC 1", NULL, SND_SOC_NOPM, 0, 0),
 
         /* ADC Mux */
-        SND_SOC_DAPM_MUX_E("ADC 0 Mux", RT286_SET_POWER(RT286_ADC_IN1), 0, 1,
-                &rt286_adc0_mux, rt286_adc_event, SND_SOC_DAPM_PRE_PMD |
-                SND_SOC_DAPM_POST_PMU),
-        SND_SOC_DAPM_MUX_E("ADC 1 Mux", RT286_SET_POWER(RT286_ADC_IN2), 0, 1,
-                &rt286_adc1_mux, rt286_adc_event, SND_SOC_DAPM_PRE_PMD |
-                SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_MUX("ADC 0 Mux", RT286_SET_POWER(RT286_ADC_IN1), 0, 1,
+                &rt286_adc0_mux),
+        SND_SOC_DAPM_MUX("ADC 1 Mux", RT286_SET_POWER(RT286_ADC_IN2), 0, 1,
+                &rt286_adc1_mux),
 
         /* Audio Interface */
         SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index 6d7b7ca7d530..c61852742ee3 100644
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -287,70 +287,78 @@ static const struct snd_kcontrol_new rt5631_snd_controls[] = {
 static int check_sysclk1_source(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg;
 
-        reg = snd_soc_read(source->codec, RT5631_GLOBAL_CLK_CTRL);
+        reg = snd_soc_read(codec, RT5631_GLOBAL_CLK_CTRL);
         return reg & RT5631_SYSCLK_SOUR_SEL_PLL;
 }
 
 static int check_dmic_used(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
-        struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(source->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
+        struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec);
         return rt5631->dmic_used_flag;
 }
 
 static int check_dacl_to_outmixl(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg;
 
-        reg = snd_soc_read(source->codec, RT5631_OUTMIXER_L_CTRL);
+        reg = snd_soc_read(codec, RT5631_OUTMIXER_L_CTRL);
         return !(reg & RT5631_M_DAC_L_TO_OUTMIXER_L);
 }
 
 static int check_dacr_to_outmixr(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg;
 
-        reg = snd_soc_read(source->codec, RT5631_OUTMIXER_R_CTRL);
+        reg = snd_soc_read(codec, RT5631_OUTMIXER_R_CTRL);
         return !(reg & RT5631_M_DAC_R_TO_OUTMIXER_R);
 }
 
 static int check_dacl_to_spkmixl(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg;
 
-        reg = snd_soc_read(source->codec, RT5631_SPK_MIXER_CTRL);
+        reg = snd_soc_read(codec, RT5631_SPK_MIXER_CTRL);
         return !(reg & RT5631_M_DAC_L_TO_SPKMIXER_L);
 }
 
 static int check_dacr_to_spkmixr(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg;
 
-        reg = snd_soc_read(source->codec, RT5631_SPK_MIXER_CTRL);
+        reg = snd_soc_read(codec, RT5631_SPK_MIXER_CTRL);
         return !(reg & RT5631_M_DAC_R_TO_SPKMIXER_R);
 }
 
 static int check_adcl_select(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg;
 
-        reg = snd_soc_read(source->codec, RT5631_ADC_REC_MIXER);
+        reg = snd_soc_read(codec, RT5631_ADC_REC_MIXER);
         return !(reg & RT5631_M_MIC1_TO_RECMIXER_L);
 }
 
 static int check_adcr_select(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg;
 
-        reg = snd_soc_read(source->codec, RT5631_ADC_REC_MIXER);
+        reg = snd_soc_read(codec, RT5631_ADC_REC_MIXER);
         return !(reg & RT5631_M_MIC2_TO_RECMIXER_R);
 }
 
@@ -556,7 +564,7 @@ static void depop_seq_mute_stage(struct snd_soc_codec *codec, int enable)
 static int hp_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -590,7 +598,7 @@ static int hp_event(struct snd_soc_dapm_widget *w,
 static int set_dmic_params(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec);
 
         switch (rt5631->rx_rate) {
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index c3f2decd643c..178e55d4d481 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -458,7 +458,7 @@ static const struct snd_kcontrol_new rt5640_specific_snd_controls[] = {
 static int set_dmic_clk(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
         int idx = -EINVAL;
 
@@ -475,9 +475,10 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w,
 static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int val;
 
-        val = snd_soc_read(source->codec, RT5640_GLB_CLK);
+        val = snd_soc_read(codec, RT5640_GLB_CLK);
         val &= RT5640_SCLK_SRC_MASK;
         if (val == RT5640_SCLK_SRC_PLL1)
                 return 1;
@@ -963,7 +964,7 @@ static void rt5640_pmu_depop(struct snd_soc_codec *codec)
 static int rt5640_hp_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -987,7 +988,7 @@ static int rt5640_hp_event(struct snd_soc_dapm_widget *w,
 static int rt5640_hp_power_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -1003,7 +1004,7 @@ static int rt5640_hp_power_event(struct snd_soc_dapm_widget *w,
 static int rt5640_hp_post_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -2124,6 +2125,7 @@ MODULE_DEVICE_TABLE(of, rt5640_of_match);
 static struct acpi_device_id rt5640_acpi_match[] = {
         { "INT33CA", 0 },
         { "10EC5640", 0 },
+        { "10EC5642", 0 },
         { },
 };
 MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match);
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 27141e2df878..3e16a889a806 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -31,6 +31,7 @@
 #include "rt5645.h"
 
 #define RT5645_DEVICE_ID 0x6308
+#define RT5650_DEVICE_ID 0x6419
 
 #define RT5645_PR_RANGE_BASE (0xff + 1)
 #define RT5645_PR_SPACING 0x100
@@ -59,6 +60,10 @@ static const struct reg_default init_list[] = {
 };
 #define RT5645_INIT_REG_LEN ARRAY_SIZE(init_list)
 
+static const struct reg_default rt5650_init_list[] = {
+        {0xf6,  0x0100},
+};
+
 static const struct reg_default rt5645_reg[] = {
         { 0x00, 0x0000 },
         { 0x01, 0xc8c8 },
@@ -86,6 +91,7 @@ static const struct reg_default rt5645_reg[] = {
         { 0x2a, 0x5656 },
         { 0x2b, 0x5454 },
         { 0x2c, 0xaaa0 },
+        { 0x2d, 0x0000 },
         { 0x2f, 0x1002 },
         { 0x31, 0x5000 },
         { 0x32, 0x0000 },
@@ -193,6 +199,8 @@ static const struct reg_default rt5645_reg[] = {
         { 0xdb, 0x0003 },
         { 0xdc, 0x0049 },
         { 0xdd, 0x001b },
+        { 0xdf, 0x0008 },
+        { 0xe0, 0x4000 },
         { 0xe6, 0x8000 },
         { 0xe7, 0x0200 },
         { 0xec, 0xb300 },
@@ -242,6 +250,7 @@ static bool rt5645_volatile_register(struct device *dev, unsigned int reg)
         case RT5645_IRQ_CTRL3:
         case RT5645_INT_IRQ_ST:
         case RT5645_IL_CMD:
+        case RT5650_4BTN_IL_CMD1:
         case RT5645_VENDOR_ID:
         case RT5645_VENDOR_ID1:
         case RT5645_VENDOR_ID2:
@@ -287,6 +296,7 @@ static bool rt5645_readable_register(struct device *dev, unsigned int reg)
         case RT5645_STO_DAC_MIXER:
         case RT5645_MONO_DAC_MIXER:
         case RT5645_DIG_MIXER:
+        case RT5650_A_DAC_SOUR:
         case RT5645_DIG_INF1_DATA:
         case RT5645_PDM_OUT_CTRL:
         case RT5645_REC_L1_MIXER:
@@ -378,6 +388,8 @@ static bool rt5645_readable_register(struct device *dev, unsigned int reg)
         case RT5645_IL_CMD:
         case RT5645_IL_CMD2:
         case RT5645_IL_CMD3:
+        case RT5650_4BTN_IL_CMD1:
+        case RT5650_4BTN_IL_CMD2:
         case RT5645_DRC1_HL_CTRL1:
         case RT5645_DRC2_HL_CTRL1:
         case RT5645_ADC_MONO_HP_CTRL1:
@@ -527,7 +539,7 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = {
 static int set_dmic_clk(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
         int idx = -EINVAL;
 
@@ -544,9 +556,10 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w,
 static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int val;
 
-        val = snd_soc_read(source->codec, RT5645_GLB_CLK);
+        val = snd_soc_read(codec, RT5645_GLB_CLK);
         val &= RT5645_SCLK_SRC_MASK;
         if (val == RT5645_SCLK_SRC_PLL1)
                 return 1;
@@ -557,6 +570,7 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
 static int is_using_asrc(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg, shift, val;
 
         switch (source->shift) {
@@ -588,7 +602,7 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source,
                 return 0;
         }
 
-        val = (snd_soc_read(source->codec, reg) >> shift) & 0xf;
+        val = (snd_soc_read(codec, reg) >> shift) & 0xf;
         switch (val) {
         case 1:
         case 2:
@@ -1007,6 +1021,44 @@ static SOC_ENUM_SINGLE_DECL(
 static const struct snd_kcontrol_new rt5645_if1_adc_in_mux =
         SOC_DAPM_ENUM("IF1 ADC IN source", rt5645_if1_adc_in_enum);
 
+/* MX-2d [3] [2] */
+static const char * const rt5650_a_dac1_src[] = {
+        "DAC1", "Stereo DAC Mixer"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5650_a_dac1_l_enum, RT5650_A_DAC_SOUR,
+        RT5650_A_DAC1_L_IN_SFT, rt5650_a_dac1_src);
+
+static const struct snd_kcontrol_new rt5650_a_dac1_l_mux =
+        SOC_DAPM_ENUM("A DAC1 L source", rt5650_a_dac1_l_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5650_a_dac1_r_enum, RT5650_A_DAC_SOUR,
+        RT5650_A_DAC1_R_IN_SFT, rt5650_a_dac1_src);
+
+static const struct snd_kcontrol_new rt5650_a_dac1_r_mux =
+        SOC_DAPM_ENUM("A DAC1 R source", rt5650_a_dac1_r_enum);
+
+/* MX-2d [1] [0] */
+static const char * const rt5650_a_dac2_src[] = {
+        "Stereo DAC Mixer", "Mono DAC Mixer"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5650_a_dac2_l_enum, RT5650_A_DAC_SOUR,
+        RT5650_A_DAC2_L_IN_SFT, rt5650_a_dac2_src);
+
+static const struct snd_kcontrol_new rt5650_a_dac2_l_mux =
+        SOC_DAPM_ENUM("A DAC2 L source", rt5650_a_dac2_l_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5650_a_dac2_r_enum, RT5650_A_DAC_SOUR,
+        RT5650_A_DAC2_R_IN_SFT, rt5650_a_dac2_src);
+
+static const struct snd_kcontrol_new rt5650_a_dac2_r_mux =
+        SOC_DAPM_ENUM("A DAC2 R source", rt5650_a_dac2_r_enum);
+
 /* MX-2F [13:12] */
 static const char * const rt5645_if2_adc_in_src[] = {
         "IF_ADC1", "IF_ADC2", "VAD_ADC"
@@ -1144,18 +1196,23 @@ static void hp_amp_power(struct snd_soc_codec *codec, int on)
 static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
                 hp_amp_power(codec, 1);
                 /* headphone unmute sequence */
-                snd_soc_update_bits(codec, RT5645_DEPOP_M3, RT5645_CP_FQ1_MASK |
-                        RT5645_CP_FQ2_MASK | RT5645_CP_FQ3_MASK,
-                        (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ1_SFT) |
-                        (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
-                        (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ3_SFT));
+                if (rt5645->codec_type == CODEC_TYPE_RT5650) {
+                        snd_soc_write(codec, RT5645_DEPOP_M3, 0x0737);
+                } else {
+                        snd_soc_update_bits(codec, RT5645_DEPOP_M3,
+                                RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
+                                RT5645_CP_FQ3_MASK,
+                                (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ1_SFT) |
+                                (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
+                                (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ3_SFT));
+                }
                 regmap_write(rt5645->regmap,
                         RT5645_PR_BASE + RT5645_MAMP_INT_REG2, 0xfc00);
                 snd_soc_update_bits(codec, RT5645_DEPOP_M1,
@@ -1175,12 +1232,16 @@ static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
 
         case SND_SOC_DAPM_PRE_PMD:
                 /* headphone mute sequence */
-                snd_soc_update_bits(codec, RT5645_DEPOP_M3,
-                        RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
-                        RT5645_CP_FQ3_MASK,
-                        (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ1_SFT) |
-                        (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
-                        (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ3_SFT));
+                if (rt5645->codec_type == CODEC_TYPE_RT5650) {
+                        snd_soc_write(codec, RT5645_DEPOP_M3, 0x0737);
+                } else {
+                        snd_soc_update_bits(codec, RT5645_DEPOP_M3,
+                                RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
+                                RT5645_CP_FQ3_MASK,
+                                (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ1_SFT) |
+                                (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
+                                (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ3_SFT));
+                }
                 regmap_write(rt5645->regmap,
                         RT5645_PR_BASE + RT5645_MAMP_INT_REG2, 0xfc00);
                 snd_soc_update_bits(codec, RT5645_DEPOP_M1,
@@ -1205,7 +1266,7 @@ static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
 static int rt5645_spk_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -1232,7 +1293,7 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w,
 static int rt5645_lout_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -1262,7 +1323,7 @@ static int rt5645_lout_event(struct snd_soc_dapm_widget *w,
 static int rt5645_bst2_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -1574,6 +1635,17 @@ static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("SPOR"),
 };
 
+static const struct snd_soc_dapm_widget rt5650_specific_dapm_widgets[] = {
+        SND_SOC_DAPM_MUX("A DAC1 L Mux", SND_SOC_NOPM,
+                0, 0, &rt5650_a_dac1_l_mux),
+        SND_SOC_DAPM_MUX("A DAC1 R Mux", SND_SOC_NOPM,
+                0, 0, &rt5650_a_dac1_r_mux),
+        SND_SOC_DAPM_MUX("A DAC2 L Mux", SND_SOC_NOPM,
+                0, 0, &rt5650_a_dac2_l_mux),
+        SND_SOC_DAPM_MUX("A DAC2 R Mux", SND_SOC_NOPM,
+                0, 0, &rt5650_a_dac2_r_mux),
+};
+
 static const struct snd_soc_dapm_route rt5645_dapm_routes[] = {
         { "adc stereo1 filter", NULL, "ADC STO1 ASRC", is_using_asrc },
         { "adc stereo2 filter", NULL, "ADC STO2 ASRC", is_using_asrc },
@@ -1779,13 +1851,9 @@ static const struct snd_soc_dapm_route rt5645_dapm_routes[] = {
         { "DAC MIXR", "DAC R2 Switch", "DAC R2 Volume" },
         { "DAC MIXR", "DAC L2 Switch", "DAC L2 Volume" },
 
-        { "DAC L1", NULL, "Stereo DAC MIXL" },
         { "DAC L1", NULL, "PLL1", is_sys_clk_from_pll },
-        { "DAC R1", NULL, "Stereo DAC MIXR" },
         { "DAC R1", NULL, "PLL1", is_sys_clk_from_pll },
-        { "DAC L2", NULL, "Mono DAC MIXL" },
         { "DAC L2", NULL, "PLL1", is_sys_clk_from_pll },
-        { "DAC R2", NULL, "Mono DAC MIXR" },
         { "DAC R2", NULL, "PLL1", is_sys_clk_from_pll },
 
         { "SPK MIXL", "BST1 Switch", "BST1" },
@@ -1874,6 +1942,30 @@ static const struct snd_soc_dapm_route rt5645_dapm_routes[] = {
         { "SPOR", NULL, "SPK amp" },
 };
 
+static const struct snd_soc_dapm_route rt5650_specific_dapm_routes[] = {
+        { "A DAC1 L Mux", "DAC1",  "DAC1 MIXL"},
+        { "A DAC1 L Mux", "Stereo DAC Mixer", "Stereo DAC MIXL"},
+        { "A DAC1 R Mux", "DAC1",  "DAC1 MIXR"},
+        { "A DAC1 R Mux", "Stereo DAC Mixer", "Stereo DAC MIXR"},
+
+        { "A DAC2 L Mux", "Stereo DAC Mixer", "Stereo DAC MIXL"},
+        { "A DAC2 L Mux", "Mono DAC Mixer", "Mono DAC MIXL"},
+        { "A DAC2 R Mux", "Stereo DAC Mixer", "Stereo DAC MIXR"},
+        { "A DAC2 R Mux", "Mono DAC Mixer", "Mono DAC MIXR"},
+
+        { "DAC L1", NULL, "A DAC1 L Mux" },
+        { "DAC R1", NULL, "A DAC1 R Mux" },
+        { "DAC L2", NULL, "A DAC2 L Mux" },
+        { "DAC R2", NULL, "A DAC2 R Mux" },
+};
+
+static const struct snd_soc_dapm_route rt5645_specific_dapm_routes[] = {
+        { "DAC L1", NULL, "Stereo DAC MIXL" },
+        { "DAC R1", NULL, "Stereo DAC MIXR" },
+        { "DAC L2", NULL, "Mono DAC MIXL" },
+        { "DAC R2", NULL, "Mono DAC MIXR" },
+};
+
 static int rt5645_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
@@ -2293,6 +2385,22 @@ static int rt5645_probe(struct snd_soc_codec *codec)
 
         rt5645->codec = codec;
 
+        switch (rt5645->codec_type) {
+        case CODEC_TYPE_RT5645:
+                snd_soc_dapm_add_routes(&codec->dapm,
+                        rt5645_specific_dapm_routes,
+                        ARRAY_SIZE(rt5645_specific_dapm_routes));
+                break;
+        case CODEC_TYPE_RT5650:
+                snd_soc_dapm_new_controls(&codec->dapm,
+                        rt5650_specific_dapm_widgets,
+                        ARRAY_SIZE(rt5650_specific_dapm_widgets));
+                snd_soc_dapm_add_routes(&codec->dapm,
+                        rt5650_specific_dapm_routes,
+                        ARRAY_SIZE(rt5650_specific_dapm_routes));
+                break;
+        }
+
         rt5645_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200);
@@ -2424,6 +2532,7 @@ static const struct regmap_config rt5645_regmap = {
 
 static const struct i2c_device_id rt5645_i2c_id[] = {
         { "rt5645", 0 },
+        { "rt5650", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id);
@@ -2456,9 +2565,18 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
         }
 
         regmap_read(rt5645->regmap, RT5645_VENDOR_ID2, &val);
-        if (val != RT5645_DEVICE_ID) {
+
+        switch (val) {
+        case RT5645_DEVICE_ID:
+                rt5645->codec_type = CODEC_TYPE_RT5645;
+                break;
+        case RT5650_DEVICE_ID:
+                rt5645->codec_type = CODEC_TYPE_RT5650;
+                break;
+        default:
                 dev_err(&i2c->dev,
-                        "Device with ID register %x is not rt5645\n", val);
+                        "Device with ID register %x is not rt5645 or rt5650\n",
+                        val);
                 return -ENODEV;
         }
 
@@ -2469,6 +2587,14 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
         if (ret != 0)
                 dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
 
+        if (rt5645->codec_type == CODEC_TYPE_RT5650) {
+                ret = regmap_register_patch(rt5645->regmap, rt5650_init_list,
+                                    ARRAY_SIZE(rt5650_init_list));
+                if (ret != 0)
+                        dev_warn(&i2c->dev, "Apply rt5650 patch failed: %d\n",
+                                           ret);
+        }
+
         if (rt5645->pdata.in2_diff)
                 regmap_update_bits(rt5645->regmap, RT5645_IN2_CTRL,
                                         RT5645_IN_DF2, RT5645_IN_DF2);
diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h
index a815e36a2bdb..74542310d3f0 100644
--- a/sound/soc/codecs/rt5645.h
+++ b/sound/soc/codecs/rt5645.h
@@ -47,6 +47,7 @@
 #define RT5645_STO_DAC_MIXER                    0x2a
 #define RT5645_MONO_DAC_MIXER                   0x2b
 #define RT5645_DIG_MIXER                        0x2c
+#define RT5650_A_DAC_SOUR                       0x2d
 #define RT5645_DIG_INF1_DATA                    0x2f
 /* Mixer - PDM */
 #define RT5645_PDM_OUT_CTRL                     0x31
@@ -150,6 +151,8 @@
 #define RT5645_IL_CMD                           0xdb
 #define RT5645_IL_CMD2                          0xdc
 #define RT5645_IL_CMD3                          0xdd
+#define RT5650_4BTN_IL_CMD1                     0xdf
+#define RT5650_4BTN_IL_CMD2                     0xe0
 #define RT5645_DRC1_HL_CTRL1                    0xe7
 #define RT5645_DRC2_HL_CTRL1                    0xe9
 #define RT5645_MUTI_DRC_CTRL1                   0xea
@@ -472,6 +475,12 @@
 #define RT5645_DAC_L2_DAC_R_VOL_MASK            (0x1 << 4)
 #define RT5645_DAC_L2_DAC_R_VOL_SFT             4
 
+/* Analog DAC1/2 Input Source Control (0x2d) */
+#define RT5650_A_DAC1_L_IN_SFT                  3
+#define RT5650_A_DAC1_R_IN_SFT                  2
+#define RT5650_A_DAC2_L_IN_SFT                  1
+#define RT5650_A_DAC2_R_IN_SFT                  0
+
 /* Digital Interface Data Control (0x2f) */
 #define RT5645_IF1_ADC2_IN_SEL                  (0x1 << 15)
 #define RT5645_IF1_ADC2_IN_SFT                  15
@@ -2175,6 +2184,11 @@ enum {
         RT5645_DMIC_DATA_GPIO11,
 };
 
+enum {
+        CODEC_TYPE_RT5645,
+        CODEC_TYPE_RT5650,
+};
+
 struct rt5645_priv {
         struct snd_soc_codec *codec;
         struct rt5645_platform_data pdata;
@@ -2184,6 +2198,7 @@ struct rt5645_priv {
         struct snd_soc_jack *mic_jack;
         struct delayed_work jack_detect_work;
 
+        int codec_type;
         int sysclk;
         int sysclk_src;
         int lrck[RT5645_AIFS];
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index bb0a3ab5416c..9f4c7be6d798 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -376,7 +376,7 @@ static const struct snd_kcontrol_new rt5651_snd_controls[] = {
 static int set_dmic_clk(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
         int idx = -EINVAL;
 
@@ -394,9 +394,10 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w,
 static int is_sysclk_from_pll(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int val;
 
-        val = snd_soc_read(source->codec, RT5651_GLB_CLK);
+        val = snd_soc_read(codec, RT5651_GLB_CLK);
         val &= RT5651_SCLK_SRC_MASK;
         if (val == RT5651_SCLK_SRC_PLL1)
                 return 1;
@@ -731,7 +732,7 @@ static const struct snd_kcontrol_new rt5651_pdm_r_mux =
 static int rt5651_amp_power_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -769,7 +770,7 @@ static int rt5651_amp_power_event(struct snd_soc_dapm_widget *w,
 static int rt5651_hp_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -813,7 +814,8 @@ static int rt5651_hp_event(struct snd_soc_dapm_widget *w,
 static int rt5651_hp_post_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -833,7 +835,7 @@ static int rt5651_hp_post_event(struct snd_soc_dapm_widget *w,
 static int rt5651_bst1_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -856,7 +858,7 @@ static int rt5651_bst1_event(struct snd_soc_dapm_widget *w,
 static int rt5651_bst2_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -879,7 +881,7 @@ static int rt5651_bst2_event(struct snd_soc_dapm_widget *w,
 static int rt5651_bst3_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index 0a027bc94399..7b3d6b5992f1 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -500,7 +500,7 @@ static const struct snd_kcontrol_new rt5670_snd_controls[] = {
 static int set_dmic_clk(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
         int idx = -EINVAL;
 
@@ -517,9 +517,10 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w,
 static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int val;
 
-        val = snd_soc_read(source->codec, RT5670_GLB_CLK);
+        val = snd_soc_read(codec, RT5670_GLB_CLK);
         val &= RT5670_SCLK_SRC_MASK;
         if (val == RT5670_SCLK_SRC_PLL1)
                 return 1;
@@ -530,6 +531,7 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
 static int is_using_asrc(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg, shift, val;
 
         switch (source->shift) {
@@ -565,7 +567,7 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source,
                 return 0;
         }
 
-        val = (snd_soc_read(source->codec, reg) >> shift) & 0xf;
+        val = (snd_soc_read(codec, reg) >> shift) & 0xf;
         switch (val) {
         case 1:
         case 2:
@@ -590,6 +592,89 @@ static int can_use_asrc(struct snd_soc_dapm_widget *source,
         return 0;
 }
 
+
+/**
+ * rt5670_sel_asrc_clk_src - select ASRC clock source for a set of filters
+ * @codec: SoC audio codec device.
+ * @filter_mask: mask of filters.
+ * @clk_src: clock source
+ *
+ * The ASRC function is for asynchronous MCLK and LRCK. Also, since RT5670 can
+ * only support standard 32fs or 64fs i2s format, ASRC should be enabled to
+ * support special i2s clock format such as Intel's 100fs(100 * sampling rate).
+ * ASRC function will track i2s clock and generate a corresponding system clock
+ * for codec. This function provides an API to select the clock source for a
+ * set of filters specified by the mask. And the codec driver will turn on ASRC
+ * for these filters if ASRC is selected as their clock source.
+ */
+int rt5670_sel_asrc_clk_src(struct snd_soc_codec *codec,
+                            unsigned int filter_mask, unsigned int clk_src)
+{
+        unsigned int asrc2_mask = 0, asrc2_value = 0;
+        unsigned int asrc3_mask = 0, asrc3_value = 0;
+
+        if (clk_src > RT5670_CLK_SEL_SYS3)
+                return -EINVAL;
+
+        if (filter_mask & RT5670_DA_STEREO_FILTER) {
+                asrc2_mask |= RT5670_DA_STO_CLK_SEL_MASK;
+                asrc2_value = (asrc2_value & ~RT5670_DA_STO_CLK_SEL_MASK)
+                                | (clk_src <<  RT5670_DA_STO_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5670_DA_MONO_L_FILTER) {
+                asrc2_mask |= RT5670_DA_MONOL_CLK_SEL_MASK;
+                asrc2_value = (asrc2_value & ~RT5670_DA_MONOL_CLK_SEL_MASK)
+                                | (clk_src <<  RT5670_DA_MONOL_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5670_DA_MONO_R_FILTER) {
+                asrc2_mask |= RT5670_DA_MONOR_CLK_SEL_MASK;
+                asrc2_value = (asrc2_value & ~RT5670_DA_MONOR_CLK_SEL_MASK)
+                                | (clk_src <<  RT5670_DA_MONOR_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5670_AD_STEREO_FILTER) {
+                asrc2_mask |= RT5670_AD_STO1_CLK_SEL_MASK;
+                asrc2_value = (asrc2_value & ~RT5670_AD_STO1_CLK_SEL_MASK)
+                                | (clk_src <<  RT5670_AD_STO1_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5670_AD_MONO_L_FILTER) {
+                asrc3_mask |= RT5670_AD_MONOL_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5670_AD_MONOL_CLK_SEL_MASK)
+                                | (clk_src <<  RT5670_AD_MONOL_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5670_AD_MONO_R_FILTER)  {
+                asrc3_mask |= RT5670_AD_MONOR_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5670_AD_MONOR_CLK_SEL_MASK)
+                                | (clk_src <<  RT5670_AD_MONOR_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5670_UP_RATE_FILTER) {
+                asrc3_mask |= RT5670_UP_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5670_UP_CLK_SEL_MASK)
+                                | (clk_src <<  RT5670_UP_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5670_DOWN_RATE_FILTER) {
+                asrc3_mask |= RT5670_DOWN_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5670_DOWN_CLK_SEL_MASK)
+                                | (clk_src <<  RT5670_DOWN_CLK_SEL_SFT);
+        }
+
+        if (asrc2_mask)
+                snd_soc_update_bits(codec, RT5670_ASRC_2,
+                                    asrc2_mask, asrc2_value);
+
+        if (asrc3_mask)
+                snd_soc_update_bits(codec, RT5670_ASRC_3,
+                                    asrc3_mask, asrc3_value);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rt5670_sel_asrc_clk_src);
+
 /* Digital Mixer */
 static const struct snd_kcontrol_new rt5670_sto1_adc_l_mix[] = {
         SOC_DAPM_SINGLE("ADC1 Switch", RT5670_STO1_ADC_MIXER,
@@ -1148,7 +1233,7 @@ static const struct snd_kcontrol_new rt5670_vad_adc_mux =
 static int rt5670_hp_power_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -1184,7 +1269,7 @@ static int rt5670_hp_power_event(struct snd_soc_dapm_widget *w,
 static int rt5670_hp_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -1234,7 +1319,7 @@ static int rt5670_hp_event(struct snd_soc_dapm_widget *w,
 static int rt5670_bst1_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -1257,7 +1342,7 @@ static int rt5670_bst1_event(struct snd_soc_dapm_widget *w,
 static int rt5670_bst2_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
diff --git a/sound/soc/codecs/rt5670.h b/sound/soc/codecs/rt5670.h
index d11b9c207e26..21f8e18c13c4 100644
--- a/sound/soc/codecs/rt5670.h
+++ b/sound/soc/codecs/rt5670.h
@@ -1023,50 +1023,33 @@
 #define RT5670_DMIC_2_M_NOR                     (0x0 << 8)
 #define RT5670_DMIC_2_M_ASYN                    (0x1 << 8)
 
+/* ASRC clock source selection (0x84, 0x85) */
+#define RT5670_CLK_SEL_SYS                      (0x0)
+#define RT5670_CLK_SEL_I2S1_ASRC                (0x1)
+#define RT5670_CLK_SEL_I2S2_ASRC                (0x2)
+#define RT5670_CLK_SEL_I2S3_ASRC                (0x3)
+#define RT5670_CLK_SEL_SYS2                     (0x5)
+#define RT5670_CLK_SEL_SYS3                     (0x6)
+
 /* ASRC Control 2 (0x84) */
-#define RT5670_MDA_L_M_MASK                     (0x1 << 15)
-#define RT5670_MDA_L_M_SFT                      15
-#define RT5670_MDA_L_M_NOR                      (0x0 << 15)
-#define RT5670_MDA_L_M_ASYN                     (0x1 << 15)
-#define RT5670_MDA_R_M_MASK                     (0x1 << 14)
-#define RT5670_MDA_R_M_SFT                      14
-#define RT5670_MDA_R_M_NOR                      (0x0 << 14)
-#define RT5670_MDA_R_M_ASYN                     (0x1 << 14)
-#define RT5670_MAD_L_M_MASK                     (0x1 << 13)
-#define RT5670_MAD_L_M_SFT                      13
-#define RT5670_MAD_L_M_NOR                      (0x0 << 13)
-#define RT5670_MAD_L_M_ASYN                     (0x1 << 13)
-#define RT5670_MAD_R_M_MASK                     (0x1 << 12)
-#define RT5670_MAD_R_M_SFT                      12
-#define RT5670_MAD_R_M_NOR                      (0x0 << 12)
-#define RT5670_MAD_R_M_ASYN                     (0x1 << 12)
-#define RT5670_ADC_M_MASK                       (0x1 << 11)
-#define RT5670_ADC_M_SFT                        11
-#define RT5670_ADC_M_NOR                        (0x0 << 11)
-#define RT5670_ADC_M_ASYN                       (0x1 << 11)
-#define RT5670_STO_DAC_M_MASK                   (0x1 << 5)
-#define RT5670_STO_DAC_M_SFT                    5
-#define RT5670_STO_DAC_M_NOR                    (0x0 << 5)
-#define RT5670_STO_DAC_M_ASYN                   (0x1 << 5)
-#define RT5670_I2S1_R_D_MASK                    (0x1 << 4)
-#define RT5670_I2S1_R_D_SFT                     4
-#define RT5670_I2S1_R_D_DIS                     (0x0 << 4)
-#define RT5670_I2S1_R_D_EN                      (0x1 << 4)
-#define RT5670_I2S2_R_D_MASK                    (0x1 << 3)
-#define RT5670_I2S2_R_D_SFT                     3
-#define RT5670_I2S2_R_D_DIS                     (0x0 << 3)
-#define RT5670_I2S2_R_D_EN                      (0x1 << 3)
-#define RT5670_PRE_SCLK_MASK                    (0x3)
-#define RT5670_PRE_SCLK_SFT                     0
-#define RT5670_PRE_SCLK_512                     (0x0)
-#define RT5670_PRE_SCLK_1024                    (0x1)
-#define RT5670_PRE_SCLK_2048                    (0x2)
+#define RT5670_DA_STO_CLK_SEL_MASK              (0xf << 12)
+#define RT5670_DA_STO_CLK_SEL_SFT               12
+#define RT5670_DA_MONOL_CLK_SEL_MASK            (0xf << 8)
+#define RT5670_DA_MONOL_CLK_SEL_SFT             8
+#define RT5670_DA_MONOR_CLK_SEL_MASK            (0xf << 4)
+#define RT5670_DA_MONOR_CLK_SEL_SFT             4
+#define RT5670_AD_STO1_CLK_SEL_MASK             (0xf << 0)
+#define RT5670_AD_STO1_CLK_SEL_SFT              0
 
 /* ASRC Control 3 (0x85) */
-#define RT5670_I2S1_RATE_MASK                   (0xf << 12)
-#define RT5670_I2S1_RATE_SFT                    12
-#define RT5670_I2S2_RATE_MASK                   (0xf << 8)
-#define RT5670_I2S2_RATE_SFT                    8
+#define RT5670_UP_CLK_SEL_MASK                  (0xf << 12)
+#define RT5670_UP_CLK_SEL_SFT                   12
+#define RT5670_DOWN_CLK_SEL_MASK                (0xf << 8)
+#define RT5670_DOWN_CLK_SEL_SFT                 8
+#define RT5670_AD_MONOL_CLK_SEL_MASK            (0xf << 4)
+#define RT5670_AD_MONOL_CLK_SEL_SFT             4
+#define RT5670_AD_MONOR_CLK_SEL_MASK            (0xf << 0)
+#define RT5670_AD_MONOR_CLK_SEL_SFT             0
 
 /* ASRC Control 4 (0x89) */
 #define RT5670_I2S1_PD_MASK                     (0x7 << 12)
@@ -1983,6 +1966,21 @@ enum {
         RT5670_DMIC_DATA_GPIO5,
 };
 
+/* filter mask */
+enum {
+        RT5670_DA_STEREO_FILTER = 0x1,
+        RT5670_DA_MONO_L_FILTER = (0x1 << 1),
+        RT5670_DA_MONO_R_FILTER = (0x1 << 2),
+        RT5670_AD_STEREO_FILTER = (0x1 << 3),
+        RT5670_AD_MONO_L_FILTER = (0x1 << 4),
+        RT5670_AD_MONO_R_FILTER = (0x1 << 5),
+        RT5670_UP_RATE_FILTER   = (0x1 << 6),
+        RT5670_DOWN_RATE_FILTER = (0x1 << 7),
+};
+
+int rt5670_sel_asrc_clk_src(struct snd_soc_codec *codec,
+                            unsigned int filter_mask, unsigned int clk_src);
+
 struct rt5670_priv {
         struct snd_soc_codec *codec;
         struct rt5670_platform_data pdata;
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index d27630accf03..5d0bb8748dd1 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -702,6 +702,9 @@ static int rt5677_set_dsp_vad(struct snd_soc_codec *codec, bool on)
         static bool activity;
         int ret;
 
+        if (!IS_ENABLED(CONFIG_SND_SOC_RT5677_SPI))
+                return -ENXIO;
+
         if (on && !activity) {
                 activity = true;
 
@@ -896,7 +899,7 @@ static const struct snd_kcontrol_new rt5677_snd_controls[] = {
 static int set_dmic_clk(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
         int idx = rl6231_calc_dmic_clk(rt5677->sysclk);
 
@@ -911,7 +914,8 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w,
 static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
-        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(source->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
         unsigned int val;
 
         regmap_read(rt5677->regmap, RT5677_GLB_CLK1, &val);
@@ -925,6 +929,8 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
 static int is_using_asrc(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
         unsigned int reg, shift, val;
 
         if (source->reg == RT5677_ASRC_1) {
@@ -991,7 +997,9 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source,
                 }
         }
 
-        val = (snd_soc_read(source->codec, reg) >> shift) & 0xf;
+        regmap_read(rt5677->regmap, reg, &val);
+        val = (val >> shift) & 0xf;
+
         switch (val) {
         case 1 ... 6:
                 return 1;
@@ -2122,7 +2130,7 @@ static const struct snd_kcontrol_new rt5677_if2_dac7_tdm_sel_mux =
 static int rt5677_bst1_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -2146,7 +2154,7 @@ static int rt5677_bst1_event(struct snd_soc_dapm_widget *w,
 static int rt5677_bst2_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -2170,7 +2178,7 @@ static int rt5677_bst2_event(struct snd_soc_dapm_widget *w,
 static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -2192,7 +2200,7 @@ static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w,
 static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -2214,7 +2222,7 @@ static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w,
 static int rt5677_set_micbias1_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -2241,7 +2249,7 @@ static int rt5677_set_micbias1_event(struct snd_soc_dapm_widget *w,
 static int rt5677_if1_adc_tdm_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
         unsigned int value;
 
@@ -2264,7 +2272,7 @@ static int rt5677_if1_adc_tdm_event(struct snd_soc_dapm_widget *w,
 static int rt5677_if2_adc_tdm_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
         unsigned int value;
 
@@ -2287,7 +2295,7 @@ static int rt5677_if2_adc_tdm_event(struct snd_soc_dapm_widget *w,
 static int rt5677_vref_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -4098,7 +4106,8 @@ static int rt5677_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
                         unsigned int rx_mask, int slots, int slot_width)
 {
         struct snd_soc_codec *codec = dai->codec;
-        unsigned int val = 0;
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        unsigned int val = 0, slot_width_25 = 0;
 
         if (rx_mask || tx_mask)
                 val |= (1 << 12);
@@ -4122,6 +4131,8 @@ static int rt5677_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
         case 20:
                 val |= (1 << 8);
                 break;
+        case 25:
+                slot_width_25 = 0x8080;
         case 24:
                 val |= (2 << 8);
                 break;
@@ -4135,10 +4146,16 @@ static int rt5677_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 
         switch (dai->id) {
         case RT5677_AIF1:
-                snd_soc_update_bits(codec, RT5677_TDM1_CTRL1, 0x1f00, val);
+                regmap_update_bits(rt5677->regmap, RT5677_TDM1_CTRL1, 0x1f00,
+                        val);
+                regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x8000,
+                        slot_width_25);
                 break;
         case RT5677_AIF2:
-                snd_soc_update_bits(codec, RT5677_TDM2_CTRL1, 0x1f00, val);
+                regmap_update_bits(rt5677->regmap, RT5677_TDM2_CTRL1, 0x1f00,
+                        val);
+                regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x80,
+                        slot_width_25);
                 break;
         default:
                 break;
@@ -4923,6 +4940,11 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,
                                         RT5677_GPIO5_DIR_OUT);
         }
 
+        if (rt5677->pdata.micbias1_vdd_3v3)
+                regmap_update_bits(rt5677->regmap, RT5677_MICBIAS,
+                        RT5677_MICBIAS1_CTRL_VDD_MASK,
+                        RT5677_MICBIAS1_CTRL_VDD_3_3V);
+
         rt5677_init_gpio(i2c);
         rt5677_init_irq(i2c);
 
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 29cf7ce610f4..e182e6569bbd 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -155,18 +155,19 @@ struct sgtl5000_priv {
 static int mic_bias_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
                 /* change mic bias resistor */
-                snd_soc_update_bits(w->codec, SGTL5000_CHIP_MIC_CTRL,
+                snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL,
                         SGTL5000_BIAS_R_MASK,
                         sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT);
                 break;
 
         case SND_SOC_DAPM_PRE_PMD:
-                snd_soc_update_bits(w->codec, SGTL5000_CHIP_MIC_CTRL,
+                snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL,
                                 SGTL5000_BIAS_R_MASK, 0);
                 break;
         }
@@ -181,11 +182,12 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w,
 static int power_vag_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         const u32 mask = SGTL5000_DAC_POWERUP | SGTL5000_ADC_POWERUP;
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
-                snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER,
+                snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
                         SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP);
                 break;
 
@@ -195,9 +197,9 @@ static int power_vag_event(struct snd_soc_dapm_widget *w,
                  * operational to prevent inadvertently starving the
                  * other one of them.
                  */
-                if ((snd_soc_read(w->codec, SGTL5000_CHIP_ANA_POWER) &
+                if ((snd_soc_read(codec, SGTL5000_CHIP_ANA_POWER) &
                                 mask) != mask) {
-                        snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER,
+                        snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
                                 SGTL5000_VAG_POWERUP, 0);
                         msleep(400);
                 }
@@ -483,21 +485,21 @@ static int sgtl5000_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
         /* setting i2s data format */
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
         case SND_SOC_DAIFMT_DSP_A:
-                i2sctl |= SGTL5000_I2S_MODE_PCM;
+                i2sctl |= SGTL5000_I2S_MODE_PCM << SGTL5000_I2S_MODE_SHIFT;
                 break;
         case SND_SOC_DAIFMT_DSP_B:
-                i2sctl |= SGTL5000_I2S_MODE_PCM;
+                i2sctl |= SGTL5000_I2S_MODE_PCM << SGTL5000_I2S_MODE_SHIFT;
                 i2sctl |= SGTL5000_I2S_LRALIGN;
                 break;
         case SND_SOC_DAIFMT_I2S:
-                i2sctl |= SGTL5000_I2S_MODE_I2S_LJ;
+                i2sctl |= SGTL5000_I2S_MODE_I2S_LJ << SGTL5000_I2S_MODE_SHIFT;
                 break;
         case SND_SOC_DAIFMT_RIGHT_J:
-                i2sctl |= SGTL5000_I2S_MODE_RJ;
+                i2sctl |= SGTL5000_I2S_MODE_RJ << SGTL5000_I2S_MODE_SHIFT;
                 i2sctl |= SGTL5000_I2S_LRPOL;
                 break;
         case SND_SOC_DAIFMT_LEFT_J:
-                i2sctl |= SGTL5000_I2S_MODE_I2S_LJ;
+                i2sctl |= SGTL5000_I2S_MODE_I2S_LJ << SGTL5000_I2S_MODE_SHIFT;
                 i2sctl |= SGTL5000_I2S_LRALIGN;
                 break;
         default:
@@ -1462,6 +1464,9 @@ static int sgtl5000_i2c_probe(struct i2c_client *client,
         if (ret)
                 return ret;
 
+        /* Need 8 clocks before I2C accesses */
+        udelay(1);
+
         /* read chip information */
         ret = regmap_read(sgtl5000->regmap, SGTL5000_CHIP_ID, &reg);
         if (ret)
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index 1f451a1946eb..47b257e41809 100644
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -233,16 +233,18 @@ static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
 static int sn95031_vhs_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
         if (SND_SOC_DAPM_EVENT_ON(event)) {
                 pr_debug("VHS SND_SOC_DAPM_EVENT_ON doing rail startup now\n");
                 /* power up the rail */
-                snd_soc_write(w->codec, SN95031_VHSP, 0x3D);
-                snd_soc_write(w->codec, SN95031_VHSN, 0x3F);
+                snd_soc_write(codec, SN95031_VHSP, 0x3D);
+                snd_soc_write(codec, SN95031_VHSN, 0x3F);
                 msleep(1);
         } else if (SND_SOC_DAPM_EVENT_OFF(event)) {
                 pr_debug("VHS SND_SOC_DAPM_EVENT_OFF doing rail shutdown\n");
-                snd_soc_write(w->codec, SN95031_VHSP, 0xC4);
-                snd_soc_write(w->codec, SN95031_VHSN, 0x04);
+                snd_soc_write(codec, SN95031_VHSP, 0xC4);
+                snd_soc_write(codec, SN95031_VHSN, 0x04);
         }
         return 0;
 }
@@ -250,14 +252,16 @@ static int sn95031_vhs_event(struct snd_soc_dapm_widget *w,
 static int sn95031_vihf_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
         if (SND_SOC_DAPM_EVENT_ON(event)) {
                 pr_debug("VIHF SND_SOC_DAPM_EVENT_ON doing rail startup now\n");
                 /* power up the rail */
-                snd_soc_write(w->codec, SN95031_VIHF, 0x27);
+                snd_soc_write(codec, SN95031_VIHF, 0x27);
                 msleep(1);
         } else if (SND_SOC_DAPM_EVENT_OFF(event)) {
                 pr_debug("VIHF SND_SOC_DAPM_EVENT_OFF doing rail shutdown\n");
-                snd_soc_write(w->codec, SN95031_VIHF, 0x24);
+                snd_soc_write(codec, SN95031_VIHF, 0x24);
         }
         return 0;
 }
@@ -265,6 +269,7 @@ static int sn95031_vihf_event(struct snd_soc_dapm_widget *w,
 static int sn95031_dmic12_event(struct snd_soc_dapm_widget *w,
                         struct snd_kcontrol *k, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         unsigned int ldo = 0, clk_dir = 0, data_dir = 0;
 
         if (SND_SOC_DAPM_EVENT_ON(event)) {
@@ -273,15 +278,16 @@ static int sn95031_dmic12_event(struct snd_soc_dapm_widget *w,
                 data_dir = BIT(7);
         }
         /* program DMIC LDO, clock and set clock */
-        snd_soc_update_bits(w->codec, SN95031_MICBIAS, BIT(5)|BIT(4), ldo);
-        snd_soc_update_bits(w->codec, SN95031_DMICBUF0123, BIT(0), clk_dir);
-        snd_soc_update_bits(w->codec, SN95031_DMICBUF0123, BIT(7), data_dir);
+        snd_soc_update_bits(codec, SN95031_MICBIAS, BIT(5)|BIT(4), ldo);
+        snd_soc_update_bits(codec, SN95031_DMICBUF0123, BIT(0), clk_dir);
+        snd_soc_update_bits(codec, SN95031_DMICBUF0123, BIT(7), data_dir);
         return 0;
 }
 
 static int sn95031_dmic34_event(struct snd_soc_dapm_widget *w,
                         struct snd_kcontrol *k, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         unsigned int ldo = 0, clk_dir = 0, data_dir = 0;
 
         if (SND_SOC_DAPM_EVENT_ON(event)) {
@@ -290,22 +296,23 @@ static int sn95031_dmic34_event(struct snd_soc_dapm_widget *w,
                 data_dir = BIT(1);
         }
         /* program DMIC LDO, clock and set clock */
-        snd_soc_update_bits(w->codec, SN95031_MICBIAS, BIT(5)|BIT(4), ldo);
-        snd_soc_update_bits(w->codec, SN95031_DMICBUF0123, BIT(2), clk_dir);
-        snd_soc_update_bits(w->codec, SN95031_DMICBUF45, BIT(1), data_dir);
+        snd_soc_update_bits(codec, SN95031_MICBIAS, BIT(5)|BIT(4), ldo);
+        snd_soc_update_bits(codec, SN95031_DMICBUF0123, BIT(2), clk_dir);
+        snd_soc_update_bits(codec, SN95031_DMICBUF45, BIT(1), data_dir);
         return 0;
 }
 
 static int sn95031_dmic56_event(struct snd_soc_dapm_widget *w,
                         struct snd_kcontrol *k, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         unsigned int ldo = 0;
 
         if (SND_SOC_DAPM_EVENT_ON(event))
                 ldo = BIT(7)|BIT(6);
 
         /* program DMIC LDO */
-        snd_soc_update_bits(w->codec, SN95031_MICBIAS, BIT(7)|BIT(6), ldo);
+        snd_soc_update_bits(codec, SN95031_MICBIAS, BIT(7)|BIT(6), ldo);
         return 0;
 }
 
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 7e18200dd6a9..3a1343fa109b 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -24,8 +24,11 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
+#include <linux/gpio/consumer.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <sound/core.h>
@@ -102,6 +105,35 @@ static const struct reg_default sta32x_regs[] = {
         { 0x2c, 0x0c },
 };
 
+static const struct regmap_range sta32x_write_regs_range[] = {
+        regmap_reg_range(STA32X_CONFA,  STA32X_AUTO2),
+        regmap_reg_range(STA32X_C1CFG,  STA32X_FDRC2),
+};
+
+static const struct regmap_range sta32x_read_regs_range[] = {
+        regmap_reg_range(STA32X_CONFA,  STA32X_AUTO2),
+        regmap_reg_range(STA32X_C1CFG,  STA32X_FDRC2),
+};
+
+static const struct regmap_range sta32x_volatile_regs_range[] = {
+        regmap_reg_range(STA32X_CFADDR2, STA32X_CFUD),
+};
+
+static const struct regmap_access_table sta32x_write_regs = {
+        .yes_ranges =   sta32x_write_regs_range,
+        .n_yes_ranges = ARRAY_SIZE(sta32x_write_regs_range),
+};
+
+static const struct regmap_access_table sta32x_read_regs = {
+        .yes_ranges =   sta32x_read_regs_range,
+        .n_yes_ranges = ARRAY_SIZE(sta32x_read_regs_range),
+};
+
+static const struct regmap_access_table sta32x_volatile_regs = {
+        .yes_ranges =   sta32x_volatile_regs_range,
+        .n_yes_ranges = ARRAY_SIZE(sta32x_volatile_regs_range),
+};
+
 /* regulator power supply names */
 static const char *sta32x_supply_names[] = {
         "Vdda", /* analog supply, 3.3VV */
@@ -122,6 +154,8 @@ struct sta32x_priv {
         u32 coef_shadow[STA32X_COEF_COUNT];
         struct delayed_work watchdog_work;
         int shutdown;
+        struct gpio_desc *gpiod_nreset;
+        struct mutex coeff_lock;
 };
 
 static const DECLARE_TLV_DB_SCALE(mvol_tlv, -12700, 50, 1);
@@ -155,37 +189,32 @@ static const char *sta32x_limiter_release_rate[] = {
         "0.5116", "0.1370", "0.0744", "0.0499", "0.0360", "0.0299",
         "0.0264", "0.0208", "0.0198", "0.0172", "0.0147", "0.0137",
         "0.0134", "0.0117", "0.0110", "0.0104" };
-
-static const unsigned int sta32x_limiter_ac_attack_tlv[] = {
-        TLV_DB_RANGE_HEAD(2),
+static DECLARE_TLV_DB_RANGE(sta32x_limiter_ac_attack_tlv,
         0, 7, TLV_DB_SCALE_ITEM(-1200, 200, 0),
         8, 16, TLV_DB_SCALE_ITEM(300, 100, 0),
-};
+);
 
-static const unsigned int sta32x_limiter_ac_release_tlv[] = {
-        TLV_DB_RANGE_HEAD(5),
+static DECLARE_TLV_DB_RANGE(sta32x_limiter_ac_release_tlv,
         0, 0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 0),
         1, 1, TLV_DB_SCALE_ITEM(-2900, 0, 0),
         2, 2, TLV_DB_SCALE_ITEM(-2000, 0, 0),
         3, 8, TLV_DB_SCALE_ITEM(-1400, 200, 0),
         8, 16, TLV_DB_SCALE_ITEM(-700, 100, 0),
-};
+);
 
-static const unsigned int sta32x_limiter_drc_attack_tlv[] = {
-        TLV_DB_RANGE_HEAD(3),
+static DECLARE_TLV_DB_RANGE(sta32x_limiter_drc_attack_tlv,
         0, 7, TLV_DB_SCALE_ITEM(-3100, 200, 0),
         8, 13, TLV_DB_SCALE_ITEM(-1600, 100, 0),
         14, 16, TLV_DB_SCALE_ITEM(-1000, 300, 0),
-};
+);
 
-static const unsigned int sta32x_limiter_drc_release_tlv[] = {
-        TLV_DB_RANGE_HEAD(5),
+static DECLARE_TLV_DB_RANGE(sta32x_limiter_drc_release_tlv,
         0, 0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 0),
         1, 2, TLV_DB_SCALE_ITEM(-3800, 200, 0),
         3, 4, TLV_DB_SCALE_ITEM(-3300, 200, 0),
         5, 12, TLV_DB_SCALE_ITEM(-3000, 200, 0),
         13, 16, TLV_DB_SCALE_ITEM(-1500, 300, 0),
-};
+);
 
 static SOC_ENUM_SINGLE_DECL(sta32x_drc_ac_enum,
                             STA32X_CONFD, STA32X_CONFD_DRC_SHIFT,
@@ -244,29 +273,42 @@ static int sta32x_coefficient_get(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+        struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
         int numcoef = kcontrol->private_value >> 16;
         int index = kcontrol->private_value & 0xffff;
-        unsigned int cfud;
-        int i;
+        unsigned int cfud, val;
+        int i, ret = 0;
+
+        mutex_lock(&sta32x->coeff_lock);
 
         /* preserve reserved bits in STA32X_CFUD */
-        cfud = snd_soc_read(codec, STA32X_CFUD) & 0xf0;
-        /* chip documentation does not say if the bits are self clearing,
-         * so do it explicitly */
-        snd_soc_write(codec, STA32X_CFUD, cfud);
+        regmap_read(sta32x->regmap, STA32X_CFUD, &cfud);
+        cfud &= 0xf0;
+        /*
+         * chip documentation does not say if the bits are self clearing,
+         * so do it explicitly
+         */
+        regmap_write(sta32x->regmap, STA32X_CFUD, cfud);
 
-        snd_soc_write(codec, STA32X_CFADDR2, index);
-        if (numcoef == 1)
-                snd_soc_write(codec, STA32X_CFUD, cfud | 0x04);
-        else if (numcoef == 5)
-                snd_soc_write(codec, STA32X_CFUD, cfud | 0x08);
-        else
-                return -EINVAL;
-        for (i = 0; i < 3 * numcoef; i++)
-                ucontrol->value.bytes.data[i] =
-                        snd_soc_read(codec, STA32X_B1CF1 + i);
+        regmap_write(sta32x->regmap, STA32X_CFADDR2, index);
+        if (numcoef == 1) {
+                regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x04);
+        } else if (numcoef == 5) {
+                regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x08);
+        } else {
+                ret = -EINVAL;
+                goto exit_unlock;
+        }
 
-        return 0;
+        for (i = 0; i < 3 * numcoef; i++) {
+                regmap_read(sta32x->regmap, STA32X_B1CF1 + i, &val);
+                ucontrol->value.bytes.data[i] = val;
+        }
+
+exit_unlock:
+        mutex_unlock(&sta32x->coeff_lock);
+
+        return ret;
 }
 
 static int sta32x_coefficient_put(struct snd_kcontrol *kcontrol,
@@ -280,24 +322,27 @@ static int sta32x_coefficient_put(struct snd_kcontrol *kcontrol,
         int i;
 
         /* preserve reserved bits in STA32X_CFUD */
-        cfud = snd_soc_read(codec, STA32X_CFUD) & 0xf0;
-        /* chip documentation does not say if the bits are self clearing,
-         * so do it explicitly */
-        snd_soc_write(codec, STA32X_CFUD, cfud);
+        regmap_read(sta32x->regmap, STA32X_CFUD, &cfud);
+        cfud &= 0xf0;
+        /*
+         * chip documentation does not say if the bits are self clearing,
+         * so do it explicitly
+         */
+        regmap_write(sta32x->regmap, STA32X_CFUD, cfud);
 
-        snd_soc_write(codec, STA32X_CFADDR2, index);
+        regmap_write(sta32x->regmap, STA32X_CFADDR2, index);
         for (i = 0; i < numcoef && (index + i < STA32X_COEF_COUNT); i++)
                 sta32x->coef_shadow[index + i] =
                           (ucontrol->value.bytes.data[3 * i] << 16)
                         | (ucontrol->value.bytes.data[3 * i + 1] << 8)
                         | (ucontrol->value.bytes.data[3 * i + 2]);
         for (i = 0; i < 3 * numcoef; i++)
-                snd_soc_write(codec, STA32X_B1CF1 + i,
-                              ucontrol->value.bytes.data[i]);
+                regmap_write(sta32x->regmap, STA32X_B1CF1 + i,
+                             ucontrol->value.bytes.data[i]);
         if (numcoef == 1)
-                snd_soc_write(codec, STA32X_CFUD, cfud | 0x01);
+                regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x01);
         else if (numcoef == 5)
-                snd_soc_write(codec, STA32X_CFUD, cfud | 0x02);
+                regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x02);
         else
                 return -EINVAL;
 
@@ -311,20 +356,23 @@ static int sta32x_sync_coef_shadow(struct snd_soc_codec *codec)
         int i;
 
         /* preserve reserved bits in STA32X_CFUD */
-        cfud = snd_soc_read(codec, STA32X_CFUD) & 0xf0;
+        regmap_read(sta32x->regmap, STA32X_CFUD, &cfud);
+        cfud &= 0xf0;
 
         for (i = 0; i < STA32X_COEF_COUNT; i++) {
-                snd_soc_write(codec, STA32X_CFADDR2, i);
-                snd_soc_write(codec, STA32X_B1CF1,
-                              (sta32x->coef_shadow[i] >> 16) & 0xff);
-                snd_soc_write(codec, STA32X_B1CF2,
-                              (sta32x->coef_shadow[i] >> 8) & 0xff);
-                snd_soc_write(codec, STA32X_B1CF3,
-                              (sta32x->coef_shadow[i]) & 0xff);
-                /* chip documentation does not say if the bits are
-                 * self-clearing, so do it explicitly */
-                snd_soc_write(codec, STA32X_CFUD, cfud);
-                snd_soc_write(codec, STA32X_CFUD, cfud | 0x01);
+                regmap_write(sta32x->regmap, STA32X_CFADDR2, i);
+                regmap_write(sta32x->regmap, STA32X_B1CF1,
+                             (sta32x->coef_shadow[i] >> 16) & 0xff);
+                regmap_write(sta32x->regmap, STA32X_B1CF2,
+                             (sta32x->coef_shadow[i] >> 8) & 0xff);
+                regmap_write(sta32x->regmap, STA32X_B1CF3,
+                             (sta32x->coef_shadow[i]) & 0xff);
+                /*
+                 * chip documentation does not say if the bits are
+                 * self-clearing, so do it explicitly
+                 */
+                regmap_write(sta32x->regmap, STA32X_CFUD, cfud);
+                regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x01);
         }
         return 0;
 }
@@ -336,11 +384,11 @@ static int sta32x_cache_sync(struct snd_soc_codec *codec)
         int rc;
 
         /* mute during register sync */
-        mute = snd_soc_read(codec, STA32X_MMUTE);
-        snd_soc_write(codec, STA32X_MMUTE, mute | STA32X_MMUTE_MMUTE);
+        regmap_read(sta32x->regmap, STA32X_MMUTE, &mute);
+        regmap_write(sta32x->regmap, STA32X_MMUTE, mute | STA32X_MMUTE_MMUTE);
         sta32x_sync_coef_shadow(codec);
         rc = regcache_sync(sta32x->regmap);
-        snd_soc_write(codec, STA32X_MMUTE, mute);
+        regmap_write(sta32x->regmap, STA32X_MMUTE, mute);
         return rc;
 }
 
@@ -508,17 +556,12 @@ static struct {
 };
 
 /* MCLK to fs clock ratios */
-static struct {
-        int ratio;
-        int mcs;
-} mclk_ratios[3][7] = {
-        { { 768, 0 }, { 512, 1 }, { 384, 2 }, { 256, 3 },
-          { 128, 4 }, { 576, 5 }, { 0, 0 } },
-        { { 384, 2 }, { 256, 3 }, { 192, 4 }, { 128, 5 }, {64, 0 }, { 0, 0 } },
-        { { 384, 2 }, { 256, 3 }, { 192, 4 }, { 128, 5 }, {64, 0 }, { 0, 0 } },
+static int mcs_ratio_table[3][7] = {
+        { 768, 512, 384, 256, 128, 576, 0 },
+        { 384, 256, 192, 128,  64,   0 },
+        { 384, 256, 192, 128,  64,   0 },
 };
 
-
 /**
  * sta32x_set_dai_sysclk - configure MCLK
  * @codec_dai: the codec DAI
@@ -543,46 +586,10 @@ static int sta32x_set_dai_sysclk(struct snd_soc_dai *codec_dai,
 {
         struct snd_soc_codec *codec = codec_dai->codec;
         struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
-        int i, j, ir, fs;
-        unsigned int rates = 0;
-        unsigned int rate_min = -1;
-        unsigned int rate_max = 0;
 
-        pr_debug("mclk=%u\n", freq);
+        dev_dbg(codec->dev, "mclk=%u\n", freq);
         sta32x->mclk = freq;
 
-        if (sta32x->mclk) {
-                for (i = 0; i < ARRAY_SIZE(interpolation_ratios); i++) {
-                        ir = interpolation_ratios[i].ir;
-                        fs = interpolation_ratios[i].fs;
-                        for (j = 0; mclk_ratios[ir][j].ratio; j++) {
-                                if (mclk_ratios[ir][j].ratio * fs == freq) {
-                                        rates |= snd_pcm_rate_to_rate_bit(fs);
-                                        if (fs < rate_min)
-                                                rate_min = fs;
-                                        if (fs > rate_max)
-                                                rate_max = fs;
-                                        break;
-                                }
-                        }
-                }
-                /* FIXME: soc should support a rate list */
-                rates &= ~SNDRV_PCM_RATE_KNOT;
-
-                if (!rates) {
-                        dev_err(codec->dev, "could not find a valid sample rate\n");
-                        return -EINVAL;
-                }
-        } else {
-                /* enable all possible rates */
-                rates = STA32X_RATES;
-                rate_min = 32000;
-                rate_max = 192000;
-        }
-
-        codec_dai->driver->playback.rates = rates;
-        codec_dai->driver->playback.rate_min = rate_min;
-        codec_dai->driver->playback.rate_max = rate_max;
         return 0;
 }
 
@@ -599,10 +606,7 @@ static int sta32x_set_dai_fmt(struct snd_soc_dai *codec_dai,
 {
         struct snd_soc_codec *codec = codec_dai->codec;
         struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
-        u8 confb = snd_soc_read(codec, STA32X_CONFB);
-
-        pr_debug("\n");
-        confb &= ~(STA32X_CONFB_C1IM | STA32X_CONFB_C2IM);
+        u8 confb = 0;
 
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
         case SND_SOC_DAIFMT_CBS_CFS:
@@ -632,8 +636,8 @@ static int sta32x_set_dai_fmt(struct snd_soc_dai *codec_dai,
                 return -EINVAL;
         }
 
-        snd_soc_write(codec, STA32X_CONFB, confb);
-        return 0;
+        return regmap_update_bits(sta32x->regmap, STA32X_CONFB,
+                                  STA32X_CONFB_C1IM | STA32X_CONFB_C2IM, confb);
 }
 
 /**
@@ -651,39 +655,55 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_codec *codec = dai->codec;
         struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
-        unsigned int rate;
-        int i, mcs = -1, ir = -1;
-        u8 confa, confb;
+        int i, mcs = -EINVAL, ir = -EINVAL;
+        unsigned int confa, confb;
+        unsigned int rate, ratio;
+        int ret;
+
+        if (!sta32x->mclk) {
+                dev_err(codec->dev,
+                        "sta32x->mclk is unset. Unable to determine ratio\n");
+                return -EIO;
+        }
 
         rate = params_rate(params);
-        pr_debug("rate: %u\n", rate);
-        for (i = 0; i < ARRAY_SIZE(interpolation_ratios); i++)
+        ratio = sta32x->mclk / rate;
+        dev_dbg(codec->dev, "rate: %u, ratio: %u\n", rate, ratio);
+
+        for (i = 0; i < ARRAY_SIZE(interpolation_ratios); i++) {
                 if (interpolation_ratios[i].fs == rate) {
                         ir = interpolation_ratios[i].ir;
                         break;
                 }
-        if (ir < 0)
+        }
+
+        if (ir < 0) {
+                dev_err(codec->dev, "Unsupported samplerate: %u\n", rate);
                 return -EINVAL;
-        for (i = 0; mclk_ratios[ir][i].ratio; i++)
-                if (mclk_ratios[ir][i].ratio * rate == sta32x->mclk) {
-                        mcs = mclk_ratios[ir][i].mcs;
+        }
+
+        for (i = 0; i < 6; i++) {
+                if (mcs_ratio_table[ir][i] == ratio) {
+                        mcs = i;
                         break;
                 }
-        if (mcs < 0)
+        }
+
+        if (mcs < 0) {
+                dev_err(codec->dev, "Unresolvable ratio: %u\n", ratio);
                 return -EINVAL;
+        }
 
-        confa = snd_soc_read(codec, STA32X_CONFA);
-        confa &= ~(STA32X_CONFA_MCS_MASK | STA32X_CONFA_IR_MASK);
-        confa |= (ir << STA32X_CONFA_IR_SHIFT) | (mcs << STA32X_CONFA_MCS_SHIFT);
+        confa = (ir << STA32X_CONFA_IR_SHIFT) |
+                (mcs << STA32X_CONFA_MCS_SHIFT);
+        confb = 0;
 
-        confb = snd_soc_read(codec, STA32X_CONFB);
-        confb &= ~(STA32X_CONFB_SAI_MASK | STA32X_CONFB_SAIFB);
         switch (params_width(params)) {
         case 24:
-                pr_debug("24bit\n");
+                dev_dbg(codec->dev, "24bit\n");
                 /* fall through */
         case 32:
-                pr_debug("24bit or 32bit\n");
+                dev_dbg(codec->dev, "24bit or 32bit\n");
                 switch (sta32x->format) {
                 case SND_SOC_DAIFMT_I2S:
                         confb |= 0x0;
@@ -698,7 +718,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
 
                 break;
         case 20:
-                pr_debug("20bit\n");
+                dev_dbg(codec->dev, "20bit\n");
                 switch (sta32x->format) {
                 case SND_SOC_DAIFMT_I2S:
                         confb |= 0x4;
@@ -713,7 +733,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
 
                 break;
         case 18:
-                pr_debug("18bit\n");
+                dev_dbg(codec->dev, "18bit\n");
                 switch (sta32x->format) {
                 case SND_SOC_DAIFMT_I2S:
                         confb |= 0x8;
@@ -728,7 +748,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
 
                 break;
         case 16:
-                pr_debug("16bit\n");
+                dev_dbg(codec->dev, "16bit\n");
                 switch (sta32x->format) {
                 case SND_SOC_DAIFMT_I2S:
                         confb |= 0x0;
@@ -746,8 +766,30 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        snd_soc_write(codec, STA32X_CONFA, confa);
-        snd_soc_write(codec, STA32X_CONFB, confb);
+        ret = regmap_update_bits(sta32x->regmap, STA32X_CONFA,
+                                 STA32X_CONFA_MCS_MASK | STA32X_CONFA_IR_MASK,
+                                 confa);
+        if (ret < 0)
+                return ret;
+
+        ret = regmap_update_bits(sta32x->regmap, STA32X_CONFB,
+                                 STA32X_CONFB_SAI_MASK | STA32X_CONFB_SAIFB,
+                                 confb);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int sta32x_startup_sequence(struct sta32x_priv *sta32x)
+{
+        if (sta32x->gpiod_nreset) {
+                gpiod_set_value(sta32x->gpiod_nreset, 0);
+                mdelay(1);
+                gpiod_set_value(sta32x->gpiod_nreset, 1);
+                mdelay(1);
+        }
+
         return 0;
 }
 
@@ -766,14 +808,14 @@ static int sta32x_set_bias_level(struct snd_soc_codec *codec,
         int ret;
         struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
 
-        pr_debug("level = %d\n", level);
+        dev_dbg(codec->dev, "level = %d\n", level);
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
 
         case SND_SOC_BIAS_PREPARE:
                 /* Full power on */
-                snd_soc_update_bits(codec, STA32X_CONFF,
+                regmap_update_bits(sta32x->regmap, STA32X_CONFF,
                                     STA32X_CONFF_PWDN | STA32X_CONFF_EAPD,
                                     STA32X_CONFF_PWDN | STA32X_CONFF_EAPD);
                 break;
@@ -788,25 +830,28 @@ static int sta32x_set_bias_level(struct snd_soc_codec *codec,
                                 return ret;
                         }
 
+                        sta32x_startup_sequence(sta32x);
                         sta32x_cache_sync(codec);
                         sta32x_watchdog_start(sta32x);
                 }
 
-                /* Power up to mute */
-                /* FIXME */
-                snd_soc_update_bits(codec, STA32X_CONFF,
-                                    STA32X_CONFF_PWDN | STA32X_CONFF_EAPD,
-                                    STA32X_CONFF_PWDN | STA32X_CONFF_EAPD);
+                /* Power down */
+                regmap_update_bits(sta32x->regmap, STA32X_CONFF,
+                                   STA32X_CONFF_PWDN | STA32X_CONFF_EAPD,
+                                   0);
 
                 break;
 
         case SND_SOC_BIAS_OFF:
                 /* The chip runs through the power down sequence for us. */
-                snd_soc_update_bits(codec, STA32X_CONFF,
-                                    STA32X_CONFF_PWDN | STA32X_CONFF_EAPD,
-                                    STA32X_CONFF_PWDN);
+                regmap_update_bits(sta32x->regmap, STA32X_CONFF,
+                                   STA32X_CONFF_PWDN | STA32X_CONFF_EAPD, 0);
                 msleep(300);
                 sta32x_watchdog_stop(sta32x);
+
+                if (sta32x->gpiod_nreset)
+                        gpiod_set_value(sta32x->gpiod_nreset, 0);
+
                 regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies),
                                        sta32x->supplies);
                 break;
@@ -822,7 +867,7 @@ static const struct snd_soc_dai_ops sta32x_dai_ops = {
 };
 
 static struct snd_soc_dai_driver sta32x_dai = {
-        .name = "STA32X",
+        .name = "sta32x-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 2,
@@ -836,11 +881,8 @@ static struct snd_soc_dai_driver sta32x_dai = {
 static int sta32x_probe(struct snd_soc_codec *codec)
 {
         struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
+        struct sta32x_platform_data *pdata = sta32x->pdata;
         int i, ret = 0, thermal = 0;
-
-        sta32x->codec = codec;
-        sta32x->pdata = dev_get_platdata(codec->dev);
-
         ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
                                     sta32x->supplies);
         if (ret != 0) {
@@ -848,50 +890,73 @@ static int sta32x_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
-        /* Chip documentation explicitly requires that the reset values
-         * of reserved register bits are left untouched.
-         * Write the register default value to cache for reserved registers,
-         * so the write to the these registers are suppressed by the cache
-         * restore code when it skips writes of default registers.
-         */
-        regcache_cache_only(sta32x->regmap, true);
-        snd_soc_write(codec, STA32X_CONFC, 0xc2);
-        snd_soc_write(codec, STA32X_CONFE, 0xc2);
-        snd_soc_write(codec, STA32X_CONFF, 0x5c);
-        snd_soc_write(codec, STA32X_MMUTE, 0x10);
-        snd_soc_write(codec, STA32X_AUTO1, 0x60);
-        snd_soc_write(codec, STA32X_AUTO3, 0x00);
-        snd_soc_write(codec, STA32X_C3CFG, 0x40);
-        regcache_cache_only(sta32x->regmap, false);
-
-        /* set thermal warning adjustment and recovery */
-        if (!(sta32x->pdata->thermal_conf & STA32X_THERMAL_ADJUSTMENT_ENABLE))
+        ret = sta32x_startup_sequence(sta32x);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to startup device\n");
+                return ret;
+        }
+
+        /* CONFA */
+        if (!pdata->thermal_warning_recovery)
                 thermal |= STA32X_CONFA_TWAB;
-        if (!(sta32x->pdata->thermal_conf & STA32X_THERMAL_RECOVERY_ENABLE))
+        if (!pdata->thermal_warning_adjustment)
                 thermal |= STA32X_CONFA_TWRB;
-        snd_soc_update_bits(codec, STA32X_CONFA,
-                            STA32X_CONFA_TWAB | STA32X_CONFA_TWRB,
-                            thermal);
+        if (!pdata->fault_detect_recovery)
+                thermal |= STA32X_CONFA_FDRB;
+        regmap_update_bits(sta32x->regmap, STA32X_CONFA,
+                           STA32X_CONFA_TWAB | STA32X_CONFA_TWRB |
+                           STA32X_CONFA_FDRB,
+                           thermal);
+
+        /* CONFC */
+        regmap_update_bits(sta32x->regmap, STA32X_CONFC,
+                           STA32X_CONFC_CSZ_MASK,
+                           pdata->drop_compensation_ns
+                                << STA32X_CONFC_CSZ_SHIFT);
+
+        /* CONFE */
+        regmap_update_bits(sta32x->regmap, STA32X_CONFE,
+                           STA32X_CONFE_MPCV,
+                           pdata->max_power_use_mpcc ?
+                                STA32X_CONFE_MPCV : 0);
+        regmap_update_bits(sta32x->regmap, STA32X_CONFE,
+                           STA32X_CONFE_MPC,
+                           pdata->max_power_correction ?
+                                STA32X_CONFE_MPC : 0);
+        regmap_update_bits(sta32x->regmap, STA32X_CONFE,
+                           STA32X_CONFE_AME,
+                           pdata->am_reduction_mode ?
+                                STA32X_CONFE_AME : 0);
+        regmap_update_bits(sta32x->regmap, STA32X_CONFE,
+                           STA32X_CONFE_PWMS,
+                           pdata->odd_pwm_speed_mode ?
+                                STA32X_CONFE_PWMS : 0);
+
+        /*  CONFF */
+        regmap_update_bits(sta32x->regmap, STA32X_CONFF,
+                           STA32X_CONFF_IDE,
+                           pdata->invalid_input_detect_mute ?
+                                STA32X_CONFF_IDE : 0);
 
         /* select output configuration  */
-        snd_soc_update_bits(codec, STA32X_CONFF,
-                            STA32X_CONFF_OCFG_MASK,
-                            sta32x->pdata->output_conf
-                            << STA32X_CONFF_OCFG_SHIFT);
+        regmap_update_bits(sta32x->regmap, STA32X_CONFF,
+                           STA32X_CONFF_OCFG_MASK,
+                           pdata->output_conf
+                                << STA32X_CONFF_OCFG_SHIFT);
 
         /* channel to output mapping */
-        snd_soc_update_bits(codec, STA32X_C1CFG,
-                            STA32X_CxCFG_OM_MASK,
-                            sta32x->pdata->ch1_output_mapping
-                            << STA32X_CxCFG_OM_SHIFT);
-        snd_soc_update_bits(codec, STA32X_C2CFG,
-                            STA32X_CxCFG_OM_MASK,
-                            sta32x->pdata->ch2_output_mapping
-                            << STA32X_CxCFG_OM_SHIFT);
-        snd_soc_update_bits(codec, STA32X_C3CFG,
-                            STA32X_CxCFG_OM_MASK,
-                            sta32x->pdata->ch3_output_mapping
-                            << STA32X_CxCFG_OM_SHIFT);
+        regmap_update_bits(sta32x->regmap, STA32X_C1CFG,
+                           STA32X_CxCFG_OM_MASK,
+                           pdata->ch1_output_mapping
+                                << STA32X_CxCFG_OM_SHIFT);
+        regmap_update_bits(sta32x->regmap, STA32X_C2CFG,
+                           STA32X_CxCFG_OM_MASK,
+                           pdata->ch2_output_mapping
+                                << STA32X_CxCFG_OM_SHIFT);
+        regmap_update_bits(sta32x->regmap, STA32X_C3CFG,
+                           STA32X_CxCFG_OM_MASK,
+                           pdata->ch3_output_mapping
+                                << STA32X_CxCFG_OM_SHIFT);
 
         /* initialize coefficient shadow RAM with reset values */
         for (i = 4; i <= 49; i += 5)
@@ -924,16 +989,6 @@ static int sta32x_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
-static bool sta32x_reg_is_volatile(struct device *dev, unsigned int reg)
-{
-        switch (reg) {
-        case STA32X_CONFA ... STA32X_L2ATRT:
-        case STA32X_MPCC1 ... STA32X_FDRC2:
-                return 0;
-        }
-        return 1;
-}
-
 static const struct snd_soc_codec_driver sta32x_codec = {
         .probe =                sta32x_probe,
         .remove =               sta32x_remove,
@@ -954,12 +1009,75 @@ static const struct regmap_config sta32x_regmap = {
         .reg_defaults =         sta32x_regs,
         .num_reg_defaults =     ARRAY_SIZE(sta32x_regs),
         .cache_type =           REGCACHE_RBTREE,
-        .volatile_reg =         sta32x_reg_is_volatile,
+        .wr_table =             &sta32x_write_regs,
+        .rd_table =             &sta32x_read_regs,
+        .volatile_table =       &sta32x_volatile_regs,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id st32x_dt_ids[] = {
+        { .compatible = "st,sta32x", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, st32x_dt_ids);
+
+static int sta32x_probe_dt(struct device *dev, struct sta32x_priv *sta32x)
+{
+        struct device_node *np = dev->of_node;
+        struct sta32x_platform_data *pdata;
+        u16 tmp;
+
+        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return -ENOMEM;
+
+        of_property_read_u8(np, "st,output-conf",
+                            &pdata->output_conf);
+        of_property_read_u8(np, "st,ch1-output-mapping",
+                            &pdata->ch1_output_mapping);
+        of_property_read_u8(np, "st,ch2-output-mapping",
+                            &pdata->ch2_output_mapping);
+        of_property_read_u8(np, "st,ch3-output-mapping",
+                            &pdata->ch3_output_mapping);
+
+        if (of_get_property(np, "st,thermal-warning-recovery", NULL))
+                pdata->thermal_warning_recovery = 1;
+        if (of_get_property(np, "st,thermal-warning-adjustment", NULL))
+                pdata->thermal_warning_adjustment = 1;
+        if (of_get_property(np, "st,needs_esd_watchdog", NULL))
+                pdata->needs_esd_watchdog = 1;
+
+        tmp = 140;
+        of_property_read_u16(np, "st,drop-compensation-ns", &tmp);
+        pdata->drop_compensation_ns = clamp_t(u16, tmp, 0, 300) / 20;
+
+        /* CONFE */
+        if (of_get_property(np, "st,max-power-use-mpcc", NULL))
+                pdata->max_power_use_mpcc = 1;
+
+        if (of_get_property(np, "st,max-power-correction", NULL))
+                pdata->max_power_correction = 1;
+
+        if (of_get_property(np, "st,am-reduction-mode", NULL))
+                pdata->am_reduction_mode = 1;
+
+        if (of_get_property(np, "st,odd-pwm-speed-mode", NULL))
+                pdata->odd_pwm_speed_mode = 1;
+
+        /* CONFF */
+        if (of_get_property(np, "st,invalid-input-detect-mute", NULL))
+                pdata->invalid_input_detect_mute = 1;
+
+        sta32x->pdata = pdata;
+
+        return 0;
+}
+#endif
+
 static int sta32x_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
+        struct device *dev = &i2c->dev;
         struct sta32x_priv *sta32x;
         int ret, i;
 
@@ -968,6 +1086,29 @@ static int sta32x_i2c_probe(struct i2c_client *i2c,
         if (!sta32x)
                 return -ENOMEM;
 
+        mutex_init(&sta32x->coeff_lock);
+        sta32x->pdata = dev_get_platdata(dev);
+
+#ifdef CONFIG_OF
+        if (dev->of_node) {
+                ret = sta32x_probe_dt(dev, sta32x);
+                if (ret < 0)
+                        return ret;
+        }
+#endif
+
+        /* GPIOs */
+        sta32x->gpiod_nreset = devm_gpiod_get(dev, "reset");
+        if (IS_ERR(sta32x->gpiod_nreset)) {
+                ret = PTR_ERR(sta32x->gpiod_nreset);
+                if (ret != -ENOENT && ret != -ENOSYS)
+                        return ret;
+
+                sta32x->gpiod_nreset = NULL;
+        } else {
+                gpiod_direction_output(sta32x->gpiod_nreset, 0);
+        }
+
         /* regulators */
         for (i = 0; i < ARRAY_SIZE(sta32x->supplies); i++)
                 sta32x->supplies[i].supply = sta32x_supply_names[i];
@@ -982,15 +1123,15 @@ static int sta32x_i2c_probe(struct i2c_client *i2c,
         sta32x->regmap = devm_regmap_init_i2c(i2c, &sta32x_regmap);
         if (IS_ERR(sta32x->regmap)) {
                 ret = PTR_ERR(sta32x->regmap);
-                dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret);
+                dev_err(dev, "Failed to init regmap: %d\n", ret);
                 return ret;
         }
 
         i2c_set_clientdata(i2c, sta32x);
 
-        ret = snd_soc_register_codec(&i2c->dev, &sta32x_codec, &sta32x_dai, 1);
-        if (ret != 0)
-                dev_err(&i2c->dev, "Failed to register codec (%d)\n", ret);
+        ret = snd_soc_register_codec(dev, &sta32x_codec, &sta32x_dai, 1);
+        if (ret < 0)
+                dev_err(dev, "Failed to register codec (%d)\n", ret);
 
         return ret;
 }
@@ -1013,6 +1154,7 @@ static struct i2c_driver sta32x_i2c_driver = {
         .driver = {
                 .name = "sta32x",
                 .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(st32x_dt_ids),
         },
         .probe =    sta32x_i2c_probe,
         .remove =   sta32x_i2c_remove,
diff --git a/sound/soc/codecs/sta32x.h b/sound/soc/codecs/sta32x.h
index d8e32a6262ee..d3191c983d71 100644
--- a/sound/soc/codecs/sta32x.h
+++ b/sound/soc/codecs/sta32x.h
@@ -131,7 +131,7 @@
 #define STA32X_CONFF_OCFG_MASK  0x03
 #define STA32X_CONFF_OCFG_SHIFT 0
 #define STA32X_CONFF_IDE        0x04
-#define STA32X_CONFF_IDE_SHIFT  3
+#define STA32X_CONFF_IDE_SHIFT  2
 #define STA32X_CONFF_BCLE       0x08
 #define STA32X_CONFF_ECLE       0x20
 #define STA32X_CONFF_PWDN       0x40
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index dc3223d6eca1..c86dd9aae157 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -349,7 +349,8 @@ static int aic31xx_wait_bits(struct aic31xx_priv *aic31xx, unsigned int reg,
 static int aic31xx_dapm_power_event(struct snd_soc_dapm_widget *w,
                                     struct snd_kcontrol *kcontrol, int event)
 {
-        struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec);
         unsigned int reg = AIC31XX_DACFLAG1;
         unsigned int mask;
 
@@ -377,7 +378,7 @@ static int aic31xx_dapm_power_event(struct snd_soc_dapm_widget *w,
                 reg = AIC31XX_ADCFLAG;
                 break;
         default:
-                dev_err(w->codec->dev, "Unknown widget '%s' calling %s\n",
+                dev_err(codec->dev, "Unknown widget '%s' calling %s\n",
                         w->name, __func__);
                 return -EINVAL;
         }
@@ -388,7 +389,7 @@ static int aic31xx_dapm_power_event(struct snd_soc_dapm_widget *w,
         case SND_SOC_DAPM_POST_PMD:
                 return aic31xx_wait_bits(aic31xx, reg, mask, 0, 5000, 100);
         default:
-                dev_dbg(w->codec->dev,
+                dev_dbg(codec->dev,
                         "Unhandled dapm widget event %d from %s\n",
                         event, w->name);
         }
@@ -433,7 +434,7 @@ static const struct snd_kcontrol_new aic31xx_dapm_spr_switch =
 static int mic_bias_event(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index b7ebce054b4e..51c4713ac6e3 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -87,6 +87,7 @@ struct aic3x_priv {
 #define AIC3X_MODEL_3X 0
 #define AIC3X_MODEL_33 1
 #define AIC3X_MODEL_3007 2
+#define AIC3X_MODEL_3104 3
         u16 model;
 
         /* Selects the micbias voltage */
@@ -197,7 +198,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
 static int mic_bias_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -316,52 +317,37 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
          * only for swapped L-to-R and R-to-L routes. See below stereo controls
          * for direct L-to-L and R-to-R routes.
          */
-        SOC_SINGLE_TLV("Left Line Mixer Line2R Bypass Volume",
-                       LINE2R_2_LLOPM_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Left Line Mixer PGAR Bypass Volume",
                        PGAR_2_LLOPM_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Left Line Mixer DACR1 Playback Volume",
                        DACR1_2_LLOPM_VOL, 0, 118, 1, output_stage_tlv),
 
-        SOC_SINGLE_TLV("Right Line Mixer Line2L Bypass Volume",
-                       LINE2L_2_RLOPM_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Right Line Mixer PGAL Bypass Volume",
                        PGAL_2_RLOPM_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Right Line Mixer DACL1 Playback Volume",
                        DACL1_2_RLOPM_VOL, 0, 118, 1, output_stage_tlv),
 
-        SOC_SINGLE_TLV("Left HP Mixer Line2R Bypass Volume",
-                       LINE2R_2_HPLOUT_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Left HP Mixer PGAR Bypass Volume",
                        PGAR_2_HPLOUT_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Left HP Mixer DACR1 Playback Volume",
                        DACR1_2_HPLOUT_VOL, 0, 118, 1, output_stage_tlv),
 
-        SOC_SINGLE_TLV("Right HP Mixer Line2L Bypass Volume",
-                       LINE2L_2_HPROUT_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Right HP Mixer PGAL Bypass Volume",
                        PGAL_2_HPROUT_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Right HP Mixer DACL1 Playback Volume",
                        DACL1_2_HPROUT_VOL, 0, 118, 1, output_stage_tlv),
 
-        SOC_SINGLE_TLV("Left HPCOM Mixer Line2R Bypass Volume",
-                       LINE2R_2_HPLCOM_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Left HPCOM Mixer PGAR Bypass Volume",
                        PGAR_2_HPLCOM_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Left HPCOM Mixer DACR1 Playback Volume",
                        DACR1_2_HPLCOM_VOL, 0, 118, 1, output_stage_tlv),
 
-        SOC_SINGLE_TLV("Right HPCOM Mixer Line2L Bypass Volume",
-                       LINE2L_2_HPRCOM_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Right HPCOM Mixer PGAL Bypass Volume",
                        PGAL_2_HPRCOM_VOL, 0, 118, 1, output_stage_tlv),
         SOC_SINGLE_TLV("Right HPCOM Mixer DACL1 Playback Volume",
                        DACL1_2_HPRCOM_VOL, 0, 118, 1, output_stage_tlv),
 
         /* Stereo output controls for direct L-to-L and R-to-R routes */
-        SOC_DOUBLE_R_TLV("Line Line2 Bypass Volume",
-                         LINE2L_2_LLOPM_VOL, LINE2R_2_RLOPM_VOL,
-                         0, 118, 1, output_stage_tlv),
         SOC_DOUBLE_R_TLV("Line PGA Bypass Volume",
                          PGAL_2_LLOPM_VOL, PGAR_2_RLOPM_VOL,
                          0, 118, 1, output_stage_tlv),
@@ -369,9 +355,6 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
                          DACL1_2_LLOPM_VOL, DACR1_2_RLOPM_VOL,
                          0, 118, 1, output_stage_tlv),
 
-        SOC_DOUBLE_R_TLV("HP Line2 Bypass Volume",
-                         LINE2L_2_HPLOUT_VOL, LINE2R_2_HPROUT_VOL,
-                         0, 118, 1, output_stage_tlv),
         SOC_DOUBLE_R_TLV("HP PGA Bypass Volume",
                          PGAL_2_HPLOUT_VOL, PGAR_2_HPROUT_VOL,
                          0, 118, 1, output_stage_tlv),
@@ -379,9 +362,6 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
                          DACL1_2_HPLOUT_VOL, DACR1_2_HPROUT_VOL,
                          0, 118, 1, output_stage_tlv),
 
-        SOC_DOUBLE_R_TLV("HPCOM Line2 Bypass Volume",
-                         LINE2L_2_HPLCOM_VOL, LINE2R_2_HPRCOM_VOL,
-                         0, 118, 1, output_stage_tlv),
         SOC_DOUBLE_R_TLV("HPCOM PGA Bypass Volume",
                          PGAL_2_HPLCOM_VOL, PGAR_2_HPRCOM_VOL,
                          0, 118, 1, output_stage_tlv),
@@ -424,6 +404,45 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
         SOC_ENUM("Output Driver Ramp-up step", aic3x_rampup_step_enum),
 };
 
+/* For other than tlv320aic3104 */
+static const struct snd_kcontrol_new aic3x_extra_snd_controls[] = {
+        /*
+         * Output controls that map to output mixer switches. Note these are
+         * only for swapped L-to-R and R-to-L routes. See below stereo controls
+         * for direct L-to-L and R-to-R routes.
+         */
+        SOC_SINGLE_TLV("Left Line Mixer Line2R Bypass Volume",
+                       LINE2R_2_LLOPM_VOL, 0, 118, 1, output_stage_tlv),
+
+        SOC_SINGLE_TLV("Right Line Mixer Line2L Bypass Volume",
+                       LINE2L_2_RLOPM_VOL, 0, 118, 1, output_stage_tlv),
+
+        SOC_SINGLE_TLV("Left HP Mixer Line2R Bypass Volume",
+                       LINE2R_2_HPLOUT_VOL, 0, 118, 1, output_stage_tlv),
+
+        SOC_SINGLE_TLV("Right HP Mixer Line2L Bypass Volume",
+                       LINE2L_2_HPROUT_VOL, 0, 118, 1, output_stage_tlv),
+
+        SOC_SINGLE_TLV("Left HPCOM Mixer Line2R Bypass Volume",
+                       LINE2R_2_HPLCOM_VOL, 0, 118, 1, output_stage_tlv),
+
+        SOC_SINGLE_TLV("Right HPCOM Mixer Line2L Bypass Volume",
+                       LINE2L_2_HPRCOM_VOL, 0, 118, 1, output_stage_tlv),
+
+        /* Stereo output controls for direct L-to-L and R-to-R routes */
+        SOC_DOUBLE_R_TLV("Line Line2 Bypass Volume",
+                         LINE2L_2_LLOPM_VOL, LINE2R_2_RLOPM_VOL,
+                         0, 118, 1, output_stage_tlv),
+
+        SOC_DOUBLE_R_TLV("HP Line2 Bypass Volume",
+                         LINE2L_2_HPLOUT_VOL, LINE2R_2_HPROUT_VOL,
+                         0, 118, 1, output_stage_tlv),
+
+        SOC_DOUBLE_R_TLV("HPCOM Line2 Bypass Volume",
+                         LINE2L_2_HPLCOM_VOL, LINE2R_2_HPRCOM_VOL,
+                         0, 118, 1, output_stage_tlv),
+};
+
 static const struct snd_kcontrol_new aic3x_mono_controls[] = {
         SOC_DOUBLE_R_TLV("Mono Line2 Bypass Volume",
                          LINE2L_2_MONOLOPM_VOL, LINE2R_2_MONOLOPM_VOL,
@@ -464,22 +483,24 @@ SOC_DAPM_ENUM("Route", aic3x_right_hpcom_enum);
 
 /* Left Line Mixer */
 static const struct snd_kcontrol_new aic3x_left_line_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_LLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAL Bypass Switch", PGAL_2_LLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACL1 Switch", DACL1_2_LLOPM_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_LLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAR Bypass Switch", PGAR_2_LLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACR1 Switch", DACR1_2_LLOPM_VOL, 7, 1, 0),
+        /* Not on tlv320aic3104 */
+        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_LLOPM_VOL, 7, 1, 0),
 };
 
 /* Right Line Mixer */
 static const struct snd_kcontrol_new aic3x_right_line_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAL Bypass Switch", PGAL_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACL1 Switch", DACL1_2_RLOPM_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAR Bypass Switch", PGAR_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACR1 Switch", DACR1_2_RLOPM_VOL, 7, 1, 0),
+        /* Not on tlv320aic3104 */
+        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_RLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_RLOPM_VOL, 7, 1, 0),
 };
 
 /* Mono Mixer */
@@ -494,42 +515,46 @@ static const struct snd_kcontrol_new aic3x_mono_mixer_controls[] = {
 
 /* Left HP Mixer */
 static const struct snd_kcontrol_new aic3x_left_hp_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_HPLOUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAL Bypass Switch", PGAL_2_HPLOUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACL1 Switch", DACL1_2_HPLOUT_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_HPLOUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAR Bypass Switch", PGAR_2_HPLOUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACR1 Switch", DACR1_2_HPLOUT_VOL, 7, 1, 0),
+        /* Not on tlv320aic3104 */
+        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_HPLOUT_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_HPLOUT_VOL, 7, 1, 0),
 };
 
 /* Right HP Mixer */
 static const struct snd_kcontrol_new aic3x_right_hp_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_HPROUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAL Bypass Switch", PGAL_2_HPROUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACL1 Switch", DACL1_2_HPROUT_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_HPROUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAR Bypass Switch", PGAR_2_HPROUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACR1 Switch", DACR1_2_HPROUT_VOL, 7, 1, 0),
+        /* Not on tlv320aic3104 */
+        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_HPROUT_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_HPROUT_VOL, 7, 1, 0),
 };
 
 /* Left HPCOM Mixer */
 static const struct snd_kcontrol_new aic3x_left_hpcom_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_HPLCOM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAL Bypass Switch", PGAL_2_HPLCOM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACL1 Switch", DACL1_2_HPLCOM_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_HPLCOM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAR Bypass Switch", PGAR_2_HPLCOM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACR1 Switch", DACR1_2_HPLCOM_VOL, 7, 1, 0),
+        /* Not on tlv320aic3104 */
+        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_HPLCOM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_HPLCOM_VOL, 7, 1, 0),
 };
 
 /* Right HPCOM Mixer */
 static const struct snd_kcontrol_new aic3x_right_hpcom_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_HPRCOM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAL Bypass Switch", PGAL_2_HPRCOM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACL1 Switch", DACL1_2_HPRCOM_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_HPRCOM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("PGAR Bypass Switch", PGAR_2_HPRCOM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("DACR1 Switch", DACR1_2_HPRCOM_VOL, 7, 1, 0),
+        /* Not on tlv320aic3104 */
+        SOC_DAPM_SINGLE("Line2L Bypass Switch", LINE2L_2_HPRCOM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("Line2R Bypass Switch", LINE2R_2_HPRCOM_VOL, 7, 1, 0),
 };
 
 /* Left PGA Mixer */
@@ -550,6 +575,22 @@ static const struct snd_kcontrol_new aic3x_right_pga_mixer_controls[] = {
         SOC_DAPM_SINGLE_AIC3X("Mic3R Switch", MIC3LR_2_RADC_CTRL, 0, 1, 1),
 };
 
+/* Left PGA Mixer for tlv320aic3104 */
+static const struct snd_kcontrol_new aic3104_left_pga_mixer_controls[] = {
+        SOC_DAPM_SINGLE_AIC3X("Line1L Switch", LINE1L_2_LADC_CTRL, 3, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Line1R Switch", LINE1R_2_LADC_CTRL, 3, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Mic2L Switch", MIC3LR_2_LADC_CTRL, 4, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Mic2R Switch", MIC3LR_2_LADC_CTRL, 0, 1, 1),
+};
+
+/* Right PGA Mixer for tlv320aic3104 */
+static const struct snd_kcontrol_new aic3104_right_pga_mixer_controls[] = {
+        SOC_DAPM_SINGLE_AIC3X("Line1R Switch", LINE1R_2_RADC_CTRL, 3, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Line1L Switch", LINE1L_2_RADC_CTRL, 3, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Mic2L Switch", MIC3LR_2_RADC_CTRL, 4, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Mic2R Switch", MIC3LR_2_RADC_CTRL, 0, 1, 1),
+};
+
 /* Left Line1 Mux */
 static const struct snd_kcontrol_new aic3x_left_line1l_mux_controls =
 SOC_DAPM_ENUM("Route", aic3x_line1l_2_l_enum);
@@ -593,26 +634,56 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
 
         /* Inputs to Left ADC */
         SND_SOC_DAPM_ADC("Left ADC", "Left Capture", LINE1L_2_LADC_CTRL, 2, 0),
-        SND_SOC_DAPM_MIXER("Left PGA Mixer", SND_SOC_NOPM, 0, 0,
-                           &aic3x_left_pga_mixer_controls[0],
-                           ARRAY_SIZE(aic3x_left_pga_mixer_controls)),
         SND_SOC_DAPM_MUX("Left Line1L Mux", SND_SOC_NOPM, 0, 0,
                          &aic3x_left_line1l_mux_controls),
         SND_SOC_DAPM_MUX("Left Line1R Mux", SND_SOC_NOPM, 0, 0,
                          &aic3x_left_line1r_mux_controls),
-        SND_SOC_DAPM_MUX("Left Line2L Mux", SND_SOC_NOPM, 0, 0,
-                         &aic3x_left_line2_mux_controls),
 
         /* Inputs to Right ADC */
         SND_SOC_DAPM_ADC("Right ADC", "Right Capture",
                          LINE1R_2_RADC_CTRL, 2, 0),
-        SND_SOC_DAPM_MIXER("Right PGA Mixer", SND_SOC_NOPM, 0, 0,
-                           &aic3x_right_pga_mixer_controls[0],
-                           ARRAY_SIZE(aic3x_right_pga_mixer_controls)),
         SND_SOC_DAPM_MUX("Right Line1L Mux", SND_SOC_NOPM, 0, 0,
                          &aic3x_right_line1l_mux_controls),
         SND_SOC_DAPM_MUX("Right Line1R Mux", SND_SOC_NOPM, 0, 0,
                          &aic3x_right_line1r_mux_controls),
+
+        /* Mic Bias */
+        SND_SOC_DAPM_SUPPLY("Mic Bias", MICBIAS_CTRL, 6, 0,
+                         mic_bias_event,
+                         SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+
+        SND_SOC_DAPM_OUTPUT("LLOUT"),
+        SND_SOC_DAPM_OUTPUT("RLOUT"),
+        SND_SOC_DAPM_OUTPUT("HPLOUT"),
+        SND_SOC_DAPM_OUTPUT("HPROUT"),
+        SND_SOC_DAPM_OUTPUT("HPLCOM"),
+        SND_SOC_DAPM_OUTPUT("HPRCOM"),
+
+        SND_SOC_DAPM_INPUT("LINE1L"),
+        SND_SOC_DAPM_INPUT("LINE1R"),
+
+        /*
+         * Virtual output pin to detection block inside codec. This can be
+         * used to keep codec bias on if gpio or detection features are needed.
+         * Force pin on or construct a path with an input jack and mic bias
+         * widgets.
+         */
+        SND_SOC_DAPM_OUTPUT("Detection"),
+};
+
+/* For other than tlv320aic3104 */
+static const struct snd_soc_dapm_widget aic3x_extra_dapm_widgets[] = {
+        /* Inputs to Left ADC */
+        SND_SOC_DAPM_MIXER("Left PGA Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3x_left_pga_mixer_controls[0],
+                           ARRAY_SIZE(aic3x_left_pga_mixer_controls)),
+        SND_SOC_DAPM_MUX("Left Line2L Mux", SND_SOC_NOPM, 0, 0,
+                         &aic3x_left_line2_mux_controls),
+
+        /* Inputs to Right ADC */
+        SND_SOC_DAPM_MIXER("Right PGA Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3x_right_pga_mixer_controls[0],
+                           ARRAY_SIZE(aic3x_right_pga_mixer_controls)),
         SND_SOC_DAPM_MUX("Right Line2R Mux", SND_SOC_NOPM, 0, 0,
                          &aic3x_right_line2_mux_controls),
 
@@ -637,11 +708,6 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
         SND_SOC_DAPM_REG(snd_soc_dapm_micbias, "DMic Rate 32",
                          AIC3X_ASD_INTF_CTRLA, 0, 3, 3, 0),
 
-        /* Mic Bias */
-        SND_SOC_DAPM_SUPPLY("Mic Bias", MICBIAS_CTRL, 6, 0,
-                         mic_bias_event,
-                         SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
-
         /* Output mixers */
         SND_SOC_DAPM_MIXER("Left Line Mixer", SND_SOC_NOPM, 0, 0,
                            &aic3x_left_line_mixer_controls[0],
@@ -662,27 +728,46 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
                            &aic3x_right_hpcom_mixer_controls[0],
                            ARRAY_SIZE(aic3x_right_hpcom_mixer_controls)),
 
-        SND_SOC_DAPM_OUTPUT("LLOUT"),
-        SND_SOC_DAPM_OUTPUT("RLOUT"),
-        SND_SOC_DAPM_OUTPUT("HPLOUT"),
-        SND_SOC_DAPM_OUTPUT("HPROUT"),
-        SND_SOC_DAPM_OUTPUT("HPLCOM"),
-        SND_SOC_DAPM_OUTPUT("HPRCOM"),
-
         SND_SOC_DAPM_INPUT("MIC3L"),
         SND_SOC_DAPM_INPUT("MIC3R"),
-        SND_SOC_DAPM_INPUT("LINE1L"),
-        SND_SOC_DAPM_INPUT("LINE1R"),
         SND_SOC_DAPM_INPUT("LINE2L"),
         SND_SOC_DAPM_INPUT("LINE2R"),
+};
 
-        /*
-         * Virtual output pin to detection block inside codec. This can be
-         * used to keep codec bias on if gpio or detection features are needed.
-         * Force pin on or construct a path with an input jack and mic bias
-         * widgets.
-         */
-        SND_SOC_DAPM_OUTPUT("Detection"),
+/* For tlv320aic3104 */
+static const struct snd_soc_dapm_widget aic3104_extra_dapm_widgets[] = {
+        /* Inputs to Left ADC */
+        SND_SOC_DAPM_MIXER("Left PGA Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3104_left_pga_mixer_controls[0],
+                           ARRAY_SIZE(aic3104_left_pga_mixer_controls)),
+
+        /* Inputs to Right ADC */
+        SND_SOC_DAPM_MIXER("Right PGA Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3104_right_pga_mixer_controls[0],
+                           ARRAY_SIZE(aic3104_right_pga_mixer_controls)),
+
+        /* Output mixers */
+        SND_SOC_DAPM_MIXER("Left Line Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3x_left_line_mixer_controls[0],
+                           ARRAY_SIZE(aic3x_left_line_mixer_controls) - 2),
+        SND_SOC_DAPM_MIXER("Right Line Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3x_right_line_mixer_controls[0],
+                           ARRAY_SIZE(aic3x_right_line_mixer_controls) - 2),
+        SND_SOC_DAPM_MIXER("Left HP Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3x_left_hp_mixer_controls[0],
+                           ARRAY_SIZE(aic3x_left_hp_mixer_controls) - 2),
+        SND_SOC_DAPM_MIXER("Right HP Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3x_right_hp_mixer_controls[0],
+                           ARRAY_SIZE(aic3x_right_hp_mixer_controls) - 2),
+        SND_SOC_DAPM_MIXER("Left HPCOM Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3x_left_hpcom_mixer_controls[0],
+                           ARRAY_SIZE(aic3x_left_hpcom_mixer_controls) - 2),
+        SND_SOC_DAPM_MIXER("Right HPCOM Mixer", SND_SOC_NOPM, 0, 0,
+                           &aic3x_right_hpcom_mixer_controls[0],
+                           ARRAY_SIZE(aic3x_right_hpcom_mixer_controls) - 2),
+
+        SND_SOC_DAPM_INPUT("MIC2L"),
+        SND_SOC_DAPM_INPUT("MIC2R"),
 };
 
 static const struct snd_soc_dapm_widget aic3x_dapm_mono_widgets[] = {
@@ -712,17 +797,10 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Left Line1R Mux", "single-ended", "LINE1R"},
         {"Left Line1R Mux", "differential", "LINE1R"},
 
-        {"Left Line2L Mux", "single-ended", "LINE2L"},
-        {"Left Line2L Mux", "differential", "LINE2L"},
-
         {"Left PGA Mixer", "Line1L Switch", "Left Line1L Mux"},
         {"Left PGA Mixer", "Line1R Switch", "Left Line1R Mux"},
-        {"Left PGA Mixer", "Line2L Switch", "Left Line2L Mux"},
-        {"Left PGA Mixer", "Mic3L Switch", "MIC3L"},
-        {"Left PGA Mixer", "Mic3R Switch", "MIC3R"},
 
         {"Left ADC", NULL, "Left PGA Mixer"},
-        {"Left ADC", NULL, "GPIO1 dmic modclk"},
 
         /* Right Input */
         {"Right Line1R Mux", "single-ended", "LINE1R"},
@@ -730,25 +808,10 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Right Line1L Mux", "single-ended", "LINE1L"},
         {"Right Line1L Mux", "differential", "LINE1L"},
 
-        {"Right Line2R Mux", "single-ended", "LINE2R"},
-        {"Right Line2R Mux", "differential", "LINE2R"},
-
         {"Right PGA Mixer", "Line1L Switch", "Right Line1L Mux"},
         {"Right PGA Mixer", "Line1R Switch", "Right Line1R Mux"},
-        {"Right PGA Mixer", "Line2R Switch", "Right Line2R Mux"},
-        {"Right PGA Mixer", "Mic3L Switch", "MIC3L"},
-        {"Right PGA Mixer", "Mic3R Switch", "MIC3R"},
 
         {"Right ADC", NULL, "Right PGA Mixer"},
-        {"Right ADC", NULL, "GPIO1 dmic modclk"},
-
-        /*
-         * Logical path between digital mic enable and GPIO1 modulator clock
-         * output function
-         */
-        {"GPIO1 dmic modclk", NULL, "DMic Rate 128"},
-        {"GPIO1 dmic modclk", NULL, "DMic Rate 64"},
-        {"GPIO1 dmic modclk", NULL, "DMic Rate 32"},
 
         /* Left DAC Output */
         {"Left DAC Mux", "DAC_L1", "Left DAC"},
@@ -761,10 +824,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Right DAC Mux", "DAC_R3", "Right DAC"},
 
         /* Left Line Output */
-        {"Left Line Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
         {"Left Line Mixer", "PGAL Bypass Switch", "Left PGA Mixer"},
         {"Left Line Mixer", "DACL1 Switch", "Left DAC Mux"},
-        {"Left Line Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
         {"Left Line Mixer", "PGAR Bypass Switch", "Right PGA Mixer"},
         {"Left Line Mixer", "DACR1 Switch", "Right DAC Mux"},
 
@@ -773,10 +834,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"LLOUT", NULL, "Left Line Out"},
 
         /* Right Line Output */
-        {"Right Line Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
         {"Right Line Mixer", "PGAL Bypass Switch", "Left PGA Mixer"},
         {"Right Line Mixer", "DACL1 Switch", "Left DAC Mux"},
-        {"Right Line Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
         {"Right Line Mixer", "PGAR Bypass Switch", "Right PGA Mixer"},
         {"Right Line Mixer", "DACR1 Switch", "Right DAC Mux"},
 
@@ -785,10 +844,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"RLOUT", NULL, "Right Line Out"},
 
         /* Left HP Output */
-        {"Left HP Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
         {"Left HP Mixer", "PGAL Bypass Switch", "Left PGA Mixer"},
         {"Left HP Mixer", "DACL1 Switch", "Left DAC Mux"},
-        {"Left HP Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
         {"Left HP Mixer", "PGAR Bypass Switch", "Right PGA Mixer"},
         {"Left HP Mixer", "DACR1 Switch", "Right DAC Mux"},
 
@@ -797,10 +854,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"HPLOUT", NULL, "Left HP Out"},
 
         /* Right HP Output */
-        {"Right HP Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
         {"Right HP Mixer", "PGAL Bypass Switch", "Left PGA Mixer"},
         {"Right HP Mixer", "DACL1 Switch", "Left DAC Mux"},
-        {"Right HP Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
         {"Right HP Mixer", "PGAR Bypass Switch", "Right PGA Mixer"},
         {"Right HP Mixer", "DACR1 Switch", "Right DAC Mux"},
 
@@ -809,10 +864,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"HPROUT", NULL, "Right HP Out"},
 
         /* Left HPCOM Output */
-        {"Left HPCOM Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
         {"Left HPCOM Mixer", "PGAL Bypass Switch", "Left PGA Mixer"},
         {"Left HPCOM Mixer", "DACL1 Switch", "Left DAC Mux"},
-        {"Left HPCOM Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
         {"Left HPCOM Mixer", "PGAR Bypass Switch", "Right PGA Mixer"},
         {"Left HPCOM Mixer", "DACR1 Switch", "Right DAC Mux"},
 
@@ -823,10 +876,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"HPLCOM", NULL, "Left HP Com"},
 
         /* Right HPCOM Output */
-        {"Right HPCOM Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
         {"Right HPCOM Mixer", "PGAL Bypass Switch", "Left PGA Mixer"},
         {"Right HPCOM Mixer", "DACL1 Switch", "Left DAC Mux"},
-        {"Right HPCOM Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
         {"Right HPCOM Mixer", "PGAR Bypass Switch", "Right PGA Mixer"},
         {"Right HPCOM Mixer", "DACR1 Switch", "Right DAC Mux"},
 
@@ -839,6 +890,72 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"HPRCOM", NULL, "Right HP Com"},
 };
 
+/* For other than tlv320aic3104 */
+static const struct snd_soc_dapm_route intercon_extra[] = {
+        /* Left Input */
+        {"Left Line2L Mux", "single-ended", "LINE2L"},
+        {"Left Line2L Mux", "differential", "LINE2L"},
+
+        {"Left PGA Mixer", "Line2L Switch", "Left Line2L Mux"},
+        {"Left PGA Mixer", "Mic3L Switch", "MIC3L"},
+        {"Left PGA Mixer", "Mic3R Switch", "MIC3R"},
+
+        {"Left ADC", NULL, "GPIO1 dmic modclk"},
+
+        /* Right Input */
+        {"Right Line2R Mux", "single-ended", "LINE2R"},
+        {"Right Line2R Mux", "differential", "LINE2R"},
+
+        {"Right PGA Mixer", "Line2R Switch", "Right Line2R Mux"},
+        {"Right PGA Mixer", "Mic3L Switch", "MIC3L"},
+        {"Right PGA Mixer", "Mic3R Switch", "MIC3R"},
+
+        {"Right ADC", NULL, "GPIO1 dmic modclk"},
+
+        /*
+         * Logical path between digital mic enable and GPIO1 modulator clock
+         * output function
+         */
+        {"GPIO1 dmic modclk", NULL, "DMic Rate 128"},
+        {"GPIO1 dmic modclk", NULL, "DMic Rate 64"},
+        {"GPIO1 dmic modclk", NULL, "DMic Rate 32"},
+
+        /* Left Line Output */
+        {"Left Line Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
+        {"Left Line Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
+
+        /* Right Line Output */
+        {"Right Line Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
+        {"Right Line Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
+
+        /* Left HP Output */
+        {"Left HP Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
+        {"Left HP Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
+
+        /* Right HP Output */
+        {"Right HP Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
+        {"Right HP Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
+
+        /* Left HPCOM Output */
+        {"Left HPCOM Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
+        {"Left HPCOM Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
+
+        /* Right HPCOM Output */
+        {"Right HPCOM Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
+        {"Right HPCOM Mixer", "Line2R Bypass Switch", "Right Line2R Mux"},
+};
+
+/* For tlv320aic3104 */
+static const struct snd_soc_dapm_route intercon_extra_3104[] = {
+        /* Left Input */
+        {"Left PGA Mixer", "Mic2L Switch", "MIC2L"},
+        {"Left PGA Mixer", "Mic2R Switch", "MIC2R"},
+
+        /* Right Input */
+        {"Right PGA Mixer", "Mic2L Switch", "MIC2L"},
+        {"Right PGA Mixer", "Mic2R Switch", "MIC2R"},
+};
+
 static const struct snd_soc_dapm_route intercon_mono[] = {
         /* Mono Output */
         {"Mono Mixer", "Line2L Bypass Switch", "Left Line2L Mux"},
@@ -867,17 +984,31 @@ static int aic3x_add_widgets(struct snd_soc_codec *codec)
         switch (aic3x->model) {
         case AIC3X_MODEL_3X:
         case AIC3X_MODEL_33:
+                snd_soc_dapm_new_controls(dapm, aic3x_extra_dapm_widgets,
+                                          ARRAY_SIZE(aic3x_extra_dapm_widgets));
+                snd_soc_dapm_add_routes(dapm, intercon_extra,
+                                        ARRAY_SIZE(intercon_extra));
                 snd_soc_dapm_new_controls(dapm, aic3x_dapm_mono_widgets,
                         ARRAY_SIZE(aic3x_dapm_mono_widgets));
                 snd_soc_dapm_add_routes(dapm, intercon_mono,
                                         ARRAY_SIZE(intercon_mono));
                 break;
         case AIC3X_MODEL_3007:
+                snd_soc_dapm_new_controls(dapm, aic3x_extra_dapm_widgets,
+                                          ARRAY_SIZE(aic3x_extra_dapm_widgets));
+                snd_soc_dapm_add_routes(dapm, intercon_extra,
+                                        ARRAY_SIZE(intercon_extra));
                 snd_soc_dapm_new_controls(dapm, aic3007_dapm_widgets,
                         ARRAY_SIZE(aic3007_dapm_widgets));
                 snd_soc_dapm_add_routes(dapm, intercon_3007,
                                         ARRAY_SIZE(intercon_3007));
                 break;
+        case AIC3X_MODEL_3104:
+                snd_soc_dapm_new_controls(dapm, aic3104_extra_dapm_widgets,
+                                ARRAY_SIZE(aic3104_extra_dapm_widgets));
+                snd_soc_dapm_add_routes(dapm, intercon_extra_3104,
+                                ARRAY_SIZE(intercon_extra_3104));
+                break;
         }
 
         return 0;
@@ -1046,7 +1177,7 @@ static int aic3x_prepare(struct snd_pcm_substream *substream,
                 delay += aic3x->tdm_delay;
 
         /* Configure data delay */
-        snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, aic3x->tdm_delay);
+        snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, delay);
 
         return 0;
 }
@@ -1438,23 +1569,33 @@ static int aic3x_probe(struct snd_soc_codec *codec)
         aic3x_init(codec);
 
         if (aic3x->setup) {
-                /* setup GPIO functions */
-                snd_soc_write(codec, AIC3X_GPIO1_REG,
-                              (aic3x->setup->gpio_func[0] & 0xf) << 4);
-                snd_soc_write(codec, AIC3X_GPIO2_REG,
-                              (aic3x->setup->gpio_func[1] & 0xf) << 4);
+                if (aic3x->model != AIC3X_MODEL_3104) {
+                        /* setup GPIO functions */
+                        snd_soc_write(codec, AIC3X_GPIO1_REG,
+                                      (aic3x->setup->gpio_func[0] & 0xf) << 4);
+                        snd_soc_write(codec, AIC3X_GPIO2_REG,
+                                      (aic3x->setup->gpio_func[1] & 0xf) << 4);
+                } else {
+                        dev_warn(codec->dev, "GPIO functionality is not supported on tlv320aic3104\n");
+                }
         }
 
         switch (aic3x->model) {
         case AIC3X_MODEL_3X:
         case AIC3X_MODEL_33:
+                snd_soc_add_codec_controls(codec, aic3x_extra_snd_controls,
+                                ARRAY_SIZE(aic3x_extra_snd_controls));
                 snd_soc_add_codec_controls(codec, aic3x_mono_controls,
                                 ARRAY_SIZE(aic3x_mono_controls));
                 break;
         case AIC3X_MODEL_3007:
+                snd_soc_add_codec_controls(codec, aic3x_extra_snd_controls,
+                                ARRAY_SIZE(aic3x_extra_snd_controls));
                 snd_soc_add_codec_controls(codec,
                                 &aic3x_classd_amp_gain_ctrl, 1);
                 break;
+        case AIC3X_MODEL_3104:
+                break;
         }
 
         /* set mic bias voltage */
@@ -1522,6 +1663,7 @@ static const struct i2c_device_id aic3x_i2c_id[] = {
         { "tlv320aic33", AIC3X_MODEL_33 },
         { "tlv320aic3007", AIC3X_MODEL_3007 },
         { "tlv320aic3106", AIC3X_MODEL_3X },
+        { "tlv320aic3104", AIC3X_MODEL_3104 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);
@@ -1673,6 +1815,7 @@ static const struct of_device_id tlv320aic3x_of_match[] = {
         { .compatible = "ti,tlv320aic33" },
         { .compatible = "ti,tlv320aic3007" },
         { .compatible = "ti,tlv320aic3106" },
+        { .compatible = "ti,tlv320aic3104" },
         {},
 };
 MODULE_DEVICE_TABLE(of, tlv320aic3x_of_match);
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 0fe2ced5b09f..4e3e607dec13 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -423,17 +423,18 @@ exit:
 static int dac33_playback_event(struct snd_soc_dapm_widget *w,
                 struct snd_kcontrol *kcontrol, int event)
 {
-        struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
                 if (likely(dac33->substream)) {
-                        dac33_calculate_times(dac33->substream, w->codec);
-                        dac33_prepare_chip(dac33->substream, w->codec);
+                        dac33_calculate_times(dac33->substream, codec);
+                        dac33_prepare_chip(dac33->substream, codec);
                 }
                 break;
         case SND_SOC_DAPM_POST_PMD:
-                dac33_disable_digital(w->codec);
+                dac33_disable_digital(codec);
                 break;
         }
         return 0;
diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c
index 9f2dced046de..9fd80ac1897f 100644
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@ -20,6 +20,8 @@
 #include <sound/jack.h>
 #include <sound/soc.h>
 
+#include "ts3a227e.h"
+
 struct ts3a227e {
         struct regmap *regmap;
         struct snd_soc_jack *jack;
@@ -79,6 +81,10 @@ static const int ts3a227e_buttons[] = {
 /* TS3A227E_REG_SETTING_2 0x05 */
 #define KP_ENABLE 0x04
 
+/* TS3A227E_REG_SETTING_3 0x06 */
+#define MICBIAS_SETTING_SFT (3)
+#define MICBIAS_SETTING_MASK (0x7 << MICBIAS_SETTING_SFT)
+
 /* TS3A227E_REG_ACCESSORY_STATUS  0x0b */
 #define TYPE_3_POLE 0x01
 #define TYPE_4_POLE_OMTP 0x02
@@ -221,9 +227,9 @@ int ts3a227e_enable_jack_detect(struct snd_soc_component *component,
         struct ts3a227e *ts3a227e = snd_soc_component_get_drvdata(component);
 
         snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA);
-        snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);
-        snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
-        snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
+        snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
+        snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
+        snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
 
         ts3a227e->jack = jack;
         ts3a227e_jack_report(ts3a227e);
@@ -248,6 +254,21 @@ static const struct regmap_config ts3a227e_regmap_config = {
         .num_reg_defaults = ARRAY_SIZE(ts3a227e_reg_defaults),
 };
 
+static int ts3a227e_parse_dt(struct ts3a227e *ts3a227e, struct device_node *np)
+{
+        u32 micbias;
+        int err;
+
+        err = of_property_read_u32(np, "ti,micbias", &micbias);
+        if (!err) {
+                regmap_update_bits(ts3a227e->regmap, TS3A227E_REG_SETTING_3,
+                        MICBIAS_SETTING_MASK,
+                        (micbias & 0x07) << MICBIAS_SETTING_SFT);
+        }
+
+        return 0;
+}
+
 static int ts3a227e_i2c_probe(struct i2c_client *i2c,
                               const struct i2c_device_id *id)
 {
@@ -266,6 +287,14 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,
         if (IS_ERR(ts3a227e->regmap))
                 return PTR_ERR(ts3a227e->regmap);
 
+        if (dev->of_node) {
+                ret = ts3a227e_parse_dt(ts3a227e, dev->of_node);
+                if (ret) {
+                        dev_err(dev, "Failed to parse device tree: %d\n", ret);
+                        return ret;
+                }
+        }
+
         ret = devm_request_threaded_irq(dev, i2c->irq, NULL, ts3a227e_interrupt,
                                         IRQF_TRIGGER_LOW | IRQF_ONESHOT,
                                         "TS3A227E", ts3a227e);
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 44af3188afb9..d04693e9cf9f 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -567,12 +567,13 @@ static const struct snd_kcontrol_new twl4030_dapm_dbypassv_control =
 static int pin_name##pga_event(struct snd_soc_dapm_widget *w,           \
                                struct snd_kcontrol *kcontrol, int event) \
 {                                                                       \
-        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec); \
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);   \
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); \
                                                                         \
         switch (event) {                                                \
         case SND_SOC_DAPM_POST_PMU:                                     \
                 twl4030->pin_name##_enabled = 1;                        \
-                twl4030_write(w->codec, reg, twl4030_read(w->codec, reg)); \
+                twl4030_write(codec, reg, twl4030_read(codec, reg));    \
                 break;                                                  \
         case SND_SOC_DAPM_POST_PMD:                                     \
                 twl4030->pin_name##_enabled = 0;                        \
@@ -621,12 +622,14 @@ static void handsfree_ramp(struct snd_soc_codec *codec, int reg, int ramp)
 static int handsfreelpga_event(struct snd_soc_dapm_widget *w,
                                struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
-                handsfree_ramp(w->codec, TWL4030_REG_HFL_CTL, 1);
+                handsfree_ramp(codec, TWL4030_REG_HFL_CTL, 1);
                 break;
         case SND_SOC_DAPM_POST_PMD:
-                handsfree_ramp(w->codec, TWL4030_REG_HFL_CTL, 0);
+                handsfree_ramp(codec, TWL4030_REG_HFL_CTL, 0);
                 break;
         }
         return 0;
@@ -635,12 +638,14 @@ static int handsfreelpga_event(struct snd_soc_dapm_widget *w,
 static int handsfreerpga_event(struct snd_soc_dapm_widget *w,
                                struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
-                handsfree_ramp(w->codec, TWL4030_REG_HFR_CTL, 1);
+                handsfree_ramp(codec, TWL4030_REG_HFR_CTL, 1);
                 break;
         case SND_SOC_DAPM_POST_PMD:
-                handsfree_ramp(w->codec, TWL4030_REG_HFR_CTL, 0);
+                handsfree_ramp(codec, TWL4030_REG_HFR_CTL, 0);
                 break;
         }
         return 0;
@@ -649,19 +654,23 @@ static int handsfreerpga_event(struct snd_soc_dapm_widget *w,
 static int vibramux_event(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *kcontrol, int event)
 {
-        twl4030_write(w->codec, TWL4030_REG_VIBRA_SET, 0xff);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        twl4030_write(codec, TWL4030_REG_VIBRA_SET, 0xff);
         return 0;
 }
 
 static int apll_event(struct snd_soc_dapm_widget *w,
                       struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
-                twl4030_apll_enable(w->codec, 1);
+                twl4030_apll_enable(codec, 1);
                 break;
         case SND_SOC_DAPM_POST_PMD:
-                twl4030_apll_enable(w->codec, 0);
+                twl4030_apll_enable(codec, 0);
                 break;
         }
         return 0;
@@ -670,23 +679,24 @@ static int apll_event(struct snd_soc_dapm_widget *w,
 static int aif_event(struct snd_soc_dapm_widget *w,
                      struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u8 audio_if;
 
-        audio_if = twl4030_read(w->codec, TWL4030_REG_AUDIO_IF);
+        audio_if = twl4030_read(codec, TWL4030_REG_AUDIO_IF);
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
                 /* Enable AIF */
                 /* enable the PLL before we use it to clock the DAI */
-                twl4030_apll_enable(w->codec, 1);
+                twl4030_apll_enable(codec, 1);
 
-                twl4030_write(w->codec, TWL4030_REG_AUDIO_IF,
+                twl4030_write(codec, TWL4030_REG_AUDIO_IF,
                               audio_if | TWL4030_AIF_EN);
                 break;
         case SND_SOC_DAPM_POST_PMD:
                 /* disable the DAI before we stop it's source PLL */
-                twl4030_write(w->codec, TWL4030_REG_AUDIO_IF,
+                twl4030_write(codec, TWL4030_REG_AUDIO_IF,
                               audio_if &  ~TWL4030_AIF_EN);
-                twl4030_apll_enable(w->codec, 0);
+                twl4030_apll_enable(codec, 0);
                 break;
         }
         return 0;
@@ -758,20 +768,21 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
 static int headsetlpga_event(struct snd_soc_dapm_widget *w,
                              struct snd_kcontrol *kcontrol, int event)
 {
-        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
                 /* Do the ramp-up only once */
                 if (!twl4030->hsr_enabled)
-                        headset_ramp(w->codec, 1);
+                        headset_ramp(codec, 1);
 
                 twl4030->hsl_enabled = 1;
                 break;
         case SND_SOC_DAPM_POST_PMD:
                 /* Do the ramp-down only if both headsetL/R is disabled */
                 if (!twl4030->hsr_enabled)
-                        headset_ramp(w->codec, 0);
+                        headset_ramp(codec, 0);
 
                 twl4030->hsl_enabled = 0;
                 break;
@@ -782,20 +793,21 @@ static int headsetlpga_event(struct snd_soc_dapm_widget *w,
 static int headsetrpga_event(struct snd_soc_dapm_widget *w,
                              struct snd_kcontrol *kcontrol, int event)
 {
-        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
                 /* Do the ramp-up only once */
                 if (!twl4030->hsl_enabled)
-                        headset_ramp(w->codec, 1);
+                        headset_ramp(codec, 1);
 
                 twl4030->hsr_enabled = 1;
                 break;
         case SND_SOC_DAPM_POST_PMD:
                 /* Do the ramp-down only if both headsetL/R is disabled */
                 if (!twl4030->hsl_enabled)
-                        headset_ramp(w->codec, 0);
+                        headset_ramp(codec, 0);
 
                 twl4030->hsr_enabled = 0;
                 break;
@@ -806,7 +818,8 @@ static int headsetrpga_event(struct snd_soc_dapm_widget *w,
 static int digimic_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         struct twl4030_codec_data *pdata = twl4030->pdata;
 
         if (pdata && pdata->digimic_delay)
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 90f47f988b3f..aeec27b6f1af 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -234,7 +234,7 @@ static int headset_power_mode(struct snd_soc_codec *codec, int high_perf)
 static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w,
                         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u8 hslctl, hsrctl;
 
         /*
@@ -261,7 +261,7 @@ static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w,
 static int twl6040_ep_drv_event(struct snd_soc_dapm_widget *w,
                         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
         int ret = 0;
 
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index 34ef65c52a7d..8d9de49a5052 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -683,7 +683,7 @@ static const struct snd_kcontrol_new wm2000_controls[] = {
 static int wm2000_anc_power_event(struct snd_soc_dapm_widget *w,
                                   struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
         int ret;
 
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index b80970dc2d2f..ea09db585aa1 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -775,7 +775,8 @@ static int wm5100_out_ev(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol,
                          int event)
 {
-        struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
 
         switch (w->reg) {
         case WM5100_CHANNEL_ENABLES_1:
@@ -839,7 +840,7 @@ static int wm5100_post_ev(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *kcontrol,
                           int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index f439ae052128..6d0fe0ac95a3 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -28,6 +28,7 @@
 
 #include <linux/mfd/arizona/core.h>
 #include <linux/mfd/arizona/registers.h>
+#include <asm/unaligned.h>
 
 #include "arizona.h"
 #include "wm5102.h"
@@ -580,7 +581,7 @@ static const struct reg_default wm5102_sysclk_revb_patch[] = {
 static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
         struct regmap *regmap = arizona->regmap;
         const struct reg_default *patch = NULL;
@@ -617,11 +618,10 @@ static int wm5102_out_comp_coeff_get(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
-        uint16_t data;
 
         mutex_lock(&arizona->dac_comp_lock);
-        data = cpu_to_be16(arizona->dac_comp_coeff);
-        memcpy(ucontrol->value.bytes.data, &data, sizeof(data));
+        put_unaligned_be16(arizona->dac_comp_coeff,
+                           ucontrol->value.bytes.data);
         mutex_unlock(&arizona->dac_comp_lock);
 
         return 0;
@@ -1272,19 +1272,24 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
 
 SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
                    ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_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("OUT1R", SND_SOC_NOPM,
                    ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_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("OUT2L", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_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("OUT2R", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT2R_ENA_SHIFT, 0, NULL, 0, arizona_out_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("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_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | 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),
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 4456b38a3ef5..fbaeddb3e903 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -134,7 +134,7 @@ static const struct reg_default wm5110_sysclk_revd_patch[] = {
 static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
         struct regmap *regmap = arizona->regmap;
         const struct reg_default *patch = NULL;
@@ -905,22 +905,28 @@ SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,
 
 SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
                    ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_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("OUT1R", SND_SOC_NOPM,
                    ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_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("OUT2L", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_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("OUT2R", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT2R_ENA_SHIFT, 0, NULL, 0, arizona_out_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("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_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
 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_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | 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),
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 574579b98872..c81a9eab3e3e 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -259,7 +259,7 @@ static void wm8350_pga_work(struct work_struct *work)
 static int pga_event(struct snd_soc_dapm_widget *w,
                      struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8350_data *wm8350_data = snd_soc_codec_get_drvdata(codec);
         struct wm8350_output *out;
 
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 8ee446987aa9..b0d84e552fca 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -324,6 +324,7 @@ SOC_SINGLE("RIN34 Mute Switch", WM8400_RIGHT_LINE_INPUT_3_4_VOLUME,
 static int outmixer_event (struct snd_soc_dapm_widget *w,
         struct snd_kcontrol * kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         u32 reg_shift = mc->shift;
@@ -332,7 +333,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w,
 
         switch (reg_shift) {
         case WM8400_SPEAKER_MIXER | (WM8400_LDSPK << 8) :
-                reg = snd_soc_read(w->codec, WM8400_OUTPUT_MIXER1);
+                reg = snd_soc_read(codec, WM8400_OUTPUT_MIXER1);
                 if (reg & WM8400_LDLO) {
                         printk(KERN_WARNING
                         "Cannot set as Output Mixer 1 LDLO Set\n");
@@ -340,7 +341,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w,
                 }
                 break;
         case WM8400_SPEAKER_MIXER | (WM8400_RDSPK << 8):
-                reg = snd_soc_read(w->codec, WM8400_OUTPUT_MIXER2);
+                reg = snd_soc_read(codec, WM8400_OUTPUT_MIXER2);
                 if (reg & WM8400_RDRO) {
                         printk(KERN_WARNING
                         "Cannot set as Output Mixer 2 RDRO Set\n");
@@ -348,7 +349,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w,
                 }
                 break;
         case WM8400_OUTPUT_MIXER1 | (WM8400_LDLO << 8):
-                reg = snd_soc_read(w->codec, WM8400_SPEAKER_MIXER);
+                reg = snd_soc_read(codec, WM8400_SPEAKER_MIXER);
                 if (reg & WM8400_LDSPK) {
                         printk(KERN_WARNING
                         "Cannot set as Speaker Mixer LDSPK Set\n");
@@ -356,7 +357,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w,
                 }
                 break;
         case WM8400_OUTPUT_MIXER2 | (WM8400_RDRO << 8):
-                reg = snd_soc_read(w->codec, WM8400_SPEAKER_MIXER);
+                reg = snd_soc_read(codec, WM8400_SPEAKER_MIXER);
                 if (reg & WM8400_RDSPK) {
                         printk(KERN_WARNING
                         "Cannot set as Speaker Mixer RDSPK Set\n");
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index b9211b42f6e9..098c143f44d6 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -217,7 +217,8 @@ SND_SOC_DAPM_INPUT("LLINEIN"),
 static int wm8731_check_osc(struct snd_soc_dapm_widget *source,
                             struct snd_soc_dapm_widget *sink)
 {
-        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(source->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
 
         return wm8731->sysclk_type == WM8731_SYSCLK_XTAL;
 }
@@ -717,6 +718,8 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
         if (wm8731 == NULL)
                 return -ENOMEM;
 
+        mutex_init(&wm8731->lock);
+
         wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
         if (IS_ERR(wm8731->regmap)) {
                 ret = PTR_ERR(wm8731->regmap);
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c
index 180e7a098726..53e977da2f86 100644
--- a/sound/soc/codecs/wm8770.c
+++ b/sound/soc/codecs/wm8770.c
@@ -308,9 +308,7 @@ static const struct snd_soc_dapm_route wm8770_intercon[] = {
 static int vout12supply_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec;
-
-        codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
@@ -327,9 +325,7 @@ static int vout12supply_event(struct snd_soc_dapm_widget *w,
 static int vout34supply_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec;
-
-        codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 1315f7642503..b2b0e68f707e 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -648,7 +648,7 @@ static struct snd_soc_dai_driver wm8804_dai = {
         .symmetric_rates = 1
 };
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
         .probe = wm8804_probe,
         .remove = wm8804_remove,
         .set_bias_level = wm8804_set_bias_level,
@@ -664,7 +664,7 @@ static const struct of_device_id wm8804_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8804_of_match);
 
-static struct regmap_config wm8804_regmap_config = {
+static const struct regmap_config wm8804_regmap_config = {
         .reg_bits = 8,
         .val_bits = 8,
 
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 3a0d4b7d692f..2eb986c19b88 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -224,7 +224,7 @@ static void wm8900_reset(struct snd_soc_codec *codec)
 static int wm8900_hp_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u16 hpctl1 = snd_soc_read(codec, WM8900_REG_HPCTL1);
 
         switch (event) {
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index cc6b0ef98a34..dde462c082be 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -260,7 +260,7 @@ static int wm8903_cp_event(struct snd_soc_dapm_widget *w,
 static int wm8903_dcs_event(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 75b87c5c0f04..d3b3f57668cc 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -673,7 +673,7 @@ static int cp_event(struct snd_soc_dapm_widget *w,
 static int sysclk_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -711,7 +711,7 @@ static int sysclk_event(struct snd_soc_dapm_widget *w,
 static int out_pga_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         int reg, val;
         int dcs_mask;
@@ -2105,6 +2105,24 @@ static const struct regmap_config wm8904_regmap = {
         .num_reg_defaults = ARRAY_SIZE(wm8904_reg_defaults),
 };
 
+#ifdef CONFIG_OF
+static enum wm8904_type wm8904_data = WM8904;
+static enum wm8904_type wm8912_data = WM8912;
+
+static const struct of_device_id wm8904_of_match[] = {
+        {
+                .compatible = "wlf,wm8904",
+                .data = &wm8904_data,
+        }, {
+                .compatible = "wlf,wm8912",
+                .data = &wm8912_data,
+        }, {
+                /* sentinel */
+        }
+};
+MODULE_DEVICE_TABLE(of, wm8904_of_match);
+#endif
+
 static int wm8904_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
@@ -2132,7 +2150,17 @@ static int wm8904_i2c_probe(struct i2c_client *i2c,
                 return ret;
         }
 
-        wm8904->devtype = id->driver_data;
+        if (i2c->dev.of_node) {
+                const struct of_device_id *match;
+
+                match = of_match_node(wm8904_of_match, i2c->dev.of_node);
+                if (match == NULL)
+                        return -EINVAL;
+                wm8904->devtype = *((enum wm8904_type *)match->data);
+        } else {
+                wm8904->devtype = id->driver_data;
+        }
+
         i2c_set_clientdata(i2c, wm8904);
         wm8904->pdata = i2c->dev.platform_data;
 
@@ -2266,6 +2294,7 @@ static struct i2c_driver wm8904_i2c_driver = {
         .driver = {
                 .name = "wm8904",
                 .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(wm8904_of_match),
         },
         .probe =    wm8904_i2c_probe,
         .remove =   wm8904_i2c_remove,
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 1173f7fef5a7..1ab2d462afad 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -333,7 +333,7 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec)
 static int wm8955_sysclk(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         int ret = 0;
 
         /* Always disable the clocks - if we're doing reconfiguration this
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index 3cbc82b33292..c799cca5abeb 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -418,7 +418,7 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)
 int wm8958_aif_ev(struct snd_soc_dapm_widget *w,
                   struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         int i;
 
         switch (event) {
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index a96eb497a379..cf8fecf97f2c 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
+#include <linux/clk.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -117,6 +118,7 @@ static bool wm8960_volatile(struct device *dev, unsigned int reg)
 }
 
 struct wm8960_priv {
+        struct clk *mclk;
         struct regmap *regmap;
         int (*set_bias_level)(struct snd_soc_codec *,
                               enum snd_soc_bias_level level);
@@ -618,14 +620,38 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
                                       enum snd_soc_bias_level level)
 {
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
+        int ret;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
 
         case SND_SOC_BIAS_PREPARE:
-                /* Set VMID to 2x50k */
-                snd_soc_update_bits(codec, WM8960_POWER1, 0x180, 0x80);
+                switch (codec->dapm.bias_level) {
+                case SND_SOC_BIAS_STANDBY:
+                        if (!IS_ERR(wm8960->mclk)) {
+                                ret = clk_prepare_enable(wm8960->mclk);
+                                if (ret) {
+                                        dev_err(codec->dev,
+                                                "Failed to enable MCLK: %d\n",
+                                                ret);
+                                        return ret;
+                                }
+                        }
+
+                        /* Set VMID to 2x50k */
+                        snd_soc_update_bits(codec, WM8960_POWER1, 0x180, 0x80);
+                        break;
+
+                case SND_SOC_BIAS_ON:
+                        if (!IS_ERR(wm8960->mclk))
+                                clk_disable_unprepare(wm8960->mclk);
+                        break;
+
+                default:
+                        break;
+                }
+
                 break;
 
         case SND_SOC_BIAS_STANDBY:
@@ -674,7 +700,7 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                                          enum snd_soc_bias_level level)
 {
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
-        int reg;
+        int reg, ret;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
@@ -715,9 +741,22 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                                             WM8960_VREF, WM8960_VREF);
 
                         msleep(100);
+
+                        if (!IS_ERR(wm8960->mclk)) {
+                                ret = clk_prepare_enable(wm8960->mclk);
+                                if (ret) {
+                                        dev_err(codec->dev,
+                                                "Failed to enable MCLK: %d\n",
+                                                ret);
+                                        return ret;
+                                }
+                        }
                         break;
 
                 case SND_SOC_BIAS_ON:
+                        if (!IS_ERR(wm8960->mclk))
+                                clk_disable_unprepare(wm8960->mclk);
+
                         /* Enable anti-pop mode */
                         snd_soc_update_bits(codec, WM8960_APOP1,
                                             WM8960_POBCTRL | WM8960_SOFT_ST |
@@ -1002,6 +1041,12 @@ static int wm8960_i2c_probe(struct i2c_client *i2c,
         if (wm8960 == NULL)
                 return -ENOMEM;
 
+        wm8960->mclk = devm_clk_get(&i2c->dev, "mclk");
+        if (IS_ERR(wm8960->mclk)) {
+                if (PTR_ERR(wm8960->mclk) == -EPROBE_DEFER)
+                        return -EPROBE_DEFER;
+        }
+
         wm8960->regmap = devm_regmap_init_i2c(i2c, &wm8960_regmap);
         if (IS_ERR(wm8960->regmap))
                 return PTR_ERR(wm8960->regmap);
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index eeffd05384b4..95e2c1bfc809 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -194,7 +194,7 @@ static bool wm8961_readable(struct device *dev, unsigned int reg)
 static int wm8961_hp_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u16 hp_reg = snd_soc_read(codec, WM8961_ANALOGUE_HP_0);
         u16 cp_reg = snd_soc_read(codec, WM8961_CHARGE_PUMP_1);
         u16 pwr_reg = snd_soc_read(codec, WM8961_PWR_MGMT_2);
@@ -286,7 +286,7 @@ static int wm8961_hp_event(struct snd_soc_dapm_widget *w,
 static int wm8961_spk_event(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u16 pwr_reg = snd_soc_read(codec, WM8961_PWR_MGMT_2);
         u16 spk_reg = snd_soc_read(codec, WM8961_CLASS_D_CONTROL_1);
 
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index d32d554f5b34..118b0034ba23 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1866,7 +1866,7 @@ static int cp_event(struct snd_soc_dapm_widget *w,
 static int hp_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         int timeout;
         int reg;
         int expected = (WM8962_DCS_STARTUP_DONE_HP1L |
@@ -1960,7 +1960,7 @@ static int hp_event(struct snd_soc_dapm_widget *w,
 static int out_pga_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         int reg;
 
         switch (w->shift) {
@@ -1993,7 +1993,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
 static int dsp2_event(struct snd_soc_dapm_widget *w,
                       struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index e418199155a8..24968aa8618a 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -244,7 +244,7 @@ SOC_DOUBLE_R_TLV("Output 2 Playback Volume", WM8988_LOUT2V, WM8988_ROUT2V,
 static int wm8988_lrc_control(struct snd_soc_dapm_widget *w,
                               struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u16 adctl2 = snd_soc_read(codec, WM8988_ADCTL2);
 
         /* Use the DAC to gate LRC if active, otherwise use ADC */
@@ -813,7 +813,7 @@ static int wm8988_probe(struct snd_soc_codec *codec)
         return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8988 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8988 = {
         .probe =        wm8988_probe,
         .set_bias_level = wm8988_set_bias_level,
         .suspend_bias_off = true,
@@ -826,7 +826,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8988 = {
         .num_dapm_routes = ARRAY_SIZE(wm8988_dapm_routes),
 };
 
-static struct regmap_config wm8988_regmap = {
+static const struct regmap_config wm8988_regmap = {
         .reg_bits = 7,
         .val_bits = 9,
 
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 8a584229310a..c93bffcb3cfb 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -374,13 +374,14 @@ SOC_SINGLE("RIN34 Mute Switch", WM8990_RIGHT_LINE_INPUT_3_4_VOLUME,
 static int outmixer_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u32 reg_shift = kcontrol->private_value & 0xfff;
         int ret = 0;
         u16 reg;
 
         switch (reg_shift) {
         case WM8990_SPEAKER_MIXER | (WM8990_LDSPK_BIT << 8) :
-                reg = snd_soc_read(w->codec, WM8990_OUTPUT_MIXER1);
+                reg = snd_soc_read(codec, WM8990_OUTPUT_MIXER1);
                 if (reg & WM8990_LDLO) {
                         printk(KERN_WARNING
                         "Cannot set as Output Mixer 1 LDLO Set\n");
@@ -388,7 +389,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
                 }
                 break;
         case WM8990_SPEAKER_MIXER | (WM8990_RDSPK_BIT << 8):
-                reg = snd_soc_read(w->codec, WM8990_OUTPUT_MIXER2);
+                reg = snd_soc_read(codec, WM8990_OUTPUT_MIXER2);
                 if (reg & WM8990_RDRO) {
                         printk(KERN_WARNING
                         "Cannot set as Output Mixer 2 RDRO Set\n");
@@ -396,7 +397,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
                 }
                 break;
         case WM8990_OUTPUT_MIXER1 | (WM8990_LDLO_BIT << 8):
-                reg = snd_soc_read(w->codec, WM8990_SPEAKER_MIXER);
+                reg = snd_soc_read(codec, WM8990_SPEAKER_MIXER);
                 if (reg & WM8990_LDSPK) {
                         printk(KERN_WARNING
                         "Cannot set as Speaker Mixer LDSPK Set\n");
@@ -404,7 +405,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
                 }
                 break;
         case WM8990_OUTPUT_MIXER2 | (WM8990_RDRO_BIT << 8):
-                reg = snd_soc_read(w->codec, WM8990_SPEAKER_MIXER);
+                reg = snd_soc_read(codec, WM8990_SPEAKER_MIXER);
                 if (reg & WM8990_RDSPK) {
                         printk(KERN_WARNING
                         "Cannot set as Speaker Mixer RDSPK Set\n");
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index b0ac2c3e31b9..49df0dc607e6 100644
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -382,13 +382,14 @@ static const struct snd_kcontrol_new wm8991_snd_controls[] = {
 static int outmixer_event(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *kcontrol, int event)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u32 reg_shift = kcontrol->private_value & 0xfff;
         int ret = 0;
         u16 reg;
 
         switch (reg_shift) {
         case WM8991_SPEAKER_MIXER | (WM8991_LDSPK_BIT << 8):
-                reg = snd_soc_read(w->codec, WM8991_OUTPUT_MIXER1);
+                reg = snd_soc_read(codec, WM8991_OUTPUT_MIXER1);
                 if (reg & WM8991_LDLO) {
                         printk(KERN_WARNING
                                "Cannot set as Output Mixer 1 LDLO Set\n");
@@ -397,7 +398,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
                 break;
 
         case WM8991_SPEAKER_MIXER | (WM8991_RDSPK_BIT << 8):
-                reg = snd_soc_read(w->codec, WM8991_OUTPUT_MIXER2);
+                reg = snd_soc_read(codec, WM8991_OUTPUT_MIXER2);
                 if (reg & WM8991_RDRO) {
                         printk(KERN_WARNING
                                "Cannot set as Output Mixer 2 RDRO Set\n");
@@ -406,7 +407,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
                 break;
 
         case WM8991_OUTPUT_MIXER1 | (WM8991_LDLO_BIT << 8):
-                reg = snd_soc_read(w->codec, WM8991_SPEAKER_MIXER);
+                reg = snd_soc_read(codec, WM8991_SPEAKER_MIXER);
                 if (reg & WM8991_LDSPK) {
                         printk(KERN_WARNING
                                "Cannot set as Speaker Mixer LDSPK Set\n");
@@ -415,7 +416,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
                 break;
 
         case WM8991_OUTPUT_MIXER2 | (WM8991_RDRO_BIT << 8):
-                reg = snd_soc_read(w->codec, WM8991_SPEAKER_MIXER);
+                reg = snd_soc_read(codec, WM8991_SPEAKER_MIXER);
                 if (reg & WM8991_RDSPK) {
                         printk(KERN_WARNING
                                "Cannot set as Speaker Mixer RDSPK Set\n");
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 53c6fe359496..2e70a270eb28 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -810,7 +810,7 @@ SOC_SINGLE_TLV("EQ5 Volume", WM8993_EQ6, 0, 24, 0, eq_tlv),
 static int clk_sys_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 1b97de2e4e67..4fbc7689339a 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -249,7 +249,8 @@ static int configure_clock(struct snd_soc_codec *codec)
 static int check_clk_sys(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
-        int reg = snd_soc_read(source->codec, WM8994_CLOCKING_1);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
+        int reg = snd_soc_read(codec, WM8994_CLOCKING_1);
         const char *clk;
 
         /* Check what we're currently using for CLK_SYS */
@@ -806,7 +807,7 @@ static void active_dereference(struct snd_soc_codec *codec)
 static int clk_sys_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -981,7 +982,7 @@ static void vmid_dereference(struct snd_soc_codec *codec)
 static int vmid_event(struct snd_soc_dapm_widget *w,
                       struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
@@ -1037,7 +1038,7 @@ static bool wm8994_check_class_w_digital(struct snd_soc_codec *codec)
 static int aif1clk_ev(struct snd_soc_dapm_widget *w,
                       struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
         int mask = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA;
@@ -1135,7 +1136,7 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w,
 static int aif2clk_ev(struct snd_soc_dapm_widget *w,
                       struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         int i;
         int dac;
         int adc;
@@ -1220,7 +1221,7 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w,
 static int aif1clk_late_ev(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -1238,7 +1239,7 @@ static int aif1clk_late_ev(struct snd_soc_dapm_widget *w,
 static int aif2clk_late_ev(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -1256,7 +1257,7 @@ static int aif2clk_late_ev(struct snd_soc_dapm_widget *w,
 static int late_enable_ev(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -1289,7 +1290,7 @@ static int late_enable_ev(struct snd_soc_dapm_widget *w,
 static int late_disable_ev(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -1331,7 +1332,7 @@ static int micbias_ev(struct snd_soc_dapm_widget *w,
 static int dac_ev(struct snd_soc_dapm_widget *w,
                   struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         unsigned int mask = 1 << w->shift;
 
         snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,
@@ -1372,7 +1373,7 @@ SOC_DAPM_SINGLE("DAC1 Switch", WM8994_SPEAKER_MIXER, 0, 1, 0),
 static int post_ev(struct snd_soc_dapm_widget *w,
             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         dev_dbg(codec->dev, "SRC status: %x\n",
                 snd_soc_read(codec,
                              WM8994_RATE_STATUS));
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index c280f0a3a424..66103c2b012e 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -44,7 +44,7 @@ static const char *wm8995_supply_names[WM8995_NUM_SUPPLIES] = {
         "MICVDD"
 };
 
-static struct reg_default wm8995_reg_defaults[] = {
+static const struct reg_default wm8995_reg_defaults[] = {
         { 0, 0x8995 },
         { 5, 0x0100 },
         { 16, 0x000b },
@@ -534,10 +534,11 @@ static void wm8995_update_class_w(struct snd_soc_codec *codec)
 static int check_clk_sys(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
         unsigned int reg;
         const char *clk;
 
-        reg = snd_soc_read(source->codec, WM8995_CLOCKING_1);
+        reg = snd_soc_read(codec, WM8995_CLOCKING_1);
         /* Check what we're currently using for CLK_SYS */
         if (reg & WM8995_SYSCLK_SRC)
                 clk = "AIF2CLK";
@@ -560,9 +561,7 @@ static int wm8995_put_class_w(struct snd_kcontrol *kcontrol,
 static int hp_supply_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec;
-
-        codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
@@ -611,10 +610,9 @@ static void dc_servo_cmd(struct snd_soc_codec *codec,
 static int hp_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         unsigned int reg;
 
-        codec = w->codec;
         reg = snd_soc_read(codec, WM8995_ANALOGUE_HP_1);
 
         switch (event) {
@@ -761,9 +759,7 @@ static int configure_clock(struct snd_soc_codec *codec)
 static int clk_sys_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec;
-
-        codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
@@ -2190,7 +2186,7 @@ static struct snd_soc_dai_driver wm8995_dai[] = {
         }
 };
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
         .probe = wm8995_probe,
         .remove = wm8995_remove,
         .set_bias_level = wm8995_set_bias_level,
@@ -2204,7 +2200,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
         .num_dapm_routes = ARRAY_SIZE(wm8995_intercon),
 };
 
-static struct regmap_config wm8995_regmap = {
+static const struct regmap_config wm8995_regmap = {
         .reg_bits = 16,
         .val_bits = 16,
 
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index b1dcc11c1b23..dc92d5e4e942 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -599,7 +599,7 @@ static void wm8996_bg_disable(struct snd_soc_codec *codec)
 static int bg_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         int ret = 0;
 
         switch (event) {
@@ -634,7 +634,8 @@ static int cp_event(struct snd_soc_dapm_widget *w,
 static int rmv_short_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
 
         /* Record which outputs we enabled */
         switch (event) {
@@ -758,7 +759,8 @@ static void wm8996_seq_notifier(struct snd_soc_dapm_context *dapm,
 static int dcs_start(struct snd_soc_dapm_widget *w,
                      struct snd_kcontrol *kcontrol, int event)
 {
-        struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(w->codec);
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 7e8bfe27566b..a4d11770630c 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -84,7 +84,7 @@ static const struct reg_default wm8997_sysclk_reva_patch[] = {
 static int wm8997_sysclk_ev(struct snd_soc_dapm_widget *w,
                             struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
         struct regmap *regmap = arizona->regmap;
         const struct reg_default *patch = NULL;
@@ -610,13 +610,16 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
 
 SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
                    ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_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("OUT1R", SND_SOC_NOPM,
                    ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_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("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_PRE_PMD | SND_SOC_DAPM_POST_PMD |
+                   SND_SOC_DAPM_PRE_PMU | 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),
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index b1d946facd57..13a3f335ea5b 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -734,7 +734,7 @@ static int configure_clock(struct snd_soc_codec *codec)
 static int clk_sys_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec);
 
         /* This should be done on init() for bypass paths */
diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c
index 6ffe8dc4f3fa..60d243c904f5 100644
--- a/sound/soc/codecs/wm9090.c
+++ b/sound/soc/codecs/wm9090.c
@@ -254,7 +254,7 @@ SOC_SINGLE_TLV("MIXOUTR IN2B Volume", WM9090_OUTPUT_MIXER4, 0, 3, 1,
 static int hp_ev(struct snd_soc_dapm_widget *w,
                  struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         unsigned int reg = snd_soc_read(codec, WM9090_ANALOGUE_HP_0);
 
         switch (event) {
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index 3eddb18fefd1..5cc457ef8894 100644
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -344,23 +344,27 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec)
         struct snd_ac97 *ac97;
         int ret = 0;
 
-        ac97 = snd_soc_new_ac97_codec(codec);
+        ac97 = snd_soc_alloc_ac97_codec(codec);
         if (IS_ERR(ac97)) {
                 ret = PTR_ERR(ac97);
                 dev_err(codec->dev, "Failed to register AC97 codec\n");
                 return ret;
         }
 
-        snd_soc_codec_set_drvdata(codec, ac97);
-
         ret = wm9705_reset(codec);
         if (ret)
-                goto reset_err;
+                goto err_put_device;
+
+        ret = device_add(&ac97->dev);
+        if (ret)
+                goto err_put_device;
+
+        snd_soc_codec_set_drvdata(codec, ac97);
 
         return 0;
 
-reset_err:
-        snd_soc_free_ac97_codec(ac97);
+err_put_device:
+        put_device(&ac97->dev);
         return ret;
 }
 
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index e04643d2bb24..9517571e820d 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -666,7 +666,7 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
         struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
         int ret = 0;
 
-        wm9712->ac97 = snd_soc_new_ac97_codec(codec);
+        wm9712->ac97 = snd_soc_alloc_ac97_codec(codec);
         if (IS_ERR(wm9712->ac97)) {
                 ret = PTR_ERR(wm9712->ac97);
                 dev_err(codec->dev, "Failed to register AC97 codec: %d\n", ret);
@@ -675,15 +675,19 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
 
         ret = wm9712_reset(codec, 0);
         if (ret < 0)
-                goto reset_err;
+                goto err_put_device;
+
+        ret = device_add(&wm9712->ac97->dev);
+        if (ret)
+                goto err_put_device;
 
         /* set alc mux to none */
         ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000);
 
         return 0;
 
-reset_err:
-        snd_soc_free_ac97_codec(wm9712->ac97);
+err_put_device:
+        put_device(&wm9712->ac97->dev);
         return ret;
 }
 
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 71b9d5b0734d..68222917b396 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -217,7 +217,7 @@ SOC_SINGLE("3D Depth", AC97_REC_GAIN_MIC, 0, 15, 1),
 static int wm9713_voice_shutdown(struct snd_soc_dapm_widget *w,
                                  struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u16 status, rate;
 
         if (WARN_ON(event != SND_SOC_DAPM_PRE_PMD))
@@ -1225,7 +1225,7 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec)
         struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec);
         int ret = 0, reg;
 
-        wm9713->ac97 = snd_soc_new_ac97_codec(codec);
+        wm9713->ac97 = snd_soc_alloc_ac97_codec(codec);
         if (IS_ERR(wm9713->ac97))
                 return PTR_ERR(wm9713->ac97);
 
@@ -1234,7 +1234,11 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec)
         wm9713_reset(codec, 0);
         ret = wm9713_reset(codec, 1);
         if (ret < 0)
-                goto reset_err;
+                goto err_put_device;
+
+        ret = device_add(&wm9713->ac97->dev);
+        if (ret)
+                goto err_put_device;
 
         /* unmute the adc - move to kcontrol */
         reg = ac97_read(codec, AC97_CD) & 0x7fff;
@@ -1242,8 +1246,8 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec)
 
         return 0;
 
-reset_err:
-        snd_soc_free_ac97_codec(wm9713->ac97);
+err_put_device:
+        put_device(&wm9713->ac97->dev);
         return ret;
 }
 
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 720d6e852986..ff67b334065b 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -1373,7 +1373,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol,
                    int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
         struct wm_adsp *dsp = &dsps[w->shift];
         struct wm_adsp_alg_region *alg_region;
@@ -1605,7 +1605,7 @@ err:
 int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
         struct wm_adsp *dsp = &dsps[w->shift];
 
@@ -1626,7 +1626,7 @@ EXPORT_SYMBOL_GPL(wm_adsp2_early_event);
 int wm_adsp2_event(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
         struct wm_adsp *dsp = &dsps[w->shift];
         struct wm_adsp_alg_region *alg_region;
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 374537d5e179..8366e19657a7 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -500,7 +500,7 @@ SOC_SINGLE_TLV("LINEOUT2 Volume", WM8993_LINE_OUTPUTS_VOLUME, 0, 1, 1,
 static int hp_supply_event(struct snd_soc_dapm_widget *w,
                            struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
@@ -542,7 +542,7 @@ static int hp_supply_event(struct snd_soc_dapm_widget *w,
 static int hp_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         unsigned int reg = snd_soc_read(codec, WM8993_ANALOGUE_HP_0);
 
         switch (event) {
@@ -594,7 +594,7 @@ static int hp_event(struct snd_soc_dapm_widget *w,
 static int earpiece_event(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *control, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         u16 reg = snd_soc_read(codec, WM8993_ANTIPOP1) & ~WM8993_HPOUT2_IN_ENA;
 
         switch (event) {
@@ -619,7 +619,7 @@ static int earpiece_event(struct snd_soc_dapm_widget *w,
 static int lineout_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *control, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
         bool *flag;
 
@@ -649,7 +649,7 @@ static int lineout_event(struct snd_soc_dapm_widget *w,
 static int micbias_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event)
 {
-        struct snd_soc_codec *codec = w->codec;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
 
         switch (w->shift) {
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index 8e948c63f3d9..2b81ca418d2a 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -58,13 +58,12 @@ choice
         depends on MACH_DAVINCI_DM365_EVM
 
 config SND_DM365_AIC3X_CODEC
-        bool "Audio Codec - AIC3101"
+        tristate "Audio Codec - AIC3101"
         help
           Say Y if you want to add support for AIC3101 audio codec
 
 config SND_DM365_VOICE_CODEC
         tristate "Voice Codec - CQ93VC"
-        depends on SND_DAVINCI_SOC
         select MFD_DAVINCI_VOICECODEC
         select SND_DAVINCI_SOC_VCIF
         select SND_SOC_CQ0093VC
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 158cb3d1db70..b6bb5947a8a8 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -14,7 +14,6 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/edma.h>
 #include <linux/i2c.h>
 #include <linux/of_platform.h>
 #include <linux/clk.h>
@@ -25,11 +24,6 @@
 #include <asm/dma.h>
 #include <asm/mach-types.h>
 
-#include <linux/edma.h>
-
-#include "davinci-pcm.h"
-#include "davinci-i2s.h"
-
 struct snd_soc_card_drvdata_davinci {
         struct clk *mclk;
         unsigned sysclk;
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 30b94d4f9c5d..de3b155a5011 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -364,6 +364,20 @@ static irqreturn_t davinci_mcasp_rx_irq_handler(int irq, void *data)
         return IRQ_RETVAL(handled_mask);
 }
 
+static irqreturn_t davinci_mcasp_common_irq_handler(int irq, void *data)
+{
+        struct davinci_mcasp *mcasp = (struct davinci_mcasp *)data;
+        irqreturn_t ret = IRQ_NONE;
+
+        if (mcasp->substreams[SNDRV_PCM_STREAM_PLAYBACK])
+                ret = davinci_mcasp_tx_irq_handler(irq, data);
+
+        if (mcasp->substreams[SNDRV_PCM_STREAM_CAPTURE])
+                ret |= davinci_mcasp_rx_irq_handler(irq, data);
+
+        return ret;
+}
+
 static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                                          unsigned int fmt)
 {
@@ -1313,16 +1327,19 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of(
 
         pdata->tx_dma_channel = dma_spec.args[0];
 
-        ret = of_property_match_string(np, "dma-names", "rx");
-        if (ret < 0)
-                goto nodata;
+        /* RX is not valid in DIT mode */
+        if (pdata->op_mode != DAVINCI_MCASP_DIT_MODE) {
+                ret = of_property_match_string(np, "dma-names", "rx");
+                if (ret < 0)
+                        goto nodata;
 
-        ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells", ret,
-                                         &dma_spec);
-        if (ret < 0)
-                goto nodata;
+                ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells", ret,
+                                                 &dma_spec);
+                if (ret < 0)
+                        goto nodata;
 
-        pdata->rx_dma_channel = dma_spec.args[0];
+                pdata->rx_dma_channel = dma_spec.args[0];
+        }
 
         ret = of_property_read_u32(np, "tx-num-evt", &val);
         if (ret >= 0)
@@ -1441,6 +1458,23 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 
         mcasp->dev = &pdev->dev;
 
+        irq = platform_get_irq_byname(pdev, "common");
+        if (irq >= 0) {
+                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_common\n",
+                                          dev_name(&pdev->dev));
+                ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                                davinci_mcasp_common_irq_handler,
+                                                IRQF_ONESHOT | IRQF_SHARED,
+                                                irq_name, mcasp);
+                if (ret) {
+                        dev_err(&pdev->dev, "common IRQ request failed\n");
+                        goto err;
+                }
+
+                mcasp->irq_request[SNDRV_PCM_STREAM_PLAYBACK] = XUNDRN;
+                mcasp->irq_request[SNDRV_PCM_STREAM_CAPTURE] = ROVRN;
+        }
+
         irq = platform_get_irq_byname(pdev, "rx");
         if (irq >= 0) {
                 irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_rx\n",
@@ -1501,19 +1535,34 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         else
                 dma_data->filter_data = &dma_params->channel;
 
-        dma_params = &mcasp->dma_params[SNDRV_PCM_STREAM_CAPTURE];
-        dma_data = &mcasp->dma_data[SNDRV_PCM_STREAM_CAPTURE];
-        dma_params->asp_chan_q = pdata->asp_chan_q;
-        dma_params->ram_chan_q = pdata->ram_chan_q;
-        dma_params->sram_pool = pdata->sram_pool;
-        dma_params->sram_size = pdata->sram_size_capture;
-        if (dat)
-                dma_params->dma_addr = dat->start;
-        else
-                dma_params->dma_addr = mem->start + pdata->rx_dma_offset;
-
-        /* Unconditional dmaengine stuff */
-        dma_data->addr = dma_params->dma_addr;
+        /* RX is not valid in DIT mode */
+        if (mcasp->op_mode != DAVINCI_MCASP_DIT_MODE) {
+                dma_params = &mcasp->dma_params[SNDRV_PCM_STREAM_CAPTURE];
+                dma_data = &mcasp->dma_data[SNDRV_PCM_STREAM_CAPTURE];
+                dma_params->asp_chan_q = pdata->asp_chan_q;
+                dma_params->ram_chan_q = pdata->ram_chan_q;
+                dma_params->sram_pool = pdata->sram_pool;
+                dma_params->sram_size = pdata->sram_size_capture;
+                if (dat)
+                        dma_params->dma_addr = dat->start;
+                else
+                        dma_params->dma_addr = mem->start + pdata->rx_dma_offset;
+
+                /* Unconditional dmaengine stuff */
+                dma_data->addr = dma_params->dma_addr;
+
+                res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+                if (res)
+                        dma_params->channel = res->start;
+                else
+                        dma_params->channel = pdata->rx_dma_channel;
+
+                /* dmaengine filter data for DT and non-DT boot */
+                if (pdev->dev.of_node)
+                        dma_data->filter_data = "rx";
+                else
+                        dma_data->filter_data = &dma_params->channel;
+        }
 
         if (mcasp->version < MCASP_VERSION_3) {
                 mcasp->fifo_base = DAVINCI_MCASP_V2_AFIFO_BASE;
@@ -1523,18 +1572,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
                 mcasp->fifo_base = DAVINCI_MCASP_V3_AFIFO_BASE;
         }
 
-        res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
-        if (res)
-                dma_params->channel = res->start;
-        else
-                dma_params->channel = pdata->rx_dma_channel;
-
-        /* dmaengine filter data for DT and non-DT boot */
-        if (pdev->dev.of_node)
-                dma_data->filter_data = "rx";
-        else
-                dma_data->filter_data = &dma_params->channel;
-
         dev_set_drvdata(&pdev->dev, mcasp);
 
         mcasp_reparent_fck(pdev);
diff --git a/sound/soc/dwc/Kconfig b/sound/soc/dwc/Kconfig
index e334900cf0b8..d50e08517dce 100644
--- a/sound/soc/dwc/Kconfig
+++ b/sound/soc/dwc/Kconfig
@@ -1,6 +1,7 @@
 config SND_DESIGNWARE_I2S
         tristate "Synopsys I2S Device Driver"
         depends on CLKDEV_LOOKUP
+        select SND_SOC_GENERIC_DMAENGINE_PCM
         help
          Say Y or M if you want to add support for I2S driver for
          Synopsys desigwnware I2S device. The device supports upto
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index 06d3a34ac90a..a3e97b46b64e 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -22,6 +22,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/dmaengine_pcm.h>
 
 /* common register for all channel */
 #define IER             0x000
@@ -54,9 +55,39 @@
 #define I2S_COMP_VERSION        0x01F8
 #define I2S_COMP_TYPE           0x01FC
 
+/*
+ * Component parameter register fields - define the I2S block's
+ * configuration.
+ */
+#define COMP1_TX_WORDSIZE_3(r)  (((r) & GENMASK(27, 25)) >> 25)
+#define COMP1_TX_WORDSIZE_2(r)  (((r) & GENMASK(24, 22)) >> 22)
+#define COMP1_TX_WORDSIZE_1(r)  (((r) & GENMASK(21, 19)) >> 19)
+#define COMP1_TX_WORDSIZE_0(r)  (((r) & GENMASK(18, 16)) >> 16)
+#define COMP1_TX_CHANNELS(r)    (((r) & GENMASK(10, 9)) >> 9)
+#define COMP1_RX_CHANNELS(r)    (((r) & GENMASK(8, 7)) >> 7)
+#define COMP1_RX_ENABLED(r)     (((r) & BIT(6)) >> 6)
+#define COMP1_TX_ENABLED(r)     (((r) & BIT(5)) >> 5)
+#define COMP1_MODE_EN(r)        (((r) & BIT(4)) >> 4)
+#define COMP1_FIFO_DEPTH_GLOBAL(r)      (((r) & GENMASK(3, 2)) >> 2)
+#define COMP1_APB_DATA_WIDTH(r) (((r) & GENMASK(1, 0)) >> 0)
+
+#define COMP2_RX_WORDSIZE_3(r)  (((r) & GENMASK(12, 10)) >> 10)
+#define COMP2_RX_WORDSIZE_2(r)  (((r) & GENMASK(9, 7)) >> 7)
+#define COMP2_RX_WORDSIZE_1(r)  (((r) & GENMASK(5, 3)) >> 3)
+#define COMP2_RX_WORDSIZE_0(r)  (((r) & GENMASK(2, 0)) >> 0)
+
+/* Number of entries in WORDSIZE and DATA_WIDTH parameter registers */
+#define COMP_MAX_WORDSIZE       (1 << 3)
+#define COMP_MAX_DATA_WIDTH     (1 << 2)
+
 #define MAX_CHANNEL_NUM         8
 #define MIN_CHANNEL_NUM         2
 
+union dw_i2s_snd_dma_data {
+        struct i2s_dma_data pd;
+        struct snd_dmaengine_dai_dma_data dt;
+};
+
 struct dw_i2s_dev {
         void __iomem *i2s_base;
         struct clk *clk;
@@ -65,8 +96,8 @@ struct dw_i2s_dev {
         struct device *dev;
 
         /* data related to DMA transfers b/w i2s and DMAC */
-        struct i2s_dma_data play_dma_data;
-        struct i2s_dma_data capture_dma_data;
+        union dw_i2s_snd_dma_data play_dma_data;
+        union dw_i2s_snd_dma_data capture_dma_data;
         struct i2s_clk_config_data config;
         int (*i2s_clk_cfg)(struct i2s_clk_config_data *config);
 };
@@ -153,7 +184,7 @@ static int dw_i2s_startup(struct snd_pcm_substream *substream,
                 struct snd_soc_dai *cpu_dai)
 {
         struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
-        struct i2s_dma_data *dma_data = NULL;
+        union dw_i2s_snd_dma_data *dma_data = NULL;
 
         if (!(dev->capability & DWC_I2S_RECORD) &&
                         (substream->stream == SNDRV_PCM_STREAM_CAPTURE))
@@ -242,13 +273,21 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
 
         config->sample_rate = params_rate(params);
 
-        if (!dev->i2s_clk_cfg)
-                return -EINVAL;
+        if (dev->i2s_clk_cfg) {
+                ret = dev->i2s_clk_cfg(config);
+                if (ret < 0) {
+                        dev_err(dev->dev, "runtime audio clk config fail\n");
+                        return ret;
+                }
+        } else {
+                u32 bitclk = config->sample_rate * config->data_width * 2;
 
-        ret = dev->i2s_clk_cfg(config);
-        if (ret < 0) {
-                dev_err(dev->dev, "runtime audio clk config fail\n");
-                return ret;
+                ret = clk_set_rate(dev->clk, bitclk);
+                if (ret) {
+                        dev_err(dev->dev, "Can't set I2S clock rate: %d\n",
+                                ret);
+                        return ret;
+                }
         }
 
         return 0;
@@ -335,39 +374,152 @@ static int dw_i2s_resume(struct snd_soc_dai *dai)
 #define dw_i2s_resume   NULL
 #endif
 
-static void dw_configure_dai_by_pd(struct dw_i2s_dev *dev,
+/*
+ * The following tables allow a direct lookup of various parameters
+ * defined in the I2S block's configuration in terms of sound system
+ * parameters.  Each table is sized to the number of entries possible
+ * according to the number of configuration bits describing an I2S
+ * block parameter.
+ */
+
+/* Maximum bit resolution of a channel - not uniformly spaced */
+static const u32 fifo_width[COMP_MAX_WORDSIZE] = {
+        12, 16, 20, 24, 32, 0, 0, 0
+};
+
+/* Width of (DMA) bus */
+static const u32 bus_widths[COMP_MAX_DATA_WIDTH] = {
+        DMA_SLAVE_BUSWIDTH_1_BYTE,
+        DMA_SLAVE_BUSWIDTH_2_BYTES,
+        DMA_SLAVE_BUSWIDTH_4_BYTES,
+        DMA_SLAVE_BUSWIDTH_UNDEFINED
+};
+
+/* PCM format to support channel resolution */
+static const u32 formats[COMP_MAX_WORDSIZE] = {
+        SNDRV_PCM_FMTBIT_S16_LE,
+        SNDRV_PCM_FMTBIT_S16_LE,
+        SNDRV_PCM_FMTBIT_S24_LE,
+        SNDRV_PCM_FMTBIT_S24_LE,
+        SNDRV_PCM_FMTBIT_S32_LE,
+        0,
+        0,
+        0
+};
+
+static int dw_configure_dai(struct dw_i2s_dev *dev,
                                    struct snd_soc_dai_driver *dw_i2s_dai,
-                                   struct resource *res,
-                                   const struct i2s_platform_data *pdata)
+                                   unsigned int rates)
 {
-        /* Set DMA slaves info */
-
-        dev->play_dma_data.data = pdata->play_dma_data;
-        dev->capture_dma_data.data = pdata->capture_dma_data;
-        dev->play_dma_data.addr = res->start + I2S_TXDMA;
-        dev->capture_dma_data.addr = res->start + I2S_RXDMA;
-        dev->play_dma_data.max_burst = 16;
-        dev->capture_dma_data.max_burst = 16;
-        dev->play_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
-        dev->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
-        dev->play_dma_data.filter = pdata->filter;
-        dev->capture_dma_data.filter = pdata->filter;
-
-        if (pdata->cap & DWC_I2S_PLAY) {
+        /*
+         * Read component parameter registers to extract
+         * the I2S block's configuration.
+         */
+        u32 comp1 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_1);
+        u32 comp2 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_2);
+        u32 idx;
+
+        if (COMP1_TX_ENABLED(comp1)) {
                 dev_dbg(dev->dev, " designware: play supported\n");
+                idx = COMP1_TX_WORDSIZE_0(comp1);
+                if (WARN_ON(idx >= ARRAY_SIZE(formats)))
+                        return -EINVAL;
                 dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM;
-                dw_i2s_dai->playback.channels_max = pdata->channel;
-                dw_i2s_dai->playback.formats = pdata->snd_fmts;
-                dw_i2s_dai->playback.rates = pdata->snd_rates;
+                dw_i2s_dai->playback.channels_max =
+                                1 << (COMP1_TX_CHANNELS(comp1) + 1);
+                dw_i2s_dai->playback.formats = formats[idx];
+                dw_i2s_dai->playback.rates = rates;
         }
 
-        if (pdata->cap & DWC_I2S_RECORD) {
+        if (COMP1_RX_ENABLED(comp1)) {
                 dev_dbg(dev->dev, "designware: record supported\n");
+                idx = COMP2_RX_WORDSIZE_0(comp2);
+                if (WARN_ON(idx >= ARRAY_SIZE(formats)))
+                        return -EINVAL;
                 dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM;
-                dw_i2s_dai->capture.channels_max = pdata->channel;
-                dw_i2s_dai->capture.formats = pdata->snd_fmts;
-                dw_i2s_dai->capture.rates = pdata->snd_rates;
+                dw_i2s_dai->capture.channels_max =
+                                1 << (COMP1_RX_CHANNELS(comp1) + 1);
+                dw_i2s_dai->capture.formats = formats[idx];
+                dw_i2s_dai->capture.rates = rates;
         }
+
+        return 0;
+}
+
+static int dw_configure_dai_by_pd(struct dw_i2s_dev *dev,
+                                   struct snd_soc_dai_driver *dw_i2s_dai,
+                                   struct resource *res,
+                                   const struct i2s_platform_data *pdata)
+{
+        u32 comp1 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_1);
+        u32 idx = COMP1_APB_DATA_WIDTH(comp1);
+        int ret;
+
+        if (WARN_ON(idx >= ARRAY_SIZE(bus_widths)))
+                return -EINVAL;
+
+        ret = dw_configure_dai(dev, dw_i2s_dai, pdata->snd_rates);
+        if (ret < 0)
+                return ret;
+
+        /* Set DMA slaves info */
+        dev->play_dma_data.pd.data = pdata->play_dma_data;
+        dev->capture_dma_data.pd.data = pdata->capture_dma_data;
+        dev->play_dma_data.pd.addr = res->start + I2S_TXDMA;
+        dev->capture_dma_data.pd.addr = res->start + I2S_RXDMA;
+        dev->play_dma_data.pd.max_burst = 16;
+        dev->capture_dma_data.pd.max_burst = 16;
+        dev->play_dma_data.pd.addr_width = bus_widths[idx];
+        dev->capture_dma_data.pd.addr_width = bus_widths[idx];
+        dev->play_dma_data.pd.filter = pdata->filter;
+        dev->capture_dma_data.pd.filter = pdata->filter;
+
+        return 0;
+}
+
+static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev,
+                                   struct snd_soc_dai_driver *dw_i2s_dai,
+                                   struct resource *res)
+{
+        u32 comp1 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_1);
+        u32 comp2 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_2);
+        u32 fifo_depth = 1 << (1 + COMP1_FIFO_DEPTH_GLOBAL(comp1));
+        u32 idx = COMP1_APB_DATA_WIDTH(comp1);
+        u32 idx2;
+        int ret;
+
+        if (WARN_ON(idx >= ARRAY_SIZE(bus_widths)))
+                return -EINVAL;
+
+        ret = dw_configure_dai(dev, dw_i2s_dai, SNDRV_PCM_RATE_8000_192000);
+        if (ret < 0)
+                return ret;
+
+        if (COMP1_TX_ENABLED(comp1)) {
+                idx2 = COMP1_TX_WORDSIZE_0(comp1);
+
+                dev->capability |= DWC_I2S_PLAY;
+                dev->play_dma_data.dt.addr = res->start + I2S_TXDMA;
+                dev->play_dma_data.dt.addr_width = bus_widths[idx];
+                dev->play_dma_data.dt.chan_name = "TX";
+                dev->play_dma_data.dt.fifo_size = fifo_depth *
+                        (fifo_width[idx2]) >> 8;
+                dev->play_dma_data.dt.maxburst = 16;
+        }
+        if (COMP1_RX_ENABLED(comp1)) {
+                idx2 = COMP2_RX_WORDSIZE_0(comp2);
+
+                dev->capability |= DWC_I2S_RECORD;
+                dev->capture_dma_data.dt.addr = res->start + I2S_RXDMA;
+                dev->capture_dma_data.dt.addr_width = bus_widths[idx];
+                dev->capture_dma_data.dt.chan_name = "RX";
+                dev->capture_dma_data.dt.fifo_size = fifo_depth *
+                        (fifo_width[idx2] >> 8);
+                dev->capture_dma_data.dt.maxburst = 16;
+        }
+
+        return 0;
+
 }
 
 static int dw_i2s_probe(struct platform_device *pdev)
@@ -378,11 +530,6 @@ static int dw_i2s_probe(struct platform_device *pdev)
         int ret;
         struct snd_soc_dai_driver *dw_i2s_dai;
 
-        if (!pdata) {
-                dev_err(&pdev->dev, "Invalid platform data\n");
-                return -EINVAL;
-        }
-
         dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
         if (!dev) {
                 dev_warn(&pdev->dev, "kzalloc fail\n");
@@ -403,32 +550,54 @@ static int dw_i2s_probe(struct platform_device *pdev)
                 return PTR_ERR(dev->i2s_base);
 
         dev->dev = &pdev->dev;
-        dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata);
+        if (pdata) {
+                ret = dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata);
+                if (ret < 0)
+                        return ret;
+
+                dev->capability = pdata->cap;
+                dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
+                if (!dev->i2s_clk_cfg) {
+                        dev_err(&pdev->dev, "no clock configure method\n");
+                        return -ENODEV;
+                }
 
-        dev->capability = pdata->cap;
-        dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
-        dev->clk = clk_get(&pdev->dev, NULL);
+                dev->clk = devm_clk_get(&pdev->dev, NULL);
+        } else {
+                ret = dw_configure_dai_by_dt(dev, dw_i2s_dai, res);
+                if (ret < 0)
+                        return ret;
+
+                dev->clk = devm_clk_get(&pdev->dev, "i2sclk");
+        }
         if (IS_ERR(dev->clk))
-                return  PTR_ERR(dev->clk);
+                return PTR_ERR(dev->clk);
 
-        ret = clk_enable(dev->clk);
+        ret = clk_prepare_enable(dev->clk);
         if (ret < 0)
-                goto err_clk_put;
+                return ret;
 
         dev_set_drvdata(&pdev->dev, dev);
-        ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component,
+        ret = devm_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_clk_disable;
         }
 
+        if (!pdata) {
+                ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
+                if (ret) {
+                        dev_err(&pdev->dev,
+                                "Could not register PCM: %d\n", ret);
+                        goto err_clk_disable;
+                }
+        }
+
         return 0;
 
 err_clk_disable:
-        clk_disable(dev->clk);
-err_clk_put:
-        clk_put(dev->clk);
+        clk_disable_unprepare(dev->clk);
         return ret;
 }
 
@@ -436,18 +605,26 @@ static int dw_i2s_remove(struct platform_device *pdev)
 {
         struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_component(&pdev->dev);
-
-        clk_put(dev->clk);
+        clk_disable_unprepare(dev->clk);
 
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id dw_i2s_of_match[] = {
+        { .compatible = "snps,designware-i2s",   },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, dw_i2s_of_match);
+#endif
+
 static struct platform_driver dw_i2s_driver = {
         .probe          = dw_i2s_probe,
         .remove         = dw_i2s_remove,
         .driver         = {
                 .name   = "designware-i2s",
+                .of_match_table = of_match_ptr(dw_i2s_of_match),
         },
 };
 
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c
index 9ce70fc67b09..e1aa3834b101 100644
--- a/sound/soc/fsl/eukrea-tlv320.c
+++ b/sound/soc/fsl/eukrea-tlv320.c
@@ -42,25 +42,6 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret;
 
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        /* fsl_ssi lacks the set_fmt ops. */
-        if (ret && ret != -ENOTSUPP) {
-                dev_err(cpu_dai->dev,
-                        "Failed to set the cpu dai format.\n");
-                return ret;
-        }
-
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (ret) {
-                dev_err(cpu_dai->dev,
-                        "Failed to set the codec format.\n");
-                return ret;
-        }
-
         ret = snd_soc_dai_set_sysclk(codec_dai, 0,
                                      CODEC_CLOCK, SND_SOC_CLOCK_OUT);
         if (ret) {
@@ -69,7 +50,7 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
                 return ret;
         }
 
-        snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);
+        snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, 0);
 
         ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0,
                                 SND_SOC_CLOCK_IN);
@@ -91,6 +72,8 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = {
         .name           = "tlv320aic23",
         .stream_name    = "TLV320AIC23",
         .codec_dai_name = "tlv320aic23-hifi",
+        .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                          SND_SOC_DAIFMT_CBM_CFM,
         .ops            = &eukrea_tlv320_snd_ops,
 };
 
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 026a80117540..c068494bae30 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -818,7 +818,6 @@ static int fsl_asrc_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         asrc_priv->pdev = pdev;
-        strncpy(asrc_priv->name, np->name, sizeof(asrc_priv->name) - 1);
 
         /* Get the addresses and IRQ */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -837,12 +836,12 @@ static int fsl_asrc_probe(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
-                dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
+                dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
                 return irq;
         }
 
         ret = devm_request_irq(&pdev->dev, irq, fsl_asrc_isr, 0,
-                               asrc_priv->name, asrc_priv);
+                               dev_name(&pdev->dev), asrc_priv);
         if (ret) {
                 dev_err(&pdev->dev, "failed to claim irq %u: %d\n", irq, ret);
                 return ret;
diff --git a/sound/soc/fsl/fsl_asrc.h b/sound/soc/fsl/fsl_asrc.h
index a3f211f53c23..4aed63c4b431 100644
--- a/sound/soc/fsl/fsl_asrc.h
+++ b/sound/soc/fsl/fsl_asrc.h
@@ -433,7 +433,6 @@ struct fsl_asrc_pair {
  * @channel_avail: non-occupied channel numbers
  * @asrc_rate: default sample rate for ASoC Back-Ends
  * @asrc_width: default sample width for ASoC Back-Ends
- * @name: driver name
  */
 struct fsl_asrc {
         struct snd_dmaengine_dai_dma_data dma_params_rx;
@@ -452,8 +451,6 @@ struct fsl_asrc {
 
         int asrc_rate;
         int asrc_width;
-
-        char name[32];
 };
 
 extern struct snd_soc_platform_driver fsl_asrc_platform;
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 1c08ab13637c..5c7597191e3f 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -774,7 +774,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
-                dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
+                dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
                 return irq;
         }
 
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 032d2d33619c..ec79c3d5e65e 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -612,7 +612,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
-                dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
+                dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
                 return irq;
         }
 
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index af0429421fc8..75870c0ea2c9 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -90,7 +90,6 @@ struct spdif_mixer_control {
  * @sysclk: system clock for rx clock rate measurement
  * @dma_params_tx: DMA parameters for transmit channel
  * @dma_params_rx: DMA parameters for receive channel
- * @name: driver name
  */
 struct fsl_spdif_priv {
         struct spdif_mixer_control fsl_spdif_control;
@@ -109,12 +108,8 @@ struct fsl_spdif_priv {
         struct clk *sysclk;
         struct snd_dmaengine_dai_dma_data dma_params_tx;
         struct snd_dmaengine_dai_dma_data dma_params_rx;
-
-        /* The name space will be allocated dynamically */
-        char name[0];
 };
 
-
 /* DPLL locked and lock loss interrupt handler */
 static void spdif_irq_dpll_lock(struct fsl_spdif_priv *spdif_priv)
 {
@@ -1169,19 +1164,15 @@ static int fsl_spdif_probe(struct platform_device *pdev)
         if (!np)
                 return -ENODEV;
 
-        spdif_priv = devm_kzalloc(&pdev->dev,
-                        sizeof(struct fsl_spdif_priv) + strlen(np->name) + 1,
-                        GFP_KERNEL);
+        spdif_priv = devm_kzalloc(&pdev->dev, sizeof(*spdif_priv), GFP_KERNEL);
         if (!spdif_priv)
                 return -ENOMEM;
 
-        strcpy(spdif_priv->name, np->name);
-
         spdif_priv->pdev = pdev;
 
         /* Initialize this copy of the CPU DAI driver structure */
         memcpy(&spdif_priv->cpu_dai_drv, &fsl_spdif_dai, sizeof(fsl_spdif_dai));
-        spdif_priv->cpu_dai_drv.name = spdif_priv->name;
+        spdif_priv->cpu_dai_drv.name = dev_name(&pdev->dev);
 
         /* Get the addresses and IRQ */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1198,12 +1189,12 @@ static int fsl_spdif_probe(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
-                dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
+                dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
                 return irq;
         }
 
         ret = devm_request_irq(&pdev->dev, irq, spdif_isr, 0,
-                        spdif_priv->name, spdif_priv);
+                               dev_name(&pdev->dev), spdif_priv);
         if (ret) {
                 dev_err(&pdev->dev, "could not claim irq %u\n", irq);
                 return ret;
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 059496ed9ad7..2595611e8a6d 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -160,7 +160,7 @@ struct fsl_ssi_soc_data {
  */
 struct fsl_ssi_private {
         struct regmap *regs;
-        unsigned int irq;
+        int irq;
         struct snd_soc_dai_driver cpu_dai_drv;
 
         unsigned int dai_fmt;
@@ -992,8 +992,8 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask,
         regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN,
                         CCSR_SSI_SCR_SSIEN);
 
-        regmap_write(regs, CCSR_SSI_STMSK, tx_mask);
-        regmap_write(regs, CCSR_SSI_SRMSK, rx_mask);
+        regmap_write(regs, CCSR_SSI_STMSK, ~tx_mask);
+        regmap_write(regs, CCSR_SSI_SRMSK, ~rx_mask);
 
         regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, val);
 
@@ -1362,8 +1362,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         }
 
         ssi_private->irq = platform_get_irq(pdev, 0);
-        if (ssi_private->irq < 0) {
-                dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
+        if (!ssi_private->irq) {
+                dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
                 return ssi_private->irq;
         }
 
diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c
index 2ac7755da876..b9e42b503a37 100644
--- a/sound/soc/fsl/fsl_utils.c
+++ b/sound/soc/fsl/fsl_utils.c
@@ -86,33 +86,6 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np,
 }
 EXPORT_SYMBOL(fsl_asoc_get_dma_channel);
 
-/**
- * fsl_asoc_xlate_tdm_slot_mask - generate TDM slot TX/RX mask.
- *
- * @slots: Number of slots in use.
- * @tx_mask: bitmask representing active TX slots.
- * @rx_mask: bitmask representing active RX slots.
- *
- * This function used to generate the TDM slot TX/RX mask. And the TX/RX
- * mask will use a 0 bit for an active slot as default, and the default
- * active bits are at the LSB of the mask value.
- */
-int fsl_asoc_xlate_tdm_slot_mask(unsigned int slots,
-                                    unsigned int *tx_mask,
-                                    unsigned int *rx_mask)
-{
-        if (!slots)
-                return -EINVAL;
-
-        if (tx_mask)
-                *tx_mask = ~((1 << slots) - 1);
-        if (rx_mask)
-                *rx_mask = ~((1 << slots) - 1);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(fsl_asoc_xlate_tdm_slot_mask);
-
 MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
 MODULE_DESCRIPTION("Freescale ASoC utility code");
 MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/fsl/fsl_utils.h b/sound/soc/fsl/fsl_utils.h
index df535db40313..1687b66ef18e 100644
--- a/sound/soc/fsl/fsl_utils.h
+++ b/sound/soc/fsl/fsl_utils.h
@@ -22,7 +22,4 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, const char *name,
                              struct snd_soc_dai_link *dai,
                              unsigned int *dma_channel_id,
                              unsigned int *dma_id);
-int fsl_asoc_xlate_tdm_slot_mask(unsigned int slots,
-                                    unsigned int *tx_mask,
-                                    unsigned int *rx_mask);
 #endif /* _FSL_UTILS_H */
diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c
index 6bf5bce01a92..9e6493d4e7ff 100644
--- a/sound/soc/fsl/imx-mc13783.c
+++ b/sound/soc/fsl/imx-mc13783.c
@@ -37,8 +37,7 @@ static int imx_mc13783_hifi_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         int ret;
 
-        ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xfffffffc, 0xfffffffc,
-                                        4, 16);
+        ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x3, 0x3, 4, 16);
         if (ret)
                 return ret;
 
@@ -46,7 +45,7 @@ static int imx_mc13783_hifi_hw_params(struct snd_pcm_substream *substream,
         if (ret)
                 return ret;
 
-        ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x0, 0xfffffffc, 2, 16);
+        ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, 16);
         if (ret)
                 return ret;
 
diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c
index e94704f1b9ee..33da26a12457 100644
--- a/sound/soc/fsl/imx-spdif.c
+++ b/sound/soc/fsl/imx-spdif.c
@@ -60,6 +60,7 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
         data->card.dev = &pdev->dev;
         data->card.dai_link = &data->dai;
         data->card.num_links = 1;
+        data->card.owner = THIS_MODULE;
 
         ret = snd_soc_of_parse_card_name(&data->card, "model");
         if (ret)
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index fa801e17c51e..461ce27b884f 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -74,8 +74,8 @@ static int imx_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai,
         sccr |= SSI_STCCR_DC(slots - 1);
         writel(sccr, ssi->base + SSI_SRCCR);
 
-        writel(tx_mask, ssi->base + SSI_STMSK);
-        writel(rx_mask, ssi->base + SSI_SRMSK);
+        writel(~tx_mask, ssi->base + SSI_STMSK);
+        writel(~rx_mask, ssi->base + SSI_SRMSK);
 
         return 0;
 }
@@ -340,7 +340,6 @@ static const struct snd_soc_dai_ops imx_ssi_pcm_dai_ops = {
         .set_fmt        = imx_ssi_set_dai_fmt,
         .set_clkdiv     = imx_ssi_set_dai_clkdiv,
         .set_sysclk     = imx_ssi_set_dai_sysclk,
-        .xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask,
         .set_tdm_slot   = imx_ssi_set_dai_tdm_slot,
         .trigger        = imx_ssi_trigger,
 };
diff --git a/sound/soc/fsl/mx27vis-aic32x4.c b/sound/soc/fsl/mx27vis-aic32x4.c
index b1ced7b8d80c..198eeb3f3f7a 100644
--- a/sound/soc/fsl/mx27vis-aic32x4.c
+++ b/sound/soc/fsl/mx27vis-aic32x4.c
@@ -55,16 +55,6 @@ static int mx27vis_aic32x4_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret;
-        u32 dai_format;
-
-        dai_format = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
-                SND_SOC_DAIFMT_CBM_CFM;
-
-        /* set codec DAI configuration */
-        snd_soc_dai_set_fmt(codec_dai, dai_format);
-
-        /* set cpu DAI configuration */
-        snd_soc_dai_set_fmt(cpu_dai, dai_format);
 
         ret = snd_soc_dai_set_sysclk(codec_dai, 0,
                                      25000000, SND_SOC_CLOCK_OUT);
@@ -164,6 +154,8 @@ static struct snd_soc_dai_link mx27vis_aic32x4_dai = {
         .platform_name  = "imx-ssi.0",
         .codec_name     = "tlv320aic32x4.0-0018",
         .cpu_dai_name   = "imx-ssi.0",
+        .dai_fmt        = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
+                          SND_SOC_DAIFMT_CBM_CFM,
         .ops            = &mx27vis_aic32x4_snd_ops,
 };
 
diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c
index 804749a6c61e..a958937ab405 100644
--- a/sound/soc/fsl/wm1133-ev1.c
+++ b/sound/soc/fsl/wm1133-ev1.c
@@ -87,7 +87,6 @@ static int wm1133_ev1_hw_params(struct snd_pcm_substream *substream,
         snd_pcm_format_t format = params_format(params);
         unsigned int rate = params_rate(params);
         unsigned int channels = params_channels(params);
-        u32 dai_format;
 
         /* find the correct audio parameters */
         for (i = 0; i < ARRAY_SIZE(wm8350_audio); i++) {
@@ -104,22 +103,13 @@ static int wm1133_ev1_hw_params(struct snd_pcm_substream *substream,
         /* codec FLL input is 14.75 MHz from MCLK */
         snd_soc_dai_set_pll(codec_dai, 0, 0, 14750000, wm8350_audio[i].sysclk);
 
-        dai_format = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                SND_SOC_DAIFMT_CBM_CFM;
-
-        /* set codec DAI configuration */
-        snd_soc_dai_set_fmt(codec_dai, dai_format);
-
-        /* set cpu DAI configuration */
-        snd_soc_dai_set_fmt(cpu_dai, dai_format);
-
         /* TODO: The SSI driver should figure this out for us */
         switch (channels) {
         case 2:
-                snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);
+                snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, 0);
                 break;
         case 1:
-                snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffe, 0xffffffe, 1, 0);
+                snd_soc_dai_set_tdm_slot(cpu_dai, 0x1, 0x1, 1, 0);
                 break;
         default:
                 return -EINVAL;
@@ -244,6 +234,8 @@ static struct snd_soc_dai_link wm1133_ev1_dai = {
         .init = wm1133_ev1_init,
         .ops = &wm1133_ev1_ops,
         .symmetric_rates = 1,
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBM_CFM,
 };
 
 static struct snd_soc_card wm1133_ev1 = {
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 7fe3009b1c43..f7c6734bd5da 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -39,6 +39,37 @@ struct simple_card_data {
 #define simple_priv_to_link(priv, i) ((priv)->snd_card.dai_link + i)
 #define simple_priv_to_props(priv, i) ((priv)->dai_props + i)
 
+static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
+        struct simple_dai_props *dai_props =
+                &priv->dai_props[rtd - rtd->card->rtd];
+        int ret;
+
+        ret = clk_prepare_enable(dai_props->cpu_dai.clk);
+        if (ret)
+                return ret;
+        
+        ret = clk_prepare_enable(dai_props->codec_dai.clk);
+        if (ret)
+                clk_disable_unprepare(dai_props->cpu_dai.clk);
+
+        return ret;
+}
+
+static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
+        struct simple_dai_props *dai_props =
+                &priv->dai_props[rtd - rtd->card->rtd];
+
+        clk_disable_unprepare(dai_props->cpu_dai.clk);
+
+        clk_disable_unprepare(dai_props->codec_dai.clk);
+}
+
 static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
                                       struct snd_pcm_hw_params *params)
 {
@@ -58,6 +89,8 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
 }
 
 static struct snd_soc_ops asoc_simple_card_ops = {
+        .startup = asoc_simple_card_startup,
+        .shutdown = asoc_simple_card_shutdown,
         .hw_params = asoc_simple_card_hw_params,
 };
 
@@ -219,6 +252,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
                 }
 
                 dai->sysclk = clk_get_rate(clk);
+                dai->clk = clk;
         } else if (!of_property_read_u32(np, "system-clock-frequency", &val)) {
                 dai->sysclk = val;
         } else {
diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/broadwell.c
index 7cf95d5d5d80..9cf7d01479ad 100644
--- a/sound/soc/intel/broadwell.c
+++ b/sound/soc/intel/broadwell.c
@@ -140,8 +140,6 @@ static struct snd_soc_ops broadwell_rt286_ops = {
 
 static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev);
         struct sst_hsw *broadwell = pdata->dsp;
         int ret;
@@ -155,14 +153,6 @@ static int broadwell_rtd_init(struct snd_soc_pcm_runtime *rtd)
                 return ret;
         }
 
-        /* always connected - check HP for jack detect */
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
-        snd_soc_dapm_enable_pin(dapm, "Line Jack");
-        snd_soc_dapm_enable_pin(dapm, "DMIC1");
-        snd_soc_dapm_enable_pin(dapm, "DMIC2");
-
         return 0;
 }
 
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index 0cba7830c5e9..354eaad886e1 100644
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -132,7 +132,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
 {
         int ret;
         struct snd_soc_codec *codec = runtime->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct snd_soc_card *card = runtime->card;
         const struct snd_soc_dapm_route *custom_map;
         int num_routes;
@@ -161,7 +160,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
                 num_routes = ARRAY_SIZE(byt_rt5640_intmic_dmic1_map);
         }
 
-        ret = snd_soc_dapm_add_routes(dapm, custom_map, num_routes);
+        ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes);
         if (ret)
                 return ret;
 
@@ -171,13 +170,8 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
                         return ret;
         }
 
-        snd_soc_dapm_ignore_suspend(dapm, "HPOL");
-        snd_soc_dapm_ignore_suspend(dapm, "HPOR");
-
-        snd_soc_dapm_ignore_suspend(dapm, "SPOLP");
-        snd_soc_dapm_ignore_suspend(dapm, "SPOLN");
-        snd_soc_dapm_ignore_suspend(dapm, "SPORP");
-        snd_soc_dapm_ignore_suspend(dapm, "SPORN");
+        snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone");
+        snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");
 
         return ret;
 }
diff --git a/sound/soc/intel/cht_bsw_rt5672.c b/sound/soc/intel/cht_bsw_rt5672.c
index a406c6104897..ff016621583a 100644
--- a/sound/soc/intel/cht_bsw_rt5672.c
+++ b/sound/soc/intel/cht_bsw_rt5672.c
@@ -140,6 +140,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
 {
         int ret;
         struct snd_soc_dai *codec_dai = runtime->codec_dai;
+        struct snd_soc_codec *codec = codec_dai->codec;
 
         /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */
         ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xF, 0xF, 4, 24);
@@ -148,6 +149,19 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
                 return ret;
         }
 
+        /* Select codec ASRC clock source to track I2S1 clock, because codec
+         * is in slave mode and 100fs I2S format (BCLK = 100 * LRCLK) cannot
+         * be supported by RT5672. Otherwise, ASRC will be disabled and cause
+         * noise.
+         */
+        rt5670_sel_asrc_clk_src(codec,
+                                RT5670_DA_STEREO_FILTER
+                                | RT5670_DA_MONO_L_FILTER
+                                | RT5670_DA_MONO_R_FILTER
+                                | RT5670_AD_STEREO_FILTER
+                                | RT5670_AD_MONO_L_FILTER
+                                | RT5670_AD_MONO_R_FILTER,
+                                RT5670_CLK_SEL_I2S1_ASRC);
         return 0;
 }
 
diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c
index 3bb6288d8b4d..224c49c9f135 100644
--- a/sound/soc/intel/sst-baytrail-pcm.c
+++ b/sound/soc/intel/sst-baytrail-pcm.c
@@ -320,11 +320,6 @@ static struct snd_pcm_ops sst_byt_pcm_ops = {
         .mmap           = sst_byt_pcm_mmap,
 };
 
-static void sst_byt_pcm_free(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_pcm *pcm = rtd->pcm;
@@ -403,7 +398,6 @@ static struct snd_soc_platform_driver byt_soc_platform = {
         .remove         = sst_byt_pcm_remove,
         .ops            = &sst_byt_pcm_ops,
         .pcm_new        = sst_byt_pcm_new,
-        .pcm_free       = sst_byt_pcm_free,
 };
 
 static const struct snd_soc_component_driver byt_dai_component = {
diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/sst-dsp.c
index 86e410845670..64e94212d2d2 100644
--- a/sound/soc/intel/sst-dsp.c
+++ b/sound/soc/intel/sst-dsp.c
@@ -410,8 +410,7 @@ void sst_dsp_free(struct sst_dsp *sst)
         if (sst->ops->free)
                 sst->ops->free(sst);
 
-        if (sst->dma)
-                sst_dma_free(sst->dma);
+        sst_dma_free(sst->dma);
 }
 EXPORT_SYMBOL_GPL(sst_dsp_free);
 
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index a2ae2c5f2e9f..5f71ef607a57 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -791,6 +791,7 @@ int sst_module_alloc_blocks(struct sst_module *module)
         struct sst_block_allocator ba;
         int ret;
 
+        memset(&ba, 0, sizeof(ba));
         ba.size = module->size;
         ba.type = module->type;
         ba.offset = module->offset;
@@ -864,6 +865,7 @@ int sst_module_runtime_alloc_blocks(struct sst_module_runtime *runtime,
         if (module->persistent_size == 0)
                 return 0;
 
+        memset(&ba, 0, sizeof(ba));
         ba.size = module->persistent_size;
         ba.type = SST_MEM_DRAM;
 
diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/sst-haswell-dsp.c
index 57039b00efc2..c42ffae5fe9f 100644
--- a/sound/soc/intel/sst-haswell-dsp.c
+++ b/sound/soc/intel/sst-haswell-dsp.c
@@ -306,7 +306,7 @@ static void hsw_reset(struct sst_dsp *sst)
 static int hsw_set_dsp_D0(struct sst_dsp *sst)
 {
         int tries = 10;
-        u32 reg;
+        u32 reg, fw_dump_bit;
 
         /* Disable core clock gating (VDRTCTL2.DCLCGE = 0) */
         reg = readl(sst->addr.pci_cfg + SST_VDRTCTL2);
@@ -368,7 +368,9 @@ finish:
         can't be accessed, please enable each block before accessing. */
         reg = readl(sst->addr.pci_cfg + SST_VDRTCTL0);
         reg |= SST_VDRTCL0_DSRAMPGE_MASK | SST_VDRTCL0_ISRAMPGE_MASK;
-        writel(reg, sst->addr.pci_cfg + SST_VDRTCTL0);
+        /* for D0, always enable the block(DSRAM[0]) used for FW dump */
+        fw_dump_bit = 1 << SST_VDRTCL0_DSRAMPGE_SHIFT;
+        writel(reg & ~fw_dump_bit, sst->addr.pci_cfg + SST_VDRTCTL0);
 
 
         /* disable DMA finish function for SSP0 & SSP1 */
@@ -491,6 +493,7 @@ static const struct sst_sram_shift sram_shift[] = {
         {SST_DEV_ID_LYNX_POINT, 6, 16}, /* lp */
         {SST_DEV_ID_WILDCAT_POINT, 2, 12}, /* wpt */
 };
+
 static u32 hsw_block_get_bit(struct sst_mem_block *block)
 {
         u32 bit = 0, shift = 0, index;
@@ -587,7 +590,9 @@ static int hsw_block_disable(struct sst_mem_block *block)
 
         val = readl(sst->addr.pci_cfg + SST_VDRTCTL0);
         bit = hsw_block_get_bit(block);
-        writel(val | bit, sst->addr.pci_cfg + SST_VDRTCTL0);
+        /* don't disable DSRAM[0], keep it always enable for FW dump*/
+        if (bit != (1 << SST_VDRTCL0_DSRAMPGE_SHIFT))
+                writel(val | bit, sst->addr.pci_cfg + SST_VDRTCTL0);
 
         /* wait 18 DSP clock ticks */
         udelay(10);
@@ -612,7 +617,7 @@ static int hsw_init(struct sst_dsp *sst, struct sst_pdata *pdata)
         const struct sst_adsp_memregion *region;
         struct device *dev;
         int ret = -ENODEV, i, j, region_count;
-        u32 offset, size;
+        u32 offset, size, fw_dump_bit;
 
         dev = sst->dma_dev;
 
@@ -669,9 +674,11 @@ static int hsw_init(struct sst_dsp *sst, struct sst_pdata *pdata)
                 }
         }
 
+        /* always enable the block(DSRAM[0]) used for FW dump */
+        fw_dump_bit = 1 << SST_VDRTCL0_DSRAMPGE_SHIFT;
         /* set default power gating control, enable power gating control for all blocks. that is,
         can't be accessed, please enable each block before accessing. */
-        writel(0xffffffff, sst->addr.pci_cfg + SST_VDRTCTL0);
+        writel(0xffffffff & ~fw_dump_bit, sst->addr.pci_cfg + SST_VDRTCTL0);
 
         return 0;
 }
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index 5bf14040c24a..a282179a3064 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -94,6 +94,8 @@
 /* Mailbox */
 #define IPC_MAX_MAILBOX_BYTES   256
 
+#define INVALID_STREAM_HW_ID    0xffffffff
+
 /* Global Message - Types and Replies */
 enum ipc_glb_type {
         IPC_GLB_GET_FW_VERSION = 0,             /* Retrieves firmware version */
@@ -275,7 +277,6 @@ struct sst_hsw {
         /* FW config */
         struct sst_hsw_ipc_fw_ready fw_ready;
         struct sst_hsw_ipc_fw_version version;
-        struct sst_module *scratch;
         bool fw_done;
         struct sst_fw *sst_fw;
 
@@ -651,11 +652,11 @@ static void hsw_notification_work(struct work_struct *work)
         }
 
         /* tell DSP that notification has been handled */
-        sst_dsp_shim_update_bits_unlocked(hsw->dsp, SST_IPCD,
+        sst_dsp_shim_update_bits(hsw->dsp, SST_IPCD,
                 SST_IPCD_BUSY | SST_IPCD_DONE, SST_IPCD_DONE);
 
         /* unmask busy interrupt */
-        sst_dsp_shim_update_bits_unlocked(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0);
+        sst_dsp_shim_update_bits(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0);
 }
 
 static struct ipc_message *reply_find_msg(struct sst_hsw *hsw, u32 header)
@@ -1208,6 +1209,7 @@ struct sst_hsw_stream *sst_hsw_stream_new(struct sst_hsw *hsw, int id,
                 return NULL;
 
         spin_lock_irqsave(&sst->spinlock, flags);
+        stream->reply.stream_hw_id = INVALID_STREAM_HW_ID;
         list_add(&stream->node, &hsw->stream_list);
         stream->notify_position = notify_position;
         stream->pdata = data;
@@ -2132,7 +2134,6 @@ void sst_hsw_dsp_free(struct device *dev, struct sst_pdata *pdata)
         dma_free_coherent(hsw->dsp->dma_dev, SST_HSW_DX_CONTEXT_SIZE,
                         hsw->dx_context, hsw->dx_context_paddr);
         sst_dsp_free(hsw->dsp);
-        kfree(hsw->scratch);
         kthread_stop(hsw->tx_thread);
         kfree(hsw->msg);
 }
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c
index 619525200705..ad7f4a51e138 100644
--- a/sound/soc/intel/sst-haswell-pcm.c
+++ b/sound/soc/intel/sst-haswell-pcm.c
@@ -78,7 +78,6 @@ static const u32 volume_map[] = {
 #define HSW_PCM_DAI_ID_OFFLOAD0 1
 #define HSW_PCM_DAI_ID_OFFLOAD1 2
 #define HSW_PCM_DAI_ID_LOOPBACK 3
-#define HSW_PCM_DAI_ID_CAPTURE  4
 
 
 static const struct snd_pcm_hardware hsw_pcm_hardware = {
@@ -99,6 +98,7 @@ static const struct snd_pcm_hardware hsw_pcm_hardware = {
 
 struct hsw_pcm_module_map {
         int dai_id;
+        int stream;
         enum sst_hsw_module_id mod_id;
 };
 
@@ -135,7 +135,17 @@ struct hsw_priv_data {
         struct snd_dma_buffer dmab[HSW_PCM_COUNT][2];
 
         /* DAI data */
-        struct hsw_pcm_data pcm[HSW_PCM_COUNT];
+        struct hsw_pcm_data pcm[HSW_PCM_COUNT][2];
+};
+
+
+/* static mappings between PCMs and modules - may be dynamic in future */
+static struct hsw_pcm_module_map mod_map[] = {
+        {HSW_PCM_DAI_ID_SYSTEM, 0, SST_HSW_MODULE_PCM_SYSTEM},
+        {HSW_PCM_DAI_ID_OFFLOAD0, 0, SST_HSW_MODULE_PCM},
+        {HSW_PCM_DAI_ID_OFFLOAD1, 0, SST_HSW_MODULE_PCM},
+        {HSW_PCM_DAI_ID_LOOPBACK, 1, SST_HSW_MODULE_PCM_REFERENCE},
+        {HSW_PCM_DAI_ID_SYSTEM, 1, SST_HSW_MODULE_PCM_CAPTURE},
 };
 
 static u32 hsw_notify_pointer(struct sst_hsw_stream *stream, void *data);
@@ -168,9 +178,14 @@ static int hsw_stream_volume_put(struct snd_kcontrol *kcontrol,
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct hsw_priv_data *pdata =
                 snd_soc_platform_get_drvdata(platform);
-        struct hsw_pcm_data *pcm_data = &pdata->pcm[mc->reg];
+        struct hsw_pcm_data *pcm_data;
         struct sst_hsw *hsw = pdata->hsw;
         u32 volume;
+        int dai, stream;
+
+        dai = mod_map[mc->reg].dai_id;
+        stream = mod_map[mc->reg].stream;
+        pcm_data = &pdata->pcm[dai][stream];
 
         mutex_lock(&pcm_data->mutex);
         pm_runtime_get_sync(pdata->dev);
@@ -212,9 +227,14 @@ static int hsw_stream_volume_get(struct snd_kcontrol *kcontrol,
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct hsw_priv_data *pdata =
                 snd_soc_platform_get_drvdata(platform);
-        struct hsw_pcm_data *pcm_data = &pdata->pcm[mc->reg];
+        struct hsw_pcm_data *pcm_data;
         struct sst_hsw *hsw = pdata->hsw;
         u32 volume;
+        int dai, stream;
+
+        dai = mod_map[mc->reg].dai_id;
+        stream = mod_map[mc->reg].stream;
+        pcm_data = &pdata->pcm[dai][stream];
 
         mutex_lock(&pcm_data->mutex);
         pm_runtime_get_sync(pdata->dev);
@@ -309,7 +329,7 @@ static const struct snd_kcontrol_new hsw_volume_controls[] = {
                 ARRAY_SIZE(volume_map) - 1, 0,
                 hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv),
         /* Mic Capture volume */
-        SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 0, 0, 8,
+        SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 4, 0, 8,
                 ARRAY_SIZE(volume_map) - 1, 0,
                 hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv),
 };
@@ -353,7 +373,7 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct hsw_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct hsw_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
+        struct hsw_pcm_data *pcm_data;
         struct sst_hsw *hsw = pdata->hsw;
         struct sst_module *module_data;
         struct sst_dsp *dsp;
@@ -362,7 +382,10 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream,
         enum sst_hsw_stream_path_id path_id;
         u32 rate, bits, map, pages, module_id;
         u8 channels;
-        int ret;
+        int ret, dai;
+
+        dai = mod_map[rtd->cpu_dai->id].dai_id;
+        pcm_data = &pdata->pcm[dai][substream->stream];
 
         /* check if we are being called a subsequent time */
         if (pcm_data->allocated) {
@@ -552,8 +575,12 @@ static int hsw_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct hsw_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct hsw_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
+        struct hsw_pcm_data *pcm_data;
         struct sst_hsw *hsw = pdata->hsw;
+        int dai;
+
+        dai = mod_map[rtd->cpu_dai->id].dai_id;
+        pcm_data = &pdata->pcm[dai][substream->stream];
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
@@ -597,11 +624,16 @@ static snd_pcm_uframes_t hsw_pcm_pointer(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct hsw_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct hsw_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
+        struct hsw_pcm_data *pcm_data;
         struct sst_hsw *hsw = pdata->hsw;
         snd_pcm_uframes_t offset;
         uint64_t ppos;
-        u32 position = sst_hsw_get_dsp_position(hsw, pcm_data->stream);
+        u32 position;
+        int dai;
+
+        dai = mod_map[rtd->cpu_dai->id].dai_id;
+        pcm_data = &pdata->pcm[dai][substream->stream];
+        position = sst_hsw_get_dsp_position(hsw, pcm_data->stream);
 
         offset = bytes_to_frames(runtime, position);
         ppos = sst_hsw_get_dsp_presentation_position(hsw, pcm_data->stream);
@@ -618,8 +650,10 @@ static int hsw_pcm_open(struct snd_pcm_substream *substream)
                 snd_soc_platform_get_drvdata(rtd->platform);
         struct hsw_pcm_data *pcm_data;
         struct sst_hsw *hsw = pdata->hsw;
+        int dai;
 
-        pcm_data = &pdata->pcm[rtd->cpu_dai->id];
+        dai = mod_map[rtd->cpu_dai->id].dai_id;
+        pcm_data = &pdata->pcm[dai][substream->stream];
 
         mutex_lock(&pcm_data->mutex);
         pm_runtime_get_sync(pdata->dev);
@@ -648,9 +682,12 @@ static int hsw_pcm_close(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct hsw_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct hsw_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
+        struct hsw_pcm_data *pcm_data;
         struct sst_hsw *hsw = pdata->hsw;
-        int ret;
+        int ret, dai;
+
+        dai = mod_map[rtd->cpu_dai->id].dai_id;
+        pcm_data = &pdata->pcm[dai][substream->stream];
 
         mutex_lock(&pcm_data->mutex);
         ret = sst_hsw_stream_reset(hsw, pcm_data->stream);
@@ -685,15 +722,6 @@ static struct snd_pcm_ops hsw_pcm_ops = {
         .page           = snd_pcm_sgbuf_ops_page,
 };
 
-/* static mappings between PCMs and modules - may be dynamic in future */
-static struct hsw_pcm_module_map mod_map[] = {
-        {HSW_PCM_DAI_ID_SYSTEM, SST_HSW_MODULE_PCM_SYSTEM},
-        {HSW_PCM_DAI_ID_OFFLOAD0, SST_HSW_MODULE_PCM},
-        {HSW_PCM_DAI_ID_OFFLOAD1, SST_HSW_MODULE_PCM},
-        {HSW_PCM_DAI_ID_LOOPBACK, SST_HSW_MODULE_PCM_REFERENCE},
-        {HSW_PCM_DAI_ID_CAPTURE, SST_HSW_MODULE_PCM_CAPTURE},
-};
-
 static int hsw_pcm_create_modules(struct hsw_priv_data *pdata)
 {
         struct sst_hsw *hsw = pdata->hsw;
@@ -701,7 +729,7 @@ static int hsw_pcm_create_modules(struct hsw_priv_data *pdata)
         int i;
 
         for (i = 0; i < ARRAY_SIZE(mod_map); i++) {
-                pcm_data = &pdata->pcm[i];
+                pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];
 
                 /* create new runtime module, use same offset if recreated */
                 pcm_data->runtime = sst_hsw_runtime_module_create(hsw,
@@ -716,7 +744,7 @@ static int hsw_pcm_create_modules(struct hsw_priv_data *pdata)
 
 err:
         for (--i; i >= 0; i--) {
-                pcm_data = &pdata->pcm[i];
+                pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];
                 sst_hsw_runtime_module_free(pcm_data->runtime);
         }
 
@@ -729,17 +757,12 @@ static void hsw_pcm_free_modules(struct hsw_priv_data *pdata)
         int i;
 
         for (i = 0; i < ARRAY_SIZE(mod_map); i++) {
-                pcm_data = &pdata->pcm[i];
+                pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];
 
                 sst_hsw_runtime_module_free(pcm_data->runtime);
         }
 }
 
-static void hsw_pcm_free(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_pcm *pcm = rtd->pcm;
@@ -762,7 +785,10 @@ static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd)
                         return ret;
                 }
         }
-        priv_data->pcm[rtd->cpu_dai->id].hsw_pcm = pcm;
+        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream)
+                priv_data->pcm[rtd->cpu_dai->id][SNDRV_PCM_STREAM_PLAYBACK].hsw_pcm = pcm;
+        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream)
+                priv_data->pcm[rtd->cpu_dai->id][SNDRV_PCM_STREAM_CAPTURE].hsw_pcm = pcm;
 
         return ret;
 }
@@ -871,10 +897,9 @@ static int hsw_pcm_probe(struct snd_soc_platform *platform)
         /* allocate DSP buffer page tables */
         for (i = 0; i < ARRAY_SIZE(hsw_dais); i++) {
 
-                mutex_init(&priv_data->pcm[i].mutex);
-
                 /* playback */
                 if (hsw_dais[i].playback.channels_min) {
+                        mutex_init(&priv_data->pcm[i][SNDRV_PCM_STREAM_PLAYBACK].mutex);
                         ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, dma_dev,
                                 PAGE_SIZE, &priv_data->dmab[i][0]);
                         if (ret < 0)
@@ -883,6 +908,7 @@ static int hsw_pcm_probe(struct snd_soc_platform *platform)
 
                 /* capture */
                 if (hsw_dais[i].capture.channels_min) {
+                        mutex_init(&priv_data->pcm[i][SNDRV_PCM_STREAM_CAPTURE].mutex);
                         ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, dma_dev,
                                 PAGE_SIZE, &priv_data->dmab[i][1]);
                         if (ret < 0)
@@ -936,7 +962,6 @@ static struct snd_soc_platform_driver hsw_soc_platform = {
         .remove         = hsw_pcm_remove,
         .ops            = &hsw_pcm_ops,
         .pcm_new        = hsw_pcm_new,
-        .pcm_free       = hsw_pcm_free,
 };
 
 static const struct snd_soc_component_driver hsw_dai_component = {
@@ -1081,8 +1106,8 @@ static void hsw_pcm_complete(struct device *dev)
                 return;
         }
 
-        for (i = 0; i < HSW_PCM_DAI_ID_CAPTURE + 1; i++) {
-                pcm_data = &pdata->pcm[i];
+        for (i = 0; i < ARRAY_SIZE(mod_map); i++) {
+                pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];
 
                 if (!pcm_data->substream)
                         continue;
@@ -1115,8 +1140,8 @@ static int hsw_pcm_prepare(struct device *dev)
         if (pdata->pm_state == HSW_PM_STATE_D3)
                 return 0;
         /* suspend all active streams */
-        for (i = 0; i < HSW_PCM_DAI_ID_CAPTURE + 1; i++) {
-                pcm_data = &pdata->pcm[i];
+        for (i = 0; i < ARRAY_SIZE(mod_map); i++) {
+                pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];
 
                 if (!pcm_data->substream)
                         continue;
@@ -1134,8 +1159,8 @@ static int hsw_pcm_prepare(struct device *dev)
         sst_hsw_dsp_runtime_suspend(hsw);
 
         /* preserve persistent memory */
-        for (i = 0; i < HSW_PCM_DAI_ID_CAPTURE + 1; i++) {
-                pcm_data = &pdata->pcm[i];
+        for (i = 0; i < ARRAY_SIZE(mod_map); i++) {
+                pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];
 
                 if (!pcm_data->substream)
                         continue;
diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/sst-mfld-platform-pcm.c
index 2d80c4e12997..7523cbef8780 100644
--- a/sound/soc/intel/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/sst-mfld-platform-pcm.c
@@ -643,11 +643,6 @@ static struct snd_pcm_ops sst_platform_ops = {
         .pointer = sst_platform_pcm_pointer,
 };
 
-static void sst_pcm_free(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_dai *dai = rtd->cpu_dai;
@@ -678,7 +673,6 @@ static struct snd_soc_platform_driver sst_soc_platform_drv  = {
         .ops            = &sst_platform_ops,
         .compr_ops      = &sst_platform_compr_ops,
         .pcm_new        = sst_pcm_new,
-        .pcm_free       = sst_pcm_free,
 };
 
 static const struct snd_soc_component_driver sst_component = {
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index c3fbcdec6a15..43bc1c4b9207 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -352,6 +352,8 @@ static struct sst_machines sst_acpi_bytcr[] = {
 static struct sst_machines sst_acpi_chv[] = {
         {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "fw_sst_22a8.bin",
                                                 &chv_platform_data },
+        {"10EC5645", "cht-bsw", "cht-bsw-rt5645", NULL, "fw_sst_22a8.bin",
+                                                &chv_platform_data },
         {},
 };
 
diff --git a/sound/soc/intel/sst/sst_loader.c b/sound/soc/intel/sst/sst_loader.c
index b580f96e25e5..7888cd707853 100644
--- a/sound/soc/intel/sst/sst_loader.c
+++ b/sound/soc/intel/sst/sst_loader.c
@@ -324,8 +324,7 @@ void sst_firmware_load_cb(const struct firmware *fw, void *context)
 
         if (ctx->sst_state != SST_RESET ||
                         ctx->fw_in_mem != NULL) {
-                if (fw != NULL)
-                        release_firmware(fw);
+                release_firmware(fw);
                 mutex_unlock(&ctx->sst_lock);
                 return;
         }
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index d9865082160c..c866ade28ad0 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -710,7 +710,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
         struct device_node *np = pdev->dev.of_node;
         struct resource *iores;
         struct mxs_saif *saif;
-        int ret = 0;
+        int irq, ret = 0;
         struct device_node *master;
 
         if (!np)
@@ -763,16 +763,16 @@ static int mxs_saif_probe(struct platform_device *pdev)
         if (IS_ERR(saif->base))
                 return PTR_ERR(saif->base);
 
-        saif->irq = platform_get_irq(pdev, 0);
-        if (saif->irq < 0) {
-                ret = saif->irq;
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                ret = irq;
                 dev_err(&pdev->dev, "failed to get irq resource: %d\n",
                         ret);
                 return ret;
         }
 
         saif->dev = &pdev->dev;
-        ret = devm_request_irq(&pdev->dev, saif->irq, mxs_saif_irq, 0,
+        ret = devm_request_irq(&pdev->dev, irq, mxs_saif_irq, 0,
                                dev_name(&pdev->dev), saif);
         if (ret) {
                 dev_err(&pdev->dev, "failed to request irq\n");
diff --git a/sound/soc/mxs/mxs-saif.h b/sound/soc/mxs/mxs-saif.h
index fbaf7badfdfb..9a4c0b291b9e 100644
--- a/sound/soc/mxs/mxs-saif.h
+++ b/sound/soc/mxs/mxs-saif.h
@@ -116,7 +116,6 @@ struct mxs_saif {
         unsigned int mclk;
         unsigned int mclk_in_use;
         void __iomem *base;
-        int irq;
         unsigned int id;
         unsigned int master_id;
         unsigned int cur_rate;
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c
index 6f1916b71815..6e6fce6a14ba 100644
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@ -36,7 +36,7 @@ static int mxs_sgtl5000_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         unsigned int rate = params_rate(params);
-        u32 dai_format, mclk;
+        u32 mclk;
         int ret;
 
         /* sgtl5000 does not support 512*rate when in 96000 fs */
@@ -65,26 +65,6 @@ static int mxs_sgtl5000_hw_params(struct snd_pcm_substream *substream,
                 return ret;
         }
 
-        /* set codec to slave mode */
-        dai_format = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                        SND_SOC_DAIFMT_CBS_CFS;
-
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, dai_format);
-        if (ret) {
-                dev_err(codec_dai->dev, "Failed to set dai format to %08x\n",
-                        dai_format);
-                return ret;
-        }
-
-        /* set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, dai_format);
-        if (ret) {
-                dev_err(cpu_dai->dev, "Failed to set dai format to %08x\n",
-                        dai_format);
-                return ret;
-        }
-
         return 0;
 }
 
@@ -92,17 +72,22 @@ static struct snd_soc_ops mxs_sgtl5000_hifi_ops = {
         .hw_params = mxs_sgtl5000_hw_params,
 };
 
+#define MXS_SGTL5000_DAI_FMT (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \
+        SND_SOC_DAIFMT_CBS_CFS)
+
 static struct snd_soc_dai_link mxs_sgtl5000_dai[] = {
         {
                 .name           = "HiFi Tx",
                 .stream_name    = "HiFi Playback",
                 .codec_dai_name = "sgtl5000",
+                .dai_fmt        = MXS_SGTL5000_DAI_FMT,
                 .ops            = &mxs_sgtl5000_hifi_ops,
                 .playback_only  = true,
         }, {
                 .name           = "HiFi Rx",
                 .stream_name    = "HiFi Capture",
                 .codec_dai_name = "sgtl5000",
+                .dai_fmt        = MXS_SGTL5000_DAI_FMT,
                 .ops            = &mxs_sgtl5000_hifi_ops,
                 .capture_only   = true,
         },
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c
index b779a3d9b5dd..b809fa909e4d 100644
--- a/sound/soc/nuc900/nuc900-pcm.c
+++ b/sound/soc/nuc900/nuc900-pcm.c
@@ -306,11 +306,6 @@ static struct snd_pcm_ops nuc900_dma_ops = {
         .mmap           = nuc900_dma_mmap,
 };
 
-static void nuc900_dma_free_dma_buffers(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int nuc900_dma_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_card *card = rtd->card->snd_card;
@@ -330,7 +325,6 @@ static int nuc900_dma_new(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_platform_driver nuc900_soc_platform = {
         .ops            = &nuc900_dma_ops,
         .pcm_new        = nuc900_dma_new,
-        .pcm_free       = nuc900_dma_free_dma_buffers,
 };
 
 static int nuc900_soc_platform_probe(struct platform_device *pdev)
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 4c6afb75eea6..706613077c15 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -412,21 +412,7 @@ static struct tty_ldisc_ops cx81801_ops = {
  * over the modem port.
  */
 
-static int ams_delta_hw_params(struct snd_pcm_substream *substream,
-                         struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-
-        /* Set cpu DAI configuration */
-        return snd_soc_dai_set_fmt(rtd->cpu_dai,
-                                   SND_SOC_DAIFMT_DSP_A |
-                                   SND_SOC_DAIFMT_NB_NF |
-                                   SND_SOC_DAIFMT_CBM_CFM);
-}
-
-static struct snd_soc_ops ams_delta_ops = {
-        .hw_params = ams_delta_hw_params,
-};
+static struct snd_soc_ops ams_delta_ops;
 
 
 /* Digital mute implemented using modem/CPU multiplexer.
@@ -546,6 +532,8 @@ static struct snd_soc_dai_link ams_delta_dai_link = {
         .platform_name = "omap-mcbsp.1",
         .codec_name = "cx20442-codec",
         .ops = &ams_delta_ops,
+        .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBM_CFM,
 };
 
 /* Audio card driver */
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index 5e551c762b7a..fb1f6bb87cd4 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -53,11 +53,7 @@ static int omap_twl4030_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct snd_soc_card *card = rtd->card;
         unsigned int fmt;
-        int ret;
 
         switch (params_channels(params)) {
         case 2: /* Stereo I2S mode */
@@ -74,21 +70,7 @@ static int omap_twl4030_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        /* Set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, fmt);
-        if (ret < 0) {
-                dev_err(card->dev, "can't set codec DAI configuration\n");
-                return ret;
-        }
-
-        /* Set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
-        if (ret < 0) {
-                dev_err(card->dev, "can't set cpu DAI configuration\n");
-                return ret;
-        }
-
-        return 0;
+        return snd_soc_runtime_set_dai_fmt(rtd, fmt);
 }
 
 static struct snd_soc_ops omap_twl4030_ops = {
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 04896d6252a2..7f299357c2d2 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -250,14 +250,14 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"FM Transmitter", NULL, "LLOUT"},
         {"FM Transmitter", NULL, "RLOUT"},
 
-        {"DMic Rate 64", NULL, "Mic Bias"},
-        {"Mic Bias", NULL, "DMic"},
+        {"DMic Rate 64", NULL, "DMic"},
+        {"DMic", NULL, "Mic Bias"},
 
         {"b LINE2R", NULL, "MONO_LOUT"},
         {"Earphone", NULL, "b HPLOUT"},
 
-        {"LINE1L", NULL, "b Mic Bias"},
-        {"b Mic Bias", NULL, "HS Mic"}
+        {"LINE1L", NULL, "HS Mic"},
+        {"HS Mic", NULL, "b Mic Bias"},
 };
 
 static const char * const spk_function[] = {"Off", "On"};
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 2434b6d61675..39cea80846c3 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -140,7 +140,7 @@ config SND_PXA910_SOC
           Marvell PXA910 reference platform.
 
 config SND_SOC_TTC_DKB
-        bool "SoC Audio support for TTC DKB"
+        tristate "SoC Audio support for TTC DKB"
         depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y
         select PXA_SSP
         select SND_PXA_SOC_SSP
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index b7cd0a71fd70..3580d10c9f28 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -259,20 +259,6 @@ static const struct snd_kcontrol_new wm8731_corgi_controls[] = {
                 corgi_set_spk),
 };
 
-/*
- * Logic for a wm8731 as connected on a Sharp SL-C7x0 Device
- */
-static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_nc_pin(dapm, "LLINEIN");
-        snd_soc_dapm_nc_pin(dapm, "RLINEIN");
-
-        return 0;
-}
-
 /* corgi digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link corgi_dai = {
         .name = "WM8731",
@@ -281,7 +267,6 @@ static struct snd_soc_dai_link corgi_dai = {
         .codec_dai_name = "wm8731-hifi",
         .platform_name = "pxa-pcm-audio",
         .codec_name = "wm8731.0-001b",
-        .init = corgi_wm8731_init,
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                    SND_SOC_DAIFMT_CBS_CFS,
         .ops = &corgi_ops,
@@ -300,6 +285,7 @@ static struct snd_soc_card corgi = {
         .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
         .dapm_routes = corgi_audio_map,
         .num_dapm_routes = ARRAY_SIZE(corgi_audio_map),
+        .fully_routed = true,
 };
 
 static int corgi_probe(struct platform_device *pdev)
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 7c691aae8af2..d72e124a3676 100644
--- a/sound/soc/pxa/e740_wm9705.c
+++ b/sound/soc/pxa/e740_wm9705.c
@@ -88,24 +88,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"Mic Amp", NULL, "Mic (Internal)"},
 };
 
-static int e740_ac97_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_nc_pin(dapm, "HPOUTL");
-        snd_soc_dapm_nc_pin(dapm, "HPOUTR");
-        snd_soc_dapm_nc_pin(dapm, "PHONE");
-        snd_soc_dapm_nc_pin(dapm, "LINEINL");
-        snd_soc_dapm_nc_pin(dapm, "LINEINR");
-        snd_soc_dapm_nc_pin(dapm, "CDINL");
-        snd_soc_dapm_nc_pin(dapm, "CDINR");
-        snd_soc_dapm_nc_pin(dapm, "PCBEEP");
-        snd_soc_dapm_nc_pin(dapm, "MIC2");
-
-        return 0;
-}
-
 static struct snd_soc_dai_link e740_dai[] = {
         {
                 .name = "AC97",
@@ -114,7 +96,6 @@ static struct snd_soc_dai_link e740_dai[] = {
                 .codec_dai_name = "wm9705-hifi",
                 .platform_name = "pxa-pcm-audio",
                 .codec_name = "wm9705-codec",
-                .init = e740_ac97_init,
         },
         {
                 .name = "AC97 Aux",
@@ -136,6 +117,7 @@ static struct snd_soc_card e740 = {
         .num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets),
         .dapm_routes = audio_map,
         .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static struct gpio e740_audio_gpios[] = {
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index 30544b65b5a8..48f2d7c2e68c 100644
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -70,24 +70,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"MIC1", NULL, "Mic (Internal)"},
 };
 
-static int e750_ac97_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_nc_pin(dapm, "LOUT");
-        snd_soc_dapm_nc_pin(dapm, "ROUT");
-        snd_soc_dapm_nc_pin(dapm, "PHONE");
-        snd_soc_dapm_nc_pin(dapm, "LINEINL");
-        snd_soc_dapm_nc_pin(dapm, "LINEINR");
-        snd_soc_dapm_nc_pin(dapm, "CDINL");
-        snd_soc_dapm_nc_pin(dapm, "CDINR");
-        snd_soc_dapm_nc_pin(dapm, "PCBEEP");
-        snd_soc_dapm_nc_pin(dapm, "MIC2");
-
-        return 0;
-}
-
 static struct snd_soc_dai_link e750_dai[] = {
         {
                 .name = "AC97",
@@ -96,7 +78,6 @@ static struct snd_soc_dai_link e750_dai[] = {
                 .codec_dai_name = "wm9705-hifi",
                 .platform_name = "pxa-pcm-audio",
                 .codec_name = "wm9705-codec",
-                .init = e750_ac97_init,
                 /* use ops to check startup state */
         },
         {
@@ -119,6 +100,7 @@ static struct snd_soc_card e750 = {
         .num_dapm_widgets = ARRAY_SIZE(e750_dapm_widgets),
         .dapm_routes = audio_map,
         .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static struct gpio e750_audio_gpios[] = {
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index ce26551052a3..73eb5ddf9753 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -127,15 +127,8 @@ static const struct snd_soc_dapm_route hx4700_audio_map[] = {
 static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
-        /* NC codec pins */
-        /* FIXME: is anything connected here? */
-        snd_soc_dapm_nc_pin(dapm, "MOUT1");
-        snd_soc_dapm_nc_pin(dapm, "MICEXT");
-        snd_soc_dapm_nc_pin(dapm, "AUX");
-
         /* Jack detection API stuff */
         err = snd_soc_jack_new(codec, "Headphone Jack",
                                 SND_JACK_HEADPHONE, &hs_jack);
@@ -184,6 +177,7 @@ static struct snd_soc_card snd_soc_card_hx4700 = {
         .num_dapm_widgets       = ARRAY_SIZE(hx4700_dapm_widgets),
         .dapm_routes            = hx4700_audio_map,
         .num_dapm_routes        = ARRAY_SIZE(hx4700_audio_map),
+        .fully_routed           = true,
 };
 
 static struct gpio hx4700_audio_gpios[] = {
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 259e048681c0..241d0be42d7a 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -391,25 +391,6 @@ static const struct snd_kcontrol_new uda1380_magician_controls[] = {
                         magician_get_input, magician_set_input),
 };
 
-/*
- * Logic for a uda1380 as connected on a HTC Magician
- */
-static int magician_uda1380_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        /* NC codec pins */
-        snd_soc_dapm_nc_pin(dapm, "VOUTLHP");
-        snd_soc_dapm_nc_pin(dapm, "VOUTRHP");
-
-        /* FIXME: is anything connected here? */
-        snd_soc_dapm_nc_pin(dapm, "VINL");
-        snd_soc_dapm_nc_pin(dapm, "VINR");
-
-        return 0;
-}
-
 /* magician digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link magician_dai[] = {
 {
@@ -419,7 +400,6 @@ static struct snd_soc_dai_link magician_dai[] = {
         .codec_dai_name = "uda1380-hifi-playback",
         .platform_name = "pxa-pcm-audio",
         .codec_name = "uda1380-codec.0-0018",
-        .init = magician_uda1380_init,
         .ops = &magician_playback_ops,
 },
 {
@@ -446,6 +426,7 @@ static struct snd_soc_card snd_soc_card_magician = {
         .num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets),
         .dapm_routes = audio_map,
         .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static struct platform_device *magician_snd_device;
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index 396dbd51a64f..a9615a574546 100644
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -81,7 +81,7 @@ static int rear_amp_power(struct snd_soc_codec *codec, int power)
 static int rear_amp_event(struct snd_soc_dapm_widget *widget,
                           struct snd_kcontrol *kctl, int event)
 {
-        struct snd_soc_codec *codec = widget->codec;
+        struct snd_soc_codec *codec = widget->dapm->card->rtd[0].codec;
 
         return rear_amp_power(codec, SND_SOC_DAPM_EVENT_ON(event));
 }
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index 1eebca2f0a97..910336c5ebeb 100644
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -68,7 +68,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"Ext. Speaker", NULL, "ROUT2"},
 
         /* mic connected to MIC1 */
-        {"Ext. Microphone", NULL, "MIC1"},
+        {"MIC1", NULL, "Ext. Microphone"},
 };
 
 static struct snd_soc_card palm27x_asoc;
@@ -76,18 +76,8 @@ static struct snd_soc_card palm27x_asoc;
 static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
-        /* not connected pins */
-        snd_soc_dapm_nc_pin(dapm, "OUT3");
-        snd_soc_dapm_nc_pin(dapm, "MONOOUT");
-        snd_soc_dapm_nc_pin(dapm, "LINEINL");
-        snd_soc_dapm_nc_pin(dapm, "LINEINR");
-        snd_soc_dapm_nc_pin(dapm, "PCBEEP");
-        snd_soc_dapm_nc_pin(dapm, "PHONE");
-        snd_soc_dapm_nc_pin(dapm, "MIC2");
-
         /* Jack detection API stuff */
         err = snd_soc_jack_new(codec, "Headphone Jack",
                                 SND_JACK_HEADPHONE, &hs_jack);
@@ -133,7 +123,8 @@ static struct snd_soc_card palm27x_asoc = {
         .dapm_widgets = palm27x_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(palm27x_dapm_widgets),
         .dapm_routes = audio_map,
-        .num_dapm_routes = ARRAY_SIZE(audio_map)
+        .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static int palm27x_asoc_probe(struct platform_device *pdev)
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c
index 083706595495..552b763005ed 100644
--- a/sound/soc/pxa/raumfeld.c
+++ b/sound/soc/pxa/raumfeld.c
@@ -88,7 +88,7 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        unsigned int fmt, clk = 0;
+        unsigned int clk = 0;
         int ret = 0;
 
         switch (params_rate(params)) {
@@ -112,15 +112,6 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        fmt = SND_SOC_DAIFMT_I2S |
-              SND_SOC_DAIFMT_NB_NF |
-              SND_SOC_DAIFMT_CBS_CFS;
-
-        /* setup the CODEC DAI */
-        ret = snd_soc_dai_set_fmt(codec_dai, fmt);
-        if (ret < 0)
-                return ret;
-
         ret = snd_soc_dai_set_sysclk(codec_dai, 0, clk, 0);
         if (ret < 0)
                 return ret;
@@ -130,10 +121,6 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
-        if (ret < 0)
-                return ret;
-
         ret = snd_soc_dai_set_clkdiv(cpu_dai, PXA_SSP_DIV_SCR, 4);
         if (ret < 0)
                 return ret;
@@ -169,9 +156,8 @@ static int raumfeld_ak4104_hw_params(struct snd_pcm_substream *substream,
                                      struct snd_pcm_hw_params *params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        int fmt, ret = 0, clk = 0;
+        int ret = 0, clk = 0;
 
         switch (params_rate(params)) {
         case 44100:
@@ -194,22 +180,11 @@ static int raumfeld_ak4104_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF;
-
-        /* setup the CODEC DAI */
-        ret = snd_soc_dai_set_fmt(codec_dai, fmt | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         /* setup the CPU DAI */
         ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, clk);
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_fmt(cpu_dai, fmt | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         ret = snd_soc_dai_set_clkdiv(cpu_dai, PXA_SSP_DIV_SCR, 4);
         if (ret < 0)
                 return ret;
@@ -233,6 +208,9 @@ static struct snd_soc_ops raumfeld_ak4104_ops = {
         .platform_name  = "pxa-pcm-audio",              \
         .codec_dai_name = "cs4270-hifi",                \
         .codec_name     = "cs4270.0-0048",      \
+        .dai_fmt        = SND_SOC_DAIFMT_I2S |          \
+                          SND_SOC_DAIFMT_NB_NF |        \
+                          SND_SOC_DAIFMT_CBS_CFS,       \
         .ops            = &raumfeld_cs4270_ops,         \
 }
 
@@ -243,6 +221,9 @@ static struct snd_soc_ops raumfeld_ak4104_ops = {
         .cpu_dai_name   = "pxa-ssp-dai.1",              \
         .codec_dai_name = "ak4104-hifi",                \
         .platform_name  = "pxa-pcm-audio",              \
+        .dai_fmt        = SND_SOC_DAIFMT_I2S |          \
+                          SND_SOC_DAIFMT_NB_NF |        \
+                          SND_SOC_DAIFMT_CBS_CFS,       \
         .ops            = &raumfeld_ak4104_ops,         \
         .codec_name     = "spi0.0",                     \
 }
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index a6d680acd907..461123ad5ff2 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -256,26 +256,6 @@ static const struct snd_kcontrol_new wm8750_spitz_controls[] = {
                 spitz_set_spk),
 };
 
-/*
- * Logic for a wm8750 as connected on a Sharp SL-Cxx00 Device
- */
-static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        /* NC codec pins */
-        snd_soc_dapm_nc_pin(dapm, "RINPUT1");
-        snd_soc_dapm_nc_pin(dapm, "LINPUT2");
-        snd_soc_dapm_nc_pin(dapm, "RINPUT2");
-        snd_soc_dapm_nc_pin(dapm, "LINPUT3");
-        snd_soc_dapm_nc_pin(dapm, "RINPUT3");
-        snd_soc_dapm_nc_pin(dapm, "OUT3");
-        snd_soc_dapm_nc_pin(dapm, "MONO1");
-
-        return 0;
-}
-
 /* spitz digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link spitz_dai = {
         .name = "wm8750",
@@ -284,7 +264,6 @@ static struct snd_soc_dai_link spitz_dai = {
         .codec_dai_name = "wm8750-hifi",
         .platform_name = "pxa-pcm-audio",
         .codec_name = "wm8750.0-001b",
-        .init = spitz_wm8750_init,
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                    SND_SOC_DAIFMT_CBS_CFS,
         .ops = &spitz_ops,
@@ -303,6 +282,7 @@ static struct snd_soc_card snd_soc_spitz = {
         .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
         .dapm_routes = spitz_audio_map,
         .num_dapm_routes = ARRAY_SIZE(spitz_audio_map),
+        .fully_routed = true,
 };
 
 static int spitz_probe(struct platform_device *pdev)
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c
index e3d7257ad09c..5001dbb9b257 100644
--- a/sound/soc/pxa/ttc-dkb.c
+++ b/sound/soc/pxa/ttc-dkb.c
@@ -76,10 +76,6 @@ static const struct snd_soc_dapm_route ttc_audio_map[] = {
 static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
-        snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
 
         /* Headset jack detection */
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 23bf991e95d5..8f301c72ee5e 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -130,16 +130,6 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         return 0;
 }
 
@@ -172,6 +162,8 @@ static struct snd_soc_dai_link zylonite_dai[] = {
         .platform_name = "pxa-pcm-audio",
         .cpu_dai_name = "pxa-ssp-dai.2",
         .codec_dai_name = "wm9713-voice",
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBS_CFS,
         .ops = &zylonite_voice_ops,
 },
 };
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index fc67f97f19f6..e817a2f43ea8 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -54,7 +54,7 @@ config SND_SOC_SAMSUNG_JIVE_WM8750
 config SND_SOC_SAMSUNG_SMDK_WM8580
         tristate "SoC I2S Audio support for WM8580 on SMDK"
         depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110)
-        depends on REGMAP_I2C
+        depends on I2C
         select SND_SOC_WM8580
         select SND_SAMSUNG_I2S
         help
@@ -167,7 +167,7 @@ config SND_SOC_SAMSUNG_SMDK_SPDIF
 config SND_SOC_SMDK_WM8580_PCM
         tristate "SoC PCM Audio support for WM8580 on SMDK"
         depends on SND_SOC_SAMSUNG && (MACH_SMDKV210 || MACH_SMDKC110)
-        depends on REGMAP_I2C
+        depends on I2C
         select SND_SOC_WM8580
         select SND_SAMSUNG_PCM
         help
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index 3b527dcfc0aa..fad56b9e7369 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -136,22 +136,9 @@ static int goni_hifi_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         unsigned int pll_out = 24000000;
         int ret = 0;
 
-        /* set the cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
         /* set the codec FLL */
         ret = snd_soc_dai_set_pll(codec_dai, WM8994_FLL1, 0, pll_out,
                         params_rate(params) * 256);
@@ -182,12 +169,6 @@ static int goni_voice_hw_params(struct snd_pcm_substream *substream,
         if (params_rate(params) != 8000)
                 return -EINVAL;
 
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_LEFT_J |
-                        SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
         /* set the codec FLL */
         ret = snd_soc_dai_set_pll(codec_dai, WM8994_FLL2, 0, pll_out,
                         params_rate(params) * 256);
@@ -234,6 +215,8 @@ static struct snd_soc_dai_link goni_dai[] = {
         .codec_dai_name = "wm8994-aif1",
         .platform_name = "samsung-i2s.0",
         .codec_name = "wm8994-codec.0-001a",
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBM_CFM,
         .init = goni_wm8994_init,
         .ops = &goni_hifi_ops,
 }, {
@@ -242,6 +225,8 @@ static struct snd_soc_dai_link goni_dai[] = {
         .cpu_dai_name = "goni-voice-dai",
         .codec_dai_name = "wm8994-aif2",
         .codec_name = "wm8994-codec.0-001a",
+        .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_IB_IF |
+                   SND_SOC_DAIFMT_CBM_CFM,
         .ops = &goni_voice_ops,
 },
 };
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index f2d7980d7ddc..59b044255b78 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -76,7 +76,6 @@ static int h1940_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         int div;
         int ret;
         unsigned int rate = params_rate(params);
@@ -95,18 +94,6 @@ static int h1940_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        /* set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         /* select clock source */
         ret = snd_soc_dai_set_sysclk(cpu_dai, S3C24XX_CLKSRC_PCLK, rate,
                         SND_SOC_CLOCK_OUT);
@@ -207,6 +194,8 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = {
                 .init           = h1940_uda1380_init,
                 .platform_name  = "s3c24xx-iis",
                 .codec_name     = "uda1380-codec.0-001a",
+                .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                  SND_SOC_DAIFMT_CBS_CFS,
                 .ops            = &h1940_ops,
         },
 };
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index b5a80c528d86..b92ab40d2be6 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -10,9 +10,11 @@
  * published by the Free Software Foundation.
  */
 
+#include <dt-bindings/sound/samsung-i2s.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -59,10 +61,8 @@ struct samsung_i2s_dai_data {
 struct i2s_dai {
         /* Platform device for this DAI */
         struct platform_device *pdev;
-        /* IOREMAP'd SFRs */
+        /* Memory mapped SFR region */
         void __iomem    *addr;
-        /* Physical base address of SFRs */
-        u32     base;
         /* Rate of RCLK source clock */
         unsigned long rclk_srcrate;
         /* Frame Clock */
@@ -83,8 +83,6 @@ struct i2s_dai {
 #define DAI_OPENED      (1 << 0) /* Dai is opened */
 #define DAI_MANAGER     (1 << 1) /* Dai is the manager */
         unsigned mode;
-        /* CDCLK pin direction: 0  - input, 1 - output */
-        unsigned int cdclk_out:1;
         /* Driver for this DAI */
         struct snd_soc_dai_driver i2s_dai_drv;
         /* DMA parameters */
@@ -95,8 +93,15 @@ struct i2s_dai {
         u32     suspend_i2smod;
         u32     suspend_i2scon;
         u32     suspend_i2spsr;
-        unsigned long gpios[7]; /* i2s gpio line numbers */
         const struct samsung_i2s_variant_regs *variant_regs;
+
+        /* Spinlock protecting access to the device's registers */
+        spinlock_t spinlock;
+        spinlock_t *lock;
+
+        /* Below fields are only valid if this is the primary FIFO */
+        struct clk *clk_table[3];
+        struct clk_onecell_data clk_data;
 };
 
 /* Lock for cross i/f checks */
@@ -133,10 +138,16 @@ static inline bool tx_active(struct i2s_dai *i2s)
         return active ? true : false;
 }
 
+/* Return pointer to the other DAI */
+static inline struct i2s_dai *get_other_dai(struct i2s_dai *i2s)
+{
+        return i2s->pri_dai ? : i2s->sec_dai;
+}
+
 /* If the other interface of the controller is transmitting data */
 static inline bool other_tx_active(struct i2s_dai *i2s)
 {
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
+        struct i2s_dai *other = get_other_dai(i2s);
 
         return tx_active(other);
 }
@@ -163,7 +174,7 @@ static inline bool rx_active(struct i2s_dai *i2s)
 /* If the other interface of the controller is receiving data */
 static inline bool other_rx_active(struct i2s_dai *i2s)
 {
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
+        struct i2s_dai *other = get_other_dai(i2s);
 
         return rx_active(other);
 }
@@ -464,18 +475,23 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
           int clk_id, unsigned int rfs, int dir)
 {
         struct i2s_dai *i2s = to_info(dai);
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
-        u32 mod = readl(i2s->addr + I2SMOD);
+        struct i2s_dai *other = get_other_dai(i2s);
         const struct samsung_i2s_variant_regs *i2s_regs = i2s->variant_regs;
         unsigned int cdcon_mask = 1 << i2s_regs->cdclkcon_off;
         unsigned int rsrc_mask = 1 << i2s_regs->rclksrc_off;
+        u32 mod, mask, val = 0;
+
+        spin_lock(i2s->lock);
+        mod = readl(i2s->addr + I2SMOD);
+        spin_unlock(i2s->lock);
 
         switch (clk_id) {
         case SAMSUNG_I2S_OPCLK:
-                mod &= ~MOD_OPCLK_MASK;
-                mod |= dir;
+                mask = MOD_OPCLK_MASK;
+                val = dir;
                 break;
         case SAMSUNG_I2S_CDCLK:
+                mask = 1 << i2s_regs->cdclkcon_off;
                 /* Shouldn't matter in GATING(CLOCK_IN) mode */
                 if (dir == SND_SOC_CLOCK_IN)
                         rfs = 0;
@@ -492,15 +508,15 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
                 }
 
                 if (dir == SND_SOC_CLOCK_IN)
-                        mod |= 1 << i2s_regs->cdclkcon_off;
-                else
-                        mod &= ~(1 << i2s_regs->cdclkcon_off);
+                        val = 1 << i2s_regs->cdclkcon_off;
 
                 i2s->rfs = rfs;
                 break;
 
         case SAMSUNG_I2S_RCLKSRC_0: /* clock corrsponding to IISMOD[10] := 0 */
         case SAMSUNG_I2S_RCLKSRC_1: /* clock corrsponding to IISMOD[10] := 1 */
+                mask = 1 << i2s_regs->rclksrc_off;
+
                 if ((i2s->quirks & QUIRK_NO_MUXPSR)
                                 || (clk_id == SAMSUNG_I2S_RCLKSRC_0))
                         clk_id = 0;
@@ -550,18 +566,19 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
                         return 0;
                 }
 
-                if (clk_id == 0)
-                        mod &= ~(1 << i2s_regs->rclksrc_off);
-                else
-                        mod |= 1 << i2s_regs->rclksrc_off;
-
+                if (clk_id == 1)
+                        val = 1 << i2s_regs->rclksrc_off;
                 break;
         default:
                 dev_err(&i2s->pdev->dev, "We don't serve that!\n");
                 return -EINVAL;
         }
 
+        spin_lock(i2s->lock);
+        mod = readl(i2s->addr + I2SMOD);
+        mod = (mod & ~mask) | val;
         writel(mod, i2s->addr + I2SMOD);
+        spin_unlock(i2s->lock);
 
         return 0;
 }
@@ -570,9 +587,8 @@ static int i2s_set_fmt(struct snd_soc_dai *dai,
         unsigned int fmt)
 {
         struct i2s_dai *i2s = to_info(dai);
-        u32 mod = readl(i2s->addr + I2SMOD);
         int lrp_shift, sdf_shift, sdf_mask, lrp_rlow, mod_slave;
-        u32 tmp = 0;
+        u32 mod, tmp = 0;
 
         lrp_shift = i2s->variant_regs->lrp_off;
         sdf_shift = i2s->variant_regs->sdf_off;
@@ -632,12 +648,15 @@ static int i2s_set_fmt(struct snd_soc_dai *dai,
                 return -EINVAL;
         }
 
+        spin_lock(i2s->lock);
+        mod = readl(i2s->addr + I2SMOD);
         /*
          * Don't change the I2S mode if any controller is active on this
          * channel.
          */
         if (any_active(i2s) &&
                 ((mod & (sdf_mask | lrp_rlow | mod_slave)) != tmp)) {
+                spin_unlock(i2s->lock);
                 dev_err(&i2s->pdev->dev,
                                 "%s:%d Other DAI busy\n", __func__, __LINE__);
                 return -EAGAIN;
@@ -646,6 +665,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai,
         mod &= ~(sdf_mask | lrp_rlow | mod_slave);
         mod |= tmp;
         writel(mod, i2s->addr + I2SMOD);
+        spin_unlock(i2s->lock);
 
         return 0;
 }
@@ -654,16 +674,16 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
         struct i2s_dai *i2s = to_info(dai);
-        u32 mod = readl(i2s->addr + I2SMOD);
+        u32 mod, mask = 0, val = 0;
 
         if (!is_secondary(i2s))
-                mod &= ~(MOD_DC2_EN | MOD_DC1_EN);
+                mask |= (MOD_DC2_EN | MOD_DC1_EN);
 
         switch (params_channels(params)) {
         case 6:
-                mod |= MOD_DC2_EN;
+                val |= MOD_DC2_EN;
         case 4:
-                mod |= MOD_DC1_EN;
+                val |= MOD_DC1_EN;
                 break;
         case 2:
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
@@ -685,44 +705,49 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
         }
 
         if (is_secondary(i2s))
-                mod &= ~MOD_BLCS_MASK;
+                mask |= MOD_BLCS_MASK;
         else
-                mod &= ~MOD_BLCP_MASK;
+                mask |= MOD_BLCP_MASK;
 
         if (is_manager(i2s))
-                mod &= ~MOD_BLC_MASK;
+                mask |= MOD_BLC_MASK;
 
         switch (params_width(params)) {
         case 8:
                 if (is_secondary(i2s))
-                        mod |= MOD_BLCS_8BIT;
+                        val |= MOD_BLCS_8BIT;
                 else
-                        mod |= MOD_BLCP_8BIT;
+                        val |= MOD_BLCP_8BIT;
                 if (is_manager(i2s))
-                        mod |= MOD_BLC_8BIT;
+                        val |= MOD_BLC_8BIT;
                 break;
         case 16:
                 if (is_secondary(i2s))
-                        mod |= MOD_BLCS_16BIT;
+                        val |= MOD_BLCS_16BIT;
                 else
-                        mod |= MOD_BLCP_16BIT;
+                        val |= MOD_BLCP_16BIT;
                 if (is_manager(i2s))
-                        mod |= MOD_BLC_16BIT;
+                        val |= MOD_BLC_16BIT;
                 break;
         case 24:
                 if (is_secondary(i2s))
-                        mod |= MOD_BLCS_24BIT;
+                        val |= MOD_BLCS_24BIT;
                 else
-                        mod |= MOD_BLCP_24BIT;
+                        val |= MOD_BLCP_24BIT;
                 if (is_manager(i2s))
-                        mod |= MOD_BLC_24BIT;
+                        val |= MOD_BLC_24BIT;
                 break;
         default:
                 dev_err(&i2s->pdev->dev, "Format(%d) not supported\n",
                                 params_format(params));
                 return -EINVAL;
         }
+
+        spin_lock(i2s->lock);
+        mod = readl(i2s->addr + I2SMOD);
+        mod = (mod & ~mask) | val;
         writel(mod, i2s->addr + I2SMOD);
+        spin_unlock(i2s->lock);
 
         samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture);
 
@@ -736,7 +761,7 @@ static int i2s_startup(struct snd_pcm_substream *substream,
           struct snd_soc_dai *dai)
 {
         struct i2s_dai *i2s = to_info(dai);
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
+        struct i2s_dai *other = get_other_dai(i2s);
         unsigned long flags;
 
         spin_lock_irqsave(&lock, flags);
@@ -753,9 +778,6 @@ static int i2s_startup(struct snd_pcm_substream *substream,
 
         spin_unlock_irqrestore(&lock, flags);
 
-        if (!is_opened(other) && i2s->cdclk_out)
-                i2s_set_sysclk(dai, SAMSUNG_I2S_CDCLK,
-                                0, SND_SOC_CLOCK_OUT);
         return 0;
 }
 
@@ -763,38 +785,27 @@ static void i2s_shutdown(struct snd_pcm_substream *substream,
         struct snd_soc_dai *dai)
 {
         struct i2s_dai *i2s = to_info(dai);
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
+        struct i2s_dai *other = get_other_dai(i2s);
         unsigned long flags;
-        const struct samsung_i2s_variant_regs *i2s_regs = i2s->variant_regs;
 
         spin_lock_irqsave(&lock, flags);
 
         i2s->mode &= ~DAI_OPENED;
         i2s->mode &= ~DAI_MANAGER;
 
-        if (is_opened(other)) {
+        if (is_opened(other))
                 other->mode |= DAI_MANAGER;
-        } else {
-                u32 mod = readl(i2s->addr + I2SMOD);
-                i2s->cdclk_out = !(mod & (1 << i2s_regs->cdclkcon_off));
-                if (other)
-                        other->cdclk_out = i2s->cdclk_out;
-        }
+
         /* Reset any constraint on RFS and BFS */
         i2s->rfs = 0;
         i2s->bfs = 0;
 
         spin_unlock_irqrestore(&lock, flags);
-
-        /* Gate CDCLK by default */
-        if (!is_opened(other))
-                i2s_set_sysclk(dai, SAMSUNG_I2S_CDCLK,
-                                0, SND_SOC_CLOCK_IN);
 }
 
 static int config_setup(struct i2s_dai *i2s)
 {
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
+        struct i2s_dai *other = get_other_dai(i2s);
         unsigned rfs, bfs, blc;
         u32 psr;
 
@@ -864,10 +875,10 @@ static int i2s_trigger(struct snd_pcm_substream *substream,
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                local_irq_save(flags);
+                spin_lock_irqsave(i2s->lock, flags);
 
                 if (config_setup(i2s)) {
-                        local_irq_restore(flags);
+                        spin_unlock_irqrestore(i2s->lock, flags);
                         return -EINVAL;
                 }
 
@@ -876,12 +887,12 @@ static int i2s_trigger(struct snd_pcm_substream *substream,
                 else
                         i2s_txctrl(i2s, 1);
 
-                local_irq_restore(flags);
+                spin_unlock_irqrestore(i2s->lock, flags);
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                local_irq_save(flags);
+                spin_lock_irqsave(i2s->lock, flags);
 
                 if (capture) {
                         i2s_rxctrl(i2s, 0);
@@ -891,7 +902,7 @@ static int i2s_trigger(struct snd_pcm_substream *substream,
                         i2s_fifo(i2s, FIC_TXFLUSH);
                 }
 
-                local_irq_restore(flags);
+                spin_unlock_irqrestore(i2s->lock, flags);
                 break;
         }
 
@@ -902,7 +913,7 @@ static int i2s_set_clkdiv(struct snd_soc_dai *dai,
         int div_id, int div)
 {
         struct i2s_dai *i2s = to_info(dai);
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
+        struct i2s_dai *other = get_other_dai(i2s);
 
         switch (div_id) {
         case SAMSUNG_I2S_DIV_BCLK:
@@ -971,58 +982,36 @@ static int i2s_resume(struct snd_soc_dai *dai)
 static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
 {
         struct i2s_dai *i2s = to_info(dai);
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
-        int ret;
+        struct i2s_dai *other = get_other_dai(i2s);
+        unsigned long flags;
 
-        if (other && other->clk) { /* If this is probe on secondary */
+        if (is_secondary(i2s)) { /* If this is probe on the secondary DAI */
                 samsung_asoc_init_dma_data(dai, &other->sec_dai->dma_playback,
                                            NULL);
-                goto probe_exit;
-        }
-
-        i2s->addr = ioremap(i2s->base, 0x100);
-        if (i2s->addr == NULL) {
-                dev_err(&i2s->pdev->dev, "cannot ioremap registers\n");
-                return -ENXIO;
-        }
-
-        i2s->clk = clk_get(&i2s->pdev->dev, "iis");
-        if (IS_ERR(i2s->clk)) {
-                dev_err(&i2s->pdev->dev, "failed to get i2s_clock\n");
-                iounmap(i2s->addr);
-                return PTR_ERR(i2s->clk);
-        }
-
-        ret = clk_prepare_enable(i2s->clk);
-        if (ret != 0) {
-                dev_err(&i2s->pdev->dev, "failed to enable clock: %d\n", ret);
-                return ret;
-        }
-
-        samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture);
-
-        if (other) {
-                other->addr = i2s->addr;
-                other->clk = i2s->clk;
-        }
+        } else {
+                samsung_asoc_init_dma_data(dai, &i2s->dma_playback,
+                                           &i2s->dma_capture);
 
-        if (i2s->quirks & QUIRK_NEED_RSTCLR)
-                writel(CON_RSTCLR, i2s->addr + I2SCON);
+                if (i2s->quirks & QUIRK_NEED_RSTCLR)
+                        writel(CON_RSTCLR, i2s->addr + I2SCON);
 
-        if (i2s->quirks & QUIRK_SUPPORTS_IDMA)
-                idma_reg_addr_init(i2s->addr,
+                if (i2s->quirks & QUIRK_SUPPORTS_IDMA)
+                        idma_reg_addr_init(i2s->addr,
                                         i2s->sec_dai->idma_playback.dma_addr);
+        }
 
-probe_exit:
         /* Reset any constraint on RFS and BFS */
         i2s->rfs = 0;
         i2s->bfs = 0;
         i2s->rclk_srcrate = 0;
+
+        spin_lock_irqsave(i2s->lock, flags);
         i2s_txctrl(i2s, 0);
         i2s_rxctrl(i2s, 0);
         i2s_fifo(i2s, FIC_TXFLUSH);
         i2s_fifo(other, FIC_TXFLUSH);
         i2s_fifo(i2s, FIC_RXFLUSH);
+        spin_unlock_irqrestore(i2s->lock, flags);
 
         /* Gate CDCLK by default */
         if (!is_opened(other))
@@ -1035,21 +1024,15 @@ probe_exit:
 static int samsung_i2s_dai_remove(struct snd_soc_dai *dai)
 {
         struct i2s_dai *i2s = snd_soc_dai_get_drvdata(dai);
-        struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
-
-        if (!other || !other->clk) {
 
-                if (i2s->quirks & QUIRK_NEED_RSTCLR)
+        if (!is_secondary(i2s)) {
+                if (i2s->quirks & QUIRK_NEED_RSTCLR) {
+                        spin_lock(i2s->lock);
                         writel(0, i2s->addr + I2SCON);
-
-                clk_disable_unprepare(i2s->clk);
-                clk_put(i2s->clk);
-
-                iounmap(i2s->addr);
+                        spin_unlock(i2s->lock);
+                }
         }
 
-        i2s->clk = NULL;
-
         return 0;
 }
 
@@ -1124,15 +1107,14 @@ static const struct of_device_id exynos_i2s_match[];
 static inline const struct samsung_i2s_dai_data *samsung_i2s_get_driver_data(
                                                 struct platform_device *pdev)
 {
-#ifdef CONFIG_OF
-        if (pdev->dev.of_node) {
+        if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) {
                 const struct of_device_id *match;
                 match = of_match_node(exynos_i2s_match, pdev->dev.of_node);
-                return match->data;
-        } else
-#endif
+                return match ? match->data : NULL;
+        } else {
                 return (struct samsung_i2s_dai_data *)
                                 platform_get_device_id(pdev)->driver_data;
+        }
 }
 
 #ifdef CONFIG_PM
@@ -1155,6 +1137,87 @@ static int i2s_runtime_resume(struct device *dev)
 }
 #endif /* CONFIG_PM */
 
+static void i2s_unregister_clocks(struct i2s_dai *i2s)
+{
+        int i;
+
+        for (i = 0; i < i2s->clk_data.clk_num; i++) {
+                if (!IS_ERR(i2s->clk_table[i]))
+                        clk_unregister(i2s->clk_table[i]);
+        }
+}
+
+static void i2s_unregister_clock_provider(struct platform_device *pdev)
+{
+        struct i2s_dai *i2s = dev_get_drvdata(&pdev->dev);
+
+        of_clk_del_provider(pdev->dev.of_node);
+        i2s_unregister_clocks(i2s);
+}
+
+static int i2s_register_clock_provider(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct i2s_dai *i2s = dev_get_drvdata(dev);
+        const char *clk_name[2] = { "i2s_opclk0", "i2s_opclk1" };
+        const char *p_names[2] = { NULL };
+        const struct samsung_i2s_variant_regs *reg_info = i2s->variant_regs;
+        struct clk *rclksrc;
+        int ret, i;
+
+        /* Register the clock provider only if it's expected in the DTB */
+        if (!of_find_property(dev->of_node, "#clock-cells", NULL))
+                return 0;
+
+        /* Get the RCLKSRC mux clock parent clock names */
+        for (i = 0; i < ARRAY_SIZE(p_names); i++) {
+                rclksrc = clk_get(dev, clk_name[i]);
+                if (IS_ERR(rclksrc))
+                        continue;
+                p_names[i] = __clk_get_name(rclksrc);
+                clk_put(rclksrc);
+        }
+
+        if (!(i2s->quirks & QUIRK_NO_MUXPSR)) {
+                /* Activate the prescaler */
+                u32 val = readl(i2s->addr + I2SPSR);
+                writel(val | PSR_PSREN, i2s->addr + I2SPSR);
+
+                i2s->clk_table[CLK_I2S_RCLK_SRC] = clk_register_mux(NULL,
+                                "i2s_rclksrc", p_names, ARRAY_SIZE(p_names),
+                                CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT,
+                                i2s->addr + I2SMOD, reg_info->rclksrc_off,
+                                1, 0, i2s->lock);
+
+                i2s->clk_table[CLK_I2S_RCLK_PSR] = clk_register_divider(NULL,
+                                "i2s_presc", "i2s_rclksrc",
+                                CLK_SET_RATE_PARENT,
+                                i2s->addr + I2SPSR, 8, 6, 0, i2s->lock);
+
+                p_names[0] = "i2s_presc";
+                i2s->clk_data.clk_num = 2;
+        }
+        of_property_read_string_index(dev->of_node,
+                                "clock-output-names", 0, &clk_name[0]);
+
+        i2s->clk_table[CLK_I2S_CDCLK] = clk_register_gate(NULL, clk_name[0],
+                                p_names[0], CLK_SET_RATE_PARENT,
+                                i2s->addr + I2SMOD, reg_info->cdclkcon_off,
+                                CLK_GATE_SET_TO_DISABLE, i2s->lock);
+
+        i2s->clk_data.clk_num += 1;
+        i2s->clk_data.clks = i2s->clk_table;
+
+        ret = of_clk_add_provider(dev->of_node, of_clk_src_onecell_get,
+                                  &i2s->clk_data);
+        if (ret < 0) {
+                dev_err(dev, "failed to add clock provider: %d\n", ret);
+                i2s_unregister_clocks(i2s);
+        }
+
+        return ret;
+}
+
 static int samsung_i2s_probe(struct platform_device *pdev)
 {
         struct i2s_dai *pri_dai, *sec_dai = NULL;
@@ -1164,7 +1227,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
         u32 regs_base, quirks = 0, idma_addr = 0;
         struct device_node *np = pdev->dev.of_node;
         const struct samsung_i2s_dai_data *i2s_dai_data;
-        int ret = 0;
+        int ret;
 
         /* Call during Seconday interface registration */
         i2s_dai_data = samsung_i2s_get_driver_data(pdev);
@@ -1175,11 +1238,13 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "Unable to get drvdata\n");
                         return -EFAULT;
                 }
-                devm_snd_soc_register_component(&sec_dai->pdev->dev,
+                ret = devm_snd_soc_register_component(&sec_dai->pdev->dev,
                                                 &samsung_i2s_component,
                                                 &sec_dai->i2s_dai_drv, 1);
-                samsung_asoc_dma_platform_register(&pdev->dev);
-                return 0;
+                if (ret != 0)
+                        return ret;
+
+                return samsung_asoc_dma_platform_register(&pdev->dev);
         }
 
         pri_dai = i2s_alloc_dai(pdev, false);
@@ -1188,6 +1253,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
+        spin_lock_init(&pri_dai->spinlock);
+        pri_dai->lock = &pri_dai->spinlock;
+
         if (!np) {
                 res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
                 if (!res) {
@@ -1229,25 +1297,29 @@ static int samsung_i2s_probe(struct platform_device *pdev)
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "Unable to get I2S SFR address\n");
-                return -ENXIO;
-        }
+        pri_dai->addr = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(pri_dai->addr))
+                return PTR_ERR(pri_dai->addr);
 
-        if (!request_mem_region(res->start, resource_size(res),
-                                                        "samsung-i2s")) {
-                dev_err(&pdev->dev, "Unable to request SFR region\n");
-                return -EBUSY;
-        }
         regs_base = res->start;
 
+        pri_dai->clk = devm_clk_get(&pdev->dev, "iis");
+        if (IS_ERR(pri_dai->clk)) {
+                dev_err(&pdev->dev, "Failed to get iis clock\n");
+                return PTR_ERR(pri_dai->clk);
+        }
+
+        ret = clk_prepare_enable(pri_dai->clk);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "failed to enable clock: %d\n", ret);
+                return ret;
+        }
         pri_dai->dma_playback.dma_addr = regs_base + I2STXD;
         pri_dai->dma_capture.dma_addr = regs_base + I2SRXD;
         pri_dai->dma_playback.ch_name = "tx";
         pri_dai->dma_capture.ch_name = "rx";
         pri_dai->dma_playback.dma_size = 4;
         pri_dai->dma_capture.dma_size = 4;
-        pri_dai->base = regs_base;
         pri_dai->quirks = quirks;
         pri_dai->variant_regs = i2s_dai_data->i2s_variant_regs;
 
@@ -1258,10 +1330,10 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 sec_dai = i2s_alloc_dai(pdev, true);
                 if (!sec_dai) {
                         dev_err(&pdev->dev, "Unable to alloc I2S_sec\n");
-                        ret = -ENOMEM;
-                        goto err;
+                        return -ENOMEM;
                 }
 
+                sec_dai->lock = &pri_dai->spinlock;
                 sec_dai->variant_regs = pri_dai->variant_regs;
                 sec_dai->dma_playback.dma_addr = regs_base + I2STXDS;
                 sec_dai->dma_playback.ch_name = "tx-sec";
@@ -1273,7 +1345,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 }
 
                 sec_dai->dma_playback.dma_size = 4;
-                sec_dai->base = regs_base;
+                sec_dai->addr = pri_dai->addr;
+                sec_dai->clk = pri_dai->clk;
                 sec_dai->quirks = quirks;
                 sec_dai->idma_playback.dma_addr = idma_addr;
                 sec_dai->pri_dai = pri_dai;
@@ -1282,8 +1355,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 
         if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) {
                 dev_err(&pdev->dev, "Unable to configure gpio\n");
-                ret = -EINVAL;
-                goto err;
+                return -EINVAL;
         }
 
         devm_snd_soc_register_component(&pri_dai->pdev->dev,
@@ -1292,32 +1364,30 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 
         pm_runtime_enable(&pdev->dev);
 
-        samsung_asoc_dma_platform_register(&pdev->dev);
-
-        return 0;
-err:
-        if (res)
-                release_mem_region(regs_base, resource_size(res));
+        ret = samsung_asoc_dma_platform_register(&pdev->dev);
+        if (ret != 0)
+                return ret;
 
-        return ret;
+        return i2s_register_clock_provider(pdev);
 }
 
 static int samsung_i2s_remove(struct platform_device *pdev)
 {
         struct i2s_dai *i2s, *other;
-        struct resource *res;
 
         i2s = dev_get_drvdata(&pdev->dev);
-        other = i2s->pri_dai ? : i2s->sec_dai;
+        other = get_other_dai(i2s);
 
         if (other) {
                 other->pri_dai = NULL;
                 other->sec_dai = NULL;
         } else {
                 pm_runtime_disable(&pdev->dev);
-                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-                if (res)
-                        release_mem_region(res->start, resource_size(res));
+        }
+
+        if (!is_secondary(i2s)) {
+                i2s_unregister_clock_provider(pdev);
+                clk_disable_unprepare(i2s->clk);
         }
 
         i2s->pri_dai = NULL;
diff --git a/sound/soc/samsung/jive_wm8750.c b/sound/soc/samsung/jive_wm8750.c
index b5f6abd9d221..7fcb51faa2a0 100644
--- a/sound/soc/samsung/jive_wm8750.c
+++ b/sound/soc/samsung/jive_wm8750.c
@@ -61,20 +61,6 @@ static int jive_hw_params(struct snd_pcm_substream *substream,
         s3c_i2sv2_iis_calc_rate(&div, NULL, params_rate(params),
                                 s3c_i2sv2_get_clock(cpu_dai));
 
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        /* set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         /* set the codec system clock for DAC and ADC */
         ret = snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, clk,
                                      SND_SOC_CLOCK_IN);
@@ -97,22 +83,6 @@ static struct snd_soc_ops jive_ops = {
         .hw_params      = jive_hw_params,
 };
 
-static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        /* These endpoints are not being used. */
-        snd_soc_dapm_nc_pin(dapm, "LINPUT2");
-        snd_soc_dapm_nc_pin(dapm, "RINPUT2");
-        snd_soc_dapm_nc_pin(dapm, "LINPUT3");
-        snd_soc_dapm_nc_pin(dapm, "RINPUT3");
-        snd_soc_dapm_nc_pin(dapm, "OUT3");
-        snd_soc_dapm_nc_pin(dapm, "MONO");
-
-        return 0;
-}
-
 static struct snd_soc_dai_link jive_dai = {
         .name           = "wm8750",
         .stream_name    = "WM8750",
@@ -120,7 +90,8 @@ static struct snd_soc_dai_link jive_dai = {
         .codec_dai_name = "wm8750-hifi",
         .platform_name  = "s3c2412-i2s",
         .codec_name     = "wm8750.0-001a",
-        .init           = jive_wm8750_init,
+        .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                          SND_SOC_DAIFMT_CBS_CFS,
         .ops            = &jive_ops,
 };
 
@@ -135,6 +106,7 @@ static struct snd_soc_card snd_soc_machine_jive = {
         .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
         .dapm_routes    = audio_map,
         .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed   = true,
 };
 
 static struct platform_device *jive_snd_device;
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index 9b4a09f14b6c..65602b935377 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -70,20 +70,6 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream,
                 break;
         }
 
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai,
-                SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
-        /* set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai,
-                SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
         /* set the codec system clock for DAC and ADC */
         ret = snd_soc_dai_set_sysclk(codec_dai, WM8753_MCLK, pll_out,
                 SND_SOC_CLOCK_IN);
@@ -151,13 +137,6 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream,
 
         pcmdiv = WM8753_PCM_DIV_6; /* 2.048 MHz */
 
-        /* todo: gg check mode (DSP_B) against CSR datasheet */
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         /* set the codec system clock for DAC and ADC */
         ret = snd_soc_dai_set_sysclk(codec_dai, WM8753_PCMCLK, 12288000,
                 SND_SOC_CLOCK_IN);
@@ -300,6 +279,8 @@ static struct snd_soc_dai_link neo1973_dai[] = {
         .cpu_dai_name = "s3c24xx-iis",
         .codec_dai_name = "wm8753-hifi",
         .codec_name = "wm8753.0-001a",
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBM_CFM,
         .init = neo1973_wm8753_init,
         .ops = &neo1973_hifi_ops,
 },
@@ -309,6 +290,8 @@ static struct snd_soc_dai_link neo1973_dai[] = {
         .cpu_dai_name = "bt-sco-pcm",
         .codec_dai_name = "wm8753-voice",
         .codec_name = "wm8753.0-001a",
+        .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBS_CFS,
         .ops = &neo1973_voice_ops,
 },
 };
diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c
index fa4f1d2f69bf..596f1180a369 100644
--- a/sound/soc/samsung/odroidx2_max98090.c
+++ b/sound/soc/samsung/odroidx2_max98090.c
@@ -21,6 +21,8 @@ struct odroidx2_drv_data {
 /* The I2S CDCLK output clock frequency for the MAX98090 codec */
 #define MAX98090_MCLK 19200000
 
+static struct snd_soc_dai_link odroidx2_dai[];
+
 static int odroidx2_late_probe(struct snd_soc_card *card)
 {
         struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
@@ -29,7 +31,9 @@ static int odroidx2_late_probe(struct snd_soc_card *card)
 
         ret = snd_soc_dai_set_sysclk(codec_dai, 0, MAX98090_MCLK,
                                                 SND_SOC_CLOCK_IN);
-        if (ret < 0)
+
+        if (ret < 0 || of_find_property(odroidx2_dai[0].codec_of_node,
+                                        "clocks", NULL))
                 return ret;
 
         /* Set the cpu DAI configuration in order to use CDCLK */
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index 37688ebbb2b4..873f2cb4bebe 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -89,6 +89,8 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = {
                 .init           = rx1950_uda1380_init,
                 .platform_name  = "s3c24xx-iis",
                 .codec_name     = "uda1380-codec.0-001a",
+                .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                  SND_SOC_DAIFMT_CBS_CFS,
                 .ops            = &rx1950_ops,
         },
 };
@@ -154,7 +156,6 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         int div;
         int ret;
         unsigned int rate = params_rate(params);
@@ -181,18 +182,6 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        /* set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         /* select clock source */
         ret = snd_soc_dai_set_sysclk(cpu_dai, clk_source, rate,
                         SND_SOC_CLOCK_OUT);
diff --git a/sound/soc/samsung/s3c24xx_simtec.c b/sound/soc/samsung/s3c24xx_simtec.c
index 2c015f62ead6..dcc008d1e1ab 100644
--- a/sound/soc/samsung/s3c24xx_simtec.c
+++ b/sound/soc/samsung/s3c24xx_simtec.c
@@ -169,24 +169,6 @@ static int simtec_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret;
 
-        /* Set the CODEC as the bus clock master, I2S */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (ret) {
-                pr_err("%s: failed set cpu dai format\n", __func__);
-                return ret;
-        }
-
-        /* Set the CODEC as the bus clock master */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (ret) {
-                pr_err("%s: failed set codec dai format\n", __func__);
-                return ret;
-        }
-
         ret = snd_soc_dai_set_sysclk(codec_dai, 0,
                                      CODEC_CLOCK, SND_SOC_CLOCK_IN);
         if (ret) {
@@ -320,6 +302,8 @@ int simtec_audio_core_probe(struct platform_device *pdev,
         int ret;
 
         card->dai_link->ops = &simtec_snd_ops;
+        card->dai_link->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                  SND_SOC_DAIFMT_CBM_CFM;
 
         pdata = pdev->dev.platform_data;
         if (!pdata) {
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c
index 9c6f7db56f60..50849e137fc0 100644
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
@@ -173,16 +173,6 @@ static int s3c24xx_uda134x_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         ret = snd_soc_dai_set_sysclk(cpu_dai, clk_source , clk,
                         SND_SOC_CLOCK_IN);
         if (ret < 0)
@@ -223,6 +213,8 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
         .codec_name = "uda134x-codec",
         .codec_dai_name = "uda134x-hifi",
         .cpu_dai_name = "s3c24xx-iis",
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBS_CFS,
         .ops = &s3c24xx_uda134x_ops,
         .platform_name  = "s3c24xx-iis",
 };
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c
index 9b0ffacab790..8291d2a5f152 100644
--- a/sound/soc/samsung/smartq_wm8987.c
+++ b/sound/soc/samsung/smartq_wm8987.c
@@ -56,20 +56,6 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,
                 break;
         }
 
-        /* set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                                             SND_SOC_DAIFMT_NB_NF |
-                                             SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        /* set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                                           SND_SOC_DAIFMT_NB_NF |
-                                           SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         /* Use PCLK for I2S signal generation */
         ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0,
                                         0, SND_SOC_CLOCK_IN);
@@ -199,6 +185,8 @@ static struct snd_soc_dai_link smartq_dai[] = {
                 .platform_name  = "samsung-i2s.0",
                 .codec_name     = "wm8750.0-0x1a",
                 .init           = smartq_wm8987_init,
+                .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                  SND_SOC_DAIFMT_CBS_CFS,
                 .ops            = &smartq_hifi_ops,
         },
 };
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index b1a519f83b29..548bfd993788 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -32,7 +32,6 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         unsigned int pll_out;
         int bfs, rfs, ret;
@@ -77,20 +76,6 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
         }
         pll_out = params_rate(params) * rfs;
 
-        /* Set the Codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
-                                         | SND_SOC_DAIFMT_NB_NF
-                                         | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
-        /* Set the AP DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
-                                         | SND_SOC_DAIFMT_NB_NF
-                                         | SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0)
-                return ret;
-
         /* Set WM8580 to drive MCLK from its PLLA */
         ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK,
                                         WM8580_CLKSRC_PLLA);
@@ -151,13 +136,10 @@ static const struct snd_soc_dapm_route smdk_wm8580_audio_map[] = {
 
 static int smdk_wm8580_init_paiftx(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
         /* Enabling the microphone requires the fitting of a 0R
          * resistor to connect the line from the microphone jack.
          */
-        snd_soc_dapm_disable_pin(dapm, "MicIn");
+        snd_soc_dapm_disable_pin(&rtd->card->dapm, "MicIn");
 
         return 0;
 }
@@ -168,6 +150,9 @@ enum {
         SEC_PLAYBACK,
 };
 
+#define SMDK_DAI_FMT (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \
+        SND_SOC_DAIFMT_CBM_CFM)
+
 static struct snd_soc_dai_link smdk_dai[] = {
         [PRI_PLAYBACK] = { /* Primary Playback i/f */
                 .name = "WM8580 PAIF RX",
@@ -176,6 +161,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
                 .codec_dai_name = "wm8580-hifi-playback",
                 .platform_name = "samsung-i2s.0",
                 .codec_name = "wm8580.0-001b",
+                .dai_fmt = SMDK_DAI_FMT,
                 .ops = &smdk_ops,
         },
         [PRI_CAPTURE] = { /* Primary Capture i/f */
@@ -185,6 +171,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
                 .codec_dai_name = "wm8580-hifi-capture",
                 .platform_name = "samsung-i2s.0",
                 .codec_name = "wm8580.0-001b",
+                .dai_fmt = SMDK_DAI_FMT,
                 .init = smdk_wm8580_init_paiftx,
                 .ops = &smdk_ops,
         },
@@ -195,6 +182,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
                 .codec_dai_name = "wm8580-hifi-playback",
                 .platform_name = "samsung-i2s-sec",
                 .codec_name = "wm8580.0-001b",
+                .dai_fmt = SMDK_DAI_FMT,
                 .ops = &smdk_ops,
         },
 };
diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c
index 05c609c62de9..6deec5234c92 100644
--- a/sound/soc/samsung/smdk_wm8580pcm.c
+++ b/sound/soc/samsung/smdk_wm8580pcm.c
@@ -62,20 +62,6 @@ static int smdk_wm8580_pcm_hw_params(struct snd_pcm_substream *substream,
 
         rfs = mclk_freq / params_rate(params) / 2;
 
-        /* Set the codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B
-                                | SND_SOC_DAIFMT_IB_NF
-                                | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        /* Set the cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_B
-                                | SND_SOC_DAIFMT_IB_NF
-                                | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         if (mclk_freq == xtal_freq) {
                 ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_MCLK,
                                                 mclk_freq, SND_SOC_CLOCK_IN);
@@ -121,6 +107,9 @@ static struct snd_soc_ops smdk_wm8580_pcm_ops = {
         .hw_params = smdk_wm8580_pcm_hw_params,
 };
 
+#define SMDK_DAI_FMT (SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | \
+        SND_SOC_DAIFMT_CBS_CFS)
+
 static struct snd_soc_dai_link smdk_dai[] = {
         {
                 .name = "WM8580 PAIF PCM RX",
@@ -129,6 +118,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
                 .codec_dai_name = "wm8580-hifi-playback",
                 .platform_name = "samsung-audio",
                 .codec_name = "wm8580.0-001b",
+                .dai_fmt = SMDK_DAI_FMT,
                 .ops = &smdk_wm8580_pcm_ops,
         }, {
                 .name = "WM8580 PAIF PCM TX",
@@ -137,6 +127,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
                 .codec_dai_name = "wm8580-hifi-capture",
                 .platform_name = "samsung-pcm.0",
                 .codec_name = "wm8580.0-001b",
+                .dai_fmt = SMDK_DAI_FMT,
                 .ops = &smdk_wm8580_pcm_ops,
         },
 };
diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c
index c470e8eed6e1..b1c89ec2d999 100644
--- a/sound/soc/samsung/smdk_wm8994pcm.c
+++ b/sound/soc/samsung/smdk_wm8994pcm.c
@@ -68,20 +68,6 @@ static int smdk_wm8994_pcm_hw_params(struct snd_pcm_substream *substream,
 
         mclk_freq = params_rate(params) * rfs;
 
-        /* Set the codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B
-                                | SND_SOC_DAIFMT_IB_NF
-                                | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        /* Set the cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_B
-                                | SND_SOC_DAIFMT_IB_NF
-                                | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         ret = snd_soc_dai_set_sysclk(codec_dai, WM8994_SYSCLK_FLL1,
                                         mclk_freq, SND_SOC_CLOCK_IN);
         if (ret < 0)
@@ -118,6 +104,8 @@ static struct snd_soc_dai_link smdk_dai[] = {
                 .codec_dai_name = "wm8994-aif1",
                 .platform_name = "samsung-pcm.0",
                 .codec_name = "wm8994-codec",
+                .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF |
+                           SND_SOC_DAIFMT_CBS_CFS,
                 .ops = &smdk_wm8994_pcm_ops,
         },
 };
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c
index a5b2c4ea90d9..fd11404a3bc7 100644
--- a/sound/soc/sh/dma-sh7760.c
+++ b/sound/soc/sh/dma-sh7760.c
@@ -305,11 +305,6 @@ static struct snd_pcm_ops camelot_pcm_ops = {
         .pointer        = camelot_pos,
 };
 
-static void camelot_pcm_free(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int camelot_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_pcm *pcm = rtd->pcm;
@@ -328,7 +323,6 @@ static int camelot_pcm_new(struct snd_soc_pcm_runtime *rtd)
 static struct snd_soc_platform_driver sh7760_soc_platform = {
         .ops            = &camelot_pcm_ops,
         .pcm_new        = camelot_pcm_new,
-        .pcm_free       = camelot_pcm_free,
 };
 
 static int sh7760_soc_platform_probe(struct platform_device *pdev)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 8869971d7884..b87b22e88e43 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -820,12 +820,9 @@ static int fsi_clk_enable(struct device *dev,
                         return ret;
                 }
 
-                if (clock->xck)
-                        clk_enable(clock->xck);
-                if (clock->ick)
-                        clk_enable(clock->ick);
-                if (clock->div)
-                        clk_enable(clock->div);
+                clk_enable(clock->xck);
+                clk_enable(clock->ick);
+                clk_enable(clock->div);
 
                 clock->count++;
         }
@@ -1765,11 +1762,6 @@ static struct snd_pcm_ops fsi_pcm_ops = {
 #define PREALLOC_BUFFER         (32 * 1024)
 #define PREALLOC_BUFFER_MAX     (32 * 1024)
 
-static void fsi_pcm_free(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int fsi_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         return snd_pcm_lib_preallocate_pages_for_all(
@@ -1821,7 +1813,6 @@ static struct snd_soc_dai_driver fsi_soc_dai[] = {
 static struct snd_soc_platform_driver fsi_soc_platform = {
         .ops            = &fsi_pcm_ops,
         .pcm_new        = fsi_pcm_new,
-        .pcm_free       = fsi_pcm_free,
 };
 
 static const struct snd_soc_component_driver fsi_soc_component = {
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
index c58c2529f103..82f582344fe7 100644
--- a/sound/soc/sh/migor.c
+++ b/sound/soc/sh/migor.c
@@ -63,16 +63,6 @@ static int migor_hw_params(struct snd_pcm_substream *substream,
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_NB_IF |
-                                  SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        ret = snd_soc_dai_set_fmt(rtd->cpu_dai, SND_SOC_DAIFMT_NB_IF |
-                                  SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         codec_freq = rate * 512;
         /*
          * This propagates the parent frequency change to children and
@@ -144,6 +134,8 @@ static struct snd_soc_dai_link migor_dai = {
         .codec_dai_name = "wm8978-hifi",
         .platform_name = "siu-pcm-audio",
         .codec_name = "wm8978.0-001a",
+        .dai_fmt = SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_I2S |
+                   SND_SOC_DAIFMT_CBS_CFS,
         .ops = &migor_dai_ops,
 };
 
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 14d1a7193469..7ac35c9d1cb8 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -57,8 +57,7 @@ static u32 rsnd_adg_ssi_ws_timing_gen2(struct rsnd_dai_stream *io)
         return (0x6 + ws) << 8;
 }
 
-int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_dai *rdai,
-                                 struct rsnd_mod *mod,
+int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *mod,
                                  struct rsnd_dai_stream *io)
 {
         int id = rsnd_mod_id(mod);
@@ -75,12 +74,11 @@ int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_dai *rdai,
         return 0;
 }
 
-static int rsnd_adg_set_src_timsel_gen2(struct rsnd_dai *rdai,
-                                        struct rsnd_mod *mod,
+static int rsnd_adg_set_src_timsel_gen2(struct rsnd_mod *mod,
                                         struct rsnd_dai_stream *io,
                                         u32 timsel)
 {
-        int is_play = rsnd_dai_is_play(rdai, io);
+        int is_play = rsnd_io_is_play(io);
         int id = rsnd_mod_id(mod);
         int shift = (id % 2) ? 16 : 0;
         u32 mask, ws;
@@ -122,7 +120,6 @@ static int rsnd_adg_set_src_timsel_gen2(struct rsnd_dai *rdai,
 }
 
 int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod,
-                                  struct rsnd_dai *rdai,
                                   struct rsnd_dai_stream *io,
                                   unsigned int src_rate,
                                   unsigned int dst_rate)
@@ -178,7 +175,7 @@ int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod,
                 return -EIO;
         }
 
-        ret = rsnd_adg_set_src_timsel_gen2(rdai, mod, io, val);
+        ret = rsnd_adg_set_src_timsel_gen2(mod, io, val);
         if (ret < 0) {
                 dev_err(dev, "timsel error\n");
                 return ret;
@@ -190,12 +187,11 @@ int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod,
 }
 
 int rsnd_adg_set_convert_timing_gen2(struct rsnd_mod *mod,
-                                     struct rsnd_dai *rdai,
                                      struct rsnd_dai_stream *io)
 {
         u32 val = rsnd_adg_ssi_ws_timing_gen2(io);
 
-        return rsnd_adg_set_src_timsel_gen2(rdai, mod, io, val);
+        return rsnd_adg_set_src_timsel_gen2(mod, io, val);
 }
 
 int rsnd_adg_set_convert_clk_gen1(struct rsnd_priv *priv,
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 75308bbc2ce8..1b53605f7154 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -149,16 +149,16 @@ char *rsnd_mod_dma_name(struct rsnd_mod *mod)
         return mod->ops->dma_name(mod);
 }
 
-void rsnd_mod_init(struct rsnd_priv *priv,
-                   struct rsnd_mod *mod,
+void rsnd_mod_init(struct rsnd_mod *mod,
                    struct rsnd_mod_ops *ops,
+                   struct clk *clk,
                    enum rsnd_mod_type type,
                    int id)
 {
-        mod->priv       = priv;
         mod->id         = id;
         mod->ops        = ops;
         mod->type       = type;
+        mod->clk        = clk;
 }
 
 /*
@@ -412,7 +412,7 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod)
 /*
  *      rsnd_dai functions
  */
-#define __rsnd_mod_call(mod, func, rdai...)                     \
+#define __rsnd_mod_call(mod, func, param...)                    \
 ({                                                              \
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);         \
         struct device *dev = rsnd_priv_to_dev(priv);            \
@@ -422,18 +422,18 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod)
         if ((mod->status & mask) == call) {                             \
                 dev_dbg(dev, "%s[%d] %s\n",                             \
                         rsnd_mod_name(mod), rsnd_mod_id(mod), #func);   \
-                ret = (mod)->ops->func(mod, rdai);                      \
+                ret = (mod)->ops->func(mod, param);                     \
                 mod->status = (mod->status & ~mask) | (~call & mask);   \
         }                                                               \
         ret;                                                            \
 })
 
-#define rsnd_mod_call(mod, func, rdai...)       \
+#define rsnd_mod_call(mod, func, param...)      \
         (!(mod) ? -ENODEV :                     \
          !((mod)->ops->func) ? 0 :              \
-         __rsnd_mod_call(mod, func, rdai))
+         __rsnd_mod_call(mod, func, param))
 
-#define rsnd_dai_call(fn, io, rdai...)                          \
+#define rsnd_dai_call(fn, io, param...)                         \
 ({                                                              \
         struct rsnd_mod *mod;                                   \
         int ret = 0, i;                                         \
@@ -441,7 +441,7 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod)
                 mod = (io)->mod[i];                             \
                 if (!mod)                                       \
                         continue;                               \
-                ret = rsnd_mod_call(mod, fn, rdai);             \
+                ret = rsnd_mod_call(mod, fn, param);            \
                 if (ret < 0)                                    \
                         break;                                  \
         }                                                       \
@@ -477,17 +477,7 @@ static void rsnd_dai_disconnect(struct rsnd_mod *mod,
         io->mod[mod->type] = NULL;
 }
 
-int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai)
-{
-        int id = rdai - priv->rdai;
-
-        if ((id < 0) || (id >= rsnd_rdai_nr(priv)))
-                return -EINVAL;
-
-        return id;
-}
-
-struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id)
+struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id)
 {
         if ((id < 0) || (id >= rsnd_rdai_nr(priv)))
                 return NULL;
@@ -499,12 +489,7 @@ static struct rsnd_dai *rsnd_dai_to_rdai(struct snd_soc_dai *dai)
 {
         struct rsnd_priv *priv = snd_soc_dai_get_drvdata(dai);
 
-        return rsnd_dai_get(priv, dai->id);
-}
-
-int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io)
-{
-        return &rdai->playback == io;
+        return rsnd_rdai_get(priv, dai->id);
 }
 
 /*
@@ -598,20 +583,20 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd,
                 if (ret < 0)
                         goto dai_trigger_end;
 
-                ret = rsnd_dai_call(init, io, rdai);
+                ret = rsnd_dai_call(init, io, priv);
                 if (ret < 0)
                         goto dai_trigger_end;
 
-                ret = rsnd_dai_call(start, io, rdai);
+                ret = rsnd_dai_call(start, io, priv);
                 if (ret < 0)
                         goto dai_trigger_end;
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
-                ret = rsnd_dai_call(stop, io, rdai);
+                ret = rsnd_dai_call(stop, io, priv);
                 if (ret < 0)
                         goto dai_trigger_end;
 
-                ret = rsnd_dai_call(quit, io, rdai);
+                ret = rsnd_dai_call(quit, io, priv);
                 if (ret < 0)
                         goto dai_trigger_end;
 
@@ -873,15 +858,15 @@ static int rsnd_dai_probe(struct platform_device *pdev,
         priv->rdai      = rdai;
 
         for (i = 0; i < dai_nr; i++) {
-                rdai[i].info = &info->dai_info[i];
 
-                pmod = rdai[i].info->playback.ssi;
-                cmod = rdai[i].info->capture.ssi;
+                pmod = info->dai_info[i].playback.ssi;
+                cmod = info->dai_info[i].capture.ssi;
 
                 /*
                  *      init rsnd_dai
                  */
                 snprintf(rdai[i].name, RSND_DAI_NAME_SIZE, "rsnd-dai.%d", i);
+                rdai[i].priv = priv;
 
                 /*
                  *      init snd_soc_dai_driver
@@ -895,6 +880,7 @@ static int rsnd_dai_probe(struct platform_device *pdev,
                         drv[i].playback.channels_max    = 2;
 
                         rdai[i].playback.info = &info->dai_info[i].playback;
+                        rdai[i].playback.rdai = rdai + i;
                         rsnd_path_init(priv, &rdai[i], &rdai[i].playback);
                 }
                 if (cmod) {
@@ -904,6 +890,7 @@ static int rsnd_dai_probe(struct platform_device *pdev,
                         drv[i].capture.channels_max     = 2;
 
                         rdai[i].capture.info = &info->dai_info[i].capture;
+                        rdai[i].capture.rdai = rdai + i;
                         rsnd_path_init(priv, &rdai[i], &rdai[i].capture);
                 }
 
@@ -1037,7 +1024,6 @@ static int rsnd_kctrl_put(struct snd_kcontrol *kctrl,
 }
 
 static int __rsnd_kctrl_new(struct rsnd_mod *mod,
-                            struct rsnd_dai *rdai,
                             struct snd_soc_pcm_runtime *rtd,
                             const unsigned char *name,
                             struct rsnd_kctrl_cfg *cfg,
@@ -1060,16 +1046,24 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
                 return -ENOMEM;
 
         ret = snd_ctl_add(card, kctrl);
-        if (ret < 0)
+        if (ret < 0) {
+                snd_ctl_free_one(kctrl);
                 return ret;
+        }
 
         cfg->update = update;
+        cfg->card = card;
+        cfg->kctrl = kctrl;
 
         return 0;
 }
 
+void _rsnd_kctrl_remove(struct rsnd_kctrl_cfg *cfg)
+{
+        snd_ctl_remove(cfg->card, cfg->kctrl);
+}
+
 int rsnd_kctrl_new_m(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
                      void (*update)(struct rsnd_mod *mod),
@@ -1079,11 +1073,10 @@ int rsnd_kctrl_new_m(struct rsnd_mod *mod,
         _cfg->cfg.max   = max;
         _cfg->cfg.size  = RSND_DVC_CHANNELS;
         _cfg->cfg.val   = _cfg->val;
-        return __rsnd_kctrl_new(mod, rdai, rtd, name, &_cfg->cfg, update);
+        return __rsnd_kctrl_new(mod, rtd, name, &_cfg->cfg, update);
 }
 
 int rsnd_kctrl_new_s(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
                      void (*update)(struct rsnd_mod *mod),
@@ -1093,11 +1086,10 @@ int rsnd_kctrl_new_s(struct rsnd_mod *mod,
         _cfg->cfg.max   = max;
         _cfg->cfg.size  = 1;
         _cfg->cfg.val   = &_cfg->val;
-        return __rsnd_kctrl_new(mod, rdai, rtd, name, &_cfg->cfg, update);
+        return __rsnd_kctrl_new(mod, rtd, name, &_cfg->cfg, update);
 }
 
 int rsnd_kctrl_new_e(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
                      struct rsnd_kctrl_cfg_s *_cfg,
@@ -1109,7 +1101,7 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod,
         _cfg->cfg.size  = 1;
         _cfg->cfg.val   = &_cfg->val;
         _cfg->cfg.texts = texts;
-        return __rsnd_kctrl_new(mod, rdai, rtd, name, &_cfg->cfg, update);
+        return __rsnd_kctrl_new(mod, rtd, name, &_cfg->cfg, update);
 }
 
 /*
@@ -1125,11 +1117,11 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
         struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
         int ret;
 
-        ret = rsnd_dai_call(pcm_new, &rdai->playback, rdai, rtd);
+        ret = rsnd_dai_call(pcm_new, &rdai->playback, rtd);
         if (ret)
                 return ret;
 
-        ret = rsnd_dai_call(pcm_new, &rdai->capture, rdai, rtd);
+        ret = rsnd_dai_call(pcm_new, &rdai->capture, rtd);
         if (ret)
                 return ret;
 
@@ -1140,15 +1132,9 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
                 PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
 }
 
-static void rsnd_pcm_free(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static struct snd_soc_platform_driver rsnd_soc_platform = {
         .ops            = &rsnd_pcm_ops,
         .pcm_new        = rsnd_pcm_new,
-        .pcm_free       = rsnd_pcm_free,
 };
 
 static const struct snd_soc_component_driver rsnd_soc_component = {
@@ -1156,13 +1142,11 @@ static const struct snd_soc_component_driver rsnd_soc_component = {
 };
 
 static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,
-                                       struct rsnd_dai *rdai,
-                                       int is_play)
+                                       struct rsnd_dai_stream *io)
 {
-        struct rsnd_dai_stream *io = is_play ? &rdai->playback : &rdai->capture;
         int ret;
 
-        ret = rsnd_dai_call(probe, io, rdai);
+        ret = rsnd_dai_call(probe, io, priv);
         if (ret == -EAGAIN) {
                 /*
                  * Fallback to PIO mode
@@ -1175,7 +1159,7 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,
                  *      rsnd_dma_init()
                  *      rsnd_ssi_fallback()
                  */
-                rsnd_dai_call(remove, io, rdai);
+                rsnd_dai_call(remove, io, priv);
 
                 /*
                  * remove SRC/DVC from DAI,
@@ -1186,13 +1170,13 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,
                 /*
                  * fallback
                  */
-                rsnd_dai_call(fallback, io, rdai);
+                rsnd_dai_call(fallback, io, priv);
 
                 /*
                  * retry to "probe".
                  * DAI has SSI which is PIO mode only now.
                  */
-                ret = rsnd_dai_call(probe, io, rdai);
+                ret = rsnd_dai_call(probe, io, priv);
         }
 
         return ret;
@@ -1259,11 +1243,11 @@ static int rsnd_probe(struct platform_device *pdev)
         }
 
         for_each_rsnd_dai(rdai, priv, i) {
-                ret = rsnd_rdai_continuance_probe(priv, rdai, 1);
+                ret = rsnd_rdai_continuance_probe(priv, &rdai->playback);
                 if (ret)
                         goto exit_snd_probe;
 
-                ret = rsnd_rdai_continuance_probe(priv, rdai, 0);
+                ret = rsnd_rdai_continuance_probe(priv, &rdai->capture);
                 if (ret)
                         goto exit_snd_probe;
         }
@@ -1295,8 +1279,8 @@ exit_snd_soc:
         snd_soc_unregister_platform(dev);
 exit_snd_probe:
         for_each_rsnd_dai(rdai, priv, i) {
-                rsnd_dai_call(remove, &rdai->playback, rdai);
-                rsnd_dai_call(remove, &rdai->capture, rdai);
+                rsnd_dai_call(remove, &rdai->playback, priv);
+                rsnd_dai_call(remove, &rdai->capture, priv);
         }
 
         return ret;
@@ -1311,10 +1295,13 @@ static int rsnd_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
 
         for_each_rsnd_dai(rdai, priv, i) {
-                ret |= rsnd_dai_call(remove, &rdai->playback, rdai);
-                ret |= rsnd_dai_call(remove, &rdai->capture, rdai);
+                ret |= rsnd_dai_call(remove, &rdai->playback, priv);
+                ret |= rsnd_dai_call(remove, &rdai->capture, priv);
         }
 
+        snd_soc_unregister_component(&pdev->dev);
+        snd_soc_unregister_platform(&pdev->dev);
+
         return ret;
 }
 
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 5380a4827ba7..d7f9ed959c4e 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -17,7 +17,6 @@
 struct rsnd_dvc {
         struct rsnd_dvc_platform_info *info; /* rcar_snd.h */
         struct rsnd_mod mod;
-        struct clk *clk;
         struct rsnd_kctrl_cfg_m volume;
         struct rsnd_kctrl_cfg_m mute;
         struct rsnd_kctrl_cfg_s ren;    /* Ramp Enable */
@@ -118,9 +117,8 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod)
 }
 
 static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai)
+                               struct rsnd_priv *priv)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
 
         dev_dbg(dev, "%s[%d] (Gen2) is probed\n",
@@ -129,12 +127,24 @@ static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod,
         return 0;
 }
 
+static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod,
+                                struct rsnd_priv *priv)
+{
+        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
+
+        rsnd_kctrl_remove(dvc->volume);
+        rsnd_kctrl_remove(dvc->mute);
+        rsnd_kctrl_remove(dvc->ren);
+        rsnd_kctrl_remove(dvc->rup);
+        rsnd_kctrl_remove(dvc->rdown);
+
+        return 0;
+}
+
 static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
-                         struct rsnd_dai *rdai)
+                         struct rsnd_priv *priv)
 {
-        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(dvc_mod);
         struct rsnd_dai_stream *io = rsnd_mod_to_io(dvc_mod);
-        struct rsnd_priv *priv = rsnd_mod_to_priv(dvc_mod);
         struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         int dvc_id = rsnd_mod_id(dvc_mod);
@@ -153,7 +163,7 @@ static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
                 return -EINVAL;
         }
 
-        clk_prepare_enable(dvc->clk);
+        rsnd_mod_hw_start(dvc_mod);
 
         /*
          * fixme
@@ -173,23 +183,21 @@ static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
 
         rsnd_mod_write(dvc_mod, DVC_DVUIR, 0);
 
-        rsnd_adg_set_cmd_timsel_gen2(rdai, dvc_mod, io);
+        rsnd_adg_set_cmd_timsel_gen2(dvc_mod, io);
 
         return 0;
 }
 
 static int rsnd_dvc_quit(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai)
+                         struct rsnd_priv *priv)
 {
-        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
-
-        clk_disable_unprepare(dvc->clk);
+        rsnd_mod_hw_stop(mod);
 
         return 0;
 }
 
 static int rsnd_dvc_start(struct rsnd_mod *mod,
-                          struct rsnd_dai *rdai)
+                          struct rsnd_priv *priv)
 {
         rsnd_mod_write(mod, CMD_CTRL, 0x10);
 
@@ -197,7 +205,7 @@ static int rsnd_dvc_start(struct rsnd_mod *mod,
 }
 
 static int rsnd_dvc_stop(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai)
+                         struct rsnd_priv *priv)
 {
         rsnd_mod_write(mod, CMD_CTRL, 0);
 
@@ -205,16 +213,16 @@ static int rsnd_dvc_stop(struct rsnd_mod *mod,
 }
 
 static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
-                            struct rsnd_dai *rdai,
                             struct snd_soc_pcm_runtime *rtd)
 {
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
+        int is_play = rsnd_io_is_play(io);
         int ret;
 
         /* Volume */
-        ret = rsnd_kctrl_new_m(mod, rdai, rtd,
-                        rsnd_dai_is_play(rdai, io) ?
+        ret = rsnd_kctrl_new_m(mod, rtd,
+                        is_play ?
                         "DVC Out Playback Volume" : "DVC In Capture Volume",
                         rsnd_dvc_volume_update,
                         &dvc->volume, 0x00800000 - 1);
@@ -222,8 +230,8 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
                 return ret;
 
         /* Mute */
-        ret = rsnd_kctrl_new_m(mod, rdai, rtd,
-                        rsnd_dai_is_play(rdai, io) ?
+        ret = rsnd_kctrl_new_m(mod, rtd,
+                        is_play ?
                         "DVC Out Mute Switch" : "DVC In Mute Switch",
                         rsnd_dvc_volume_update,
                         &dvc->mute, 1);
@@ -231,16 +239,16 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
                 return ret;
 
         /* Ramp */
-        ret = rsnd_kctrl_new_s(mod, rdai, rtd,
-                        rsnd_dai_is_play(rdai, io) ?
+        ret = rsnd_kctrl_new_s(mod, rtd,
+                        is_play ?
                         "DVC Out Ramp Switch" : "DVC In Ramp Switch",
                         rsnd_dvc_volume_update,
                         &dvc->ren, 1);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_kctrl_new_e(mod, rdai, rtd,
-                        rsnd_dai_is_play(rdai, io) ?
+        ret = rsnd_kctrl_new_e(mod, rtd,
+                        is_play ?
                         "DVC Out Ramp Up Rate" : "DVC In Ramp Up Rate",
                         &dvc->rup,
                         rsnd_dvc_volume_update,
@@ -248,8 +256,8 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_kctrl_new_e(mod, rdai, rtd,
-                        rsnd_dai_is_play(rdai, io) ?
+        ret = rsnd_kctrl_new_e(mod, rtd,
+                        is_play ?
                         "DVC Out Ramp Down Rate" : "DVC In Ramp Down Rate",
                         &dvc->rdown,
                         rsnd_dvc_volume_update,
@@ -264,6 +272,7 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
 static struct rsnd_mod_ops rsnd_dvc_ops = {
         .name           = DVC_NAME,
         .probe          = rsnd_dvc_probe_gen2,
+        .remove         = rsnd_dvc_remove_gen2,
         .init           = rsnd_dvc_init,
         .quit           = rsnd_dvc_quit,
         .start          = rsnd_dvc_start,
@@ -356,9 +365,9 @@ int rsnd_dvc_probe(struct platform_device *pdev,
                         return PTR_ERR(clk);
 
                 dvc->info = &info->dvc_info[i];
-                dvc->clk  = clk;
 
-                rsnd_mod_init(priv, &dvc->mod, &rsnd_dvc_ops, RSND_MOD_DVC, i);
+                rsnd_mod_init(&dvc->mod, &rsnd_dvc_ops,
+                              clk, RSND_MOD_DVC, i);
 
                 dev_dbg(dev, "CMD%d probed\n", i);
         }
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 87a6f2d62775..de0685f2abae 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -309,8 +309,13 @@ static int rsnd_gen2_probe(struct platform_device *pdev,
                 RSND_GEN_M_REG(SRC_BUSIF_MODE,  0x0,    0x20),
                 RSND_GEN_M_REG(SRC_ROUTE_MODE0, 0xc,    0x20),
                 RSND_GEN_M_REG(SRC_CTRL,        0x10,   0x20),
+                RSND_GEN_M_REG(SRC_INT_ENABLE0, 0x18,   0x20),
                 RSND_GEN_M_REG(CMD_ROUTE_SLCT,  0x18c,  0x20),
                 RSND_GEN_M_REG(CMD_CTRL,        0x190,  0x20),
+                RSND_GEN_S_REG(SCU_SYS_STATUS0, 0x1c8),
+                RSND_GEN_S_REG(SCU_SYS_INT_EN0, 0x1cc),
+                RSND_GEN_S_REG(SCU_SYS_STATUS1, 0x1d0),
+                RSND_GEN_S_REG(SCU_SYS_INT_EN1, 0x1c4),
                 RSND_GEN_M_REG(SRC_SWRSR,       0x200,  0x40),
                 RSND_GEN_M_REG(SRC_SRCIR,       0x204,  0x40),
                 RSND_GEN_M_REG(SRC_ADINR,       0x214,  0x40),
@@ -403,6 +408,16 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
                 RSND_GEN_M_REG(SRC_IFSVR,       0x220,  0x40),
                 RSND_GEN_M_REG(SRC_SRCCR,       0x224,  0x40),
                 RSND_GEN_M_REG(SRC_MNFSR,       0x228,  0x40),
+                /*
+                 * ADD US
+                 *
+                 * SRC_STATUS
+                 * SRC_INT_EN
+                 * SCU_SYS_STATUS0
+                 * SCU_SYS_STATUS1
+                 * SCU_SYS_INT_EN0
+                 * SCU_SYS_INT_EN1
+                 */
         };
         struct rsnd_regmap_field_conf conf_adg[] = {
                 RSND_GEN_S_REG(BRRA,            0x00),
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 5826c8abf794..e7914bd610e2 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -44,6 +44,8 @@ enum rsnd_reg {
         RSND_REG_SRC_IFSCR,
         RSND_REG_SRC_IFSVR,
         RSND_REG_SRC_SRCCR,
+        RSND_REG_SCU_SYS_STATUS0,
+        RSND_REG_SCU_SYS_INT_EN0,
         RSND_REG_CMD_ROUTE_SLCT,
         RSND_REG_DVC_SWRSR,
         RSND_REG_DVC_DVUIR,
@@ -94,6 +96,9 @@ enum rsnd_reg {
         RSND_REG_SHARE23,
         RSND_REG_SHARE24,
         RSND_REG_SHARE25,
+        RSND_REG_SHARE26,
+        RSND_REG_SHARE27,
+        RSND_REG_SHARE28,
 
         RSND_REG_MAX,
 };
@@ -135,6 +140,9 @@ enum rsnd_reg {
 #define RSND_REG_DVC_VRCTR              RSND_REG_SHARE23
 #define RSND_REG_DVC_VRPDR              RSND_REG_SHARE24
 #define RSND_REG_DVC_VRDBR              RSND_REG_SHARE25
+#define RSND_REG_SCU_SYS_STATUS1        RSND_REG_SHARE26
+#define RSND_REG_SCU_SYS_INT_EN1        RSND_REG_SHARE27
+#define RSND_REG_SRC_INT_ENABLE0        RSND_REG_SHARE28
 
 struct rsnd_of_data;
 struct rsnd_priv;
@@ -182,9 +190,9 @@ void  rsnd_dma_quit(struct rsnd_priv *priv,
  *      R-Car sound mod
  */
 enum rsnd_mod_type {
-        RSND_MOD_SRC = 0,
+        RSND_MOD_DVC = 0,
+        RSND_MOD_SRC,
         RSND_MOD_SSI,
-        RSND_MOD_DVC,
         RSND_MOD_MAX,
 };
 
@@ -192,32 +200,31 @@ struct rsnd_mod_ops {
         char *name;
         char* (*dma_name)(struct rsnd_mod *mod);
         int (*probe)(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai);
+                     struct rsnd_priv *priv);
         int (*remove)(struct rsnd_mod *mod,
-                      struct rsnd_dai *rdai);
+                      struct rsnd_priv *priv);
         int (*init)(struct rsnd_mod *mod,
-                    struct rsnd_dai *rdai);
+                    struct rsnd_priv *priv);
         int (*quit)(struct rsnd_mod *mod,
-                    struct rsnd_dai *rdai);
+                    struct rsnd_priv *priv);
         int (*start)(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai);
+                     struct rsnd_priv *priv);
         int (*stop)(struct rsnd_mod *mod,
-                    struct rsnd_dai *rdai);
+                    struct rsnd_priv *priv);
         int (*pcm_new)(struct rsnd_mod *mod,
-                       struct rsnd_dai *rdai,
                        struct snd_soc_pcm_runtime *rtd);
         int (*fallback)(struct rsnd_mod *mod,
-                        struct rsnd_dai *rdai);
+                        struct rsnd_priv *priv);
 };
 
 struct rsnd_dai_stream;
 struct rsnd_mod {
         int id;
         enum rsnd_mod_type type;
-        struct rsnd_priv *priv;
         struct rsnd_mod_ops *ops;
         struct rsnd_dma dma;
         struct rsnd_dai_stream *io;
+        struct clk *clk;
         u32 status;
 };
 /*
@@ -248,15 +255,17 @@ struct rsnd_mod {
 #define __rsnd_mod_call_pcm_new         0
 #define __rsnd_mod_call_fallback        0
 
-#define rsnd_mod_to_priv(mod) ((mod)->priv)
+#define rsnd_mod_to_priv(mod) (rsnd_io_to_priv(rsnd_mod_to_io(mod)))
 #define rsnd_mod_to_dma(mod) (&(mod)->dma)
 #define rsnd_dma_to_mod(_dma) container_of((_dma), struct rsnd_mod, dma)
 #define rsnd_mod_to_io(mod) ((mod)->io)
 #define rsnd_mod_id(mod) ((mod)->id)
+#define rsnd_mod_hw_start(mod)  clk_prepare_enable((mod)->clk)
+#define rsnd_mod_hw_stop(mod)   clk_disable_unprepare((mod)->clk)
 
-void rsnd_mod_init(struct rsnd_priv *priv,
-                   struct rsnd_mod *mod,
+void rsnd_mod_init(struct rsnd_mod *mod,
                    struct rsnd_mod_ops *ops,
+                   struct clk *clk,
                    enum rsnd_mod_type type,
                    int id);
 char *rsnd_mod_name(struct rsnd_mod *mod);
@@ -270,6 +279,7 @@ struct rsnd_dai_stream {
         struct snd_pcm_substream *substream;
         struct rsnd_mod *mod[RSND_MOD_MAX];
         struct rsnd_dai_path_info *info; /* rcar_snd.h */
+        struct rsnd_dai *rdai;
         int byte_pos;
         int period_pos;
         int byte_per_period;
@@ -278,12 +288,18 @@ struct rsnd_dai_stream {
 #define rsnd_io_to_mod_ssi(io)  ((io)->mod[RSND_MOD_SSI])
 #define rsnd_io_to_mod_src(io)  ((io)->mod[RSND_MOD_SRC])
 #define rsnd_io_to_mod_dvc(io)  ((io)->mod[RSND_MOD_DVC])
+#define rsnd_io_to_rdai(io)     ((io)->rdai)
+#define rsnd_io_to_priv(io)     (rsnd_rdai_to_priv(rsnd_io_to_rdai(io)))
+#define rsnd_io_is_play(io)     (&rsnd_io_to_rdai(io)->playback == io)
+#define rsnd_io_to_runtime(io) ((io)->substream ? \
+                                (io)->substream->runtime : NULL)
+
 
 struct rsnd_dai {
         char name[RSND_DAI_NAME_SIZE];
-        struct rsnd_dai_platform_info *info; /* rcar_snd.h */
         struct rsnd_dai_stream playback;
         struct rsnd_dai_stream capture;
+        struct rsnd_priv *priv;
 
         unsigned int clk_master:1;
         unsigned int bit_clk_inv:1;
@@ -293,22 +309,18 @@ struct rsnd_dai {
 };
 
 #define rsnd_rdai_nr(priv) ((priv)->rdai_nr)
+#define rsnd_rdai_is_clk_master(rdai) ((rdai)->clk_master)
+#define rsnd_rdai_to_priv(rdai) ((rdai)->priv)
 #define for_each_rsnd_dai(rdai, priv, i)                \
         for (i = 0;                                     \
              (i < rsnd_rdai_nr(priv)) &&                \
-             ((rdai) = rsnd_dai_get(priv, i));          \
+             ((rdai) = rsnd_rdai_get(priv, i));         \
              i++)
 
-struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id);
-int rsnd_dai_is_play(struct rsnd_dai *rdai, struct rsnd_dai_stream *io);
-int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai);
-#define rsnd_dai_get_platform_info(rdai) ((rdai)->info)
-#define rsnd_io_to_runtime(io) ((io)->substream ? \
-                                (io)->substream->runtime : NULL)
+struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id);
 
 void rsnd_dai_pointer_update(struct rsnd_dai_stream *io, int cnt);
 int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional);
-#define rsnd_dai_is_clk_master(rdai) ((rdai)->clk_master)
 
 /*
  *      R-Car Gen1/Gen2
@@ -339,15 +351,12 @@ int rsnd_adg_set_convert_clk_gen1(struct rsnd_priv *priv,
                                   unsigned int src_rate,
                                   unsigned int dst_rate);
 int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod,
-                                  struct rsnd_dai *rdai,
                                   struct rsnd_dai_stream *io,
                                   unsigned int src_rate,
                                   unsigned int dst_rate);
 int rsnd_adg_set_convert_timing_gen2(struct rsnd_mod *mod,
-                                     struct rsnd_dai *rdai,
                                      struct rsnd_dai_stream *io);
-int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_dai *rdai,
-                                 struct rsnd_mod *mod,
+int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *mod,
                                  struct rsnd_dai_stream *io);
 
 /*
@@ -427,6 +436,8 @@ struct rsnd_kctrl_cfg {
         u32 *val;
         const char * const *texts;
         void (*update)(struct rsnd_mod *mod);
+        struct snd_card *card;
+        struct snd_kcontrol *kctrl;
 };
 
 #define RSND_DVC_CHANNELS       2
@@ -440,22 +451,22 @@ struct rsnd_kctrl_cfg_s {
         u32 val;
 };
 
+void _rsnd_kctrl_remove(struct rsnd_kctrl_cfg *cfg);
+#define rsnd_kctrl_remove(_cfg) _rsnd_kctrl_remove(&((_cfg).cfg))
+
 int rsnd_kctrl_new_m(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
                      void (*update)(struct rsnd_mod *mod),
                      struct rsnd_kctrl_cfg_m *_cfg,
                      u32 max);
 int rsnd_kctrl_new_s(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
                      void (*update)(struct rsnd_mod *mod),
                      struct rsnd_kctrl_cfg_s *_cfg,
                      u32 max);
 int rsnd_kctrl_new_e(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai,
                      struct snd_soc_pcm_runtime *rtd,
                      const unsigned char *name,
                      struct rsnd_kctrl_cfg_s *_cfg,
@@ -474,14 +485,10 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
                                    struct rsnd_dai_stream *io,
                                    struct snd_pcm_runtime *runtime);
 int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
-                        struct rsnd_dai *rdai,
                         int use_busif);
-int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,
-                       struct rsnd_dai *rdai);
-int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod,
-                            struct rsnd_dai *rdai);
-int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod,
-                             struct rsnd_dai *rdai);
+int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod);
+int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod);
+int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod);
 
 #define rsnd_src_nr(priv) ((priv)->src_nr)
 
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index eede3ac6eed2..81c182b4bad5 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -12,10 +12,17 @@
 
 #define SRC_NAME "src"
 
+/* SRCx_STATUS */
+#define OUF_SRCO        ((1 << 12) | (1 << 13))
+#define OUF_SRCI        ((1 <<  9) | (1 <<  8))
+
+/* SCU_SYSTEM_STATUS0/1 */
+#define OUF_SRC(id)     ((1 << (id + 16)) | (1 << id))
+
 struct rsnd_src {
         struct rsnd_src_platform_info *info; /* rcar_snd.h */
         struct rsnd_mod mod;
-        struct clk *clk;
+        int err;
 };
 
 #define RSND_SRC_NAME_SIZE 16
@@ -107,10 +114,10 @@ struct rsnd_src {
  *              Gen1/Gen2 common functions
  */
 int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
-                        struct rsnd_dai *rdai,
                         int use_busif)
 {
         struct rsnd_dai_stream *io = rsnd_mod_to_io(ssi_mod);
+        struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         int ssi_id = rsnd_mod_id(ssi_mod);
 
@@ -140,7 +147,7 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
                 if (shift >= 0)
                         rsnd_mod_bset(ssi_mod, SSI_MODE1,
                                       0x3 << shift,
-                                      rsnd_dai_is_clk_master(rdai) ?
+                                      rsnd_rdai_is_clk_master(rdai) ?
                                       0x2 << shift : 0x1 << shift);
         }
 
@@ -174,8 +181,7 @@ int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
         return 0;
 }
 
-int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,
-                       struct rsnd_dai *rdai)
+int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod)
 {
         /*
          * DMA settings for SSIU
@@ -185,8 +191,7 @@ int rsnd_src_ssiu_stop(struct rsnd_mod *ssi_mod,
         return 0;
 }
 
-int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod,
-                            struct rsnd_dai *rdai)
+int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);
 
@@ -202,8 +207,7 @@ int rsnd_src_ssi_irq_enable(struct rsnd_mod *ssi_mod,
         return 0;
 }
 
-int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod,
-                            struct rsnd_dai *rdai)
+int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);
 
@@ -240,8 +244,7 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
         return rate;
 }
 
-static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
-                                     struct rsnd_dai *rdai)
+static int rsnd_src_set_convert_rate(struct rsnd_mod *mod)
 {
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
@@ -273,12 +276,13 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
         return 0;
 }
 
-static int rsnd_src_init(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai)
+static int rsnd_src_init(struct rsnd_mod *mod)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
-        clk_prepare_enable(src->clk);
+        rsnd_mod_hw_start(mod);
+
+        src->err = 0;
 
         /*
          * Initialize the operation of the SRC internal circuits
@@ -290,11 +294,16 @@ static int rsnd_src_init(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_quit(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai)
+                         struct rsnd_priv *priv)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
+        struct device *dev = rsnd_priv_to_dev(priv);
+
+        rsnd_mod_hw_stop(mod);
 
-        clk_disable_unprepare(src->clk);
+        if (src->err)
+                dev_warn(dev, "%s[%d] under/over flow err = %d\n",
+                         rsnd_mod_name(mod), rsnd_mod_id(mod), src->err);
 
         return 0;
 }
@@ -319,8 +328,7 @@ static int rsnd_src_stop(struct rsnd_mod *mod)
 /*
  *              Gen1 functions
  */
-static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
-                                   struct rsnd_dai *rdai)
+static int rsnd_src_set_route_gen1(struct rsnd_mod *mod)
 {
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct src_route_config {
@@ -348,7 +356,7 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
         /*
          * SRC_ROUTE_SELECT
          */
-        val = rsnd_dai_is_play(rdai, io) ? 0x1 : 0x2;
+        val = rsnd_io_is_play(io) ? 0x1 : 0x2;
         val = val               << routes[id].shift;
         mask = routes[id].mask  << routes[id].shift;
 
@@ -357,8 +365,7 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
         return 0;
 }
 
-static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod,
-                                            struct rsnd_dai *rdai)
+static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod)
 {
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
@@ -416,13 +423,12 @@ static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod,
         return 0;
 }
 
-static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
-                                          struct rsnd_dai *rdai)
+static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         int ret;
 
-        ret = rsnd_src_set_convert_rate(mod, rdai);
+        ret = rsnd_src_set_convert_rate(mod);
         if (ret < 0)
                 return ret;
 
@@ -443,9 +449,8 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_probe_gen1(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai)
+                               struct rsnd_priv *priv)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
 
         dev_dbg(dev, "%s[%d] (Gen1) is probed\n",
@@ -455,23 +460,23 @@ static int rsnd_src_probe_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_init_gen1(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai)
+                              struct rsnd_priv *priv)
 {
         int ret;
 
-        ret = rsnd_src_init(mod, rdai);
+        ret = rsnd_src_init(mod);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_route_gen1(mod, rdai);
+        ret = rsnd_src_set_route_gen1(mod);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_rate_gen1(mod, rdai);
+        ret = rsnd_src_set_convert_rate_gen1(mod);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_timing_gen1(mod, rdai);
+        ret = rsnd_src_set_convert_timing_gen1(mod);
         if (ret < 0)
                 return ret;
 
@@ -479,7 +484,7 @@ static int rsnd_src_init_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start_gen1(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai)
+                               struct rsnd_priv *priv)
 {
         int id = rsnd_mod_id(mod);
 
@@ -489,7 +494,7 @@ static int rsnd_src_start_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_stop_gen1(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai)
+                              struct rsnd_priv *priv)
 {
         int id = rsnd_mod_id(mod);
 
@@ -510,8 +515,111 @@ static struct rsnd_mod_ops rsnd_src_gen1_ops = {
 /*
  *              Gen2 functions
  */
-static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
-                                          struct rsnd_dai *rdai)
+#define rsnd_src_irq_enable_gen2(mod)  rsnd_src_irq_ctrol_gen2(mod, 1)
+#define rsnd_src_irq_disable_gen2(mod) rsnd_src_irq_ctrol_gen2(mod, 0)
+static void rsnd_src_irq_ctrol_gen2(struct rsnd_mod *mod, int enable)
+{
+        struct rsnd_src *src = rsnd_mod_to_src(mod);
+        u32 sys_int_val, int_val, sys_int_mask;
+        int irq = src->info->irq;
+        int id = rsnd_mod_id(mod);
+
+        sys_int_val =
+        sys_int_mask = OUF_SRC(id);
+        int_val = 0x3300;
+
+        /*
+         * IRQ is not supported on non-DT
+         * see
+         *      rsnd_src_probe_gen2()
+         */
+        if ((irq <= 0) || !enable) {
+                sys_int_val = 0;
+                int_val = 0;
+        }
+
+        rsnd_mod_write(mod, SRC_INT_ENABLE0, int_val);
+        rsnd_mod_bset(mod, SCU_SYS_INT_EN0, sys_int_mask, sys_int_val);
+        rsnd_mod_bset(mod, SCU_SYS_INT_EN1, sys_int_mask, sys_int_val);
+}
+
+static void rsnd_src_error_clear_gen2(struct rsnd_mod *mod)
+{
+        u32 val = OUF_SRC(rsnd_mod_id(mod));
+
+        rsnd_mod_bset(mod, SCU_SYS_STATUS0, val, val);
+        rsnd_mod_bset(mod, SCU_SYS_STATUS1, val, val);
+}
+
+static bool rsnd_src_error_record_gen2(struct rsnd_mod *mod)
+{
+        u32 val = OUF_SRC(rsnd_mod_id(mod));
+        bool ret = false;
+
+        if ((rsnd_mod_read(mod, SCU_SYS_STATUS0) & val) ||
+            (rsnd_mod_read(mod, SCU_SYS_STATUS1) & val)) {
+                struct rsnd_src *src = rsnd_mod_to_src(mod);
+
+                src->err++;
+                ret = true;
+        }
+
+        /* clear error static */
+        rsnd_src_error_clear_gen2(mod);
+
+        return ret;
+}
+
+static int _rsnd_src_start_gen2(struct rsnd_mod *mod)
+{
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        u32 val = rsnd_io_to_mod_dvc(io) ? 0x01 : 0x11;
+
+        rsnd_mod_write(mod, SRC_CTRL, val);
+
+        rsnd_src_error_clear_gen2(mod);
+
+        rsnd_src_start(mod);
+
+        rsnd_src_irq_enable_gen2(mod);
+
+        return 0;
+}
+
+static int _rsnd_src_stop_gen2(struct rsnd_mod *mod)
+{
+        rsnd_src_irq_disable_gen2(mod);
+
+        rsnd_mod_write(mod, SRC_CTRL, 0);
+
+        rsnd_src_error_record_gen2(mod);
+
+        return rsnd_src_stop(mod);
+}
+
+static irqreturn_t rsnd_src_interrupt_gen2(int irq, void *data)
+{
+        struct rsnd_mod *mod = data;
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+
+        if (!io)
+                return IRQ_NONE;
+
+        if (rsnd_src_error_record_gen2(mod)) {
+                struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+                struct device *dev = rsnd_priv_to_dev(priv);
+
+                _rsnd_src_stop_gen2(mod);
+                _rsnd_src_start_gen2(mod);
+
+                dev_dbg(dev, "%s[%d] restart\n",
+                        rsnd_mod_name(mod), rsnd_mod_id(mod));
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
@@ -535,7 +643,7 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
                 return -EINVAL;
         }
 
-        ret = rsnd_src_set_convert_rate(mod, rdai);
+        ret = rsnd_src_set_convert_rate(mod);
         if (ret < 0)
                 return ret;
 
@@ -563,8 +671,7 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
         return 0;
 }
 
-static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod,
-                                            struct rsnd_dai *rdai)
+static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod)
 {
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
@@ -573,59 +680,78 @@ static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod,
         int ret;
 
         if (convert_rate)
-                ret = rsnd_adg_set_convert_clk_gen2(mod, rdai, io,
+                ret = rsnd_adg_set_convert_clk_gen2(mod, io,
                                                     runtime->rate,
                                                     convert_rate);
         else
-                ret = rsnd_adg_set_convert_timing_gen2(mod, rdai, io);
+                ret = rsnd_adg_set_convert_timing_gen2(mod, io);
 
         return ret;
 }
 
 static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai)
+                               struct rsnd_priv *priv)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
+        int irq = src->info->irq;
         int ret;
 
+        if (irq > 0) {
+                /*
+                 * IRQ is not supported on non-DT
+                 * see
+                 *      rsnd_src_irq_enable_gen2()
+                 */
+                ret = devm_request_irq(dev, irq,
+                                       rsnd_src_interrupt_gen2,
+                                       IRQF_SHARED,
+                                       dev_name(dev), mod);
+                if (ret)
+                        goto rsnd_src_probe_gen2_fail;
+        }
+
         ret = rsnd_dma_init(priv,
                             rsnd_mod_to_dma(mod),
                             rsnd_info_is_playback(priv, src),
                             src->info->dma_id);
-        if (ret < 0)
-                dev_err(dev, "%s[%d] (Gen2) failed\n",
-                        rsnd_mod_name(mod), rsnd_mod_id(mod));
-        else
-                dev_dbg(dev, "%s[%d] (Gen2) is probed\n",
-                        rsnd_mod_name(mod), rsnd_mod_id(mod));
+        if (ret)
+                goto rsnd_src_probe_gen2_fail;
+
+        dev_dbg(dev, "%s[%d] (Gen2) is probed\n",
+                rsnd_mod_name(mod), rsnd_mod_id(mod));
+
+        return ret;
+
+rsnd_src_probe_gen2_fail:
+        dev_err(dev, "%s[%d] (Gen2) failed\n",
+                rsnd_mod_name(mod), rsnd_mod_id(mod));
 
         return ret;
 }
 
 static int rsnd_src_remove_gen2(struct rsnd_mod *mod,
-                                struct rsnd_dai *rdai)
+                                struct rsnd_priv *priv)
 {
-        rsnd_dma_quit(rsnd_mod_to_priv(mod), rsnd_mod_to_dma(mod));
+        rsnd_dma_quit(priv, rsnd_mod_to_dma(mod));
 
         return 0;
 }
 
 static int rsnd_src_init_gen2(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai)
+                              struct rsnd_priv *priv)
 {
         int ret;
 
-        ret = rsnd_src_init(mod, rdai);
+        ret = rsnd_src_init(mod);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_rate_gen2(mod, rdai);
+        ret = rsnd_src_set_convert_rate_gen2(mod);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_timing_gen2(mod, rdai);
+        ret = rsnd_src_set_convert_timing_gen2(mod);
         if (ret < 0)
                 return ret;
 
@@ -633,29 +759,23 @@ static int rsnd_src_init_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start_gen2(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai)
+                               struct rsnd_priv *priv)
 {
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
-        struct rsnd_src *src = rsnd_mod_to_src(mod);
-        u32 val = rsnd_io_to_mod_dvc(io) ? 0x01 : 0x11;
-
-        rsnd_dma_start(rsnd_mod_to_dma(&src->mod));
+        rsnd_dma_start(rsnd_mod_to_dma(mod));
 
-        rsnd_mod_write(mod, SRC_CTRL, val);
-
-        return rsnd_src_start(mod);
+        return _rsnd_src_start_gen2(mod);
 }
 
 static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai)
+                              struct rsnd_priv *priv)
 {
-        struct rsnd_src *src = rsnd_mod_to_src(mod);
+        int ret;
 
-        rsnd_mod_write(mod, SRC_CTRL, 0);
+        ret = _rsnd_src_stop_gen2(mod);
 
-        rsnd_dma_stop(rsnd_mod_to_dma(&src->mod));
+        rsnd_dma_stop(rsnd_mod_to_dma(mod));
 
-        return rsnd_src_stop(mod);
+        return ret;
 }
 
 static struct rsnd_mod_ops rsnd_src_gen2_ops = {
@@ -681,10 +801,11 @@ static void rsnd_of_parse_src(struct platform_device *pdev,
                               struct rsnd_priv *priv)
 {
         struct device_node *src_node;
+        struct device_node *np;
         struct rcar_snd_info *info = rsnd_priv_to_info(priv);
         struct rsnd_src_platform_info *src_info;
         struct device *dev = &pdev->dev;
-        int nr;
+        int nr, i;
 
         if (!of_data)
                 return;
@@ -708,6 +829,13 @@ static void rsnd_of_parse_src(struct platform_device *pdev,
         info->src_info          = src_info;
         info->src_info_nr       = nr;
 
+        i = 0;
+        for_each_child_of_node(src_node, np) {
+                src_info[i].irq = irq_of_parse_and_map(np, 0);
+
+                i++;
+        }
+
 rsnd_of_parse_src_end:
         of_node_put(src_node);
 }
@@ -761,9 +889,8 @@ int rsnd_src_probe(struct platform_device *pdev,
                         return PTR_ERR(clk);
 
                 src->info = &info->src_info[i];
-                src->clk = clk;
 
-                rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i);
+                rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i);
 
                 dev_dbg(dev, "SRC%d probed\n", i);
         }
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 3844fbef4664..9e7b627c08e2 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -60,17 +60,14 @@
 #define SSI_NAME "ssi"
 
 struct rsnd_ssi {
-        struct clk *clk;
         struct rsnd_ssi_platform_info *info; /* rcar_snd.h */
         struct rsnd_ssi *parent;
         struct rsnd_mod mod;
 
-        struct rsnd_dai *rdai;
         u32 cr_own;
         u32 cr_clk;
         int err;
         unsigned int usrcnt;
-        unsigned int rate;
 };
 
 #define for_each_rsnd_ssi(pos, priv, i)                                 \
@@ -128,7 +125,7 @@ static void rsnd_ssi_status_check(struct rsnd_mod *mod,
 static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi,
                                      struct rsnd_dai_stream *io)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(&ssi->mod);
+        struct rsnd_priv *priv = rsnd_io_to_priv(io);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         int i, j, ret;
@@ -157,7 +154,6 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi,
 
                         ret = rsnd_adg_ssi_clk_try_start(&ssi->mod, main_rate);
                         if (0 == ret) {
-                                ssi->rate       = rate;
                                 ssi->cr_clk     = FORCE | SWL_32 |
                                                   SCKD | SWSD | CKDV(j);
 
@@ -176,26 +172,25 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi,
 
 static void rsnd_ssi_master_clk_stop(struct rsnd_ssi *ssi)
 {
-        ssi->rate = 0;
         ssi->cr_clk = 0;
         rsnd_adg_ssi_clk_stop(&ssi->mod);
 }
 
 static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
-                              struct rsnd_dai *rdai,
                               struct rsnd_dai_stream *io)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(&ssi->mod);
+        struct rsnd_priv *priv = rsnd_io_to_priv(io);
+        struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         u32 cr_mode;
         u32 cr;
 
         if (0 == ssi->usrcnt) {
-                clk_prepare_enable(ssi->clk);
+                rsnd_mod_hw_start(&ssi->mod);
 
-                if (rsnd_dai_is_clk_master(rdai)) {
+                if (rsnd_rdai_is_clk_master(rdai)) {
                         if (rsnd_ssi_clk_from_parent(ssi))
-                                rsnd_ssi_hw_start(ssi->parent, rdai, io);
+                                rsnd_ssi_hw_start(ssi->parent, io);
                         else
                                 rsnd_ssi_master_clk_start(ssi, io);
                 }
@@ -214,7 +209,7 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
         rsnd_mod_write(&ssi->mod, SSICR, cr);
 
         /* enable WS continue */
-        if (rsnd_dai_is_clk_master(rdai))
+        if (rsnd_rdai_is_clk_master(rdai))
                 rsnd_mod_write(&ssi->mod, SSIWSR, CONT);
 
         /* clear error status */
@@ -226,10 +221,11 @@ static void rsnd_ssi_hw_start(struct rsnd_ssi *ssi,
                 rsnd_mod_name(&ssi->mod), rsnd_mod_id(&ssi->mod));
 }
 
-static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
-                             struct rsnd_dai *rdai)
+static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(&ssi->mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(&ssi->mod);
+        struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
         struct device *dev = rsnd_priv_to_dev(priv);
         u32 cr;
 
@@ -256,14 +252,14 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
                 rsnd_mod_write(&ssi->mod, SSICR, cr);   /* disabled all */
                 rsnd_ssi_status_check(&ssi->mod, IIRQ);
 
-                if (rsnd_dai_is_clk_master(rdai)) {
+                if (rsnd_rdai_is_clk_master(rdai)) {
                         if (rsnd_ssi_clk_from_parent(ssi))
-                                rsnd_ssi_hw_stop(ssi->parent, rdai);
+                                rsnd_ssi_hw_stop(ssi->parent);
                         else
                                 rsnd_ssi_master_clk_stop(ssi);
                 }
 
-                clk_disable_unprepare(ssi->clk);
+                rsnd_mod_hw_stop(&ssi->mod);
         }
 
         dev_dbg(dev, "%s[%d] hw stopped\n",
@@ -274,10 +270,11 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
  *      SSI mod common functions
  */
 static int rsnd_ssi_init(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai)
+                         struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         u32 cr;
 
@@ -311,13 +308,12 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
                 cr |= SDTA;
         if (rdai->sys_delay)
                 cr |= DEL;
-        if (rsnd_dai_is_play(rdai, io))
+        if (rsnd_io_is_play(io))
                 cr |= TRMD;
 
         /*
          * set ssi parameter
          */
-        ssi->rdai       = rdai;
         ssi->cr_own     = cr;
         ssi->err        = -1; /* ignore 1st error */
 
@@ -325,16 +321,15 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_quit(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai)
+                         struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
 
         if (ssi->err > 0)
-                dev_warn(dev, "ssi under/over flow err = %d\n", ssi->err);
+                dev_warn(dev, "%s[%d] under/over flow err = %d\n",
+                         rsnd_mod_name(mod), rsnd_mod_id(mod), ssi->err);
 
-        ssi->rdai       = NULL;
         ssi->cr_own     = 0;
         ssi->err        = 0;
 
@@ -353,32 +348,32 @@ static void rsnd_ssi_record_error(struct rsnd_ssi *ssi, u32 status)
 }
 
 static int rsnd_ssi_start(struct rsnd_mod *mod,
-                          struct rsnd_dai *rdai)
+                          struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
 
-        rsnd_src_ssiu_start(mod, rdai, rsnd_ssi_use_busif(mod));
+        rsnd_src_ssiu_start(mod, rsnd_ssi_use_busif(mod));
 
-        rsnd_ssi_hw_start(ssi, rdai, io);
+        rsnd_ssi_hw_start(ssi, io);
 
-        rsnd_src_ssi_irq_enable(mod, rdai);
+        rsnd_src_ssi_irq_enable(mod);
 
         return 0;
 }
 
 static int rsnd_ssi_stop(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai)
+                         struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
 
-        rsnd_src_ssi_irq_disable(mod, rdai);
+        rsnd_src_ssi_irq_disable(mod);
 
         rsnd_ssi_record_error(ssi, rsnd_mod_read(mod, SSISR));
 
-        rsnd_ssi_hw_stop(ssi, rdai);
+        rsnd_ssi_hw_stop(ssi);
 
-        rsnd_src_ssiu_stop(mod, rdai);
+        rsnd_src_ssiu_stop(mod);
 
         return 0;
 }
@@ -386,16 +381,17 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod,
 static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
 {
         struct rsnd_ssi *ssi = data;
-        struct rsnd_dai *rdai = ssi->rdai;
         struct rsnd_mod *mod = &ssi->mod;
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        int is_dma = rsnd_ssi_is_dma_mode(mod);
         u32 status = rsnd_mod_read(mod, SSISR);
 
         if (!io)
                 return IRQ_NONE;
 
         /* PIO only */
-        if (status & DIRQ) {
+        if (!is_dma && (status & DIRQ)) {
                 struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
                 u32 *buf = (u32 *)(runtime->dma_area +
                                    rsnd_dai_pointer_offset(io, 0));
@@ -405,7 +401,7 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
                  * directly as 32bit data
                  * see rsnd_ssi_init()
                  */
-                if (rsnd_dai_is_play(rdai, io))
+                if (rsnd_io_is_play(io))
                         rsnd_mod_write(mod, SSITDR, *buf);
                 else
                         *buf = rsnd_mod_read(mod, SSIRDR);
@@ -415,14 +411,13 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
 
         /* PIO / DMA */
         if (status & (UIRQ | OIRQ)) {
-                struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
                 struct device *dev = rsnd_priv_to_dev(priv);
 
                 /*
                  * restart SSI
                  */
-                rsnd_ssi_stop(mod, rdai);
-                rsnd_ssi_start(mod, rdai);
+                rsnd_ssi_stop(mod, priv);
+                rsnd_ssi_start(mod, priv);
 
                 dev_dbg(dev, "%s[%d] restart\n",
                         rsnd_mod_name(mod), rsnd_mod_id(mod));
@@ -437,9 +432,8 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
  *              SSI PIO
  */
 static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai)
+                              struct rsnd_priv *priv)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         int ret;
@@ -468,9 +462,8 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
 };
 
 static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
-                          struct rsnd_dai *rdai)
+                              struct rsnd_priv *priv)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
         int dma_id = ssi->info->dma_id;
@@ -503,14 +496,13 @@ rsnd_ssi_dma_probe_fail:
 }
 
 static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai)
+                               struct rsnd_priv *priv)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
         int irq = ssi->info->irq;
 
-        rsnd_dma_quit(rsnd_mod_to_priv(mod), rsnd_mod_to_dma(mod));
+        rsnd_dma_quit(priv, rsnd_mod_to_dma(mod));
 
         /* PIO will request IRQ again */
         devm_free_irq(dev, irq, ssi);
@@ -519,9 +511,8 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_fallback(struct rsnd_mod *mod,
-                             struct rsnd_dai *rdai)
+                             struct rsnd_priv *priv)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
 
         /*
@@ -540,25 +531,25 @@ static int rsnd_ssi_fallback(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_dma_start(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai)
+                              struct rsnd_priv *priv)
 {
         struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
 
-        rsnd_ssi_start(mod, rdai);
-
         rsnd_dma_start(dma);
 
+        rsnd_ssi_start(mod, priv);
+
         return 0;
 }
 
 static int rsnd_ssi_dma_stop(struct rsnd_mod *mod,
-                             struct rsnd_dai *rdai)
+                             struct rsnd_priv *priv)
 {
         struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
 
-        rsnd_dma_stop(dma);
+        rsnd_ssi_stop(mod, priv);
 
-        rsnd_ssi_stop(mod, rdai);
+        rsnd_dma_stop(dma);
 
         return 0;
 }
@@ -734,7 +725,6 @@ int rsnd_ssi_probe(struct platform_device *pdev,
                         return PTR_ERR(clk);
 
                 ssi->info       = pinfo;
-                ssi->clk        = clk;
 
                 ops = &rsnd_ssi_non_ops;
                 if (pinfo->dma_id > 0)
@@ -742,7 +732,7 @@ int rsnd_ssi_probe(struct platform_device *pdev,
                 else if (rsnd_ssi_pio_available(ssi))
                         ops = &rsnd_ssi_pio_ops;
 
-                rsnd_mod_init(priv, &ssi->mod, ops, RSND_MOD_SSI, i);
+                rsnd_mod_init(&ssi->mod, ops, clk, RSND_MOD_SSI, i);
 
                 rsnd_ssi_parent_clk_setup(priv, ssi);
         }
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 32eb6da2d2bd..82902f56e82f 100644
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -589,7 +589,6 @@ static void siu_pcm_free(struct snd_pcm *pcm)
         tasklet_kill(&port_info->playback.tasklet);
 
         siu_free_port(port_info);
-        snd_pcm_lib_preallocate_free_for_all(pcm);
 
         dev_dbg(pcm->card->dev, "%s\n", __func__);
 }
diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c
index 2e10e9a38376..08d7259bbaab 100644
--- a/sound/soc/soc-ac97.c
+++ b/sound/soc/soc-ac97.c
@@ -48,15 +48,18 @@ static void soc_ac97_device_release(struct device *dev)
 }
 
 /**
- * snd_soc_new_ac97_codec - initailise AC97 device
- * @codec: audio codec
+ * snd_soc_alloc_ac97_codec() - Allocate new a AC'97 device
+ * @codec: The CODEC for which to create the AC'97 device
  *
- * Initialises AC97 codec resources for use by ad-hoc devices only.
+ * Allocated a new snd_ac97 device and intializes it, but does not yet register
+ * it. The caller is responsible to either call device_add(&ac97->dev) to
+ * register the device, or to call put_device(&ac97->dev) to free the device.
+ *
+ * Returns: A snd_ac97 device or a PTR_ERR in case of an error.
  */
-struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec)
+struct snd_ac97 *snd_soc_alloc_ac97_codec(struct snd_soc_codec *codec)
 {
         struct snd_ac97 *ac97;
-        int ret;
 
         ac97 = kzalloc(sizeof(struct snd_ac97), GFP_KERNEL);
         if (ac97 == NULL)
@@ -73,7 +76,28 @@ struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec)
                      codec->component.card->snd_card->number, 0,
                      codec->component.name);
 
-        ret = device_register(&ac97->dev);
+        device_initialize(&ac97->dev);
+
+        return ac97;
+}
+EXPORT_SYMBOL(snd_soc_alloc_ac97_codec);
+
+/**
+ * snd_soc_new_ac97_codec - initailise AC97 device
+ * @codec: audio codec
+ *
+ * Initialises AC97 codec resources for use by ad-hoc devices only.
+ */
+struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec)
+{
+        struct snd_ac97 *ac97;
+        int ret;
+
+        ac97 = snd_soc_alloc_ac97_codec(codec);
+        if (IS_ERR(ac97))
+                return ac97;
+
+        ret = device_add(&ac97->dev);
         if (ret) {
                 put_device(&ac97->dev);
                 return ERR_PTR(ret);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index c024962ba500..d94434d6138e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -191,6 +191,39 @@ static ssize_t pmdown_time_set(struct device *dev,
 
 static DEVICE_ATTR(pmdown_time, 0644, pmdown_time_show, pmdown_time_set);
 
+static struct attribute *soc_dev_attrs[] = {
+        &dev_attr_codec_reg.attr,
+        &dev_attr_pmdown_time.attr,
+        NULL
+};
+
+static umode_t soc_dev_attr_is_visible(struct kobject *kobj,
+                                       struct attribute *attr, int idx)
+{
+        struct device *dev = kobj_to_dev(kobj);
+        struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
+
+        if (attr == &dev_attr_pmdown_time.attr)
+                return attr->mode; /* always visible */
+        return rtd->codec ? attr->mode : 0; /* enabled only with codec */
+}
+
+static const struct attribute_group soc_dapm_dev_group = {
+        .attrs = soc_dapm_dev_attrs,
+        .is_visible = soc_dev_attr_is_visible,
+};
+
+static const struct attribute_group soc_dev_roup = {
+        .attrs = soc_dev_attrs,
+        .is_visible = soc_dev_attr_is_visible,
+};
+
+static const struct attribute_group *soc_dev_attr_groups[] = {
+        &soc_dapm_dev_group,
+        &soc_dev_roup,
+        NULL
+};
+
 #ifdef CONFIG_DEBUG_FS
 static ssize_t codec_reg_read_file(struct file *file, char __user *user_buf,
                                    size_t count, loff_t *ppos)
@@ -949,8 +982,6 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
 
         /* unregister the rtd device */
         if (rtd->dev_registered) {
-                device_remove_file(rtd->dev, &dev_attr_pmdown_time);
-                device_remove_file(rtd->dev, &dev_attr_codec_reg);
                 device_unregister(rtd->dev);
                 rtd->dev_registered = 0;
         }
@@ -1120,6 +1151,7 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd,
         device_initialize(rtd->dev);
         rtd->dev->parent = rtd->card->dev;
         rtd->dev->release = rtd_release;
+        rtd->dev->groups = soc_dev_attr_groups;
         dev_set_name(rtd->dev, "%s", name);
         dev_set_drvdata(rtd->dev, rtd);
         mutex_init(&rtd->pcm_mutex);
@@ -1136,23 +1168,6 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd,
                 return ret;
         }
         rtd->dev_registered = 1;
-
-        if (rtd->codec) {
-                /* add DAPM sysfs entries for this codec */
-                ret = snd_soc_dapm_sys_add(rtd->dev);
-                if (ret < 0)
-                        dev_err(rtd->dev,
-                                "ASoC: failed to add codec dapm sysfs entries: %d\n",
-                                ret);
-
-                /* add codec sysfs entries */
-                ret = device_create_file(rtd->dev, &dev_attr_codec_reg);
-                if (ret < 0)
-                        dev_err(rtd->dev,
-                                "ASoC: failed to add codec sysfs files: %d\n",
-                                ret);
-        }
-
         return 0;
 }
 
@@ -1308,11 +1323,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
         }
 #endif
 
-        ret = device_create_file(rtd->dev, &dev_attr_pmdown_time);
-        if (ret < 0)
-                dev_warn(rtd->dev, "ASoC: failed to add pmdown_time sysfs: %d\n",
-                        ret);
-
         if (cpu_dai->driver->compress_dai) {
                 /*create compress_device"*/
                 ret = soc_new_compress(rtd, num);
@@ -1427,11 +1437,76 @@ static int snd_soc_init_codec_cache(struct snd_soc_codec *codec)
         return 0;
 }
 
+/**
+ * snd_soc_runtime_set_dai_fmt() - Change DAI link format for a ASoC runtime
+ * @rtd: The runtime for which the DAI link format should be changed
+ * @dai_fmt: The new DAI link format
+ *
+ * This function updates the DAI link format for all DAIs connected to the DAI
+ * link for the specified runtime.
+ *
+ * Note: For setups with a static format set the dai_fmt field in the
+ * corresponding snd_dai_link struct instead of using this function.
+ *
+ * Returns 0 on success, otherwise a negative error code.
+ */
+int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
+        unsigned int dai_fmt)
+{
+        struct snd_soc_dai **codec_dais = rtd->codec_dais;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        unsigned int i;
+        int ret;
+
+        for (i = 0; i < rtd->num_codecs; i++) {
+                struct snd_soc_dai *codec_dai = codec_dais[i];
+
+                ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
+                if (ret != 0 && ret != -ENOTSUPP) {
+                        dev_warn(codec_dai->dev,
+                                 "ASoC: Failed to set DAI format: %d\n", ret);
+                        return ret;
+                }
+        }
+
+        /* Flip the polarity for the "CPU" end of a CODEC<->CODEC link */
+        if (cpu_dai->codec) {
+                unsigned int inv_dai_fmt;
+
+                inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;
+                switch (dai_fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+                case SND_SOC_DAIFMT_CBM_CFM:
+                        inv_dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
+                        break;
+                case SND_SOC_DAIFMT_CBM_CFS:
+                        inv_dai_fmt |= SND_SOC_DAIFMT_CBS_CFM;
+                        break;
+                case SND_SOC_DAIFMT_CBS_CFM:
+                        inv_dai_fmt |= SND_SOC_DAIFMT_CBM_CFS;
+                        break;
+                case SND_SOC_DAIFMT_CBS_CFS:
+                        inv_dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
+                        break;
+                }
+
+                dai_fmt = inv_dai_fmt;
+        }
+
+        ret = snd_soc_dai_set_fmt(cpu_dai, dai_fmt);
+        if (ret != 0 && ret != -ENOTSUPP) {
+                dev_warn(cpu_dai->dev,
+                         "ASoC: Failed to set DAI format: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);
+
 static int snd_soc_instantiate_card(struct snd_soc_card *card)
 {
         struct snd_soc_codec *codec;
-        struct snd_soc_dai_link *dai_link;
-        int ret, i, order, dai_fmt;
+        int ret, i, order;
 
         mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT);
 
@@ -1542,60 +1617,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
                                         card->num_dapm_routes);
 
         for (i = 0; i < card->num_links; i++) {
-                struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
-                dai_link = &card->dai_link[i];
-                dai_fmt = dai_link->dai_fmt;
-
-                if (dai_fmt) {
-                        struct snd_soc_dai **codec_dais = rtd->codec_dais;
-                        int j;
-
-                        for (j = 0; j < rtd->num_codecs; j++) {
-                                struct snd_soc_dai *codec_dai = codec_dais[j];
-
-                                ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
-                                if (ret != 0 && ret != -ENOTSUPP)
-                                        dev_warn(codec_dai->dev,
-                                                 "ASoC: Failed to set DAI format: %d\n",
-                                                 ret);
-                        }
-                }
-
-                /* If this is a regular CPU link there will be a platform */
-                if (dai_fmt &&
-                    (dai_link->platform_name || dai_link->platform_of_node)) {
-                        ret = snd_soc_dai_set_fmt(card->rtd[i].cpu_dai,
-                                                  dai_fmt);
-                        if (ret != 0 && ret != -ENOTSUPP)
-                                dev_warn(card->rtd[i].cpu_dai->dev,
-                                         "ASoC: Failed to set DAI format: %d\n",
-                                         ret);
-                } else if (dai_fmt) {
-                        /* Flip the polarity for the "CPU" end */
-                        dai_fmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
-                        switch (dai_link->dai_fmt &
-                                SND_SOC_DAIFMT_MASTER_MASK) {
-                        case SND_SOC_DAIFMT_CBM_CFM:
-                                dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
-                                break;
-                        case SND_SOC_DAIFMT_CBM_CFS:
-                                dai_fmt |= SND_SOC_DAIFMT_CBS_CFM;
-                                break;
-                        case SND_SOC_DAIFMT_CBS_CFM:
-                                dai_fmt |= SND_SOC_DAIFMT_CBM_CFS;
-                                break;
-                        case SND_SOC_DAIFMT_CBS_CFS:
-                                dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
-                                break;
-                        }
-
-                        ret = snd_soc_dai_set_fmt(card->rtd[i].cpu_dai,
-                                                  dai_fmt);
-                        if (ret != 0 && ret != -ENOTSUPP)
-                                dev_warn(card->rtd[i].cpu_dai->dev,
-                                         "ASoC: Failed to set DAI format: %d\n",
-                                         ret);
-                }
+                if (card->dai_link[i].dai_fmt)
+                        snd_soc_runtime_set_dai_fmt(&card->rtd[i],
+                                card->dai_link[i].dai_fmt);
         }
 
         snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
@@ -2116,15 +2140,27 @@ static int snd_soc_xlate_tdm_slot_mask(unsigned int slots,
 }
 
 /**
- * snd_soc_dai_set_tdm_slot - configure DAI TDM.
- * @dai: DAI
+ * snd_soc_dai_set_tdm_slot() - Configures a DAI for TDM operation
+ * @dai: The DAI to configure
  * @tx_mask: bitmask representing active TX slots.
  * @rx_mask: bitmask representing active RX slots.
  * @slots: Number of slots in use.
  * @slot_width: Width in bits for each slot.
  *
- * Configures a DAI for TDM operation. Both mask and slots are codec and DAI
- * specific.
+ * This function configures the specified DAI for TDM operation. @slot contains
+ * the total number of slots of the TDM stream and @slot_with the width of each
+ * slot in bit clock cycles. @tx_mask and @rx_mask are bitmasks specifying the
+ * active slots of the TDM stream for the specified DAI, i.e. which slots the
+ * DAI should write to or read from. If a bit is set the corresponding slot is
+ * active, if a bit is cleared the corresponding slot is inactive. Bit 0 maps to
+ * the first slot, bit 1 to the second slot and so on. The first active slot
+ * maps to the first channel of the DAI, the second active slot to the second
+ * channel and so on.
+ *
+ * TDM mode can be disabled by passing 0 for @slots. In this case @tx_mask,
+ * @rx_mask and @slot_width will be ignored.
+ *
+ * Returns 0 on success, a negative error code otherwise.
  */
 int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,
         unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index ea496842ee83..b6f88202b8c9 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -517,8 +517,8 @@ static int soc_dapm_update_bits(struct snd_soc_dapm_context *dapm,
 {
         if (!dapm->component)
                 return -EIO;
-        return snd_soc_component_update_bits_async(dapm->component, reg,
-                mask, value);
+        return snd_soc_component_update_bits(dapm->component, reg,
+                                             mask, value);
 }
 
 static int soc_dapm_test_bits(struct snd_soc_dapm_context *dapm,
@@ -2127,15 +2127,10 @@ static ssize_t dapm_widget_show(struct device *dev,
 
 static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL);
 
-int snd_soc_dapm_sys_add(struct device *dev)
-{
-        return device_create_file(dev, &dev_attr_dapm_widget);
-}
-
-static void snd_soc_dapm_sys_remove(struct device *dev)
-{
-        device_remove_file(dev, &dev_attr_dapm_widget);
-}
+struct attribute *soc_dapm_dev_attrs[] = {
+        &dev_attr_dapm_widget.attr,
+        NULL
+};
 
 static void dapm_free_path(struct snd_soc_dapm_path *path)
 {
@@ -3144,8 +3139,6 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
         }
 
         w->dapm = dapm;
-        if (dapm->component)
-                w->codec = dapm->component->codec;
         INIT_LIST_HEAD(&w->sources);
         INIT_LIST_HEAD(&w->sinks);
         INIT_LIST_HEAD(&w->list);
@@ -3830,7 +3823,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);
  */
 void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm)
 {
-        snd_soc_dapm_sys_remove(dapm->dev);
         dapm_debugfs_cleanup(dapm);
         dapm_free_widgets(dapm);
         list_del(&dapm->list);
diff --git a/sound/soc/soc-devres.c b/sound/soc/soc-devres.c
index 057e5ef7dcce..a57921eeee81 100644
--- a/sound/soc/soc-devres.c
+++ b/sound/soc/soc-devres.c
@@ -60,7 +60,7 @@ static void devm_platform_release(struct device *dev, void *res)
 /**
  * devm_snd_soc_register_platform - resource managed platform registration
  * @dev: Device used to manage platform
- * @platform: platform to register
+ * @platform_drv: platform to register
  *
  * Register a platform driver with automatic unregistration when the device is
  * unregistered.
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index b329b84bc5af..4864392bfcba 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -200,11 +200,6 @@ static int dmaengine_pcm_open(struct snd_pcm_substream *substream)
         return snd_dmaengine_pcm_open(substream, chan);
 }
 
-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)
@@ -283,8 +278,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
                 if (!pcm->chan[i]) {
                         dev_err(rtd->platform->dev,
                                 "Missing dma channel for stream: %d\n", i);
-                        ret = -EINVAL;
-                        goto err_free;
+                        return -EINVAL;
                 }
 
                 ret = snd_pcm_lib_preallocate_pages(substream,
@@ -293,7 +287,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
                                 prealloc_buffer_size,
                                 max_buffer_size);
                 if (ret)
-                        goto err_free;
+                        return ret;
 
                 /*
                  * This will only return false if we know for sure that at least
@@ -307,10 +301,6 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
         }
 
         return 0;
-
-err_free:
-        dmaengine_pcm_free(rtd->pcm);
-        return ret;
 }
 
 static snd_pcm_uframes_t dmaengine_pcm_pointer(
@@ -341,7 +331,6 @@ static const struct snd_soc_platform_driver dmaengine_pcm_platform = {
         },
         .ops            = &dmaengine_pcm_ops,
         .pcm_new        = dmaengine_pcm_new,
-        .pcm_free       = dmaengine_pcm_free,
 };
 
 static const char * const dmaengine_pcm_dma_channel_names[] = {
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 31198cf7f88d..a6768f832c6f 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -128,3 +128,13 @@ config SND_SOC_TEGRA_MAX98090
         help
           Say Y or M here if you want to add support for SoC audio on Tegra
           boards using the MAX98090 codec, such as Venice2.
+
+config SND_SOC_TEGRA_RT5677
+        tristate "SoC Audio support for Tegra boards using a RT5677 codec"
+        depends on SND_SOC_TEGRA && I2C && GPIOLIB
+        select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
+        select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
+        select SND_SOC_RT5677
+        help
+          Say Y or M here if you want to add support for SoC audio on Tegra
+          boards using the RT5677 codec, such as Ryu.
diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
index 5ae588cd96c4..9171655ad843 100644
--- a/sound/soc/tegra/Makefile
+++ b/sound/soc/tegra/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_SND_SOC_TEGRA30_I2S) += snd-soc-tegra30-i2s.o
 
 # Tegra machine Support
 snd-soc-tegra-rt5640-objs := tegra_rt5640.o
+snd-soc-tegra-rt5677-objs := tegra_rt5677.o
 snd-soc-tegra-wm8753-objs := tegra_wm8753.o
 snd-soc-tegra-wm8903-objs := tegra_wm8903.o
 snd-soc-tegra-wm9712-objs := tegra_wm9712.o
@@ -27,6 +28,7 @@ snd-soc-tegra-alc5632-objs := tegra_alc5632.o
 snd-soc-tegra-max98090-objs := tegra_max98090.o
 
 obj-$(CONFIG_SND_SOC_TEGRA_RT5640) += snd-soc-tegra-rt5640.o
+obj-$(CONFIG_SND_SOC_TEGRA_RT5677) += snd-soc-tegra-rt5677.o
 obj-$(CONFIG_SND_SOC_TEGRA_WM8753) += snd-soc-tegra-wm8753.o
 obj-$(CONFIG_SND_SOC_TEGRA_WM8903) += snd-soc-tegra-wm8903.o
 obj-$(CONFIG_SND_SOC_TEGRA_WM9712) += snd-soc-tegra-wm9712.o
diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c
new file mode 100644
index 000000000000..e4cf978a6e3a
--- /dev/null
+++ b/sound/soc/tegra/tegra_rt5677.c
@@ -0,0 +1,347 @@
+/*
+* tegra_rt5677.c - Tegra machine ASoC driver for boards using RT5677 codec.
+ *
+ * Copyright (c) 2014, The Chromium OS Authors.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Based on code copyright/by:
+ *
+ * Copyright (C) 2010-2012 - NVIDIA, Inc.
+ * Copyright (C) 2011 The AC100 Kernel Team <ac100@lists.lauchpad.net>
+ * (c) 2009, 2010 Nvidia Graphics Pvt. Ltd.
+ * Copyright 2007 Wolfson Microelectronics PLC.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#include "../codecs/rt5677.h"
+
+#include "tegra_asoc_utils.h"
+
+#define DRV_NAME "tegra-snd-rt5677"
+
+struct tegra_rt5677 {
+        struct tegra_asoc_utils_data util_data;
+        int gpio_hp_det;
+        int gpio_hp_en;
+        int gpio_mic_present;
+        int gpio_dmic_clk_en;
+};
+
+static int tegra_rt5677_asoc_hw_params(struct snd_pcm_substream *substream,
+                                        struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_card *card = rtd->card;
+        struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(card);
+        int srate, mclk, err;
+
+        srate = params_rate(params);
+        mclk = 256 * srate;
+
+        err = tegra_asoc_utils_set_rate(&machine->util_data, srate, mclk);
+        if (err < 0) {
+                dev_err(card->dev, "Can't configure clocks\n");
+                return err;
+        }
+
+        err = snd_soc_dai_set_sysclk(codec_dai, RT5677_SCLK_S_MCLK, mclk,
+                                        SND_SOC_CLOCK_IN);
+        if (err < 0) {
+                dev_err(card->dev, "codec_dai clock not set\n");
+                return err;
+        }
+
+        return 0;
+}
+
+static int tegra_rt5677_event_hp(struct snd_soc_dapm_widget *w,
+                        struct snd_kcontrol *k, int event)
+{
+        struct snd_soc_dapm_context *dapm = w->dapm;
+        struct snd_soc_card *card = dapm->card;
+        struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(card);
+
+        if (!gpio_is_valid(machine->gpio_hp_en))
+                return 0;
+
+        gpio_set_value_cansleep(machine->gpio_hp_en,
+                SND_SOC_DAPM_EVENT_ON(event));
+
+        return 0;
+}
+
+static struct snd_soc_ops tegra_rt5677_ops = {
+        .hw_params = tegra_rt5677_asoc_hw_params,
+};
+
+static struct snd_soc_jack tegra_rt5677_hp_jack;
+
+static struct snd_soc_jack_pin tegra_rt5677_hp_jack_pins = {
+        .pin = "Headphone",
+        .mask = SND_JACK_HEADPHONE,
+};
+static struct snd_soc_jack_gpio tegra_rt5677_hp_jack_gpio = {
+        .name = "Headphone detection",
+        .report = SND_JACK_HEADPHONE,
+        .debounce_time = 150,
+};
+
+static struct snd_soc_jack tegra_rt5677_mic_jack;
+
+static struct snd_soc_jack_pin tegra_rt5677_mic_jack_pins = {
+        .pin = "Headset Mic",
+        .mask = SND_JACK_MICROPHONE,
+};
+
+static struct snd_soc_jack_gpio tegra_rt5677_mic_jack_gpio = {
+        .name = "Headset Mic detection",
+        .report = SND_JACK_MICROPHONE,
+        .debounce_time = 150,
+        .invert = 1
+};
+
+static const struct snd_soc_dapm_widget tegra_rt5677_dapm_widgets[] = {
+        SND_SOC_DAPM_SPK("Speaker", NULL),
+        SND_SOC_DAPM_HP("Headphone", tegra_rt5677_event_hp),
+        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+        SND_SOC_DAPM_MIC("Internal Mic 1", NULL),
+        SND_SOC_DAPM_MIC("Internal Mic 2", NULL),
+};
+
+static const struct snd_kcontrol_new tegra_rt5677_controls[] = {
+        SOC_DAPM_PIN_SWITCH("Speaker"),
+        SOC_DAPM_PIN_SWITCH("Headphone"),
+        SOC_DAPM_PIN_SWITCH("Headset Mic"),
+        SOC_DAPM_PIN_SWITCH("Internal Mic 1"),
+        SOC_DAPM_PIN_SWITCH("Internal Mic 2"),
+};
+
+static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+        struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(rtd->card);
+
+        snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
+                        &tegra_rt5677_hp_jack);
+        snd_soc_jack_add_pins(&tegra_rt5677_hp_jack, 1,
+                        &tegra_rt5677_hp_jack_pins);
+
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                tegra_rt5677_hp_jack_gpio.gpio = machine->gpio_hp_det;
+                snd_soc_jack_add_gpios(&tegra_rt5677_hp_jack, 1,
+                                &tegra_rt5677_hp_jack_gpio);
+        }
+
+
+        snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
+                        &tegra_rt5677_mic_jack);
+        snd_soc_jack_add_pins(&tegra_rt5677_mic_jack, 1,
+                        &tegra_rt5677_mic_jack_pins);
+
+        if (gpio_is_valid(machine->gpio_mic_present)) {
+                tegra_rt5677_mic_jack_gpio.gpio = machine->gpio_mic_present;
+                snd_soc_jack_add_gpios(&tegra_rt5677_mic_jack, 1,
+                                &tegra_rt5677_mic_jack_gpio);
+        }
+
+        snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
+
+        return 0;
+}
+
+static int tegra_rt5677_card_remove(struct snd_soc_card *card)
+{
+        struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(card);
+
+        if (gpio_is_valid(machine->gpio_hp_det)) {
+                snd_soc_jack_free_gpios(&tegra_rt5677_hp_jack, 1,
+                                &tegra_rt5677_hp_jack_gpio);
+        }
+
+        if (gpio_is_valid(machine->gpio_mic_present)) {
+                snd_soc_jack_free_gpios(&tegra_rt5677_mic_jack, 1,
+                                &tegra_rt5677_mic_jack_gpio);
+        }
+
+        return 0;
+}
+
+static struct snd_soc_dai_link tegra_rt5677_dai = {
+        .name = "RT5677",
+        .stream_name = "RT5677 PCM",
+        .codec_dai_name = "rt5677-aif1",
+        .init = tegra_rt5677_asoc_init,
+        .ops = &tegra_rt5677_ops,
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                        SND_SOC_DAIFMT_CBS_CFS,
+};
+
+static struct snd_soc_card snd_soc_tegra_rt5677 = {
+        .name = "tegra-rt5677",
+        .owner = THIS_MODULE,
+        .remove = tegra_rt5677_card_remove,
+        .dai_link = &tegra_rt5677_dai,
+        .num_links = 1,
+        .controls = tegra_rt5677_controls,
+        .num_controls = ARRAY_SIZE(tegra_rt5677_controls),
+        .dapm_widgets = tegra_rt5677_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(tegra_rt5677_dapm_widgets),
+        .fully_routed = true,
+};
+
+static int tegra_rt5677_probe(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        struct snd_soc_card *card = &snd_soc_tegra_rt5677;
+        struct tegra_rt5677 *machine;
+        int ret;
+
+        machine = devm_kzalloc(&pdev->dev,
+                        sizeof(struct tegra_rt5677), GFP_KERNEL);
+        if (!machine)
+                return -ENOMEM;
+
+        card->dev = &pdev->dev;
+        platform_set_drvdata(pdev, card);
+        snd_soc_card_set_drvdata(card, machine);
+
+        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_mic_present = of_get_named_gpio(np,
+                        "nvidia,mic-present-gpios", 0);
+        if (machine->gpio_mic_present == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+
+        machine->gpio_hp_en = of_get_named_gpio(np, "nvidia,hp-en-gpios", 0);
+        if (machine->gpio_hp_en == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+        if (gpio_is_valid(machine->gpio_hp_en)) {
+                ret = devm_gpio_request_one(&pdev->dev, machine->gpio_hp_en,
+                                GPIOF_OUT_INIT_LOW, "hp_en");
+                if (ret) {
+                        dev_err(card->dev, "cannot get hp_en gpio\n");
+                        return ret;
+                }
+        }
+
+        machine->gpio_dmic_clk_en = of_get_named_gpio(np,
+                "nvidia,dmic-clk-en-gpios", 0);
+        if (machine->gpio_dmic_clk_en == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+        if (gpio_is_valid(machine->gpio_dmic_clk_en)) {
+                ret = devm_gpio_request_one(&pdev->dev,
+                                machine->gpio_dmic_clk_en,
+                                GPIOF_OUT_INIT_HIGH, "dmic_clk_en");
+                if (ret) {
+                        dev_err(card->dev, "cannot get dmic_clk_en gpio\n");
+                        return ret;
+                }
+        }
+
+        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_rt5677_dai.codec_of_node = of_parse_phandle(np,
+                        "nvidia,audio-codec", 0);
+        if (!tegra_rt5677_dai.codec_of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'nvidia,audio-codec' missing or invalid\n");
+                ret = -EINVAL;
+                goto err;
+        }
+
+        tegra_rt5677_dai.cpu_of_node = of_parse_phandle(np,
+                        "nvidia,i2s-controller", 0);
+        if (!tegra_rt5677_dai.cpu_of_node) {
+                dev_err(&pdev->dev,
+                        "Property 'nvidia,i2s-controller' missing or invalid\n");
+                ret = -EINVAL;
+                goto err;
+        }
+        tegra_rt5677_dai.platform_of_node = tegra_rt5677_dai.cpu_of_node;
+
+        ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
+        if (ret)
+                goto err;
+
+        ret = snd_soc_register_card(card);
+        if (ret) {
+                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
+                        ret);
+                goto err_fini_utils;
+        }
+
+        return 0;
+
+err_fini_utils:
+        tegra_asoc_utils_fini(&machine->util_data);
+err:
+        return ret;
+}
+
+static int tegra_rt5677_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+        struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(card);
+
+        snd_soc_unregister_card(card);
+
+        tegra_asoc_utils_fini(&machine->util_data);
+
+        return 0;
+}
+
+static const struct of_device_id tegra_rt5677_of_match[] = {
+        { .compatible = "nvidia,tegra-audio-rt5677", },
+        {},
+};
+
+static struct platform_driver tegra_rt5677_driver = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+                .of_match_table = tegra_rt5677_of_match,
+        },
+        .probe = tegra_rt5677_probe,
+        .remove = tegra_rt5677_remove,
+};
+module_platform_driver(tegra_rt5677_driver);
+
+MODULE_AUTHOR("Anatol Pomozov <anatol@google.com>");
+MODULE_DESCRIPTION("Tegra+RT5677 machine ASoC driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_DEVICE_TABLE(of, tegra_rt5677_of_match);
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index 070e44e251ce..88eacfd83da6 100644
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -282,11 +282,6 @@ static struct snd_pcm_ops txx9aclc_pcm_ops = {
         .pointer        = txx9aclc_pcm_pointer,
 };
 
-static void txx9aclc_pcm_free_dma_buffers(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
 static int txx9aclc_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_card *card = rtd->card->snd_card;
@@ -412,7 +407,6 @@ static struct snd_soc_platform_driver txx9aclc_soc_platform = {
         .remove         = txx9aclc_pcm_remove,
         .ops            = &txx9aclc_pcm_ops,
         .pcm_new        = txx9aclc_pcm_new,
-        .pcm_free       = txx9aclc_pcm_free_dma_buffers,
 };
 
 static int txx9aclc_soc_platform_probe(struct platform_device *pdev)
diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c
index be4f1ac7cd5e..aa65370db82a 100644
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -290,21 +290,9 @@ static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream,
                         SND_SOC_DAIFMT_GATED;
         }
 
-        ret = snd_soc_dai_set_fmt(codec_dai, fmt);
-        if (ret < 0) {
-                dev_err(dev,
-                        "%s: ERROR: snd_soc_dai_set_fmt failed for codec_dai (ret = %d)!\n",
-                        __func__, ret);
-                return ret;
-        }
-
-        ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
-        if (ret < 0) {
-                dev_err(dev,
-                        "%s: ERROR: snd_soc_dai_set_fmt failed for cpu_dai (ret = %d)!\n",
-                        __func__, ret);
+        ret = snd_soc_runtime_set_dai_fmt(rtd, fmt);
+        if (ret)
                 return ret;
-        }
 
         /* Setup TDM-slots */
 
diff --git a/sound/soc/xtensa/Kconfig b/sound/soc/xtensa/Kconfig
new file mode 100644
index 000000000000..c201beb36de6
--- /dev/null
+++ b/sound/soc/xtensa/Kconfig
@@ -0,0 +1,7 @@
+config SND_SOC_XTFPGA_I2S
+        tristate "XTFPGA I2S master"
+        select REGMAP_MMIO
+        help
+          Say Y or M if you want to add support for codecs attached to the
+          I2S interface on XTFPGA daughter board. You will also need to select
+          the drivers for the rest of XTFPGA audio subsystem.
diff --git a/sound/soc/xtensa/Makefile b/sound/soc/xtensa/Makefile
new file mode 100644
index 000000000000..15efbf914226
--- /dev/null
+++ b/sound/soc/xtensa/Makefile
@@ -0,0 +1,3 @@
+snd-soc-xtfpga-i2s-objs := xtfpga-i2s.o
+
+obj-$(CONFIG_SND_SOC_XTFPGA_I2S) += snd-soc-xtfpga-i2s.o
diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c
new file mode 100644
index 000000000000..1cfb19e12949
--- /dev/null
+++ b/sound/soc/xtensa/xtfpga-i2s.c
@@ -0,0 +1,675 @@
+/*
+ * Xtfpga I2S controller driver
+ *
+ * Copyright (c) 2014 Cadence Design Systems Inc.
+ *
+ * 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/clk.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#define DRV_NAME        "xtfpga-i2s"
+
+#define XTFPGA_I2S_VERSION      0x00
+#define XTFPGA_I2S_CONFIG       0x04
+#define XTFPGA_I2S_INT_MASK     0x08
+#define XTFPGA_I2S_INT_STATUS   0x0c
+#define XTFPGA_I2S_CHAN0_DATA   0x10
+#define XTFPGA_I2S_CHAN1_DATA   0x14
+#define XTFPGA_I2S_CHAN2_DATA   0x18
+#define XTFPGA_I2S_CHAN3_DATA   0x1c
+
+#define XTFPGA_I2S_CONFIG_TX_ENABLE     0x1
+#define XTFPGA_I2S_CONFIG_INT_ENABLE    0x2
+#define XTFPGA_I2S_CONFIG_LEFT          0x4
+#define XTFPGA_I2S_CONFIG_RATIO_BASE    8
+#define XTFPGA_I2S_CONFIG_RATIO_MASK    0x0000ff00
+#define XTFPGA_I2S_CONFIG_RES_BASE      16
+#define XTFPGA_I2S_CONFIG_RES_MASK      0x003f0000
+#define XTFPGA_I2S_CONFIG_LEVEL_BASE    24
+#define XTFPGA_I2S_CONFIG_LEVEL_MASK    0x0f000000
+#define XTFPGA_I2S_CONFIG_CHANNEL_BASE  28
+
+#define XTFPGA_I2S_INT_UNDERRUN         0x1
+#define XTFPGA_I2S_INT_LEVEL            0x2
+#define XTFPGA_I2S_INT_VALID            0x3
+
+#define XTFPGA_I2S_FIFO_SIZE            8192
+
+/*
+ * I2S controller operation:
+ *
+ * Enabling TX: output 1 period of zeros (starting with left channel)
+ * and then queued data.
+ *
+ * Level status and interrupt: whenever FIFO level is below FIFO trigger,
+ * level status is 1 and an IRQ is asserted (if enabled).
+ *
+ * Underrun status and interrupt: whenever FIFO is empty, underrun status
+ * is 1 and an IRQ is asserted (if enabled).
+ */
+struct xtfpga_i2s {
+        struct device *dev;
+        struct clk *clk;
+        struct regmap *regmap;
+        void __iomem *regs;
+
+        /* current playback substream. NULL if not playing.
+         *
+         * Access to that field is synchronized between the interrupt handler
+         * and userspace through RCU.
+         *
+         * Interrupt handler (threaded part) does PIO on substream data in RCU
+         * read-side critical section. Trigger callback sets and clears the
+         * pointer when the playback is started and stopped with
+         * rcu_assign_pointer. When userspace is about to free the playback
+         * stream in the pcm_close callback it synchronizes with the interrupt
+         * handler by means of synchronize_rcu call.
+         */
+        struct snd_pcm_substream *tx_substream;
+        unsigned (*tx_fn)(struct xtfpga_i2s *i2s,
+                          struct snd_pcm_runtime *runtime,
+                          unsigned tx_ptr);
+        unsigned tx_ptr; /* next frame index in the sample buffer */
+
+        /* current fifo level estimate.
+         * Doesn't have to be perfectly accurate, but must be not less than
+         * the actual FIFO level in order to avoid stall on push attempt.
+         */
+        unsigned tx_fifo_level;
+
+        /* FIFO level at which level interrupt occurs */
+        unsigned tx_fifo_low;
+
+        /* maximal FIFO level */
+        unsigned tx_fifo_high;
+};
+
+static bool xtfpga_i2s_wr_reg(struct device *dev, unsigned int reg)
+{
+        return reg >= XTFPGA_I2S_CONFIG;
+}
+
+static bool xtfpga_i2s_rd_reg(struct device *dev, unsigned int reg)
+{
+        return reg < XTFPGA_I2S_CHAN0_DATA;
+}
+
+static bool xtfpga_i2s_volatile_reg(struct device *dev, unsigned int reg)
+{
+        return reg == XTFPGA_I2S_INT_STATUS;
+}
+
+static const struct regmap_config xtfpga_i2s_regmap_config = {
+        .reg_bits = 32,
+        .reg_stride = 4,
+        .val_bits = 32,
+        .max_register = XTFPGA_I2S_CHAN3_DATA,
+        .writeable_reg = xtfpga_i2s_wr_reg,
+        .readable_reg = xtfpga_i2s_rd_reg,
+        .volatile_reg = xtfpga_i2s_volatile_reg,
+        .cache_type = REGCACHE_FLAT,
+};
+
+/* Generate functions that do PIO from TX DMA area to FIFO for all supported
+ * stream formats.
+ * Functions will be called xtfpga_pcm_tx_<channels>x<sample bits>, e.g.
+ * xtfpga_pcm_tx_2x16 for 16-bit stereo.
+ *
+ * FIFO consists of 32-bit words, one word per channel, always 2 channels.
+ * If I2S interface is configured with smaller sample resolution, only
+ * the LSB of each word is used.
+ */
+#define xtfpga_pcm_tx_fn(channels, sample_bits) \
+static unsigned xtfpga_pcm_tx_##channels##x##sample_bits( \
+        struct xtfpga_i2s *i2s, struct snd_pcm_runtime *runtime, \
+        unsigned tx_ptr) \
+{ \
+        const u##sample_bits (*p)[channels] = \
+                (void *)runtime->dma_area; \
+\
+        for (; i2s->tx_fifo_level < i2s->tx_fifo_high; \
+             i2s->tx_fifo_level += 2) { \
+                iowrite32(p[tx_ptr][0], \
+                          i2s->regs + XTFPGA_I2S_CHAN0_DATA); \
+                iowrite32(p[tx_ptr][channels - 1], \
+                          i2s->regs + XTFPGA_I2S_CHAN0_DATA); \
+                if (++tx_ptr >= runtime->buffer_size) \
+                        tx_ptr = 0; \
+        } \
+        return tx_ptr; \
+}
+
+xtfpga_pcm_tx_fn(1, 16)
+xtfpga_pcm_tx_fn(2, 16)
+xtfpga_pcm_tx_fn(1, 32)
+xtfpga_pcm_tx_fn(2, 32)
+
+#undef xtfpga_pcm_tx_fn
+
+static bool xtfpga_pcm_push_tx(struct xtfpga_i2s *i2s)
+{
+        struct snd_pcm_substream *tx_substream;
+        bool tx_active;
+
+        rcu_read_lock();
+        tx_substream = rcu_dereference(i2s->tx_substream);
+        tx_active = tx_substream && snd_pcm_running(tx_substream);
+        if (tx_active) {
+                unsigned tx_ptr = ACCESS_ONCE(i2s->tx_ptr);
+                unsigned new_tx_ptr = i2s->tx_fn(i2s, tx_substream->runtime,
+                                                 tx_ptr);
+
+                cmpxchg(&i2s->tx_ptr, tx_ptr, new_tx_ptr);
+        }
+        rcu_read_unlock();
+
+        return tx_active;
+}
+
+static void xtfpga_pcm_refill_fifo(struct xtfpga_i2s *i2s)
+{
+        unsigned int_status;
+        unsigned i;
+
+        regmap_read(i2s->regmap, XTFPGA_I2S_INT_STATUS,
+                    &int_status);
+
+        for (i = 0; i < 2; ++i) {
+                bool tx_active = xtfpga_pcm_push_tx(i2s);
+
+                regmap_write(i2s->regmap, XTFPGA_I2S_INT_STATUS,
+                             XTFPGA_I2S_INT_VALID);
+                if (tx_active)
+                        regmap_read(i2s->regmap, XTFPGA_I2S_INT_STATUS,
+                                    &int_status);
+
+                if (!tx_active ||
+                    !(int_status & XTFPGA_I2S_INT_LEVEL))
+                        break;
+
+                /* After the push the level IRQ is still asserted,
+                 * means FIFO level is below tx_fifo_low. Estimate
+                 * it as tx_fifo_low.
+                 */
+                i2s->tx_fifo_level = i2s->tx_fifo_low;
+        }
+
+        if (!(int_status & XTFPGA_I2S_INT_LEVEL))
+                regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK,
+                             XTFPGA_I2S_INT_VALID);
+        else if (!(int_status & XTFPGA_I2S_INT_UNDERRUN))
+                regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK,
+                             XTFPGA_I2S_INT_UNDERRUN);
+
+        if (!(int_status & XTFPGA_I2S_INT_UNDERRUN))
+                regmap_update_bits(i2s->regmap, XTFPGA_I2S_CONFIG,
+                                   XTFPGA_I2S_CONFIG_INT_ENABLE |
+                                   XTFPGA_I2S_CONFIG_TX_ENABLE,
+                                   XTFPGA_I2S_CONFIG_INT_ENABLE |
+                                   XTFPGA_I2S_CONFIG_TX_ENABLE);
+        else
+                regmap_update_bits(i2s->regmap, XTFPGA_I2S_CONFIG,
+                                   XTFPGA_I2S_CONFIG_INT_ENABLE |
+                                   XTFPGA_I2S_CONFIG_TX_ENABLE, 0);
+}
+
+static irqreturn_t xtfpga_i2s_threaded_irq_handler(int irq, void *dev_id)
+{
+        struct xtfpga_i2s *i2s = dev_id;
+        struct snd_pcm_substream *tx_substream;
+        unsigned config, int_status, int_mask;
+
+        regmap_read(i2s->regmap, XTFPGA_I2S_CONFIG, &config);
+        regmap_read(i2s->regmap, XTFPGA_I2S_INT_MASK, &int_mask);
+        regmap_read(i2s->regmap, XTFPGA_I2S_INT_STATUS, &int_status);
+
+        if (!(config & XTFPGA_I2S_CONFIG_INT_ENABLE) ||
+            !(int_status & int_mask & XTFPGA_I2S_INT_VALID))
+                return IRQ_NONE;
+
+        /* Update FIFO level estimate in accordance with interrupt status
+         * register.
+         */
+        if (int_status & XTFPGA_I2S_INT_UNDERRUN) {
+                i2s->tx_fifo_level = 0;
+                regmap_update_bits(i2s->regmap, XTFPGA_I2S_CONFIG,
+                                   XTFPGA_I2S_CONFIG_TX_ENABLE, 0);
+        } else {
+                /* The FIFO isn't empty, but is below tx_fifo_low. Estimate
+                 * it as tx_fifo_low.
+                 */
+                i2s->tx_fifo_level = i2s->tx_fifo_low;
+        }
+
+        rcu_read_lock();
+        tx_substream = rcu_dereference(i2s->tx_substream);
+
+        if (tx_substream && snd_pcm_running(tx_substream)) {
+                snd_pcm_period_elapsed(tx_substream);
+                if (int_status & XTFPGA_I2S_INT_UNDERRUN)
+                        dev_dbg_ratelimited(i2s->dev, "%s: underrun\n",
+                                            __func__);
+        }
+        rcu_read_unlock();
+
+        /* Refill FIFO, update allowed IRQ reasons, enable IRQ if FIFO is
+         * not empty.
+         */
+        xtfpga_pcm_refill_fifo(i2s);
+
+        return IRQ_HANDLED;
+}
+
+static int xtfpga_i2s_startup(struct snd_pcm_substream *substream,
+                              struct snd_soc_dai *dai)
+{
+        struct xtfpga_i2s *i2s = snd_soc_dai_get_drvdata(dai);
+
+        snd_soc_dai_set_dma_data(dai, substream, i2s);
+        return 0;
+}
+
+static int xtfpga_i2s_hw_params(struct snd_pcm_substream *substream,
+                                struct snd_pcm_hw_params *params,
+                                struct snd_soc_dai *dai)
+{
+        struct xtfpga_i2s *i2s = snd_soc_dai_get_drvdata(dai);
+        unsigned srate = params_rate(params);
+        unsigned channels = params_channels(params);
+        unsigned period_size = params_period_size(params);
+        unsigned sample_size = snd_pcm_format_width(params_format(params));
+        unsigned freq, ratio, level;
+        int err;
+
+        regmap_update_bits(i2s->regmap, XTFPGA_I2S_CONFIG,
+                           XTFPGA_I2S_CONFIG_RES_MASK,
+                           sample_size << XTFPGA_I2S_CONFIG_RES_BASE);
+
+        freq = 256 * srate;
+        err = clk_set_rate(i2s->clk, freq);
+        if (err < 0)
+                return err;
+
+        /* ratio field of the config register controls MCLK->I2S clock
+         * derivation: I2S clock = MCLK / (2 * (ratio + 2)).
+         *
+         * So with MCLK = 256 * sample rate ratio is 0 for 32 bit stereo
+         * and 2 for 16 bit stereo.
+         */
+        ratio = (freq - (srate * sample_size * 8)) /
+                (srate * sample_size * 4);
+
+        regmap_update_bits(i2s->regmap, XTFPGA_I2S_CONFIG,
+                           XTFPGA_I2S_CONFIG_RATIO_MASK,
+                           ratio << XTFPGA_I2S_CONFIG_RATIO_BASE);
+
+        i2s->tx_fifo_low = XTFPGA_I2S_FIFO_SIZE / 2;
+
+        /* period_size * 2: FIFO always gets 2 samples per frame */
+        for (level = 1;
+             i2s->tx_fifo_low / 2 >= period_size * 2 &&
+             level < (XTFPGA_I2S_CONFIG_LEVEL_MASK >>
+                      XTFPGA_I2S_CONFIG_LEVEL_BASE); ++level)
+                i2s->tx_fifo_low /= 2;
+
+        i2s->tx_fifo_high = 2 * i2s->tx_fifo_low;
+
+        regmap_update_bits(i2s->regmap, XTFPGA_I2S_CONFIG,
+                           XTFPGA_I2S_CONFIG_LEVEL_MASK,
+                           level << XTFPGA_I2S_CONFIG_LEVEL_BASE);
+
+        dev_dbg(i2s->dev,
+                "%s srate: %u, channels: %u, sample_size: %u, period_size: %u\n",
+                __func__, srate, channels, sample_size, period_size);
+        dev_dbg(i2s->dev, "%s freq: %u, ratio: %u, level: %u\n",
+                __func__, freq, ratio, level);
+
+        return 0;
+}
+
+static int xtfpga_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
+                              unsigned int fmt)
+{
+        if ((fmt & SND_SOC_DAIFMT_INV_MASK) != SND_SOC_DAIFMT_NB_NF)
+                return -EINVAL;
+        if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)
+                return -EINVAL;
+        if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) != SND_SOC_DAIFMT_I2S)
+                return -EINVAL;
+
+        return 0;
+}
+
+/* PCM */
+
+static const struct snd_pcm_hardware xtfpga_pcm_hardware = {
+        .info = SNDRV_PCM_INFO_INTERLEAVED |
+                SNDRV_PCM_INFO_MMAP_VALID |
+                SNDRV_PCM_INFO_BLOCK_TRANSFER,
+        .formats                = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S32_LE,
+        .channels_min           = 1,
+        .channels_max           = 2,
+        .period_bytes_min       = 2,
+        .period_bytes_max       = XTFPGA_I2S_FIFO_SIZE / 2 * 8,
+        .periods_min            = 2,
+        .periods_max            = XTFPGA_I2S_FIFO_SIZE * 8 / 2,
+        .buffer_bytes_max       = XTFPGA_I2S_FIFO_SIZE * 8,
+        .fifo_size              = 16,
+};
+
+static int xtfpga_pcm_open(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        void *p;
+
+        snd_soc_set_runtime_hwparams(substream, &xtfpga_pcm_hardware);
+        p = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+        runtime->private_data = p;
+
+        return 0;
+}
+
+static int xtfpga_pcm_close(struct snd_pcm_substream *substream)
+{
+        synchronize_rcu();
+        return 0;
+}
+
+static int xtfpga_pcm_hw_params(struct snd_pcm_substream *substream,
+                                struct snd_pcm_hw_params *hw_params)
+{
+        int ret;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct xtfpga_i2s *i2s = runtime->private_data;
+        unsigned channels = params_channels(hw_params);
+
+        switch (channels) {
+        case 1:
+        case 2:
+                break;
+
+        default:
+                return -EINVAL;
+
+        }
+
+        switch (params_format(hw_params)) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                i2s->tx_fn = (channels == 1) ?
+                        xtfpga_pcm_tx_1x16 :
+                        xtfpga_pcm_tx_2x16;
+                break;
+
+        case SNDRV_PCM_FORMAT_S32_LE:
+                i2s->tx_fn = (channels == 1) ?
+                        xtfpga_pcm_tx_1x32 :
+                        xtfpga_pcm_tx_2x32;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        ret = snd_pcm_lib_malloc_pages(substream,
+                                       params_buffer_bytes(hw_params));
+        return ret;
+}
+
+static int xtfpga_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+        int ret = 0;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct xtfpga_i2s *i2s = runtime->private_data;
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                ACCESS_ONCE(i2s->tx_ptr) = 0;
+                rcu_assign_pointer(i2s->tx_substream, substream);
+                xtfpga_pcm_refill_fifo(i2s);
+                break;
+
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                rcu_assign_pointer(i2s->tx_substream, NULL);
+                break;
+
+        default:
+                ret = -EINVAL;
+                break;
+        }
+        return ret;
+}
+
+static snd_pcm_uframes_t xtfpga_pcm_pointer(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct xtfpga_i2s *i2s = runtime->private_data;
+        snd_pcm_uframes_t pos = ACCESS_ONCE(i2s->tx_ptr);
+
+        return pos < runtime->buffer_size ? pos : 0;
+}
+
+static int xtfpga_pcm_new(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_card *card = rtd->card->snd_card;
+        size_t size = xtfpga_pcm_hardware.buffer_bytes_max;
+
+        return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
+                                                     SNDRV_DMA_TYPE_DEV,
+                                                     card->dev, size, size);
+}
+
+static void xtfpga_pcm_free(struct snd_pcm *pcm)
+{
+        snd_pcm_lib_preallocate_free_for_all(pcm);
+}
+
+static const struct snd_pcm_ops xtfpga_pcm_ops = {
+        .open           = xtfpga_pcm_open,
+        .close          = xtfpga_pcm_close,
+        .ioctl          = snd_pcm_lib_ioctl,
+        .hw_params      = xtfpga_pcm_hw_params,
+        .trigger        = xtfpga_pcm_trigger,
+        .pointer        = xtfpga_pcm_pointer,
+};
+
+static const struct snd_soc_platform_driver xtfpga_soc_platform = {
+        .pcm_new        = xtfpga_pcm_new,
+        .pcm_free       = xtfpga_pcm_free,
+        .ops            = &xtfpga_pcm_ops,
+};
+
+static const struct snd_soc_component_driver xtfpga_i2s_component = {
+        .name           = DRV_NAME,
+};
+
+static const struct snd_soc_dai_ops xtfpga_i2s_dai_ops = {
+        .startup        = xtfpga_i2s_startup,
+        .hw_params      = xtfpga_i2s_hw_params,
+        .set_fmt        = xtfpga_i2s_set_fmt,
+};
+
+static struct snd_soc_dai_driver xtfpga_i2s_dai[] = {
+        {
+                .name = "xtfpga-i2s",
+                .id = 0,
+                .playback = {
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_96000,
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                   SNDRV_PCM_FMTBIT_S32_LE,
+                },
+                .ops = &xtfpga_i2s_dai_ops,
+        },
+};
+
+static int xtfpga_i2s_runtime_suspend(struct device *dev)
+{
+        struct xtfpga_i2s *i2s = dev_get_drvdata(dev);
+
+        clk_disable_unprepare(i2s->clk);
+        return 0;
+}
+
+static int xtfpga_i2s_runtime_resume(struct device *dev)
+{
+        struct xtfpga_i2s *i2s = dev_get_drvdata(dev);
+        int ret;
+
+        ret = clk_prepare_enable(i2s->clk);
+        if (ret) {
+                dev_err(dev, "clk_prepare_enable failed: %d\n", ret);
+                return ret;
+        }
+        return 0;
+}
+
+static int xtfpga_i2s_probe(struct platform_device *pdev)
+{
+        struct xtfpga_i2s *i2s;
+        struct resource *mem;
+        int err, irq;
+
+        i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
+        if (!i2s) {
+                err = -ENOMEM;
+                goto err;
+        }
+        platform_set_drvdata(pdev, i2s);
+        i2s->dev = &pdev->dev;
+        dev_dbg(&pdev->dev, "dev: %p, i2s: %p\n", &pdev->dev, i2s);
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        i2s->regs = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(i2s->regs)) {
+                err = PTR_ERR(i2s->regs);
+                goto err;
+        }
+
+        i2s->regmap = devm_regmap_init_mmio(&pdev->dev, i2s->regs,
+                                            &xtfpga_i2s_regmap_config);
+        if (IS_ERR(i2s->regmap)) {
+                dev_err(&pdev->dev, "regmap init failed\n");
+                err = PTR_ERR(i2s->regmap);
+                goto err;
+        }
+
+        i2s->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(i2s->clk)) {
+                dev_err(&pdev->dev, "couldn't get clock\n");
+                err = PTR_ERR(i2s->clk);
+                goto err;
+        }
+
+        regmap_write(i2s->regmap, XTFPGA_I2S_CONFIG,
+                     (0x1 << XTFPGA_I2S_CONFIG_CHANNEL_BASE));
+        regmap_write(i2s->regmap, XTFPGA_I2S_INT_STATUS, XTFPGA_I2S_INT_VALID);
+        regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK, XTFPGA_I2S_INT_UNDERRUN);
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "No IRQ resource\n");
+                err = irq;
+                goto err;
+        }
+        err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        xtfpga_i2s_threaded_irq_handler,
+                                        IRQF_SHARED | IRQF_ONESHOT,
+                                        pdev->name, i2s);
+        if (err < 0) {
+                dev_err(&pdev->dev, "request_irq failed\n");
+                goto err;
+        }
+
+        err = snd_soc_register_platform(&pdev->dev, &xtfpga_soc_platform);
+        if (err < 0) {
+                dev_err(&pdev->dev, "couldn't register platform\n");
+                goto err;
+        }
+        err = devm_snd_soc_register_component(&pdev->dev,
+                                              &xtfpga_i2s_component,
+                                              xtfpga_i2s_dai,
+                                              ARRAY_SIZE(xtfpga_i2s_dai));
+        if (err < 0) {
+                dev_err(&pdev->dev, "couldn't register component\n");
+                goto err_unregister_platform;
+        }
+
+        pm_runtime_enable(&pdev->dev);
+        if (!pm_runtime_enabled(&pdev->dev)) {
+                err = xtfpga_i2s_runtime_resume(&pdev->dev);
+                if (err)
+                        goto err_pm_disable;
+        }
+        return 0;
+
+err_pm_disable:
+        pm_runtime_disable(&pdev->dev);
+err_unregister_platform:
+        snd_soc_unregister_platform(&pdev->dev);
+err:
+        dev_err(&pdev->dev, "%s: err = %d\n", __func__, err);
+        return err;
+}
+
+static int xtfpga_i2s_remove(struct platform_device *pdev)
+{
+        struct xtfpga_i2s *i2s = dev_get_drvdata(&pdev->dev);
+
+        snd_soc_unregister_platform(&pdev->dev);
+        if (i2s->regmap && !IS_ERR(i2s->regmap)) {
+                regmap_write(i2s->regmap, XTFPGA_I2S_CONFIG, 0);
+                regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK, 0);
+                regmap_write(i2s->regmap, XTFPGA_I2S_INT_STATUS,
+                             XTFPGA_I2S_INT_VALID);
+        }
+        pm_runtime_disable(&pdev->dev);
+        if (!pm_runtime_status_suspended(&pdev->dev))
+                xtfpga_i2s_runtime_suspend(&pdev->dev);
+        return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id xtfpga_i2s_of_match[] = {
+        { .compatible = "cdns,xtfpga-i2s", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, xtfpga_i2s_of_match);
+#endif
+
+static const struct dev_pm_ops xtfpga_i2s_pm_ops = {
+        SET_RUNTIME_PM_OPS(xtfpga_i2s_runtime_suspend,
+                           xtfpga_i2s_runtime_resume, NULL)
+};
+
+static struct platform_driver xtfpga_i2s_driver = {
+        .probe   = xtfpga_i2s_probe,
+        .remove  = xtfpga_i2s_remove,
+        .driver  = {
+                .name = "xtfpga-i2s",
+                .of_match_table = of_match_ptr(xtfpga_i2s_of_match),
+                .pm = &xtfpga_i2s_pm_ops,
+        },
+};
+
+module_platform_driver(xtfpga_i2s_driver);
+
+MODULE_AUTHOR("Max Filippov <jcmvbkbc@gmail.com>");
+MODULE_DESCRIPTION("xtfpga I2S controller driver");
+MODULE_LICENSE("GPL v2");