101 files changed, 2113 insertions, 728 deletions

diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c
index 7752860f7230..4c23381727a1 100644
--- a/sound/soc/adi/axi-i2s.c
+++ b/sound/soc/adi/axi-i2s.c
@@ -240,6 +240,8 @@ static int axi_i2s_probe(struct platform_device *pdev)
         if (ret)
                 goto err_clk_disable;
 
+        return 0;
+
 err_clk_disable:
         clk_disable_unprepare(i2s->clk);
         return ret;
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 98ca6341147b..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"
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/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/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-i2c.c b/sound/soc/codecs/pcm512x-i2c.c
index d0547fa275fc..dcdfac0ffeb1 100644
--- a/sound/soc/codecs/pcm512x-i2c.c
+++ b/sound/soc/codecs/pcm512x-i2c.c
@@ -46,6 +46,8 @@ static int pcm512x_i2c_remove(struct i2c_client *i2c)
 static const struct i2c_device_id pcm512x_i2c_id[] = {
         { "pcm5121", },
         { "pcm5122", },
+        { "pcm5141", },
+        { "pcm5142", },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
@@ -53,6 +55,8 @@ MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
 static const struct of_device_id pcm512x_of_match[] = {
         { .compatible = "ti,pcm5121", },
         { .compatible = "ti,pcm5122", },
+        { .compatible = "ti,pcm5141", },
+        { .compatible = "ti,pcm5142", },
         { }
 };
 MODULE_DEVICE_TABLE(of, pcm512x_of_match);
diff --git a/sound/soc/codecs/pcm512x-spi.c b/sound/soc/codecs/pcm512x-spi.c
index f297058c0038..7b64a9cef704 100644
--- a/sound/soc/codecs/pcm512x-spi.c
+++ b/sound/soc/codecs/pcm512x-spi.c
@@ -43,6 +43,8 @@ static int pcm512x_spi_remove(struct spi_device *spi)
 static const struct spi_device_id pcm512x_spi_id[] = {
         { "pcm5121", },
         { "pcm5122", },
+        { "pcm5141", },
+        { "pcm5142", },
         { },
 };
 MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
@@ -50,6 +52,8 @@ MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
 static const struct of_device_id pcm512x_of_match[] = {
         { .compatible = "ti,pcm5121", },
         { .compatible = "ti,pcm5122", },
+        { .compatible = "ti,pcm5141", },
+        { .compatible = "ti,pcm5142", },
         { }
 };
 MODULE_DEVICE_TABLE(of, pcm512x_of_match);
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index e5f2fb884bf3..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:
@@ -188,8 +231,8 @@ static const DECLARE_TLV_DB_SCALE(boost_tlv, 0, 80, 0);
 static const char * const pcm512x_dsp_program_texts[] = {
         "FIR interpolation with de-emphasis",
         "Low latency IIR with de-emphasis",
-        "Fixed process flow",
         "High attenuation with de-emphasis",
+        "Fixed process flow",
         "Ringing-less low latency FIR",
 };
 
@@ -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 2cd4fe463102..d0698891b69e 100644
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -305,6 +305,8 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic)
         *hp = false;
         *mic = false;
 
+        if (!rt286->codec)
+                return -EINVAL;
         if (rt286->pdata.cbj_en) {
                 regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf);
                 *hp = buf & 0x80000000;
@@ -403,7 +405,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 +420,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 +505,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 +527,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 +543,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 +564,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 +583,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 +646,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),
@@ -861,10 +838,8 @@ static int rt286_hw_params(struct snd_pcm_substream *substream,
                 RT286_I2S_CTRL1, 0x0018, d_len_code << 3);
         dev_dbg(codec->dev, "format val = 0x%x\n", val);
 
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                snd_soc_update_bits(codec, RT286_DAC_FORMAT, 0x407f, val);
-        else
-                snd_soc_update_bits(codec, RT286_ADC_FORMAT, 0x407f, val);
+        snd_soc_update_bits(codec, RT286_DAC_FORMAT, 0x407f, val);
+        snd_soc_update_bits(codec, RT286_ADC_FORMAT, 0x407f, val);
 
         return 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..068dfd5c7640 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -527,7 +527,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 +544,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 +558,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 +590,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:
@@ -1144,7 +1146,7 @@ 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) {
@@ -1205,7 +1207,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 +1234,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 +1264,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:
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 8a0833de1665..f5b054de481e 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -14,10 +14,12 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
+#include <linux/pm_runtime.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/acpi.h>
 #include <linux/spi/spi.h>
+#include <linux/dmi.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -498,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;
 
@@ -515,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;
@@ -528,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) {
@@ -563,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:
@@ -1146,7 +1150,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) {
@@ -1182,7 +1186,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) {
@@ -1232,7 +1236,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:
@@ -1255,7 +1259,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:
@@ -2188,6 +2192,13 @@ static int rt5670_set_dai_sysclk(struct snd_soc_dai *dai,
         if (freq == rt5670->sysclk && clk_id == rt5670->sysclk_src)
                 return 0;
 
+        if (rt5670->pdata.jd_mode) {
+                if (clk_id == RT5670_SCLK_S_PLL1)
+                        snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");
+                else
+                        snd_soc_dapm_disable_pin(&codec->dapm, "PLL1");
+                snd_soc_dapm_sync(&codec->dapm);
+        }
         switch (clk_id) {
         case RT5670_SCLK_S_MCLK:
                 reg_val |= RT5670_SCLK_SRC_MCLK;
@@ -2549,6 +2560,17 @@ static struct acpi_device_id rt5670_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rt5670_acpi_match);
 #endif
 
+static const struct dmi_system_id dmi_platform_intel_braswell[] = {
+        {
+                .ident = "Intel Braswell",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
+                        DMI_MATCH(DMI_BOARD_NAME, "Braswell CRB"),
+                },
+        },
+        {}
+};
+
 static int rt5670_i2c_probe(struct i2c_client *i2c,
                     const struct i2c_device_id *id)
 {
@@ -2568,6 +2590,12 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
         if (pdata)
                 rt5670->pdata = *pdata;
 
+        if (dmi_check_system(dmi_platform_intel_braswell)) {
+                rt5670->pdata.dmic_en = true;
+                rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P;
+                rt5670->pdata.jd_mode = 1;
+        }
+
         rt5670->regmap = devm_regmap_init_i2c(i2c, &rt5670_regmap);
         if (IS_ERR(rt5670->regmap)) {
                 ret = PTR_ERR(rt5670->regmap);
@@ -2609,6 +2637,10 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
         }
 
         if (rt5670->pdata.jd_mode) {
+                regmap_update_bits(rt5670->regmap, RT5670_GLB_CLK,
+                                   RT5670_SCLK_SRC_MASK, RT5670_SCLK_SRC_RCCLK);
+                rt5670->sysclk = 0;
+                rt5670->sysclk_src = RT5670_SCLK_S_RCCLK;
                 regmap_update_bits(rt5670->regmap, RT5670_PWR_ANLG1,
                                    RT5670_PWR_MB, RT5670_PWR_MB);
                 regmap_update_bits(rt5670->regmap, RT5670_PWR_ANLG2,
@@ -2716,18 +2748,26 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
 
         }
 
+        pm_runtime_enable(&i2c->dev);
+        pm_request_idle(&i2c->dev);
+
         ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5670,
                         rt5670_dai, ARRAY_SIZE(rt5670_dai));
         if (ret < 0)
                 goto err;
 
+        pm_runtime_put(&i2c->dev);
+
         return 0;
 err:
+        pm_runtime_disable(&i2c->dev);
+
         return ret;
 }
 
 static int rt5670_i2c_remove(struct i2c_client *i2c)
 {
+        pm_runtime_disable(&i2c->dev);
         snd_soc_unregister_codec(&i2c->dev);
 
         return 0;
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 81fe1464d268..26fc538f03b1 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -784,8 +784,8 @@ static unsigned int bst_tlv[] = {
 static int rt5677_dsp_vad_get(struct snd_kcontrol *kcontrol,
                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+        struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
 
         ucontrol->value.integer.value[0] = rt5677->dsp_vad_en;
 
@@ -795,8 +795,9 @@ static int rt5677_dsp_vad_get(struct snd_kcontrol *kcontrol,
 static int rt5677_dsp_vad_put(struct snd_kcontrol *kcontrol,
                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+        struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
+        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 
         rt5677->dsp_vad_en = !!ucontrol->value.integer.value[0];
 
@@ -895,7 +896,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);
 
@@ -910,7 +911,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);
@@ -921,6 +923,101 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                 return 0;
 }
 
+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) {
+                switch (source->shift) {
+                case 12:
+                        reg = RT5677_ASRC_4;
+                        shift = 0;
+                        break;
+                case 13:
+                        reg = RT5677_ASRC_4;
+                        shift = 4;
+                        break;
+                case 14:
+                        reg = RT5677_ASRC_4;
+                        shift = 8;
+                        break;
+                case 15:
+                        reg = RT5677_ASRC_4;
+                        shift = 12;
+                        break;
+                default:
+                        return 0;
+                }
+        } else {
+                switch (source->shift) {
+                case 0:
+                        reg = RT5677_ASRC_6;
+                        shift = 8;
+                        break;
+                case 1:
+                        reg = RT5677_ASRC_6;
+                        shift = 12;
+                        break;
+                case 2:
+                        reg = RT5677_ASRC_5;
+                        shift = 0;
+                        break;
+                case 3:
+                        reg = RT5677_ASRC_5;
+                        shift = 4;
+                        break;
+                case 4:
+                        reg = RT5677_ASRC_5;
+                        shift = 8;
+                        break;
+                case 5:
+                        reg = RT5677_ASRC_5;
+                        shift = 12;
+                        break;
+                case 12:
+                        reg = RT5677_ASRC_3;
+                        shift = 0;
+                        break;
+                case 13:
+                        reg = RT5677_ASRC_3;
+                        shift = 4;
+                        break;
+                case 14:
+                        reg = RT5677_ASRC_3;
+                        shift = 12;
+                        break;
+                default:
+                        return 0;
+                }
+        }
+
+        regmap_read(rt5677->regmap, reg, &val);
+        val = (val >> shift) & 0xf;
+
+        switch (val) {
+        case 1 ... 6:
+                return 1;
+        default:
+                return 0;
+        }
+
+}
+
+static int can_use_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);
+
+        if (rt5677->sysclk > rt5677->lrck[RT5677_AIF1] * 384)
+                return 1;
+
+        return 0;
+}
+
 /* Digital Mixer */
 static const struct snd_kcontrol_new rt5677_sto1_adc_l_mix[] = {
         SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO1_ADC_MIXER,
@@ -2030,7 +2127,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) {
@@ -2054,7 +2151,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) {
@@ -2078,14 +2175,18 @@ 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) {
-        case SND_SOC_DAPM_POST_PMU:
+        case SND_SOC_DAPM_PRE_PMU:
                 regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x2);
