Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.17

A few more driver specific fixes on top of the currently pending fixes
(which are already in your tree but not Linus').

14 files changed, 161 insertions, 152 deletions

diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index 986dcec79fa0..84f31e1f9d24 100644
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -79,28 +79,28 @@ static unsigned short au1xpsc_ac97_read(struct snd_ac97 *ac97,
         unsigned short retry, tmo;
         unsigned long data;
 
-        au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
-        au_sync();
+        __raw_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
+        wmb(); /* drain writebuffer */
 
         retry = AC97_RW_RETRIES;
         do {
                 mutex_lock(&pscdata->lock);
 
-                au_writel(PSC_AC97CDC_RD | PSC_AC97CDC_INDX(reg),
+                __raw_writel(PSC_AC97CDC_RD | PSC_AC97CDC_INDX(reg),
                           AC97_CDC(pscdata));
-                au_sync();
+                wmb(); /* drain writebuffer */
 
                 tmo = 20;
                 do {
                         udelay(21);
-                        if (au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)
+                        if (__raw_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)
                                 break;
                 } while (--tmo);
 
-                data = au_readl(AC97_CDC(pscdata));
+                data = __raw_readl(AC97_CDC(pscdata));
 
-                au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
-                au_sync();
+                __raw_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
+                wmb(); /* drain writebuffer */
 
                 mutex_unlock(&pscdata->lock);
 
@@ -119,26 +119,26 @@ static void au1xpsc_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
         struct au1xpsc_audio_data *pscdata = ac97_to_pscdata(ac97);
         unsigned int tmo, retry;
 
-        au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
-        au_sync();
+        __raw_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
+        wmb(); /* drain writebuffer */
 
         retry = AC97_RW_RETRIES;
         do {
                 mutex_lock(&pscdata->lock);
 
-                au_writel(PSC_AC97CDC_INDX(reg) | (val & 0xffff),
+                __raw_writel(PSC_AC97CDC_INDX(reg) | (val & 0xffff),
                           AC97_CDC(pscdata));
-                au_sync();
+                wmb(); /* drain writebuffer */
 
                 tmo = 20;
                 do {
                         udelay(21);
-                        if (au_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)
+                        if (__raw_readl(AC97_EVNT(pscdata)) & PSC_AC97EVNT_CD)
                                 break;
                 } while (--tmo);
 
-                au_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
-                au_sync();
+                __raw_writel(PSC_AC97EVNT_CD, AC97_EVNT(pscdata));
+                wmb(); /* drain writebuffer */
 
                 mutex_unlock(&pscdata->lock);
         } while (--retry && !tmo);
@@ -149,11 +149,11 @@ static void au1xpsc_ac97_warm_reset(struct snd_ac97 *ac97)
 {
         struct au1xpsc_audio_data *pscdata = ac97_to_pscdata(ac97);
 
-        au_writel(PSC_AC97RST_SNC, AC97_RST(pscdata));
-        au_sync();
+        __raw_writel(PSC_AC97RST_SNC, AC97_RST(pscdata));
+        wmb(); /* drain writebuffer */
         msleep(10);
-        au_writel(0, AC97_RST(pscdata));
-        au_sync();
+        __raw_writel(0, AC97_RST(pscdata));
+        wmb(); /* drain writebuffer */
 }
 
 static void au1xpsc_ac97_cold_reset(struct snd_ac97 *ac97)
@@ -162,25 +162,25 @@ static void au1xpsc_ac97_cold_reset(struct snd_ac97 *ac97)
         int i;
 
         /* disable PSC during cold reset */
-        au_writel(0, AC97_CFG(au1xpsc_ac97_workdata));
-        au_sync();
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(pscdata));
-        au_sync();
+        __raw_writel(0, AC97_CFG(au1xpsc_ac97_workdata));
+        wmb(); /* drain writebuffer */
+        __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(pscdata));
+        wmb(); /* drain writebuffer */
 
         /* issue cold reset */
-        au_writel(PSC_AC97RST_RST, AC97_RST(pscdata));
-        au_sync();
+        __raw_writel(PSC_AC97RST_RST, AC97_RST(pscdata));
+        wmb(); /* drain writebuffer */
         msleep(500);
-        au_writel(0, AC97_RST(pscdata));
-        au_sync();
+        __raw_writel(0, AC97_RST(pscdata));
+        wmb(); /* drain writebuffer */
 
         /* enable PSC */
-        au_writel(PSC_CTRL_ENABLE, PSC_CTRL(pscdata));
-        au_sync();
+        __raw_writel(PSC_CTRL_ENABLE, PSC_CTRL(pscdata));
+        wmb(); /* drain writebuffer */
 
         /* wait for PSC to indicate it's ready */
         i = 1000;
-        while (!((au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_SR)) && (--i))
+        while (!((__raw_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_SR)) && (--i))
                 msleep(1);
 
         if (i == 0) {
@@ -189,12 +189,12 @@ static void au1xpsc_ac97_cold_reset(struct snd_ac97 *ac97)
         }
 
         /* enable the ac97 function */
-        au_writel(pscdata->cfg | PSC_AC97CFG_DE_ENABLE, AC97_CFG(pscdata));
-        au_sync();
+        __raw_writel(pscdata->cfg | PSC_AC97CFG_DE_ENABLE, AC97_CFG(pscdata));
+        wmb(); /* drain writebuffer */
 
         /* wait for AC97 core to become ready */
         i = 1000;
-        while (!((au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR)) && (--i))
+        while (!((__raw_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR)) && (--i))
                 msleep(1);
         if (i == 0)
                 printk(KERN_ERR "au1xpsc-ac97: AC97 ctrl not ready\n");
@@ -218,8 +218,8 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
 
         chans = params_channels(params);
 
-        r = ro = au_readl(AC97_CFG(pscdata));
-        stat = au_readl(AC97_STAT(pscdata));
+        r = ro = __raw_readl(AC97_CFG(pscdata));
+        stat = __raw_readl(AC97_STAT(pscdata));
 
         /* already active? */
         if (stat & (PSC_AC97STAT_TB | PSC_AC97STAT_RB)) {
@@ -252,28 +252,28 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
                 mutex_lock(&pscdata->lock);
 
                 /* disable AC97 device controller first... */
-                au_writel(r & ~PSC_AC97CFG_DE_ENABLE, AC97_CFG(pscdata));
-                au_sync();
+                __raw_writel(r & ~PSC_AC97CFG_DE_ENABLE, AC97_CFG(pscdata));
+                wmb(); /* drain writebuffer */
 
                 /* ...wait for it... */
                 t = 100;
-                while ((au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR) && --t)
+                while ((__raw_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR) && --t)
                         msleep(1);
 
                 if (!t)
                         printk(KERN_ERR "PSC-AC97: can't disable!\n");
 
                 /* ...write config... */
-                au_writel(r, AC97_CFG(pscdata));
-                au_sync();
+                __raw_writel(r, AC97_CFG(pscdata));
+                wmb(); /* drain writebuffer */
 
                 /* ...enable the AC97 controller again... */
-                au_writel(r | PSC_AC97CFG_DE_ENABLE, AC97_CFG(pscdata));
-                au_sync();
+                __raw_writel(r | PSC_AC97CFG_DE_ENABLE, AC97_CFG(pscdata));
+                wmb(); /* drain writebuffer */
 
                 /* ...and wait for ready bit */
                 t = 100;
-                while ((!(au_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR)) && --t)
+                while ((!(__raw_readl(AC97_STAT(pscdata)) & PSC_AC97STAT_DR)) && --t)
                         msleep(1);
 
                 if (!t)
@@ -300,21 +300,21 @@ static int au1xpsc_ac97_trigger(struct snd_pcm_substream *substream,
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
-                au_writel(AC97PCR_CLRFIFO(stype), AC97_PCR(pscdata));
-                au_sync();
-                au_writel(AC97PCR_START(stype), AC97_PCR(pscdata));
-                au_sync();
+                __raw_writel(AC97PCR_CLRFIFO(stype), AC97_PCR(pscdata));
+                wmb(); /* drain writebuffer */
+                __raw_writel(AC97PCR_START(stype), AC97_PCR(pscdata));
+                wmb(); /* drain writebuffer */
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
-                au_writel(AC97PCR_STOP(stype), AC97_PCR(pscdata));
-                au_sync();
+                __raw_writel(AC97PCR_STOP(stype), AC97_PCR(pscdata));
+                wmb(); /* drain writebuffer */
 
-                while (au_readl(AC97_STAT(pscdata)) & AC97STAT_BUSY(stype))
+                while (__raw_readl(AC97_STAT(pscdata)) & AC97STAT_BUSY(stype))
                         asm volatile ("nop");
 
-                au_writel(AC97PCR_CLRFIFO(stype), AC97_PCR(pscdata));
-                au_sync();
+                __raw_writel(AC97PCR_CLRFIFO(stype), AC97_PCR(pscdata));
+                wmb(); /* drain writebuffer */
 
                 break;
         default:
@@ -398,13 +398,13 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
                   PSC_AC97CFG_DE_ENABLE;
 
         /* preserve PSC clock source set up by platform  */
-        sel = au_readl(PSC_SEL(wd)) & PSC_SEL_CLK_MASK;
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
-        au_sync();
-        au_writel(0, PSC_SEL(wd));
-        au_sync();
-        au_writel(PSC_SEL_PS_AC97MODE | sel, PSC_SEL(wd));
-        au_sync();
+        sel = __raw_readl(PSC_SEL(wd)) & PSC_SEL_CLK_MASK;
+        __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(0, PSC_SEL(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(PSC_SEL_PS_AC97MODE | sel, PSC_SEL(wd));
+        wmb(); /* drain writebuffer */
 
         /* name the DAI like this device instance ("au1xpsc-ac97.PSCINDEX") */
         memcpy(&wd->dai_drv, &au1xpsc_ac97_dai_template,
@@ -433,10 +433,10 @@ static int au1xpsc_ac97_drvremove(struct platform_device *pdev)
         snd_soc_unregister_component(&pdev->dev);
 
         /* disable PSC completely */
-        au_writel(0, AC97_CFG(wd));
-        au_sync();
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
-        au_sync();
+        __raw_writel(0, AC97_CFG(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
+        wmb(); /* drain writebuffer */
 
         au1xpsc_ac97_workdata = NULL;   /* MDEV */
 
@@ -449,12 +449,12 @@ static int au1xpsc_ac97_drvsuspend(struct device *dev)
         struct au1xpsc_audio_data *wd = dev_get_drvdata(dev);
 
         /* save interesting registers and disable PSC */
-        wd->pm[0] = au_readl(PSC_SEL(wd));
+        wd->pm[0] = __raw_readl(PSC_SEL(wd));
 
-        au_writel(0, AC97_CFG(wd));
-        au_sync();
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
-        au_sync();
+        __raw_writel(0, AC97_CFG(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
+        wmb(); /* drain writebuffer */
 
         return 0;
 }
@@ -464,8 +464,8 @@ static int au1xpsc_ac97_drvresume(struct device *dev)
         struct au1xpsc_audio_data *wd = dev_get_drvdata(dev);
 
         /* restore PSC clock config */
-        au_writel(wd->pm[0] | PSC_SEL_PS_AC97MODE, PSC_SEL(wd));
-        au_sync();
+        __raw_writel(wd->pm[0] | PSC_SEL_PS_AC97MODE, PSC_SEL(wd));
+        wmb(); /* drain writebuffer */
 
         /* after this point the ac97 core will cold-reset the codec.
          * During cold-reset the PSC is reinitialized and the last
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index fe923a7bdc39..814beffc56f2 100644
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -120,10 +120,10 @@ static int au1xpsc_i2s_hw_params(struct snd_pcm_substream *substream,
         unsigned long stat;
 
         /* check if the PSC is already streaming data */
-        stat = au_readl(I2S_STAT(pscdata));
+        stat = __raw_readl(I2S_STAT(pscdata));
         if (stat & (PSC_I2SSTAT_TB | PSC_I2SSTAT_RB)) {
                 /* reject parameters not currently set up in hardware */
-                cfgbits = au_readl(I2S_CFG(pscdata));
+                cfgbits = __raw_readl(I2S_CFG(pscdata));
                 if ((PSC_I2SCFG_GET_LEN(cfgbits) != params->msbits) ||
                     (params_rate(params) != pscdata->rate))
                         return -EINVAL;
@@ -149,33 +149,33 @@ static int au1xpsc_i2s_configure(struct au1xpsc_audio_data *pscdata)
         unsigned long tmo;
 
         /* bring PSC out of sleep, and configure I2S unit */
-        au_writel(PSC_CTRL_ENABLE, PSC_CTRL(pscdata));
-        au_sync();
+        __raw_writel(PSC_CTRL_ENABLE, PSC_CTRL(pscdata));
+        wmb(); /* drain writebuffer */
 
         tmo = 1000000;
-        while (!(au_readl(I2S_STAT(pscdata)) & PSC_I2SSTAT_SR) && tmo)
+        while (!(__raw_readl(I2S_STAT(pscdata)) & PSC_I2SSTAT_SR) && tmo)
                 tmo--;
 
         if (!tmo)
                 goto psc_err;
 
-        au_writel(0, I2S_CFG(pscdata));
-        au_sync();
-        au_writel(pscdata->cfg | PSC_I2SCFG_DE_ENABLE, I2S_CFG(pscdata));
-        au_sync();
+        __raw_writel(0, I2S_CFG(pscdata));
+        wmb(); /* drain writebuffer */
+        __raw_writel(pscdata->cfg | PSC_I2SCFG_DE_ENABLE, I2S_CFG(pscdata));
+        wmb(); /* drain writebuffer */
 
         /* wait for I2S controller to become ready */
         tmo = 1000000;
-        while (!(au_readl(I2S_STAT(pscdata)) & PSC_I2SSTAT_DR) && tmo)
+        while (!(__raw_readl(I2S_STAT(pscdata)) & PSC_I2SSTAT_DR) && tmo)
                 tmo--;
 
         if (tmo)
                 return 0;
 
 psc_err:
-        au_writel(0, I2S_CFG(pscdata));
-        au_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));
-        au_sync();
+        __raw_writel(0, I2S_CFG(pscdata));
+        __raw_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));
+        wmb(); /* drain writebuffer */
         return -ETIMEDOUT;
 }
 
@@ -187,26 +187,26 @@ static int au1xpsc_i2s_start(struct au1xpsc_audio_data *pscdata, int stype)
         ret = 0;
 
         /* if both TX and RX are idle, configure the PSC  */
-        stat = au_readl(I2S_STAT(pscdata));
+        stat = __raw_readl(I2S_STAT(pscdata));
         if (!(stat & (PSC_I2SSTAT_TB | PSC_I2SSTAT_RB))) {
                 ret = au1xpsc_i2s_configure(pscdata);
                 if (ret)
                         goto out;
         }
 
-        au_writel(I2SPCR_CLRFIFO(stype), I2S_PCR(pscdata));
-        au_sync();
-        au_writel(I2SPCR_START(stype), I2S_PCR(pscdata));
-        au_sync();
+        __raw_writel(I2SPCR_CLRFIFO(stype), I2S_PCR(pscdata));
+        wmb(); /* drain writebuffer */
+        __raw_writel(I2SPCR_START(stype), I2S_PCR(pscdata));
+        wmb(); /* drain writebuffer */
 
         /* wait for start confirmation */
         tmo = 1000000;
-        while (!(au_readl(I2S_STAT(pscdata)) & I2SSTAT_BUSY(stype)) && tmo)
+        while (!(__raw_readl(I2S_STAT(pscdata)) & I2SSTAT_BUSY(stype)) && tmo)
                 tmo--;
 
         if (!tmo) {
-                au_writel(I2SPCR_STOP(stype), I2S_PCR(pscdata));
-                au_sync();
+                __raw_writel(I2SPCR_STOP(stype), I2S_PCR(pscdata));
+                wmb(); /* drain writebuffer */
                 ret = -ETIMEDOUT;
         }
 out:
@@ -217,21 +217,21 @@ static int au1xpsc_i2s_stop(struct au1xpsc_audio_data *pscdata, int stype)
 {
         unsigned long tmo, stat;
 
-        au_writel(I2SPCR_STOP(stype), I2S_PCR(pscdata));
-        au_sync();
+        __raw_writel(I2SPCR_STOP(stype), I2S_PCR(pscdata));
+        wmb(); /* drain writebuffer */
 
         /* wait for stop confirmation */
         tmo = 1000000;
-        while ((au_readl(I2S_STAT(pscdata)) & I2SSTAT_BUSY(stype)) && tmo)
+        while ((__raw_readl(I2S_STAT(pscdata)) & I2SSTAT_BUSY(stype)) && tmo)
                 tmo--;
 
         /* if both TX and RX are idle, disable PSC */
-        stat = au_readl(I2S_STAT(pscdata));
+        stat = __raw_readl(I2S_STAT(pscdata));
         if (!(stat & (PSC_I2SSTAT_TB | PSC_I2SSTAT_RB))) {
-                au_writel(0, I2S_CFG(pscdata));
-                au_sync();
-                au_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));
-                au_sync();
+                __raw_writel(0, I2S_CFG(pscdata));
+                wmb(); /* drain writebuffer */
+                __raw_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));
+                wmb(); /* drain writebuffer */
         }
         return 0;
 }
@@ -332,12 +332,12 @@ static int au1xpsc_i2s_drvprobe(struct platform_device *pdev)
         /* preserve PSC clock source set up by platform (dev.platform_data
          * is already occupied by soc layer)
          */
-        sel = au_readl(PSC_SEL(wd)) & PSC_SEL_CLK_MASK;
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
-        au_sync();
-        au_writel(PSC_SEL_PS_I2SMODE | sel, PSC_SEL(wd));
-        au_writel(0, I2S_CFG(wd));
-        au_sync();
+        sel = __raw_readl(PSC_SEL(wd)) & PSC_SEL_CLK_MASK;
+        __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(PSC_SEL_PS_I2SMODE | sel, PSC_SEL(wd));
+        __raw_writel(0, I2S_CFG(wd));
+        wmb(); /* drain writebuffer */
 
         /* preconfigure: set max rx/tx fifo depths */
         wd->cfg |= PSC_I2SCFG_RT_FIFO8 | PSC_I2SCFG_TT_FIFO8;
@@ -364,10 +364,10 @@ static int au1xpsc_i2s_drvremove(struct platform_device *pdev)
 
         snd_soc_unregister_component(&pdev->dev);
 
-        au_writel(0, I2S_CFG(wd));
-        au_sync();
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
-        au_sync();
+        __raw_writel(0, I2S_CFG(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
+        wmb(); /* drain writebuffer */
 
         return 0;
 }
@@ -378,12 +378,12 @@ static int au1xpsc_i2s_drvsuspend(struct device *dev)
         struct au1xpsc_audio_data *wd = dev_get_drvdata(dev);
 
         /* save interesting register and disable PSC */
-        wd->pm[0] = au_readl(PSC_SEL(wd));
+        wd->pm[0] = __raw_readl(PSC_SEL(wd));
 
-        au_writel(0, I2S_CFG(wd));
-        au_sync();
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
-        au_sync();
+        __raw_writel(0, I2S_CFG(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
+        wmb(); /* drain writebuffer */
 
         return 0;
 }
@@ -393,12 +393,12 @@ static int au1xpsc_i2s_drvresume(struct device *dev)
         struct au1xpsc_audio_data *wd = dev_get_drvdata(dev);
 
         /* select I2S mode and PSC clock */
-        au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
-        au_sync();
-        au_writel(0, PSC_SEL(wd));
-        au_sync();
-        au_writel(wd->pm[0], PSC_SEL(wd));
-        au_sync();
+        __raw_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(0, PSC_SEL(wd));
+        wmb(); /* drain writebuffer */
+        __raw_writel(wd->pm[0], PSC_SEL(wd));
+        wmb(); /* drain writebuffer */
 
         return 0;
 }
diff --git a/sound/soc/au1x/psc.h b/sound/soc/au1x/psc.h
index b16b2e02e0c9..74dffeb641fa 100644
--- a/sound/soc/au1x/psc.h
+++ b/sound/soc/au1x/psc.h
@@ -27,16 +27,16 @@ struct au1xpsc_audio_data {
 };
 
 /* easy access macros */
-#define PSC_CTRL(x)     ((unsigned long)((x)->mmio) + PSC_CTRL_OFFSET)
-#define PSC_SEL(x)      ((unsigned long)((x)->mmio) + PSC_SEL_OFFSET)
-#define I2S_STAT(x)     ((unsigned long)((x)->mmio) + PSC_I2SSTAT_OFFSET)
-#define I2S_CFG(x)      ((unsigned long)((x)->mmio) + PSC_I2SCFG_OFFSET)
-#define I2S_PCR(x)      ((unsigned long)((x)->mmio) + PSC_I2SPCR_OFFSET)
-#define AC97_CFG(x)     ((unsigned long)((x)->mmio) + PSC_AC97CFG_OFFSET)
-#define AC97_CDC(x)     ((unsigned long)((x)->mmio) + PSC_AC97CDC_OFFSET)
-#define AC97_EVNT(x)    ((unsigned long)((x)->mmio) + PSC_AC97EVNT_OFFSET)
-#define AC97_PCR(x)     ((unsigned long)((x)->mmio) + PSC_AC97PCR_OFFSET)
-#define AC97_RST(x)     ((unsigned long)((x)->mmio) + PSC_AC97RST_OFFSET)
-#define AC97_STAT(x)    ((unsigned long)((x)->mmio) + PSC_AC97STAT_OFFSET)
+#define PSC_CTRL(x)     ((x)->mmio + PSC_CTRL_OFFSET)
+#define PSC_SEL(x)      ((x)->mmio + PSC_SEL_OFFSET)
+#define I2S_STAT(x)     ((x)->mmio + PSC_I2SSTAT_OFFSET)
+#define I2S_CFG(x)      ((x)->mmio + PSC_I2SCFG_OFFSET)
+#define I2S_PCR(x)      ((x)->mmio + PSC_I2SPCR_OFFSET)
+#define AC97_CFG(x)     ((x)->mmio + PSC_AC97CFG_OFFSET)
+#define AC97_CDC(x)     ((x)->mmio + PSC_AC97CDC_OFFSET)
+#define AC97_EVNT(x)    ((x)->mmio + PSC_AC97EVNT_OFFSET)
+#define AC97_PCR(x)     ((x)->mmio + PSC_AC97PCR_OFFSET)
+#define AC97_RST(x)     ((x)->mmio + PSC_AC97RST_OFFSET)
+#define AC97_STAT(x)    ((x)->mmio + PSC_AC97STAT_OFFSET)
 
 #endif
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 4dfab9573a95..2c71f16bd661 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -107,7 +107,7 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w,
                 break;
         case SND_SOC_DAPM_POST_PMU:
                 val = snd_soc_read(codec, ARIZONA_INTERRUPT_RAW_STATUS_3);
-                if (val & ARIZONA_SPK_SHUTDOWN_STS) {
+                if (val & ARIZONA_SPK_OVERHEAT_STS) {
                         dev_crit(arizona->dev,
                                  "Speaker not enabled due to temperature\n");
                         return -EBUSY;
@@ -159,7 +159,7 @@ static irqreturn_t arizona_thermal_warn(int irq, void *data)
         if (ret != 0) {
                 dev_err(arizona->dev, "Failed to read thermal status: %d\n",
                         ret);
-        } else if (val & ARIZONA_SPK_SHUTDOWN_WARN_STS) {
+        } else if (val & ARIZONA_SPK_OVERHEAT_WARN_STS) {
                 dev_crit(arizona->dev, "Thermal warning\n");
         }
 
@@ -177,7 +177,7 @@ static irqreturn_t arizona_thermal_shutdown(int irq, void *data)
         if (ret != 0) {
                 dev_err(arizona->dev, "Failed to read thermal status: %d\n",
                         ret);
-        } else if (val & ARIZONA_SPK_SHUTDOWN_STS) {
+        } else if (val & ARIZONA_SPK_OVERHEAT_STS) {
                 dev_crit(arizona->dev, "Thermal shutdown\n");
                 ret = regmap_update_bits(arizona->regmap,
                                          ARIZONA_OUTPUT_ENABLES_1,
@@ -223,7 +223,7 @@ int arizona_init_spk(struct snd_soc_codec *codec)
                 break;
         }
 
-        ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_SHUTDOWN_WARN,
+        ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT_WARN,
                                   "Thermal warning", arizona_thermal_warn,
                                   arizona);
         if (ret != 0)
@@ -231,7 +231,7 @@ int arizona_init_spk(struct snd_soc_codec *codec)
                         "Failed to get thermal warning IRQ: %d\n",
                         ret);
 
-        ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_SHUTDOWN,
+        ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT,
                                   "Thermal shutdown", arizona_thermal_shutdown,
                                   arizona);
         if (ret != 0)
diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c
index a20b30ca52c0..98523209f739 100644
--- a/sound/soc/codecs/cs4265.c
+++ b/sound/soc/codecs/cs4265.c
@@ -282,10 +282,10 @@ static const struct cs4265_clk_para clk_map_table[] = {
 
         /*64k*/
         {8192000, 64000, 1, 0},
-        {1228800, 64000, 1, 1},
-        {1693440, 64000, 1, 2},
-        {2457600, 64000, 1, 3},
-        {3276800, 64000, 1, 4},
+        {12288000, 64000, 1, 1},
+        {16934400, 64000, 1, 2},
+        {24576000, 64000, 1, 3},
+        {32768000, 64000, 1, 4},
 
         /* 88.2k */
         {11289600, 88200, 1, 0},
@@ -435,10 +435,10 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream,
         index = cs4265_get_clk_index(cs4265->sysclk, params_rate(params));
         if (index >= 0) {
                 snd_soc_update_bits(codec, CS4265_ADC_CTL,
-                        CS4265_ADC_FM, clk_map_table[index].fm_mode);
+                        CS4265_ADC_FM, clk_map_table[index].fm_mode << 6);
                 snd_soc_update_bits(codec, CS4265_MCLK_FREQ,
                         CS4265_MCLK_FREQ_MASK,
-                        clk_map_table[index].mclkdiv);
+                        clk_map_table[index].mclkdiv << 4);
 
         } else {
                 dev_err(codec->dev, "can't get correct mclk\n");
diff --git a/sound/soc/codecs/da732x.h b/sound/soc/codecs/da732x.h
index 1dceafeec415..f586cbd30b77 100644
--- a/sound/soc/codecs/da732x.h
+++ b/sound/soc/codecs/da732x.h
@@ -11,7 +11,7 @@
  */
 
 #ifndef __DA732X_H_
-#define __DA732X_H
+#define __DA732X_H_
 
 #include <sound/soc.h>
 
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 6bc6efdec550..f1ec6e6bd08a 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2059,6 +2059,7 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5640 = {
 static const struct regmap_config rt5640_regmap = {
         .reg_bits = 8,
         .val_bits = 16,
+        .use_single_rw = true,
 
         .max_register = RT5640_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5640_ranges) *
                                                RT5640_PR_SPACING),
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 67f14556462f..5337c448b5e3 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -2135,10 +2135,10 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
         { "BST2", NULL, "IN2P" },
         { "BST2", NULL, "IN2N" },
 
-        { "IN1P", NULL, "micbias1" },
-        { "IN1N", NULL, "micbias1" },
-        { "IN2P", NULL, "micbias1" },
-        { "IN2N", NULL, "micbias1" },
+        { "IN1P", NULL, "MICBIAS1" },
+        { "IN1N", NULL, "MICBIAS1" },
+        { "IN2P", NULL, "MICBIAS1" },
+        { "IN2N", NULL, "MICBIAS1" },
 
         { "ADC 1", NULL, "BST1" },
         { "ADC 1", NULL, "ADC 1 power" },
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 159e517fa09a..cef7776b712c 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -481,12 +481,19 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
         snd_soc_card_set_drvdata(&priv->snd_card, priv);
 
         ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
+        if (ret >= 0)
+                return ret;
 
 err:
         asoc_simple_card_unref(pdev);
         return ret;
 }
 
+static int asoc_simple_card_remove(struct platform_device *pdev)
+{
+        return asoc_simple_card_unref(pdev);
+}
+
 static const struct of_device_id asoc_simple_of_match[] = {
         { .compatible = "simple-audio-card", },
         {},
@@ -500,6 +507,7 @@ static struct platform_driver asoc_simple_card = {
                 .of_match_table = asoc_simple_of_match,
         },
         .probe = asoc_simple_card_probe,
+        .remove = asoc_simple_card_remove,
 };
 
 module_platform_driver(asoc_simple_card);
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index f8a6adc2d81c..4336d1831485 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -260,7 +260,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
                 .stream_name = "TWL4030 Voice",
                 .cpu_dai_name = "omap-mcbsp.3",
                 .codec_dai_name = "twl4030-voice",
-                .platform_name = "omap-mcbsp.2",
+                .platform_name = "omap-mcbsp.3",
                 .codec_name = "twl4030-codec",
                 .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
                            SND_SOC_DAIFMT_CBM_CFM,
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index 9506d7617223..3b527dcfc0aa 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -16,7 +16,7 @@
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
-#include <mach/gpio.h>
+#include <mach/gpio-samsung.h>
 
 #include "../codecs/wm8994.h"
 
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 3fdf3be7b99a..f95e7ab135e8 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -247,7 +247,7 @@ rsnd_gen2_dma_addr(struct rsnd_priv *priv,
         };
 
         /* it shouldn't happen */
-        if (use_dvc & !use_src)
+        if (use_dvc && !use_src)
                 dev_err(dev, "DVC is selected without SRC\n");
 
         /* use SSIU or SSI ? */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index d4bfd4a9076f..889f4e3d35dc 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1325,7 +1325,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->init_name = name;
+        dev_set_name(rtd->dev, "%s", name);
         dev_set_drvdata(rtd->dev, rtd);
         mutex_init(&rtd->pcm_mutex);
         INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients);
diff --git a/sound/soc/tegra/tegra_asoc_utils.h b/sound/soc/tegra/tegra_asoc_utils.h
index 9577121ce971..ca8037634100 100644
--- a/sound/soc/tegra/tegra_asoc_utils.h
+++ b/sound/soc/tegra/tegra_asoc_utils.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef __TEGRA_ASOC_UTILS_H__
-#define __TEGRA_ASOC_UTILS_H_
+#define __TEGRA_ASOC_UTILS_H__
 
 struct clk;
 struct device;