+                break;
+
+        case SND_SOC_DAPM_POST_PMU:
                 regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x0);
                 break;
+
         default:
                 return 0;
         }
@@ -2096,14 +2197,18 @@ 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) {
-        case SND_SOC_DAPM_POST_PMU:
+        case SND_SOC_DAPM_PRE_PMU:
                 regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x2);
+                break;
+
+        case SND_SOC_DAPM_POST_PMU:
                 regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x0);
                 break;
+
         default:
                 return 0;
         }
@@ -2114,7 +2219,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) {
@@ -2141,7 +2246,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;
 
@@ -2164,7 +2269,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;
 
@@ -2187,7 +2292,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) {
@@ -2211,9 +2316,50 @@ static int rt5677_vref_event(struct snd_soc_dapm_widget *w,
 
 static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
         SND_SOC_DAPM_SUPPLY("PLL1", RT5677_PWR_ANLG2, RT5677_PWR_PLL1_BIT,
-                0, rt5677_set_pll1_event, SND_SOC_DAPM_POST_PMU),
+                0, rt5677_set_pll1_event, SND_SOC_DAPM_PRE_PMU |
+                SND_SOC_DAPM_POST_PMU),
         SND_SOC_DAPM_SUPPLY("PLL2", RT5677_PWR_ANLG2, RT5677_PWR_PLL2_BIT,
-                0, rt5677_set_pll2_event, SND_SOC_DAPM_POST_PMU),
+                0, rt5677_set_pll2_event, SND_SOC_DAPM_PRE_PMU |
+                SND_SOC_DAPM_POST_PMU),
+
+        /* ASRC */
+        SND_SOC_DAPM_SUPPLY_S("I2S1 ASRC", 1, RT5677_ASRC_1, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("I2S2 ASRC", 1, RT5677_ASRC_1, 1, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("I2S3 ASRC", 1, RT5677_ASRC_1, 2, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("I2S4 ASRC", 1, RT5677_ASRC_1, 3, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DAC STO ASRC", 1, RT5677_ASRC_2, 14, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DAC MONO2 L ASRC", 1, RT5677_ASRC_2, 13, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DAC MONO2 R ASRC", 1, RT5677_ASRC_2, 12, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DAC MONO3 L ASRC", 1, RT5677_ASRC_1, 15, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DAC MONO3 R ASRC", 1, RT5677_ASRC_1, 14, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DAC MONO4 L ASRC", 1, RT5677_ASRC_1, 13, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DAC MONO4 R ASRC", 1, RT5677_ASRC_1, 12, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC STO1 ASRC", 1, RT5677_ASRC_2, 11, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC STO2 ASRC", 1, RT5677_ASRC_2, 10, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC STO3 ASRC", 1, RT5677_ASRC_2, 9, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC STO4 ASRC", 1, RT5677_ASRC_2, 8, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC MONO L ASRC", 1, RT5677_ASRC_2, 7, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC MONO R ASRC", 1, RT5677_ASRC_2, 6, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("ADC STO1 ASRC", 1, RT5677_ASRC_2, 5, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("ADC STO2 ASRC", 1, RT5677_ASRC_2, 4, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("ADC STO3 ASRC", 1, RT5677_ASRC_2, 3, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("ADC STO4 ASRC", 1, RT5677_ASRC_2, 2, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("ADC MONO L ASRC", 1, RT5677_ASRC_2, 1, 0, NULL,
+                0),
+        SND_SOC_DAPM_SUPPLY_S("ADC MONO R ASRC", 1, RT5677_ASRC_2, 0, 0, NULL,
+                0),
 
         /* Input Side */
         /* micbias */
@@ -2645,10 +2791,18 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
         /* DAC Mixer */
         SND_SOC_DAPM_SUPPLY("dac stereo1 filter", RT5677_PWR_DIG2,
                 RT5677_PWR_DAC_S1F_BIT, 0, NULL, 0),
-        SND_SOC_DAPM_SUPPLY("dac mono left filter", RT5677_PWR_DIG2,
+        SND_SOC_DAPM_SUPPLY("dac mono2 left filter", RT5677_PWR_DIG2,
                 RT5677_PWR_DAC_M2F_L_BIT, 0, NULL, 0),
-        SND_SOC_DAPM_SUPPLY("dac mono right filter", RT5677_PWR_DIG2,
+        SND_SOC_DAPM_SUPPLY("dac mono2 right filter", RT5677_PWR_DIG2,
                 RT5677_PWR_DAC_M2F_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("dac mono3 left filter", RT5677_PWR_DIG2,
+                RT5677_PWR_DAC_M3F_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("dac mono3 right filter", RT5677_PWR_DIG2,
+                RT5677_PWR_DAC_M3F_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("dac mono4 left filter", RT5677_PWR_DIG2,
+                RT5677_PWR_DAC_M4F_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("dac mono4 right filter", RT5677_PWR_DIG2,
+                RT5677_PWR_DAC_M4F_R_BIT, 0, NULL, 0),
 
         SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,
                 rt5677_sto1_dac_l_mix, ARRAY_SIZE(rt5677_sto1_dac_l_mix)),
@@ -2721,6 +2875,31 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {
 };
 
 static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
+        { "Stereo1 DMIC Mux", NULL, "DMIC STO1 ASRC", can_use_asrc },
+        { "Stereo2 DMIC Mux", NULL, "DMIC STO2 ASRC", can_use_asrc },
+        { "Stereo3 DMIC Mux", NULL, "DMIC STO3 ASRC", can_use_asrc },
+        { "Stereo4 DMIC Mux", NULL, "DMIC STO4 ASRC", can_use_asrc },
+        { "Mono DMIC L Mux", NULL, "DMIC MONO L ASRC", can_use_asrc },
+        { "Mono DMIC R Mux", NULL, "DMIC MONO R ASRC", can_use_asrc },
+        { "I2S1", NULL, "I2S1 ASRC", can_use_asrc},
+        { "I2S2", NULL, "I2S2 ASRC", can_use_asrc},
+        { "I2S3", NULL, "I2S3 ASRC", can_use_asrc},
+        { "I2S4", NULL, "I2S4 ASRC", can_use_asrc},
+
+        { "dac stereo1 filter", NULL, "DAC STO ASRC", is_using_asrc },
+        { "dac mono2 left filter", NULL, "DAC MONO2 L ASRC", is_using_asrc },
+        { "dac mono2 right filter", NULL, "DAC MONO2 R ASRC", is_using_asrc },
+        { "dac mono3 left filter", NULL, "DAC MONO3 L ASRC", is_using_asrc },
+        { "dac mono3 right filter", NULL, "DAC MONO3 R ASRC", is_using_asrc },
+        { "dac mono4 left filter", NULL, "DAC MONO4 L ASRC", is_using_asrc },
+        { "dac mono4 right filter", NULL, "DAC MONO4 R ASRC", is_using_asrc },
+        { "adc stereo1 filter", NULL, "ADC STO1 ASRC", is_using_asrc },
+        { "adc stereo2 filter", NULL, "ADC STO2 ASRC", is_using_asrc },
+        { "adc stereo3 filter", NULL, "ADC STO3 ASRC", is_using_asrc },
+        { "adc stereo4 filter", NULL, "ADC STO4 ASRC", is_using_asrc },
+        { "adc mono left filter", NULL, "ADC MONO L ASRC", is_using_asrc },
+        { "adc mono right filter", NULL, "ADC MONO R ASRC", is_using_asrc },
+
         { "DMIC1", NULL, "DMIC L1" },
         { "DMIC1", NULL, "DMIC R1" },
         { "DMIC2", NULL, "DMIC L2" },
@@ -2851,8 +3030,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
 
         { "Stereo1 ADC MIXL", NULL, "Sto1 ADC MIXL" },
         { "Stereo1 ADC MIXL", NULL, "adc stereo1 filter" },
-        { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
-
         { "Stereo1 ADC MIXR", NULL, "Sto1 ADC MIXR" },
         { "Stereo1 ADC MIXR", NULL, "adc stereo1 filter" },
         { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@ -2873,8 +3050,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
 
         { "Stereo2 ADC MIXL", NULL, "Stereo2 ADC LR Mux" },
         { "Stereo2 ADC MIXL", NULL, "adc stereo2 filter" },
-        { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll },
-
         { "Stereo2 ADC MIXR", NULL, "Sto2 ADC MIXR" },
         { "Stereo2 ADC MIXR", NULL, "adc stereo2 filter" },
         { "adc stereo2 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@ -2889,8 +3064,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
 
         { "Stereo3 ADC MIXL", NULL, "Sto3 ADC MIXL" },
         { "Stereo3 ADC MIXL", NULL, "adc stereo3 filter" },
-        { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll },
-
         { "Stereo3 ADC MIXR", NULL, "Sto3 ADC MIXR" },
         { "Stereo3 ADC MIXR", NULL, "adc stereo3 filter" },
         { "adc stereo3 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@ -2905,8 +3078,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
 
         { "Stereo4 ADC MIXL", NULL, "Sto4 ADC MIXL" },
         { "Stereo4 ADC MIXL", NULL, "adc stereo4 filter" },
-        { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll },
-
         { "Stereo4 ADC MIXR", NULL, "Sto4 ADC MIXR" },
         { "Stereo4 ADC MIXR", NULL, "adc stereo4 filter" },
         { "adc stereo4 filter", NULL, "PLL1", is_sys_clk_from_pll },
@@ -3455,10 +3626,8 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
 
         { "DAC1 MIXL", "Stereo ADC Switch", "ADDA1 Mux" },
         { "DAC1 MIXL", "DAC1 Switch", "DAC1 Mux" },
-        { "DAC1 MIXL", NULL, "dac stereo1 filter" },
         { "DAC1 MIXR", "Stereo ADC Switch", "ADDA1 Mux" },
         { "DAC1 MIXR", "DAC1 Switch", "DAC1 Mux" },
-        { "DAC1 MIXR", NULL, "dac stereo1 filter" },
 
         { "DAC1 FS", NULL, "DAC1 MIXL" },
         { "DAC1 FS", NULL, "DAC1 MIXR" },
@@ -3525,35 +3694,46 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
         { "Stereo DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" },
         { "Stereo DAC MIXR", "DAC1 L Switch", "DAC1 MIXL" },
         { "Stereo DAC MIXR", NULL, "dac stereo1 filter" },
+        { "dac stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
 
         { "Mono DAC MIXL", "ST L Switch", "Sidetone Mux" },
         { "Mono DAC MIXL", "DAC1 L Switch", "DAC1 MIXL" },
         { "Mono DAC MIXL", "DAC2 L Switch", "DAC2 L Mux" },
         { "Mono DAC MIXL", "DAC2 R Switch", "DAC2 R Mux" },
-        { "Mono DAC MIXL", NULL, "dac mono left filter" },
+        { "Mono DAC MIXL", NULL, "dac mono2 left filter" },
+        { "dac mono2 left filter", NULL, "PLL1", is_sys_clk_from_pll },
         { "Mono DAC MIXR", "ST R Switch", "Sidetone Mux" },
         { "Mono DAC MIXR", "DAC1 R Switch", "DAC1 MIXR" },
         { "Mono DAC MIXR", "DAC2 R Switch", "DAC2 R Mux" },
         { "Mono DAC MIXR", "DAC2 L Switch", "DAC2 L Mux" },
-        { "Mono DAC MIXR", NULL, "dac mono right filter" },
+        { "Mono DAC MIXR", NULL, "dac mono2 right filter" },
+        { "dac mono2 right filter", NULL, "PLL1", is_sys_clk_from_pll },
 
         { "DD1 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },
         { "DD1 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" },
         { "DD1 MIXL", "DAC3 L Switch", "DAC3 L Mux" },
         { "DD1 MIXL", "DAC3 R Switch", "DAC3 R Mux" },
+        { "DD1 MIXL", NULL, "dac mono3 left filter" },
+        { "dac mono3 left filter", NULL, "PLL1", is_sys_clk_from_pll },
         { "DD1 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },
         { "DD1 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" },
         { "DD1 MIXR", "DAC3 L Switch", "DAC3 L Mux" },
         { "DD1 MIXR", "DAC3 R Switch", "DAC3 R Mux" },
+        { "DD1 MIXR", NULL, "dac mono3 right filter" },
+        { "dac mono3 right filter", NULL, "PLL1", is_sys_clk_from_pll },
 
         { "DD2 MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },
         { "DD2 MIXL", "Mono DAC Mix L Switch", "Mono DAC MIXL" },
         { "DD2 MIXL", "DAC4 L Switch", "DAC4 L Mux" },
         { "DD2 MIXL", "DAC4 R Switch", "DAC4 R Mux" },
+        { "DD2 MIXL", NULL, "dac mono4 left filter" },
+        { "dac mono4 left filter", NULL, "PLL1", is_sys_clk_from_pll },
         { "DD2 MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },
         { "DD2 MIXR", "Mono DAC Mix R Switch", "Mono DAC MIXR" },
         { "DD2 MIXR", "DAC4 L Switch", "DAC4 L Mux" },
         { "DD2 MIXR", "DAC4 R Switch", "DAC4 R Mux" },
+        { "DD2 MIXR", NULL, "dac mono4 right filter" },
+        { "dac mono4 right filter", NULL, "PLL1", is_sys_clk_from_pll },
 
         { "Stereo DAC MIX", NULL, "Stereo DAC MIXL" },
         { "Stereo DAC MIX", NULL, "Stereo DAC MIXR" },
@@ -3575,11 +3755,8 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
         { "DAC3 SRC Mux", "DD MIX2L", "DD2 MIXL" },
 
         { "DAC 1", NULL, "DAC12 SRC Mux" },
-        { "DAC 1", NULL, "PLL1", is_sys_clk_from_pll },
         { "DAC 2", NULL, "DAC12 SRC Mux" },
-        { "DAC 2", NULL, "PLL1", is_sys_clk_from_pll },
         { "DAC 3", NULL, "DAC3 SRC Mux" },
-        { "DAC 3", NULL, "PLL1", is_sys_clk_from_pll },
 
         { "PDM1 L Mux", "STO1 DAC MIX", "Stereo DAC MIXL" },
         { "PDM1 L Mux", "MONO DAC MIX", "Mono DAC MIXL" },
@@ -3926,7 +4103,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);
@@ -3950,6 +4128,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;
@@ -3963,10 +4143,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;
@@ -4751,6 +4937,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.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..07603d142923 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -197,7 +197,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) {
@@ -1046,7 +1046,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;
 }
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 1d1205702d23..9f2dced046de 100644
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@ -254,6 +254,7 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,
         struct ts3a227e *ts3a227e;
         struct device *dev = &i2c->dev;
         int ret;
+        unsigned int acc_reg;
 
         ts3a227e = devm_kzalloc(&i2c->dev, sizeof(*ts3a227e), GFP_KERNEL);
         if (ts3a227e == NULL)
@@ -283,6 +284,11 @@ static int ts3a227e_i2c_probe(struct i2c_client *i2c,
                            INTB_DISABLE | ADC_COMPLETE_INT_DISABLE,
                            ADC_COMPLETE_INT_DISABLE);
 
+        /* Read jack status because chip might not trigger interrupt at boot. */
+        regmap_read(ts3a227e->regmap, TS3A227E_REG_ACCESSORY_STATUS, &acc_reg);
+        ts3a227e_new_jack_state(ts3a227e, acc_reg);
+        ts3a227e_jack_report(ts3a227e);
+
         return 0;
 }
 
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/wm8750.c b/sound/soc/codecs/wm8750.c
index f6847fdd6ddd..eb0a1644ba11 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -323,7 +323,7 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("ROUT2"),
         SND_SOC_DAPM_OUTPUT("MONO1"),
         SND_SOC_DAPM_OUTPUT("OUT3"),
-        SND_SOC_DAPM_OUTPUT("VREF"),
+        SND_SOC_DAPM_VMID("VREF"),
 
         SND_SOC_DAPM_INPUT("LINPUT1"),
         SND_SOC_DAPM_INPUT("LINPUT2"),
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/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 4d2d2b1380d5..c5eaa0198ef0 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;
@@ -1076,10 +1076,13 @@ static const struct snd_soc_dapm_route adc_intercon[] = {
         { "Right Capture PGA", NULL, "Right Capture Mux" },
         { "Right Capture PGA", NULL, "Right Capture Inverting Mux" },
 
-        { "AIFOUTL", "Left",  "ADCL" },
-        { "AIFOUTL", "Right", "ADCR" },
-        { "AIFOUTR", "Left",  "ADCL" },
-        { "AIFOUTR", "Right", "ADCR" },
+        { "AIFOUTL Mux", "Left", "ADCL" },
+        { "AIFOUTL Mux", "Right", "ADCR" },
+        { "AIFOUTR Mux", "Left", "ADCL" },
+        { "AIFOUTR Mux", "Right", "ADCR" },
+
+        { "AIFOUTL", NULL, "AIFOUTL Mux" },
+        { "AIFOUTR", NULL, "AIFOUTR Mux" },
 
         { "ADCL", NULL, "CLK_DSP" },
         { "ADCL", NULL, "Left Capture PGA" },
@@ -1089,12 +1092,16 @@ static const struct snd_soc_dapm_route adc_intercon[] = {
 };
 
 static const struct snd_soc_dapm_route dac_intercon[] = {
-        { "DACL", "Right", "AIFINR" },
-        { "DACL", "Left",  "AIFINL" },
+        { "DACL Mux", "Left", "AIFINL" },
+        { "DACL Mux", "Right", "AIFINR" },
+
+        { "DACR Mux", "Left", "AIFINL" },
+        { "DACR Mux", "Right", "AIFINR" },
+
+        { "DACL", NULL, "DACL Mux" },
         { "DACL", NULL, "CLK_DSP" },
 
-        { "DACR", "Right", "AIFINR" },
-        { "DACR", "Left",  "AIFINL" },
+        { "DACR", NULL, "DACR Mux" },
         { "DACR", NULL, "CLK_DSP" },
 
         { "Charge pump", NULL, "SYSCLK" },
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 031a1ae71d94..a96eb497a379 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -556,7 +556,7 @@ static struct {
         { 22050, 2 },
         { 24000, 2 },
         { 16000, 3 },
-        { 11250, 4 },
+        { 11025, 4 },
         { 12000, 4 },
         {  8000, 5 },
 };
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..baff2cc222a6 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 */
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..79e1aead5131 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -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:
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/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index b93168d4f648..06d3a34ac90a 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -209,16 +209,9 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
 
         switch (config->chan_nr) {
         case EIGHT_CHANNEL_SUPPORT:
-                ch_reg = 3;
-                break;
         case SIX_CHANNEL_SUPPORT:
-                ch_reg = 2;
-                break;
         case FOUR_CHANNEL_SUPPORT:
-                ch_reg = 1;
-                break;
         case TWO_CHANNEL_SUPPORT:
-                ch_reg = 0;
                 break;
         default:
                 dev_err(dev->dev, "channel not supported\n");
@@ -227,18 +220,22 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
 
         i2s_disable_channels(dev, substream->stream);
 
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                i2s_write_reg(dev->i2s_base, TCR(ch_reg), xfer_resolution);
-                i2s_write_reg(dev->i2s_base, TFCR(ch_reg), 0x02);
-                irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
-                i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x30);
-                i2s_write_reg(dev->i2s_base, TER(ch_reg), 1);
-        } else {
-                i2s_write_reg(dev->i2s_base, RCR(ch_reg), xfer_resolution);
-                i2s_write_reg(dev->i2s_base, RFCR(ch_reg), 0x07);
-                irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
-                i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x03);
-                i2s_write_reg(dev->i2s_base, RER(ch_reg), 1);
+        for (ch_reg = 0; ch_reg < (config->chan_nr / 2); ch_reg++) {
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                        i2s_write_reg(dev->i2s_base, TCR(ch_reg),
+                                      xfer_resolution);
+                        i2s_write_reg(dev->i2s_base, TFCR(ch_reg), 0x02);
+                        irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
+                        i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x30);
+                        i2s_write_reg(dev->i2s_base, TER(ch_reg), 1);
+                } else {
+                        i2s_write_reg(dev->i2s_base, RCR(ch_reg),
+                                      xfer_resolution);
+                        i2s_write_reg(dev->i2s_base, RFCR(ch_reg), 0x07);
+                        irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
+                        i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x03);
+                        i2s_write_reg(dev->i2s_base, RER(ch_reg), 1);
+                }
         }
 
         i2s_write_reg(dev->i2s_base, CCR, ccr);
@@ -263,6 +260,19 @@ static void dw_i2s_shutdown(struct snd_pcm_substream *substream,
         snd_soc_dai_set_dma_data(dai, substream, NULL);
 }
 
+static int dw_i2s_prepare(struct snd_pcm_substream *substream,
+                          struct snd_soc_dai *dai)
+{
+        struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                i2s_write_reg(dev->i2s_base, TXFFR, 1);
+        else
+                i2s_write_reg(dev->i2s_base, RXFFR, 1);
+
+        return 0;
+}
+
 static int dw_i2s_trigger(struct snd_pcm_substream *substream,
                 int cmd, struct snd_soc_dai *dai)
 {
@@ -294,6 +304,7 @@ static struct snd_soc_dai_ops dw_i2s_dai_ops = {
         .startup        = dw_i2s_startup,
         .shutdown       = dw_i2s_shutdown,
         .hw_params      = dw_i2s_hw_params,
+        .prepare        = dw_i2s_prepare,
         .trigger        = dw_i2s_trigger,
 };
 
@@ -324,13 +335,47 @@ 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,
+                                   struct snd_soc_dai_driver *dw_i2s_dai,
+                                   struct resource *res,
+                                   const struct i2s_platform_data *pdata)
+{
+        /* 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) {
+                dev_dbg(dev->dev, " designware: play supported\n");
+                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;
+        }
+
+        if (pdata->cap & DWC_I2S_RECORD) {
+                dev_dbg(dev->dev, "designware: record supported\n");
+                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;
+        }
+}
+
 static int dw_i2s_probe(struct platform_device *pdev)
 {
         const struct i2s_platform_data *pdata = pdev->dev.platform_data;
         struct dw_i2s_dev *dev;
         struct resource *res;
         int ret;
-        unsigned int cap;
         struct snd_soc_dai_driver *dw_i2s_dai;
 
         if (!pdata) {
@@ -345,44 +390,23 @@ static int dw_i2s_probe(struct platform_device *pdev)
         }
 
         dw_i2s_dai = devm_kzalloc(&pdev->dev, sizeof(*dw_i2s_dai), GFP_KERNEL);
-        if (!dw_i2s_dai) {
-                dev_err(&pdev->dev, "mem allocation failed for dai driver\n");
+        if (!dw_i2s_dai)
                 return -ENOMEM;
-        }
 
         dw_i2s_dai->ops = &dw_i2s_dai_ops;
         dw_i2s_dai->suspend = dw_i2s_suspend;
         dw_i2s_dai->resume = dw_i2s_resume;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "no i2s resource defined\n");
-                return -ENODEV;
-        }
-
         dev->i2s_base = devm_ioremap_resource(&pdev->dev, res);
-        if (IS_ERR(dev->i2s_base)) {
-                dev_err(&pdev->dev, "ioremap fail for i2s_region\n");
+        if (IS_ERR(dev->i2s_base))
                 return PTR_ERR(dev->i2s_base);
-        }
-
-        cap = pdata->cap;
-        dev->capability = cap;
-        dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
 
-        /* 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;
+        dev->dev = &pdev->dev;
+        dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata);
 
+        dev->capability = pdata->cap;
+        dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
         dev->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(dev->clk))
                 return  PTR_ERR(dev->clk);
@@ -391,23 +415,6 @@ static int dw_i2s_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto err_clk_put;
 
-        if (cap & DWC_I2S_PLAY) {
-                dev_dbg(&pdev->dev, " designware: play supported\n");
-                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;
-        }
-
-        if (cap & DWC_I2S_RECORD) {
-                dev_dbg(&pdev->dev, "designware: record supported\n");
-                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;
-        }
-
-        dev->dev = &pdev->dev;
         dev_set_drvdata(&pdev->dev, dev);
         ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component,
                                          dw_i2s_dai, 1);
diff --git a/sound/soc/fsl/fsl_esai.h b/sound/soc/fsl/fsl_esai.h
index 91a550f4a10d..5e793bbb6b02 100644
--- a/sound/soc/fsl/fsl_esai.h
+++ b/sound/soc/fsl/fsl_esai.h
@@ -302,7 +302,7 @@
 #define ESAI_xCCR_xFP_MASK      (((1 << ESAI_xCCR_xFP_WIDTH) - 1) << ESAI_xCCR_xFP_SHIFT)
 #define ESAI_xCCR_xFP(v)        ((((v) - 1) << ESAI_xCCR_xFP_SHIFT) & ESAI_xCCR_xFP_MASK)
 #define ESAI_xCCR_xDC_SHIFT     9
-#define ESAI_xCCR_xDC_WIDTH     4
+#define ESAI_xCCR_xDC_WIDTH     5
 #define ESAI_xCCR_xDC_MASK      (((1 << ESAI_xCCR_xDC_WIDTH) - 1) << ESAI_xCCR_xDC_SHIFT)
 #define ESAI_xCCR_xDC(v)        ((((v) - 1) << ESAI_xCCR_xDC_SHIFT) & ESAI_xCCR_xDC_MASK)
 #define ESAI_xCCR_xPSR_SHIFT    8
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index a65f17d57ffb..059496ed9ad7 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1362,9 +1362,9 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         }
 
         ssi_private->irq = platform_get_irq(pdev, 0);
-        if (!ssi_private->irq) {
+        if (ssi_private->irq < 0) {
                 dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
-                return -ENXIO;
+                return ssi_private->irq;
         }
 
         /* Are the RX and the TX clocks locked? */
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 4caacb05a623..cd146d4fa805 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -257,6 +257,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
         if (ret)
                 goto clk_fail;
         data->card.num_links = 1;
+        data->card.owner = THIS_MODULE;
         data->card.dai_link = &data->dai;
         data->card.dapm_widgets = imx_wm8962_dapm_widgets;
         data->card.num_dapm_widgets = ARRAY_SIZE(imx_wm8962_dapm_widgets);
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index fb9240fdc9b7..7fe3009b1c43 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -452,9 +452,8 @@ static int asoc_simple_card_parse_of(struct device_node *node,
 }
 
 /* Decrease the reference count of the device nodes */
-static int asoc_simple_card_unref(struct platform_device *pdev)
+static int asoc_simple_card_unref(struct snd_soc_card *card)
 {
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
         struct snd_soc_dai_link *dai_link;
         int num_links;
 
@@ -556,7 +555,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
                 return ret;
 
 err:
-        asoc_simple_card_unref(pdev);
+        asoc_simple_card_unref(&priv->snd_card);
         return ret;
 }
 
@@ -572,7 +571,7 @@ static int asoc_simple_card_remove(struct platform_device *pdev)
                 snd_soc_jack_free_gpios(&simple_card_mic_jack, 1,
                                         &simple_card_mic_jack_gpio);
 
-        return asoc_simple_card_unref(pdev);
+        return asoc_simple_card_unref(card);
 }
 
 static const struct of_device_id asoc_simple_of_match[] = {
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index e989ecf046c9..c0813f546d1f 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -46,7 +46,7 @@ config SND_SOC_INTEL_BAYTRAIL
 
 config SND_SOC_INTEL_HASWELL_MACH
         tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
-        depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C && \\
+        depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C && \
                    I2C_DESIGNWARE_PLATFORM
         select SND_SOC_INTEL_HASWELL
         select SND_SOC_RT5640
@@ -76,7 +76,7 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
 
 config SND_SOC_INTEL_BROADWELL_MACH
         tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
-        depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && DW_DMAC && \\
+        depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && DW_DMAC && \
                    I2C_DESIGNWARE_PLATFORM
         select SND_SOC_INTEL_HASWELL
         select SND_COMPRESS_OFFLOAD
@@ -89,7 +89,7 @@ config SND_SOC_INTEL_BROADWELL_MACH
 
 config SND_SOC_INTEL_BYTCR_RT5640_MACH
         tristate "ASoC Audio DSP Support for MID BYT Platform"
-        depends on X86
+        depends on X86 && I2C
         select SND_SOC_RT5640
         select SND_SST_MFLD_PLATFORM
         select SND_SST_IPC_ACPI
@@ -101,7 +101,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH
 
 config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
         tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
-        depends on X86_INTEL_LPSS
+        depends on X86_INTEL_LPSS && I2C
         select SND_SOC_RT5670
         select SND_SST_MFLD_PLATFORM
         select SND_SST_IPC_ACPI
diff --git a/sound/soc/intel/bytcr_dpcm_rt5640.c b/sound/soc/intel/bytcr_dpcm_rt5640.c
index f5d0fc1ab10c..59308629043e 100644
--- a/sound/soc/intel/bytcr_dpcm_rt5640.c
+++ b/sound/soc/intel/bytcr_dpcm_rt5640.c
@@ -215,7 +215,6 @@ static int snd_byt_mc_probe(struct platform_device *pdev)
 
 static struct platform_driver snd_byt_mc_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "bytt100_rt5640",
                 .pm = &snd_soc_pm_ops,
         },
@@ -227,4 +226,4 @@ module_platform_driver(snd_byt_mc_driver);
 MODULE_DESCRIPTION("ASoC Intel(R) Baytrail CR Machine driver");
 MODULE_AUTHOR("Subhransu S. Prusty <subhransu.s.prusty@intel.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:bytrt5640-audio");
+MODULE_ALIAS("platform:bytt100_rt5640");
diff --git a/sound/soc/intel/cht_bsw_rt5672.c b/sound/soc/intel/cht_bsw_rt5672.c
index 9b8b561171b7..a406c6104897 100644
--- a/sound/soc/intel/cht_bsw_rt5672.c
+++ b/sound/soc/intel/cht_bsw_rt5672.c
@@ -270,7 +270,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
 
 static struct platform_driver snd_cht_mc_driver = {
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "cht-bsw-rt5672",
                 .pm = &snd_soc_pm_ops,
         },
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index 4a5bde9c686b..a2ae2c5f2e9f 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -497,6 +497,7 @@ struct sst_module *sst_module_new(struct sst_fw *sst_fw,
         sst_module->sst_fw = sst_fw;
         sst_module->scratch_size = template->scratch_size;
         sst_module->persistent_size = template->persistent_size;
+        sst_module->entry = template->entry;
 
         INIT_LIST_HEAD(&sst_module->block_list);
         INIT_LIST_HEAD(&sst_module->runtime_list);
@@ -706,6 +707,7 @@ static int block_alloc_fixed(struct sst_dsp *dsp, struct sst_block_allocator *ba
         struct list_head *block_list)
 {
         struct sst_mem_block *block, *tmp;
+        struct sst_block_allocator ba_tmp = *ba;
         u32 end = ba->offset + ba->size, block_end;
         int err;
 
@@ -730,9 +732,9 @@ static int block_alloc_fixed(struct sst_dsp *dsp, struct sst_block_allocator *ba
                 if (ba->offset >= block->offset && ba->offset < block_end) {
 
                         /* align ba to block boundary */
-                        ba->size -= block_end - ba->offset;
-                        ba->offset = block_end;
-                        err = block_alloc_contiguous(dsp, ba, block_list);
+                        ba_tmp.size -= block_end - ba->offset;
+                        ba_tmp.offset = block_end;
+                        err = block_alloc_contiguous(dsp, &ba_tmp, block_list);
                         if (err < 0)
                                 return -ENOMEM;
 
@@ -763,10 +765,14 @@ static int block_alloc_fixed(struct sst_dsp *dsp, struct sst_block_allocator *ba
                 /* does block span more than 1 section */
                 if (ba->offset >= block->offset && ba->offset < block_end) {
 
+                        /* add block */
+                        list_move(&block->list, &dsp->used_block_list);
+                        list_add(&block->module_list, block_list);
                         /* align ba to block boundary */
-                        ba->offset = block->offset;
+                        ba_tmp.size -= block_end - ba->offset;
+                        ba_tmp.offset = block_end;
 
-                        err = block_alloc_contiguous(dsp, ba, block_list);
+                        err = block_alloc_contiguous(dsp, &ba_tmp, block_list);
                         if (err < 0)
                                 return -ENOMEM;
 
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index 3f8c48231364..8156cc1accb7 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -651,11 +651,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)
@@ -1228,6 +1228,11 @@ int sst_hsw_stream_free(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
         struct sst_dsp *sst = hsw->dsp;
         unsigned long flags;
 
+        if (!stream) {
+                dev_warn(hsw->dev, "warning: stream is NULL, no stream to free, ignore it.\n");
+                return 0;
+        }
+
         /* dont free DSP streams that are not commited */
         if (!stream->commited)
                 goto out;
@@ -1415,6 +1420,16 @@ int sst_hsw_stream_commit(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
         u32 header;
         int ret;
 
+        if (!stream) {
+                dev_warn(hsw->dev, "warning: stream is NULL, no stream to commit, ignore it.\n");
+                return 0;
+        }
+
+        if (stream->commited) {
+                dev_warn(hsw->dev, "warning: stream is already committed, ignore it.\n");
+                return 0;
+        }
+
         trace_ipc_request("stream alloc", stream->host_id);
 
         header = IPC_GLB_TYPE(IPC_GLB_ALLOCATE_STREAM);
@@ -1519,6 +1534,11 @@ int sst_hsw_stream_pause(struct sst_hsw *hsw, struct sst_hsw_stream *stream,
 {
         int ret;
 
+        if (!stream) {
+                dev_warn(hsw->dev, "warning: stream is NULL, no stream to pause, ignore it.\n");
+                return 0;
+        }
+
         trace_ipc_request("stream pause", stream->reply.stream_hw_id);
 
         ret = sst_hsw_stream_operations(hsw, IPC_STR_PAUSE,
@@ -1535,6 +1555,11 @@ int sst_hsw_stream_resume(struct sst_hsw *hsw, struct sst_hsw_stream *stream,
 {
         int ret;
 
+        if (!stream) {
+                dev_warn(hsw->dev, "warning: stream is NULL, no stream to resume, ignore it.\n");
+                return 0;
+        }
+
         trace_ipc_request("stream resume", stream->reply.stream_hw_id);
 
         ret = sst_hsw_stream_operations(hsw, IPC_STR_RESUME,
@@ -1550,6 +1575,11 @@ int sst_hsw_stream_reset(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
 {
         int ret, tries = 10;
 
+        if (!stream) {
+                dev_warn(hsw->dev, "warning: stream is NULL, no stream to reset, ignore it.\n");
+                return 0;
+        }
+
         /* dont reset streams that are not commited */
         if (!stream->commited)
                 return 0;
diff --git a/sound/soc/intel/sst/sst.h b/sound/soc/intel/sst/sst.h
index 7f4bbfcbc6f5..562bc483d6b7 100644
--- a/sound/soc/intel/sst/sst.h
+++ b/sound/soc/intel/sst/sst.h
@@ -58,6 +58,7 @@ enum sst_algo_ops {
 #define SST_BLOCK_TIMEOUT       1000
 
 #define FW_SIGNATURE_SIZE       4
+#define FW_NAME_SIZE            32
 
 /* stream states */
 enum sst_stream_states {
@@ -426,7 +427,7 @@ struct intel_sst_drv {
          * Holder for firmware name. Due to async call it needs to be
          * persistent till worker thread gets called
          */
-        char firmware_name[20];
+        char firmware_name[FW_NAME_SIZE];
 };
 
 /* misc definitions */
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index 3abc29e8a928..e541d0e69ea2 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -47,7 +47,7 @@ struct sst_machines {
         char board[32];
         char machine[32];
         void (*machine_quirk)(void);
-        char firmware[32];
+        char firmware[FW_NAME_SIZE];
         struct sst_platform_info *pdata;
 
 };
@@ -245,7 +245,7 @@ static struct sst_machines *sst_acpi_find_machine(
         return NULL;
 }
 
-int sst_acpi_probe(struct platform_device *pdev)
+static int sst_acpi_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         int ret = 0;
@@ -332,7 +332,7 @@ do_sst_cleanup:
 * This function is called by OS when a device is unloaded
 * This frees the interrupt etc
 */
-int sst_acpi_remove(struct platform_device *pdev)
+static int sst_acpi_remove(struct platform_device *pdev)
 {
         struct intel_sst_drv *ctx;
 
@@ -343,14 +343,14 @@ int sst_acpi_remove(struct platform_device *pdev)
 }
 
 static struct sst_machines sst_acpi_bytcr[] = {
-        {"10EC5640", "T100", "bytt100_rt5640", NULL, "fw_sst_0f28.bin",
+        {"10EC5640", "T100", "bytt100_rt5640", NULL, "intel/fw_sst_0f28.bin",
                                                 &byt_rvp_platform_data },
         {},
 };
 
 /* Cherryview-based platforms: CherryTrail and Braswell */
 static struct sst_machines sst_acpi_chv[] = {
-        {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "fw_sst_22a8.bin",
+        {"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "intel/fw_sst_22a8.bin",
                                                 &chv_platform_data },
         {},
 };
@@ -366,7 +366,6 @@ MODULE_DEVICE_TABLE(acpi, sst_acpi_ids);
 static struct platform_driver sst_acpi_driver = {
         .driver = {
                 .name                   = "intel_sst_acpi",
-                .owner                  = THIS_MODULE,
                 .acpi_match_table       = ACPI_PTR(sst_acpi_ids),
                 .pm                     = &intel_sst_pm,
         },
diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c
index 3f9ac7dbdc80..ccfb41c22e53 100644
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -393,7 +393,6 @@ static int omap_hdmi_audio_remove(struct platform_device *pdev)
 static struct platform_driver hdmi_audio_driver = {
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
         },
         .probe = omap_hdmi_audio_probe,
         .remove = omap_hdmi_audio_remove,
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 8b79cafab1e2..c7eb9dd67f60 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -434,7 +434,7 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
         case SND_SOC_DAIFMT_CBM_CFS:
                 /* McBSP slave. FS clock as output */
                 regs->srgr2     |= FSGM;
-                regs->pcr0      |= FSXM;
+                regs->pcr0      |= FSXM | FSRM;
                 break;
         case SND_SOC_DAIFMT_CBM_CFM:
                 /* McBSP slave */
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/spitz.c b/sound/soc/pxa/spitz.c
index d7d5fb20ea6f..a6d680acd907 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -352,7 +352,6 @@ static int spitz_remove(struct platform_device *pdev)
 static struct platform_driver spitz_driver = {
         .driver         = {
                 .name   = "spitz-audio",
-                .owner  = THIS_MODULE,
                 .pm     = &snd_soc_pm_ops,
         },
         .probe          = spitz_probe,
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 26ec5117b35c..acb5be53bfb4 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -247,6 +247,10 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
 
         regmap_update_bits(i2s->regmap, I2S_TXCR, I2S_TXCR_VDW_MASK, val);
         regmap_update_bits(i2s->regmap, I2S_RXCR, I2S_RXCR_VDW_MASK, val);
+        regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDL_MASK,
+                           I2S_DMACR_TDL(16));
+        regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDL_MASK,
+                           I2S_DMACR_RDL(16));
 
         return 0;
 }
@@ -335,6 +339,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = {
                             SNDRV_PCM_FMTBIT_S24_LE),
         },
         .ops = &rockchip_i2s_dai_ops,
+        .symmetric_rates = 1,
 };
 
 static const struct snd_soc_component_driver rockchip_i2s_component = {
@@ -454,11 +459,11 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
 
         i2s->playback_dma_data.addr = res->start + I2S_TXDR;
         i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-        i2s->playback_dma_data.maxburst = 16;
+        i2s->playback_dma_data.maxburst = 4;
 
         i2s->capture_dma_data.addr = res->start + I2S_RXDR;
         i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-        i2s->capture_dma_data.maxburst = 16;
+        i2s->capture_dma_data.maxburst = 4;
 
         i2s->dev = &pdev->dev;
         dev_set_drvdata(&pdev->dev, i2s);
diff --git a/sound/soc/rockchip/rockchip_i2s.h b/sound/soc/rockchip/rockchip_i2s.h
index 89a5d8bc6ee7..93f456f518a9 100644
--- a/sound/soc/rockchip/rockchip_i2s.h
+++ b/sound/soc/rockchip/rockchip_i2s.h
@@ -127,7 +127,7 @@
 #define I2S_DMACR_TDE_DISABLE   (0 << I2S_DMACR_TDE_SHIFT)
 #define I2S_DMACR_TDE_ENABLE    (1 << I2S_DMACR_TDE_SHIFT)
 #define I2S_DMACR_TDL_SHIFT     0
-#define I2S_DMACR_TDL(x)        ((x - 1) << I2S_DMACR_TDL_SHIFT)
+#define I2S_DMACR_TDL(x)        ((x) << I2S_DMACR_TDL_SHIFT)
 #define I2S_DMACR_TDL_MASK      (0x1f << I2S_DMACR_TDL_SHIFT)
 
 /*
diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale_rt5631.c
index 1e2b61ca8db2..8bf2e2c4bafb 100644
--- a/sound/soc/samsung/arndale_rt5631.c
+++ b/sound/soc/samsung/arndale_rt5631.c
@@ -135,7 +135,6 @@ MODULE_DEVICE_TABLE(of, samsung_arndale_rt5631_of_match);
 static struct platform_driver arndale_audio_driver = {
         .driver = {
                 .name   = "arndale-audio",
-                .owner  = THIS_MODULE,
                 .pm = &snd_soc_pm_ops,
                 .of_match_table = of_match_ptr(samsung_arndale_rt5631_of_match),
         },
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-compress.c b/sound/soc/soc-compress.c
index 590a82f01d0b..025c38fbe3c0 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -659,7 +659,8 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
                         rtd->dai_link->stream_name);
 
                 ret = snd_pcm_new_internal(rtd->card->snd_card, new_name, num,
-                                1, 0, &be_pcm);
+                                rtd->dai_link->dpcm_playback,
+                                rtd->dai_link->dpcm_capture, &be_pcm);
                 if (ret < 0) {
                         dev_err(rtd->card->dev, "ASoC: can't create compressed for %s\n",
                                 rtd->dai_link->name);
@@ -668,8 +669,10 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
 
                 rtd->pcm = be_pcm;
                 rtd->fe_compr = 1;
-                be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd;
-                be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd;
+                if (rtd->dai_link->dpcm_playback)
+                        be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd;
+                else if (rtd->dai_link->dpcm_capture)
+                        be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd;
                 memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops));
         } else
                 memcpy(compr->ops, &soc_compr_ops, sizeof(soc_compr_ops));
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index d342ee2ce28b..678823d2e14a 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);
@@ -1640,9 +1650,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
                 }
         }
 
-        if (card->fully_routed)
-                snd_soc_dapm_auto_nc_pins(card);
-
         snd_soc_dapm_new_widgets(card);
 
         ret = snd_card_register(card->snd_card);
@@ -2400,8 +2407,8 @@ int snd_soc_unregister_card(struct snd_soc_card *card)
                 card->instantiated = false;
                 snd_soc_dapm_shutdown(card);
                 soc_cleanup_card_resources(card);
+                dev_dbg(card->dev, "ASoC: Unregistered card '%s'\n", card->name);
         }
-        dev_dbg(card->dev, "ASoC: Unregistered card '%s'\n", card->name);
 
         return 0;
 }
@@ -3244,7 +3251,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                                    const char *propname)
 {
         struct device_node *np = card->dev->of_node;
-        int num_routes, old_routes;
+        int num_routes;
         struct snd_soc_dapm_route *routes;
         int i, ret;
 
@@ -3262,9 +3269,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                 return -EINVAL;
         }
 
-        old_routes = card->num_dapm_routes;
-        routes = devm_kzalloc(card->dev,
-                              (old_routes + num_routes) * sizeof(*routes),
+        routes = devm_kzalloc(card->dev, num_routes * sizeof(*routes),
                               GFP_KERNEL);
         if (!routes) {
                 dev_err(card->dev,
@@ -3272,11 +3277,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                 return -EINVAL;
         }
 
-        memcpy(routes, card->dapm_routes, old_routes * sizeof(*routes));
-
         for (i = 0; i < num_routes; i++) {
                 ret = of_property_read_string_index(np, propname,
-                        2 * i, &routes[old_routes + i].sink);
+                        2 * i, &routes[i].sink);
                 if (ret) {
                         dev_err(card->dev,
                                 "ASoC: Property '%s' index %d could not be read: %d\n",
@@ -3284,7 +3287,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                         return -EINVAL;
                 }
                 ret = of_property_read_string_index(np, propname,
-                        (2 * i) + 1, &routes[old_routes + i].source);
+                        (2 * i) + 1, &routes[i].source);
                 if (ret) {
                         dev_err(card->dev,
                                 "ASoC: Property '%s' index %d could not be read: %d\n",
@@ -3293,7 +3296,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                 }
         }
 
-        card->num_dapm_routes += num_routes;
+        card->num_dapm_routes = num_routes;
         card->dapm_routes = routes;
 
         return 0;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index c5136bb1f982..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)
 {
@@ -2279,6 +2274,9 @@ static void dapm_update_widget_flags(struct snd_soc_dapm_widget *w)
 
         switch (w->id) {
         case snd_soc_dapm_input:
+                /* On a fully routed card a input is never a source */
+                if (w->dapm->card->fully_routed)
+                        break;
                 w->is_source = 1;
                 list_for_each_entry(p, &w->sources, list_sink) {
                         if (p->source->id == snd_soc_dapm_micbias ||
@@ -2291,6 +2289,9 @@ static void dapm_update_widget_flags(struct snd_soc_dapm_widget *w)
                 }
                 break;
         case snd_soc_dapm_output:
+                /* On a fully routed card a output is never a sink */
+                if (w->dapm->card->fully_routed)
+                        break;
                 w->is_sink = 1;
                 list_for_each_entry(p, &w->sinks, list_source) {
                         if (p->sink->id == snd_soc_dapm_spk ||
@@ -3085,16 +3086,24 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 
         switch (w->id) {
         case snd_soc_dapm_mic:
-        case snd_soc_dapm_input:
                 w->is_source = 1;
                 w->power_check = dapm_generic_check_power;
                 break;
+        case snd_soc_dapm_input:
+                if (!dapm->card->fully_routed)
+                        w->is_source = 1;
+                w->power_check = dapm_generic_check_power;
+                break;
         case snd_soc_dapm_spk:
         case snd_soc_dapm_hp:
-        case snd_soc_dapm_output:
                 w->is_sink = 1;
                 w->power_check = dapm_generic_check_power;
                 break;
+        case snd_soc_dapm_output:
+                if (!dapm->card->fully_routed)
+                        w->is_sink = 1;
+                w->power_check = dapm_generic_check_power;
+                break;
         case snd_soc_dapm_vmid:
         case snd_soc_dapm_siggen:
                 w->is_source = 1;
@@ -3130,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);
@@ -3809,93 +3816,6 @@ int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
 EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);
 
 /**
- * dapm_is_external_path() - Checks if a path is a external path
- * @card: The card the path belongs to
- * @path: The path to check
- *
- * Returns true if the path is either between two different DAPM contexts or
- * between two external pins of the same DAPM context. Otherwise returns
- * false.
- */
-static bool dapm_is_external_path(struct snd_soc_card *card,
-        struct snd_soc_dapm_path *path)
-{
-        dev_dbg(card->dev,
-                "... Path %s(id:%d dapm:%p) - %s(id:%d dapm:%p)\n",
-                path->source->name, path->source->id, path->source->dapm,
-                path->sink->name, path->sink->id, path->sink->dapm);
-
-        /* Connection between two different DAPM contexts */
-        if (path->source->dapm != path->sink->dapm)
-                return true;
-
-        /* Loopback connection from external pin to external pin */
-        if (path->sink->id == snd_soc_dapm_input) {
-                switch (path->source->id) {
-                case snd_soc_dapm_output:
-                case snd_soc_dapm_micbias:
-                        return true;
-                default:
-                        break;
-                }
-        }
-
-        return false;
-}
-
-static bool snd_soc_dapm_widget_in_card_paths(struct snd_soc_card *card,
-                                              struct snd_soc_dapm_widget *w)
-{
-        struct snd_soc_dapm_path *p;
-
-        list_for_each_entry(p, &w->sources, list_sink) {
-                if (dapm_is_external_path(card, p))
-                        return true;
-        }
-
-        list_for_each_entry(p, &w->sinks, list_source) {
-                if (dapm_is_external_path(card, p))
-                        return true;
-        }
-
-        return false;
-}
-
-/**
- * snd_soc_dapm_auto_nc_pins - call snd_soc_dapm_nc_pin for unused pins
- * @card: The card whose pins should be processed
- *
- * Automatically call snd_soc_dapm_nc_pin() for any external pins in the card
- * which are unused. Pins are used if they are connected externally to a
- * component, whether that be to some other device, or a loop-back connection to
- * the component itself.
- */
-void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card)
-{
-        struct snd_soc_dapm_widget *w;
-
-        dev_dbg(card->dev, "ASoC: Auto NC: DAPMs: card:%p\n", &card->dapm);
-
-        list_for_each_entry(w, &card->widgets, list) {
-                switch (w->id) {
-                case snd_soc_dapm_input:
-                case snd_soc_dapm_output:
-                case snd_soc_dapm_micbias:
-                        dev_dbg(card->dev, "ASoC: Auto NC: Checking widget %s\n",
-                                w->name);
-                        if (!snd_soc_dapm_widget_in_card_paths(card, w)) {
-                                dev_dbg(card->dev,
-                                        "... Not in map; disabling\n");
-                                snd_soc_dapm_nc_pin(w->dapm, w->name);
-                        }
-                        break;
-                default:
-                        break;
-                }
-        }
-}
-
-/**
  * snd_soc_dapm_free - free dapm resources
  * @dapm: DAPM context
  *
@@ -3903,7 +3823,6 @@ void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card)
  */
 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-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/soc-pcm.c b/sound/soc/soc-pcm.c
index eb87d96e2cf0..0ae0e2a9eed7 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -746,7 +746,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
                                                               codec_dai);
                         if (ret < 0) {
                                 dev_err(codec_dai->dev,
-                                        "ASoC: DAI prepare error: %d\n", ret);
+                                        "ASoC: codec DAI prepare error: %d\n",
+                                        ret);
                                 goto out;
                         }
                 }
@@ -755,8 +756,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
         if (cpu_dai->driver->ops && cpu_dai->driver->ops->prepare) {
                 ret = cpu_dai->driver->ops->prepare(substream, cpu_dai);
                 if (ret < 0) {
-                        dev_err(cpu_dai->dev, "ASoC: DAI prepare error: %d\n",
-                                ret);
+                        dev_err(cpu_dai->dev,
+                                "ASoC: cpu DAI prepare error: %d\n", ret);
                         goto out;
                 }
         }