138 files changed, 5110 insertions, 2981 deletions

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index c5de0a84566f..5da8ca7aee05 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -9,6 +9,7 @@ menuconfig SND_SOC
         select SND_JACK if INPUT=y || INPUT=SND
         select REGMAP_I2C if I2C
         select REGMAP_SPI if SPI_MASTER
+        select SND_COMPRESS_OFFLOAD
         ---help---
 
           If you want ASoC support, you should say Y here and also to the
@@ -32,9 +33,9 @@ config SND_SOC_DMAENGINE_PCM
 source "sound/soc/atmel/Kconfig"
 source "sound/soc/au1x/Kconfig"
 source "sound/soc/blackfin/Kconfig"
+source "sound/soc/cirrus/Kconfig"
 source "sound/soc/davinci/Kconfig"
 source "sound/soc/dwc/Kconfig"
-source "sound/soc/ep93xx/Kconfig"
 source "sound/soc/fsl/Kconfig"
 source "sound/soc/jz4740/Kconfig"
 source "sound/soc/nuc900/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 00a555a743b6..bcbf1d00aa85 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,5 +1,5 @@
 snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
-snd-soc-core-objs += soc-pcm.o soc-io.o
+snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o
 
 snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o
 obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o
@@ -10,9 +10,9 @@ obj-$(CONFIG_SND_SOC)	+= generic/
 obj-$(CONFIG_SND_SOC)   += atmel/
 obj-$(CONFIG_SND_SOC)   += au1x/
 obj-$(CONFIG_SND_SOC)   += blackfin/
+obj-$(CONFIG_SND_SOC)   += cirrus/
 obj-$(CONFIG_SND_SOC)   += davinci/
 obj-$(CONFIG_SND_SOC)   += dwc/
-obj-$(CONFIG_SND_SOC)   += ep93xx/
 obj-$(CONFIG_SND_SOC)   += fsl/
 obj-$(CONFIG_SND_SOC)   += jz4740/
 obj-$(CONFIG_SND_SOC)   += mid-x86/
diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c
index d542d4063771..16b9c9efd19a 100644
--- a/sound/soc/blackfin/bf5xx-ad1836.c
+++ b/sound/soc/blackfin/bf5xx-ad1836.c
@@ -59,62 +59,63 @@ static struct snd_soc_ops bf5xx_ad1836_ops = {
 #define BF5XX_AD1836_DAIFMT (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_IF | \
                                 SND_SOC_DAIFMT_CBM_CFM)
 
-static struct snd_soc_dai_link bf5xx_ad1836_dai[] = {
-        {
-                .name = "ad1836",
-                .stream_name = "AD1836",
-                .cpu_dai_name = "bfin-tdm.0",
-                .codec_dai_name = "ad1836-hifi",
-                .platform_name = "bfin-tdm-pcm-audio",
-                .codec_name = "spi0.4",
-                .ops = &bf5xx_ad1836_ops,
-                .dai_fmt = BF5XX_AD1836_DAIFMT,
-        },
-        {
-                .name = "ad1836",
-                .stream_name = "AD1836",
-                .cpu_dai_name = "bfin-tdm.1",
-                .codec_dai_name = "ad1836-hifi",
-                .platform_name = "bfin-tdm-pcm-audio",
-                .codec_name = "spi0.4",
-                .ops = &bf5xx_ad1836_ops,
-                .dai_fmt = BF5XX_AD1836_DAIFMT,
-        },
+static struct snd_soc_dai_link bf5xx_ad1836_dai = {
+        .name = "ad1836",
+        .stream_name = "AD1836",
+        .codec_dai_name = "ad1836-hifi",
+        .platform_name = "bfin-tdm-pcm-audio",
+        .ops = &bf5xx_ad1836_ops,
+        .dai_fmt = BF5XX_AD1836_DAIFMT,
 };
 
 static struct snd_soc_card bf5xx_ad1836 = {
         .name = "bfin-ad1836",
         .owner = THIS_MODULE,
-        .dai_link = &bf5xx_ad1836_dai[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dai_link = &bf5xx_ad1836_dai,
         .num_links = 1,
 };
 
-static struct platform_device *bfxx_ad1836_snd_device;
-
-static int __init bf5xx_ad1836_init(void)
+static __devinit int bf5xx_ad1836_driver_probe(struct platform_device *pdev)
 {
+        struct snd_soc_card *card = &bf5xx_ad1836;
+        const char **link_name;
         int ret;
 
-        bfxx_ad1836_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!bfxx_ad1836_snd_device)
-                return -ENOMEM;
+        link_name = pdev->dev.platform_data;
+        if (!link_name) {
+                dev_err(&pdev->dev, "No platform data supplied\n");
+                return -EINVAL;
+        }
+        bf5xx_ad1836_dai.cpu_dai_name = link_name[0];
+        bf5xx_ad1836_dai.codec_name = link_name[1];
 
-        platform_set_drvdata(bfxx_ad1836_snd_device, &bf5xx_ad1836);
-        ret = platform_device_add(bfxx_ad1836_snd_device);
+        card->dev = &pdev->dev;
+        platform_set_drvdata(pdev, card);
 
+        ret = snd_soc_register_card(card);
         if (ret)
-                platform_device_put(bfxx_ad1836_snd_device);
-
+                dev_err(&pdev->dev, "Failed to register card\n");
         return ret;
 }
 
-static void __exit bf5xx_ad1836_exit(void)
+static int __devexit bf5xx_ad1836_driver_remove(struct platform_device *pdev)
 {
-        platform_device_unregister(bfxx_ad1836_snd_device);
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
+        return 0;
 }
 
-module_init(bf5xx_ad1836_init);
-module_exit(bf5xx_ad1836_exit);
+static struct platform_driver bf5xx_ad1836_driver = {
+        .driver = {
+                .name = "bfin-snd-ad1836",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+        },
+        .probe = bf5xx_ad1836_driver_probe,
+        .remove = __devexit_p(bf5xx_ad1836_driver_remove),
+};
+module_platform_driver(bf5xx_ad1836_driver);
 
 /* Module information */
 MODULE_AUTHOR("Barry Song");
diff --git a/sound/soc/ep93xx/Kconfig b/sound/soc/cirrus/Kconfig
index 88143db7e753..88143db7e753 100644
--- a/sound/soc/ep93xx/Kconfig
+++ b/sound/soc/cirrus/Kconfig
diff --git a/sound/soc/ep93xx/Makefile b/sound/soc/cirrus/Makefile
index 5514146cbdf0..5514146cbdf0 100644
--- a/sound/soc/ep93xx/Makefile
+++ b/sound/soc/cirrus/Makefile
diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/cirrus/edb93xx.c
index e01cb02abd3a..e01cb02abd3a 100644
--- a/sound/soc/ep93xx/edb93xx.c
+++ b/sound/soc/cirrus/edb93xx.c
diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
index bdffab33e160..bdffab33e160 100644
--- a/sound/soc/ep93xx/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 8df8f6dc474f..8df8f6dc474f 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/cirrus/ep93xx-pcm.c
index 4eea98b42bc8..4eea98b42bc8 100644
--- a/sound/soc/ep93xx/ep93xx-pcm.c
+++ b/sound/soc/cirrus/ep93xx-pcm.c
diff --git a/sound/soc/ep93xx/ep93xx-pcm.h b/sound/soc/cirrus/ep93xx-pcm.h
index 111e1121ecb8..111e1121ecb8 100644
--- a/sound/soc/ep93xx/ep93xx-pcm.h
+++ b/sound/soc/cirrus/ep93xx-pcm.h
diff --git a/sound/soc/ep93xx/simone.c b/sound/soc/cirrus/simone.c
index dd997094eb30..dd997094eb30 100644
--- a/sound/soc/ep93xx/simone.c
+++ b/sound/soc/cirrus/simone.c
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/cirrus/snappercl15.c
index a193cea3cf3c..a193cea3cf3c 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/cirrus/snappercl15.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9f8e8594aeb9..3684255e5fba 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -70,6 +70,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_UDA134X
         select SND_SOC_UDA1380 if I2C
         select SND_SOC_WL1273 if MFD_WL1273_CORE
+        select SND_SOC_WM0010 if SPI_MASTER
         select SND_SOC_WM1250_EV1 if I2C
         select SND_SOC_WM2000 if I2C
         select SND_SOC_WM2200 if I2C
@@ -326,6 +327,9 @@ config SND_SOC_UDA1380
 config SND_SOC_WL1273
         tristate
 
+config SND_SOC_WM0010
+        tristate
+
 config SND_SOC_WM1250_EV1
         tristate
 
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 34148bb59c68..ca508b251df7 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -61,6 +61,7 @@ snd-soc-twl6040-objs := twl6040.o
 snd-soc-uda134x-objs := uda134x.o
 snd-soc-uda1380-objs := uda1380.o
 snd-soc-wl1273-objs := wl1273.o
+snd-soc-wm0010-objs := wm0010.o
 snd-soc-wm1250-ev1-objs := wm1250-ev1.o
 snd-soc-wm2000-objs := wm2000.o
 snd-soc-wm2200-objs := wm2200.o
@@ -177,6 +178,7 @@ obj-$(CONFIG_SND_SOC_TWL6040)	+= snd-soc-twl6040.o
 obj-$(CONFIG_SND_SOC_UDA134X)   += snd-soc-uda134x.o
 obj-$(CONFIG_SND_SOC_UDA1380)   += snd-soc-uda1380.o
 obj-$(CONFIG_SND_SOC_WL1273)    += snd-soc-wl1273.o
+obj-$(CONFIG_SND_SOC_WM0010)    += snd-soc-wm0010.o
 obj-$(CONFIG_SND_SOC_WM1250_EV1) += snd-soc-wm1250-ev1.o
 obj-$(CONFIG_SND_SOC_WM2000)    += snd-soc-wm2000.o
 obj-$(CONFIG_SND_SOC_WM2200)    += snd-soc-wm2200.o
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 07abd09e0b1d..af547490b4f7 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -391,10 +391,10 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = {
         SND_SOC_DAPM_CLOCK_SUPPLY("audioclk"),
 
         /* Regulators */
-        SND_SOC_DAPM_REGULATOR_SUPPLY("V-AUD", 0),
-        SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC1", 0),
-        SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC2", 0),
-        SND_SOC_DAPM_REGULATOR_SUPPLY("V-DMIC", 0),
+        SND_SOC_DAPM_REGULATOR_SUPPLY("V-AUD", 0, 0),
+        SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC1", 0, 0),
+        SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC2", 0, 0),
+        SND_SOC_DAPM_REGULATOR_SUPPLY("V-DMIC", 0, 0),
 
         /* Power */
         SND_SOC_DAPM_SUPPLY("Audio Power",
@@ -2462,10 +2462,7 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
         dev_dbg(dev, "%s: Enter.\n", __func__);
 
         /* Setup AB8500 according to board-settings */
-        pdata = (struct ab8500_platform_data *)dev_get_platdata(dev->parent);
-
-        /* Inform SoC Core that we have our own I/O arrangements. */
-        codec->control_data = (void *)true;
+        pdata = dev_get_platdata(dev->parent);
 
         if (np) {
                 if (!pdata)
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index c67b50d8b317..dce6ebeef452 100644
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -19,6 +19,8 @@
 #include <sound/soc.h>
 #include <sound/tlv.h>
 #include <linux/spi/spi.h>
+#include <linux/regmap.h>
+
 #include "ad1836.h"
 
 enum ad1836_type {
@@ -30,6 +32,7 @@ enum ad1836_type {
 /* codec private data */
 struct ad1836_priv {
         enum ad1836_type type;
+        struct regmap *regmap;
 };
 
 /*
@@ -161,8 +164,8 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream,
                 struct snd_pcm_hw_params *params,
                 struct snd_soc_dai *dai)
 {
+        struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(dai->codec);
         int word_len = 0;
-        struct snd_soc_codec *codec = dai->codec;
 
         /* bit size */
         switch (params_format(params)) {
@@ -178,10 +181,12 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream,
                 break;
         }
 
-        snd_soc_update_bits(codec, AD1836_DAC_CTRL1, AD1836_DAC_WORD_LEN_MASK,
+        regmap_update_bits(ad1836->regmap, AD1836_DAC_CTRL1,
+                AD1836_DAC_WORD_LEN_MASK,
                 word_len << AD1836_DAC_WORD_LEN_OFFSET);
 
-        snd_soc_update_bits(codec, AD1836_ADC_CTRL2, AD1836_ADC_WORD_LEN_MASK,
+        regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2,
+                AD1836_ADC_WORD_LEN_MASK,
                 word_len << AD1836_ADC_WORD_OFFSET);
 
         return 0;
@@ -223,15 +228,17 @@ static struct snd_soc_dai_driver ad183x_dais[] = {
 #ifdef CONFIG_PM
 static int ad1836_suspend(struct snd_soc_codec *codec)
 {
+        struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec);
         /* reset clock control mode */
-        return snd_soc_update_bits(codec, AD1836_ADC_CTRL2,
+        return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2,
                 AD1836_ADC_SERFMT_MASK, 0);
 }
 
 static int ad1836_resume(struct snd_soc_codec *codec)
 {
+        struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec);
         /* restore clock control mode */
-        return snd_soc_update_bits(codec, AD1836_ADC_CTRL2,
+        return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2,
                 AD1836_ADC_SERFMT_MASK, AD1836_ADC_AUX);
 }
 #else
@@ -250,37 +257,30 @@ static int ad1836_probe(struct snd_soc_codec *codec)
         num_dacs = ad183x_dais[ad1836->type].playback.channels_max / 2;
         num_adcs = ad183x_dais[ad1836->type].capture.channels_max / 2;
 
-        ret = snd_soc_codec_set_cache_io(codec, 4, 12, SND_SOC_SPI);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to set cache I/O: %d\n",
-                                ret);
-                return ret;
-        }
-
         /* default setting for ad1836 */
         /* de-emphasis: 48kHz, power-on dac */
-        snd_soc_write(codec, AD1836_DAC_CTRL1, 0x300);
+        regmap_write(ad1836->regmap, AD1836_DAC_CTRL1, 0x300);
         /* unmute dac channels */
-        snd_soc_write(codec, AD1836_DAC_CTRL2, 0x0);
+        regmap_write(ad1836->regmap, AD1836_DAC_CTRL2, 0x0);
         /* high-pass filter enable, power-on adc */
-        snd_soc_write(codec, AD1836_ADC_CTRL1, 0x100);
+        regmap_write(ad1836->regmap, AD1836_ADC_CTRL1, 0x100);
         /* unmute adc channles, adc aux mode */
-        snd_soc_write(codec, AD1836_ADC_CTRL2, 0x180);
+        regmap_write(ad1836->regmap, AD1836_ADC_CTRL2, 0x180);
         /* volume */
         for (i = 1; i <= num_dacs; ++i) {
-                snd_soc_write(codec, AD1836_DAC_L_VOL(i), 0x3FF);
-                snd_soc_write(codec, AD1836_DAC_R_VOL(i), 0x3FF);
+                regmap_write(ad1836->regmap, AD1836_DAC_L_VOL(i), 0x3FF);
+                regmap_write(ad1836->regmap, AD1836_DAC_R_VOL(i), 0x3FF);
         }
 
         if (ad1836->type == AD1836) {
                 /* left/right diff:PGA/MUX */
-                snd_soc_write(codec, AD1836_ADC_CTRL3, 0x3A);
+                regmap_write(ad1836->regmap, AD1836_ADC_CTRL3, 0x3A);
                 ret = snd_soc_add_codec_controls(codec, ad1836_controls,
                                 ARRAY_SIZE(ad1836_controls));
                 if (ret)
                         return ret;
         } else {
-                snd_soc_write(codec, AD1836_ADC_CTRL3, 0x00);
+                regmap_write(ad1836->regmap, AD1836_ADC_CTRL3, 0x00);
         }
 
         ret = snd_soc_add_codec_controls(codec, ad183x_dac_controls, num_dacs * 2);
@@ -313,8 +313,9 @@ static int ad1836_probe(struct snd_soc_codec *codec)
 /* power down chip */
 static int ad1836_remove(struct snd_soc_codec *codec)
 {
+        struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec);
         /* reset clock control mode */
-        return snd_soc_update_bits(codec, AD1836_ADC_CTRL2,
+        return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2,
                 AD1836_ADC_SERFMT_MASK, 0);
 }
 
@@ -323,8 +324,6 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1836 = {
         .remove = ad1836_remove,
         .suspend = ad1836_suspend,
         .resume = ad1836_resume,
-        .reg_cache_size = AD1836_NUM_REGS,
-        .reg_word_size = sizeof(u16),
 
         .controls = ad183x_controls,
         .num_controls = ARRAY_SIZE(ad183x_controls),
@@ -334,6 +333,33 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1836 = {
         .num_dapm_routes = ARRAY_SIZE(ad183x_dapm_routes),
 };
 
+static const struct reg_default ad1836_reg_defaults[] = {
+        { AD1836_DAC_CTRL1, 0x0000 },
+        { AD1836_DAC_CTRL2, 0x0000 },
+        { AD1836_DAC_L_VOL(0), 0x0000 },
+        { AD1836_DAC_R_VOL(0), 0x0000 },
+        { AD1836_DAC_L_VOL(1), 0x0000 },
+        { AD1836_DAC_R_VOL(1), 0x0000 },
+        { AD1836_DAC_L_VOL(2), 0x0000 },
+        { AD1836_DAC_R_VOL(2), 0x0000 },
+        { AD1836_DAC_L_VOL(3), 0x0000 },
+        { AD1836_DAC_R_VOL(3), 0x0000 },
+        { AD1836_ADC_CTRL1, 0x0000 },
+        { AD1836_ADC_CTRL2, 0x0000 },
+        { AD1836_ADC_CTRL3, 0x0000 },
+};
+
+static const struct regmap_config ad1836_regmap_config = {
+        .val_bits = 12,
+        .reg_bits = 4,
+        .read_flag_mask = 0x08,
+
+        .max_register = AD1836_ADC_CTRL3,
+        .reg_defaults = ad1836_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(ad1836_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+};
+
 static int __devinit ad1836_spi_probe(struct spi_device *spi)
 {
         struct ad1836_priv *ad1836;
@@ -344,6 +370,10 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi)
         if (ad1836 == NULL)
                 return -ENOMEM;
 
+        ad1836->regmap = devm_regmap_init_spi(spi, &ad1836_regmap_config);
+        if (IS_ERR(ad1836->regmap))
+                return PTR_ERR(ad1836->regmap);
+
         ad1836->type = spi_get_device_id(spi)->driver_data;
 
         spi_set_drvdata(spi, ad1836);
@@ -379,17 +409,7 @@ static struct spi_driver ad1836_spi_driver = {
         .id_table       = ad1836_ids,
 };
 
-static int __init ad1836_init(void)
-{
-        return spi_register_driver(&ad1836_spi_driver);
-}
-module_init(ad1836_init);
-
-static void __exit ad1836_exit(void)
-{
-        spi_unregister_driver(&ad1836_spi_driver);
-}
-module_exit(ad1836_exit);
+module_spi_driver(ad1836_spi_driver);
 
 MODULE_DESCRIPTION("ASoC ad1836 driver");
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c
index 13e62be4f990..2f752660f678 100644
--- a/sound/soc/codecs/ad193x.c
+++ b/sound/soc/codecs/ad193x.c
@@ -381,40 +381,25 @@ static const struct regmap_config ad193x_spi_regmap_config = {
 static int __devinit ad193x_spi_probe(struct spi_device *spi)
 {
         struct ad193x_priv *ad193x;
-        int ret;
 
         ad193x = devm_kzalloc(&spi->dev, sizeof(struct ad193x_priv),
                               GFP_KERNEL);
         if (ad193x == NULL)
                 return -ENOMEM;
 
-        ad193x->regmap = regmap_init_spi(spi, &ad193x_spi_regmap_config);
-        if (IS_ERR(ad193x->regmap)) {
-                ret = PTR_ERR(ad193x->regmap);
-                goto err_out;
-        }
+        ad193x->regmap = devm_regmap_init_spi(spi, &ad193x_spi_regmap_config);
+        if (IS_ERR(ad193x->regmap))
+                return PTR_ERR(ad193x->regmap);
 
         spi_set_drvdata(spi, ad193x);
 
-        ret = snd_soc_register_codec(&spi->dev,
-                        &soc_codec_dev_ad193x, &ad193x_dai, 1);
-        if (ret < 0)
-                goto err_regmap_exit;
-
-        return 0;
-
-err_regmap_exit:
-        regmap_exit(ad193x->regmap);
-err_out:
-        return ret;
+        return snd_soc_register_codec(&spi->dev, &soc_codec_dev_ad193x,
+                        &ad193x_dai, 1);
 }
 
 static int __devexit ad193x_spi_remove(struct spi_device *spi)
 {
-        struct ad193x_priv *ad193x = spi_get_drvdata(spi);
-
         snd_soc_unregister_codec(&spi->dev);
-        regmap_exit(ad193x->regmap);
         return 0;
 }
 
@@ -449,40 +434,25 @@ static int __devinit ad193x_i2c_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         struct ad193x_priv *ad193x;
-        int ret;
 
         ad193x = devm_kzalloc(&client->dev, sizeof(struct ad193x_priv),
                               GFP_KERNEL);
         if (ad193x == NULL)
                 return -ENOMEM;
 
-        ad193x->regmap = regmap_init_i2c(client, &ad193x_i2c_regmap_config);
-        if (IS_ERR(ad193x->regmap)) {
-                ret = PTR_ERR(ad193x->regmap);
-                goto err_out;
-        }
+        ad193x->regmap = devm_regmap_init_i2c(client, &ad193x_i2c_regmap_config);
+        if (IS_ERR(ad193x->regmap))
+                return PTR_ERR(ad193x->regmap);
 
         i2c_set_clientdata(client, ad193x);
 
-        ret =  snd_soc_register_codec(&client->dev,
-                        &soc_codec_dev_ad193x, &ad193x_dai, 1);
-        if (ret < 0)
-                goto err_regmap_exit;
-
-        return 0;
-
-err_regmap_exit:
-        regmap_exit(ad193x->regmap);
-err_out:
-        return ret;
+        return snd_soc_register_codec(&client->dev, &soc_codec_dev_ad193x,
+                        &ad193x_dai, 1);
 }
 
 static int __devexit ad193x_i2c_remove(struct i2c_client *client)
 {
-        struct ad193x_priv *ad193x = i2c_get_clientdata(client);
-
         snd_soc_unregister_codec(&client->dev);
-        regmap_exit(ad193x->regmap);
         return 0;
 }
 
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 11b1b714b8b5..8c39dddd7d00 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -186,7 +186,6 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
 
         printk(KERN_INFO "AD1980 SoC Audio Codec\n");
 
-        codec->control_data = codec;    /* we don't use regmap! */
         ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
         if (ret < 0) {
                 printk(KERN_ERR "ad1980: failed to register AC97 codec\n");
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index 44f59064d8de..704544bfc90d 100644
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -1392,17 +1392,7 @@ static struct i2c_driver adau1373_i2c_driver = {
         .id_table = adau1373_i2c_id,
 };
 
-static int __init adau1373_init(void)
-{
-        return i2c_add_driver(&adau1373_i2c_driver);
-}
-module_init(adau1373_init);
-
-static void __exit adau1373_exit(void)
-{
-        i2c_del_driver(&adau1373_i2c_driver);
-}
-module_exit(adau1373_exit);
+module_i2c_driver(adau1373_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC ADAU1373 driver");
 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index 3d50fc8646b6..51f2f3cd8136 100644
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -527,17 +527,7 @@ static struct i2c_driver adau1701_i2c_driver = {
         .id_table       = adau1701_i2c_id,
 };
 
-static int __init adau1701_init(void)
-{
-        return i2c_add_driver(&adau1701_i2c_driver);
-}
-module_init(adau1701_init);
-
-static void __exit adau1701_exit(void)
-{
-        i2c_del_driver(&adau1701_i2c_driver);
-}
-module_exit(adau1701_exit);
+module_i2c_driver(adau1701_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC ADAU1701 SigmaDSP driver");
 MODULE_AUTHOR("Cliff Cai <cliff.cai@analog.com>");
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 5fb7c2a80e6d..2b457976a7bf 100644
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -696,17 +696,7 @@ static struct i2c_driver ak4671_i2c_driver = {
         .id_table = ak4671_i2c_id,
 };
 
-static int __init ak4671_modinit(void)
-{
-        return i2c_add_driver(&ak4671_i2c_driver);
-}
-module_init(ak4671_modinit);
-
-static void __exit ak4671_exit(void)
-{
-        i2c_del_driver(&ak4671_i2c_driver);
-}
-module_exit(ak4671_exit);
+module_i2c_driver(ak4671_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC AK4671 codec driver");
 MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 1cf7a32d1b21..c167c896eaee 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -229,6 +229,69 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w,
 }
 EXPORT_SYMBOL_GPL(arizona_out_ev);
 
+static unsigned int arizona_sysclk_48k_rates[] = {
+        6144000,
+        12288000,
+        22579200,
+        49152000,
+};
+
+static unsigned int arizona_sysclk_44k1_rates[] = {
+        5644800,
+        11289600,
+        24576000,
+        45158400,
+};
+
+static int arizona_set_opclk(struct snd_soc_codec *codec, unsigned int clk,
+                             unsigned int freq)
+{
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg;
+        unsigned int *rates;
+        int ref, div, refclk;
+
+        switch (clk) {
+        case ARIZONA_CLK_OPCLK:
+                reg = ARIZONA_OUTPUT_SYSTEM_CLOCK;
+                refclk = priv->sysclk;
+                break;
+        case ARIZONA_CLK_ASYNC_OPCLK:
+                reg = ARIZONA_OUTPUT_ASYNC_CLOCK;
+                refclk = priv->asyncclk;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (refclk % 8000)
+                rates = arizona_sysclk_44k1_rates;
+        else
+                rates = arizona_sysclk_48k_rates;
+
+        for (ref = 0; ref < ARRAY_SIZE(arizona_sysclk_48k_rates) &&
+                     rates[ref] <= refclk; ref++) {
+                div = 1;
+                while (rates[ref] / div >= freq && div < 32) {
+                        if (rates[ref] / div == freq) {
+                                dev_dbg(codec->dev, "Configured %dHz OPCLK\n",
+                                        freq);
+                                snd_soc_update_bits(codec, reg,
+                                                    ARIZONA_OPCLK_DIV_MASK |
+                                                    ARIZONA_OPCLK_SEL_MASK,
+                                                    (div <<
+                                                     ARIZONA_OPCLK_DIV_SHIFT) |
+                                                    ref);
+                                return 0;
+                        }
+                        div++;
+                }
+        }
+
+        dev_err(codec->dev, "Unable to generate %dHz OPCLK\n", freq);
+        return -EINVAL;
+}
+
 int arizona_set_sysclk(struct snd_soc_codec *codec, int clk_id,
                        int source, unsigned int freq, int dir)
 {
@@ -252,6 +315,9 @@ int arizona_set_sysclk(struct snd_soc_codec *codec, int clk_id,
                 reg = ARIZONA_ASYNC_CLOCK_1;
                 clk = &priv->asyncclk;
                 break;
+        case ARIZONA_CLK_OPCLK:
+        case ARIZONA_CLK_ASYNC_OPCLK:
+                return arizona_set_opclk(codec, clk_id, freq);
         default:
                 return -EINVAL;
         }
@@ -666,7 +732,7 @@ static irqreturn_t arizona_fll_lock(int irq, void *data)
 {
         struct arizona_fll *fll = data;
 
-        arizona_fll_dbg(fll, "Locked\n");
+        arizona_fll_dbg(fll, "Lock status changed\n");
 
         complete(&fll->lock);
 
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 59caca8865e8..eb66b52777c9 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -17,8 +17,10 @@
 
 #include <sound/soc.h>
 
-#define ARIZONA_CLK_SYSCLK   1
-#define ARIZONA_CLK_ASYNCCLK 2
+#define ARIZONA_CLK_SYSCLK         1
+#define ARIZONA_CLK_ASYNCCLK       2
+#define ARIZONA_CLK_OPCLK          3
+#define ARIZONA_CLK_ASYNC_OPCLK    4
 
 #define ARIZONA_CLK_SRC_MCLK1    0x0
 #define ARIZONA_CLK_SRC_MCLK2    0x1
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 047917f0b8ae..815b53bc2d27 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -29,6 +29,8 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/regulator/consumer.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
 
 /*
  * The codec isn't really big-endian or little-endian, since the I2S
@@ -110,14 +112,15 @@
  * This array contains the power-on default values of the registers, with the
  * exception of the "CHIPID" register (01h).  The lower four bits of that
  * register contain the hardware revision, so it is treated as volatile.
- *
- * Also note that on the CS4270, the first readable register is 1, but ASoC
- * assumes the first register is 0.  Therfore, the array must have an entry for
- * register 0, but we use cs4270_reg_is_readable() to tell ASoC that it can't
- * be read.
  */
-static const u8 cs4270_default_reg_cache[CS4270_LASTREG + 1] = {
-        0x00, 0x00, 0x00, 0x30, 0x00, 0x60, 0x20, 0x00, 0x00
+static const struct reg_default cs4270_reg_defaults[] = {
+        { 2, 0x00 },
+        { 3, 0x30 },
+        { 4, 0x00 },
+        { 5, 0x60 },
+        { 6, 0x20 },
+        { 7, 0x00 },
+        { 8, 0x00 },
 };
 
 static const char *supply_names[] = {
@@ -126,7 +129,7 @@ static const char *supply_names[] = {
 
 /* Private data for the CS4270 */
 struct cs4270_private {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         unsigned int mclk; /* Input frequency of the MCLK pin */
         unsigned int mode; /* The mode (I2S or left-justified) */
         unsigned int slave_mode;
@@ -191,12 +194,12 @@ static struct cs4270_mode_ratios cs4270_mode_ratios[] = {
 /* The number of MCLK/LRCK ratios supported by the CS4270 */
 #define NUM_MCLK_RATIOS         ARRAY_SIZE(cs4270_mode_ratios)
 
-static int cs4270_reg_is_readable(struct snd_soc_codec *codec, unsigned int reg)
+static bool cs4270_reg_is_readable(struct device *dev, unsigned int reg)
 {
         return (reg >= CS4270_FIRSTREG) && (reg <= CS4270_LASTREG);
 }
 
-static int cs4270_reg_is_volatile(struct snd_soc_codec *codec, unsigned int reg)
+static bool cs4270_reg_is_volatile(struct device *dev, unsigned int reg)
 {
         /* Unreadable registers are considered volatile */
         if ((reg < CS4270_FIRSTREG) || (reg > CS4270_LASTREG))
@@ -485,12 +488,12 @@ static struct snd_soc_dai_driver cs4270_dai = {
 static int cs4270_probe(struct snd_soc_codec *codec)
 {
         struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
-        int i, ret;
+        int ret;
 
         /* Tell ASoC what kind of I/O to use to read the registers.  ASoC will
          * then do the I2C transactions itself.
          */
-        ret = snd_soc_codec_set_cache_io(codec, 8, 8, cs4270->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "failed to set cache I/O (ret=%i)\n", ret);
                 return ret;
@@ -519,33 +522,8 @@ static int cs4270_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
-        /* Add the non-DAPM controls */
-        ret = snd_soc_add_codec_controls(codec, cs4270_snd_controls,
-                                ARRAY_SIZE(cs4270_snd_controls));
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to add controls\n");
-                return ret;
-        }
-
-        /* get the power supply regulators */
-        for (i = 0; i < ARRAY_SIZE(supply_names); i++)
-                cs4270->supplies[i].supply = supply_names[i];
-
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(cs4270->supplies),
-                                 cs4270->supplies);
-        if (ret < 0)
-                return ret;
-
         ret = regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies),
                                     cs4270->supplies);
-        if (ret < 0)
-                goto error_free_regulators;
-
-        return 0;
-
-error_free_regulators:
-        regulator_bulk_free(ARRAY_SIZE(cs4270->supplies),
-                            cs4270->supplies);
 
         return ret;
 }
@@ -561,7 +539,6 @@ static int cs4270_remove(struct snd_soc_codec *codec)
         struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
 
         regulator_bulk_disable(ARRAY_SIZE(cs4270->supplies), cs4270->supplies);
-        regulator_bulk_free(ARRAY_SIZE(cs4270->supplies), cs4270->supplies);
 
         return 0;
 };
@@ -611,7 +588,7 @@ static int cs4270_soc_resume(struct snd_soc_codec *codec)
         ndelay(500);
 
         /* first restore the entire register cache ... */
-        snd_soc_cache_sync(codec);
+        regcache_sync(cs4270->regmap);
 
         /* ... then disable the power-down bits */
         reg = snd_soc_read(codec, CS4270_PWRCTL);
@@ -632,11 +609,30 @@ static const struct snd_soc_codec_driver soc_codec_device_cs4270 = {
         .remove =               cs4270_remove,
         .suspend =              cs4270_soc_suspend,
         .resume =               cs4270_soc_resume,
-        .volatile_register =    cs4270_reg_is_volatile,
-        .readable_register =    cs4270_reg_is_readable,
-        .reg_cache_size =       CS4270_LASTREG + 1,
-        .reg_word_size =        sizeof(u8),
-        .reg_cache_default =    cs4270_default_reg_cache,
+
+        .controls =             cs4270_snd_controls,
+        .num_controls =         ARRAY_SIZE(cs4270_snd_controls),
+};
+
+/*
+ * cs4270_of_match - the device tree bindings
+ */
+static const struct of_device_id cs4270_of_match[] = {
+        { .compatible = "cirrus,cs4270", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, cs4270_of_match);
+
+static const struct regmap_config cs4270_regmap = {
+        .reg_bits =             8,
+        .val_bits =             8,
+        .max_register =         CS4270_LASTREG,
+        .reg_defaults =         cs4270_reg_defaults,
+        .num_reg_defaults =     ARRAY_SIZE(cs4270_reg_defaults),
+        .cache_type =           REGCACHE_RBTREE,
+
+        .readable_reg =         cs4270_reg_is_readable,
+        .volatile_reg =         cs4270_reg_is_volatile,
 };
 
 /**
@@ -650,19 +646,56 @@ static const struct snd_soc_codec_driver soc_codec_device_cs4270 = {
 static int cs4270_i2c_probe(struct i2c_client *i2c_client,
         const struct i2c_device_id *id)
 {
+        struct device_node *np = i2c_client->dev.of_node;
         struct cs4270_private *cs4270;
-        int ret;
+        unsigned int val;
+        int ret, i;
 
-        /* Verify that we have a CS4270 */
+        cs4270 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs4270_private),
+                              GFP_KERNEL);
+        if (!cs4270) {
+                dev_err(&i2c_client->dev, "could not allocate codec\n");
+                return -ENOMEM;
+        }
+
+        /* get the power supply regulators */
+        for (i = 0; i < ARRAY_SIZE(supply_names); i++)
+                cs4270->supplies[i].supply = supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c_client->dev,
+                                      ARRAY_SIZE(cs4270->supplies),
+                                      cs4270->supplies);
+        if (ret < 0)
+                return ret;
+
+        /* See if we have a way to bring the codec out of reset */
+        if (np) {
+                enum of_gpio_flags flags;
+                int gpio = of_get_named_gpio_flags(np, "reset-gpio", 0, &flags);
+
+                if (gpio_is_valid(gpio)) {
+                        ret = devm_gpio_request_one(&i2c_client->dev, gpio,
+                                     flags & OF_GPIO_ACTIVE_LOW ?
+                                        GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH,
+                                     "cs4270 reset");
+                        if (ret < 0)
+                                return ret;
+                }
+        }
+
+        cs4270->regmap = devm_regmap_init_i2c(i2c_client, &cs4270_regmap);
+        if (IS_ERR(cs4270->regmap))
+                return PTR_ERR(cs4270->regmap);
 
-        ret = i2c_smbus_read_byte_data(i2c_client, CS4270_CHIPID);
+        /* Verify that we have a CS4270 */
+        ret = regmap_read(cs4270->regmap, CS4270_CHIPID, &val);
         if (ret < 0) {
                 dev_err(&i2c_client->dev, "failed to read i2c at addr %X\n",
                        i2c_client->addr);
                 return ret;
         }
         /* The top four bits of the chip ID should be 1100. */
-        if ((ret & 0xF0) != 0xC0) {
+        if ((val & 0xF0) != 0xC0) {
                 dev_err(&i2c_client->dev, "device at addr %X is not a CS4270\n",
                        i2c_client->addr);
                 return -ENODEV;
@@ -670,17 +703,9 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
 
         dev_info(&i2c_client->dev, "found device at i2c address %X\n",
                 i2c_client->addr);
-        dev_info(&i2c_client->dev, "hardware revision %X\n", ret & 0xF);
-
-        cs4270 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs4270_private),
-                              GFP_KERNEL);
-        if (!cs4270) {
-                dev_err(&i2c_client->dev, "could not allocate codec\n");
-                return -ENOMEM;
-        }
+        dev_info(&i2c_client->dev, "hardware revision %X\n", val & 0xF);
 
         i2c_set_clientdata(i2c_client, cs4270);
-        cs4270->control_type = SND_SOC_I2C;
 
         ret = snd_soc_register_codec(&i2c_client->dev,
                         &soc_codec_device_cs4270, &cs4270_dai, 1);
@@ -718,23 +743,14 @@ static struct i2c_driver cs4270_i2c_driver = {
         .driver = {
                 .name = "cs4270",
                 .owner = THIS_MODULE,
+                .of_match_table = cs4270_of_match,
         },
         .id_table = cs4270_id,
         .probe = cs4270_i2c_probe,
         .remove = cs4270_i2c_remove,
 };
 
-static int __init cs4270_init(void)
-{
-        return i2c_add_driver(&cs4270_i2c_driver);
-}
-module_init(cs4270_init);
-
-static void __exit cs4270_exit(void)
-{
-        i2c_del_driver(&cs4270_i2c_driver);
-}
-module_exit(cs4270_exit);
+module_i2c_driver(cs4270_i2c_driver);
 
 MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
 MODULE_DESCRIPTION("Cirrus Logic CS4270 ALSA SoC Codec Driver");
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 091d0193f507..1e0fa3b5f79a 100644
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -614,24 +614,7 @@ static struct i2c_driver cs42l51_i2c_driver = {
         .remove = cs42l51_i2c_remove,
 };
 
-static int __init cs42l51_init(void)
-{
-        int ret;
-
-        ret = i2c_add_driver(&cs42l51_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "%s: can't add i2c driver\n", __func__);
-                return ret;
-        }
-        return 0;
-}
-module_init(cs42l51_init);
-
-static void __exit cs42l51_exit(void)
-{
-        i2c_del_driver(&cs42l51_i2c_driver);
-}
-module_exit(cs42l51_exit);
+module_i2c_driver(cs42l51_i2c_driver);
 
 MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
 MODULE_DESCRIPTION("Cirrus Logic CS42L51 ALSA SoC Codec Driver");
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 628daf6a1d97..61599298fb26 100644
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -24,7 +24,6 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/platform_device.h>
-#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c
index 5d8f39e32978..1bf55602c9eb 100644
--- a/sound/soc/codecs/isabelle.c
+++ b/sound/soc/codecs/isabelle.c
@@ -13,7 +13,6 @@
  */
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c
index ba4fafb93e56..81a328c78838 100644
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
@@ -250,17 +250,7 @@ static struct i2c_driver lm4857_i2c_driver = {
         .id_table = lm4857_i2c_id,
 };
 
-static int __init lm4857_init(void)
-{
-        return i2c_add_driver(&lm4857_i2c_driver);
-}
-module_init(lm4857_init);
-
-static void __exit lm4857_exit(void)
-{
-        i2c_del_driver(&lm4857_i2c_driver);
-}
-module_exit(lm4857_exit);
+module_i2c_driver(lm4857_i2c_driver);
 
 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
 MODULE_DESCRIPTION("LM4857 amplifier driver");
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index af7324b79dd0..3264a5169306 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -2107,23 +2107,7 @@ static struct i2c_driver max98088_i2c_driver = {
        .id_table = max98088_i2c_id,
 };
 
-static int __init max98088_init(void)
-{
-       int ret;
-
-       ret = i2c_add_driver(&max98088_i2c_driver);
-       if (ret)
-               pr_err("Failed to register max98088 I2C driver: %d\n", ret);
-
-       return ret;
-}
-module_init(max98088_init);
-
-static void __exit max98088_exit(void)
-{
-       i2c_del_driver(&max98088_i2c_driver);
-}
-module_exit(max98088_exit);
+module_i2c_driver(max98088_i2c_driver);
 
 MODULE_DESCRIPTION("ALSA SoC MAX98088 driver");
 MODULE_AUTHOR("Peter Hsiang, Jesse Marroquin");
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 7cd508e16a5c..38d43c59d3f4 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -2533,23 +2533,7 @@ static struct i2c_driver max98095_i2c_driver = {
         .id_table = max98095_i2c_id,
 };
 
-static int __init max98095_init(void)
-{
-        int ret;
-
-        ret = i2c_add_driver(&max98095_i2c_driver);
-        if (ret)
-                pr_err("Failed to register max98095 I2C driver: %d\n", ret);
-
-        return ret;
-}
-module_init(max98095_init);
-
-static void __exit max98095_exit(void)
-{
-        i2c_del_driver(&max98095_i2c_driver);
-}
-module_exit(max98095_exit);
+module_i2c_driver(max98095_i2c_driver);
 
 MODULE_DESCRIPTION("ALSA SoC MAX98095 driver");
 MODULE_AUTHOR("Peter Hsiang");
diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c
index a1913091f56c..efe535c37b39 100644
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -369,17 +369,7 @@ static struct i2c_driver max9850_i2c_driver = {
         .id_table = max9850_i2c_id,
 };
 
-static int __init max9850_init(void)
-{
-        return i2c_add_driver(&max9850_i2c_driver);
-}
-module_init(max9850_init);
-
-static void __exit max9850_exit(void)
-{
-        i2c_del_driver(&max9850_i2c_driver);
-}
-module_exit(max9850_exit);
+module_i2c_driver(max9850_i2c_driver);
 
 MODULE_AUTHOR("Christian Glindkamp <christian.glindkamp@taskit.de>");
 MODULE_DESCRIPTION("ASoC MAX9850 codec driver");
diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c
index 3a2ba3d8fd6d..d15e5943c85e 100644
--- a/sound/soc/codecs/max9877.c
+++ b/sound/soc/codecs/max9877.c
@@ -291,17 +291,7 @@ static struct i2c_driver max9877_i2c_driver = {
         .id_table = max9877_i2c_id,
 };
 
-static int __init max9877_init(void)
-{
-        return i2c_add_driver(&max9877_i2c_driver);
-}
-module_init(max9877_init);
-
-static void __exit max9877_exit(void)
-{
-        i2c_del_driver(&max9877_i2c_driver);
-}
-module_exit(max9877_exit);
+module_i2c_driver(max9877_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC MAX9877 amp driver");
 MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index 115a40301810..bc955999c8aa 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -426,16 +426,16 @@ static int mc13783_set_tdm_slot_sync(struct snd_soc_dai *dai,
 }
 
 static const struct snd_kcontrol_new mc1l_amp_ctl =
-        SOC_DAPM_SINGLE("Switch", 38, 7, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_TX, 7, 1, 0);
 
 static const struct snd_kcontrol_new mc1r_amp_ctl =
-        SOC_DAPM_SINGLE("Switch", 38, 5, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_TX, 5, 1, 0);
 
 static const struct snd_kcontrol_new mc2_amp_ctl =
-        SOC_DAPM_SINGLE("Switch", 38, 9, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_TX, 9, 1, 0);
 
 static const struct snd_kcontrol_new atx_amp_ctl =
-        SOC_DAPM_SINGLE("Switch", 38, 11, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_TX, 11, 1, 0);
 
 
 /* Virtual mux. The chip does the input selection automatically
@@ -461,22 +461,22 @@ static const struct snd_kcontrol_new right_input_mux =
         SOC_DAPM_ENUM_VIRT("Route", adcr_enum);
 
 static const struct snd_kcontrol_new samp_ctl =
-        SOC_DAPM_SINGLE("Switch", 36, 3, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 3, 1, 0);
 
 static const struct snd_kcontrol_new lamp_ctl =
-        SOC_DAPM_SINGLE("Switch", 36, 5, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 5, 1, 0);
 
 static const struct snd_kcontrol_new hlamp_ctl =
-        SOC_DAPM_SINGLE("Switch", 36, 10, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 10, 1, 0);
 
 static const struct snd_kcontrol_new hramp_ctl =
-        SOC_DAPM_SINGLE("Switch", 36, 9, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 9, 1, 0);
 
 static const struct snd_kcontrol_new llamp_ctl =
-        SOC_DAPM_SINGLE("Switch", 36, 16, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 16, 1, 0);
 
 static const struct snd_kcontrol_new lramp_ctl =
-        SOC_DAPM_SINGLE("Switch", 36, 15, 1, 0);
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 15, 1, 0);
 
 static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = {
 /* Input */
@@ -487,13 +487,13 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = {
         SND_SOC_DAPM_INPUT("RXINL"),
         SND_SOC_DAPM_INPUT("TXIN"),
 
-        SND_SOC_DAPM_SUPPLY("MC1 Bias", 38, 0, 0, NULL, 0),
-        SND_SOC_DAPM_SUPPLY("MC2 Bias", 38, 1, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("MC1 Bias", MC13783_AUDIO_TX, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("MC2 Bias", MC13783_AUDIO_TX, 1, 0, NULL, 0),
 
-        SND_SOC_DAPM_SWITCH("MC1L Amp", 38, 7, 0, &mc1l_amp_ctl),
-        SND_SOC_DAPM_SWITCH("MC1R Amp", 38, 5, 0, &mc1r_amp_ctl),
-        SND_SOC_DAPM_SWITCH("MC2 Amp", 38, 9, 0, &mc2_amp_ctl),
-        SND_SOC_DAPM_SWITCH("TXIN Amp", 38, 11, 0, &atx_amp_ctl),
+        SND_SOC_DAPM_SWITCH("MC1L Amp", MC13783_AUDIO_TX, 7, 0, &mc1l_amp_ctl),
+        SND_SOC_DAPM_SWITCH("MC1R Amp", MC13783_AUDIO_TX, 5, 0, &mc1r_amp_ctl),
+        SND_SOC_DAPM_SWITCH("MC2 Amp", MC13783_AUDIO_TX, 9, 0, &mc2_amp_ctl),
+        SND_SOC_DAPM_SWITCH("TXIN Amp", MC13783_AUDIO_TX, 11, 0, &atx_amp_ctl),
 
         SND_SOC_DAPM_VIRT_MUX("PGA Left Input Mux", SND_SOC_NOPM, 0, 0,
                               &left_input_mux),
@@ -503,12 +503,12 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = {
         SND_SOC_DAPM_PGA("PGA Left Input", SND_SOC_NOPM, 0, 0, NULL, 0),
         SND_SOC_DAPM_PGA("PGA Right Input", SND_SOC_NOPM, 0, 0, NULL, 0),
 
-        SND_SOC_DAPM_ADC("ADC", "Capture", 40, 11, 0),
-        SND_SOC_DAPM_SUPPLY("ADC_Reset", 40, 15, 0, NULL, 0),
+        SND_SOC_DAPM_ADC("ADC", "Capture", MC13783_AUDIO_CODEC, 11, 0),
+        SND_SOC_DAPM_SUPPLY("ADC_Reset", MC13783_AUDIO_CODEC, 15, 0, NULL, 0),
 
 /* Output */
-        SND_SOC_DAPM_SUPPLY("DAC_E", 41, 11, 0, NULL, 0),
-        SND_SOC_DAPM_SUPPLY("DAC_Reset", 41, 15, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC_E", MC13783_AUDIO_DAC, 11, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC_Reset", MC13783_AUDIO_DAC, 15, 0, NULL, 0),
         SND_SOC_DAPM_OUTPUT("RXOUTL"),
         SND_SOC_DAPM_OUTPUT("RXOUTR"),
         SND_SOC_DAPM_OUTPUT("HSL"),
@@ -516,14 +516,18 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("LSP"),
         SND_SOC_DAPM_OUTPUT("SP"),
 
-        SND_SOC_DAPM_SWITCH("Speaker Amp", 36, 3, 0, &samp_ctl),
+        SND_SOC_DAPM_SWITCH("Speaker Amp", MC13783_AUDIO_RX0, 3, 0, &samp_ctl),
         SND_SOC_DAPM_SWITCH("Loudspeaker Amp", SND_SOC_NOPM, 0, 0, &lamp_ctl),
-        SND_SOC_DAPM_SWITCH("Headset Amp Left", 36, 10, 0, &hlamp_ctl),
-        SND_SOC_DAPM_SWITCH("Headset Amp Right", 36, 9, 0, &hramp_ctl),
-        SND_SOC_DAPM_SWITCH("Line out Amp Left", 36, 16, 0, &llamp_ctl),
-        SND_SOC_DAPM_SWITCH("Line out Amp Right", 36, 15, 0, &lramp_ctl),
-        SND_SOC_DAPM_DAC("DAC", "Playback", 36, 22, 0),
-        SND_SOC_DAPM_PGA("DAC PGA", 37, 5, 0, NULL, 0),
+        SND_SOC_DAPM_SWITCH("Headset Amp Left", MC13783_AUDIO_RX0, 10, 0,
+                        &hlamp_ctl),
+        SND_SOC_DAPM_SWITCH("Headset Amp Right", MC13783_AUDIO_RX0, 9, 0,
+                        &hramp_ctl),
+        SND_SOC_DAPM_SWITCH("Line out Amp Left", MC13783_AUDIO_RX0, 16, 0,
+                        &llamp_ctl),
+        SND_SOC_DAPM_SWITCH("Line out Amp Right", MC13783_AUDIO_RX0, 15, 0,
+                        &lramp_ctl),
+        SND_SOC_DAPM_DAC("DAC", "Playback", MC13783_AUDIO_RX0, 22, 0),
+        SND_SOC_DAPM_PGA("DAC PGA", MC13783_AUDIO_RX1, 5, 0, NULL, 0),
 };
 
 static struct snd_soc_dapm_route mc13783_routes[] = {
@@ -581,8 +585,6 @@ static int mc13783_probe(struct snd_soc_codec *codec)
 {
         struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);
 
-        codec->control_data = priv->mc13xxx;
-
         mc13xxx_lock(priv->mc13xxx);
 
         /* these are the reset values */
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 8d717f4b5a87..0935bfe62471 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
@@ -55,12 +56,50 @@
          SNDRV_PCM_FMTBIT_S32_LE  | SNDRV_PCM_FMTBIT_S32_BE)
 
 /* Power-up register defaults */
-static const u8 sta32x_regs[STA32X_REGISTER_COUNT] = {
-        0x63, 0x80, 0xc2, 0x40, 0xc2, 0x5c, 0x10, 0xff, 0x60, 0x60,
-        0x60, 0x80, 0x00, 0x00, 0x00, 0x40, 0x80, 0x77, 0x6a, 0x69,
-        0x6a, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d,
-        0xc0, 0xf3, 0x33, 0x00, 0x0c,
+static const struct reg_default sta32x_regs[] = {
+        {  0x0, 0x63 },
+        {  0x1, 0x80 },
+        {  0x2, 0xc2 },
+        {  0x3, 0x40 },
+        {  0x4, 0xc2 },
+        {  0x5, 0x5c },
+        {  0x6, 0x10 },
+        {  0x7, 0xff },
+        {  0x8, 0x60 },
+        {  0x9, 0x60 },
+        {  0xa, 0x60 },
+        {  0xb, 0x80 },
+        {  0xc, 0x00 },
+        {  0xd, 0x00 },
+        {  0xe, 0x00 },
+        {  0xf, 0x40 },
+        { 0x10, 0x80 },
+        { 0x11, 0x77 },
+        { 0x12, 0x6a },
+        { 0x13, 0x69 },
+        { 0x14, 0x6a },
+        { 0x15, 0x69 },
+        { 0x16, 0x00 },
+        { 0x17, 0x00 },
+        { 0x18, 0x00 },
+        { 0x19, 0x00 },
+        { 0x1a, 0x00 },
+        { 0x1b, 0x00 },
+        { 0x1c, 0x00 },
+        { 0x1d, 0x00 },
+        { 0x1e, 0x00 },
+        { 0x1f, 0x00 },
+        { 0x20, 0x00 },
+        { 0x21, 0x00 },
+        { 0x22, 0x00 },
+        { 0x23, 0x00 },
+        { 0x24, 0x00 },
+        { 0x25, 0x00 },
+        { 0x26, 0x00 },
+        { 0x27, 0x2d },
+        { 0x28, 0xc0 },
+        { 0x2b, 0x00 },
+        { 0x2c, 0x0c },
 };
 
 /* regulator power supply names */
@@ -72,6 +111,7 @@ static const char *sta32x_supply_names[] = {
 
 /* codec private data */
 struct sta32x_priv {
+        struct regmap *regmap;
         struct regulator_bulk_data supplies[ARRAY_SIZE(sta32x_supply_names)];
         struct snd_soc_codec *codec;
         struct sta32x_platform_data *pdata;
@@ -291,17 +331,15 @@ static int sta32x_sync_coef_shadow(struct snd_soc_codec *codec)
 
 static int sta32x_cache_sync(struct snd_soc_codec *codec)
 {
+        struct sta32x_priv *sta32x = codec->control_data;
         unsigned int mute;
         int rc;
 
-        if (!codec->cache_sync)
-                return 0;
-
         /* mute during register sync */
         mute = snd_soc_read(codec, STA32X_MMUTE);
         snd_soc_write(codec, STA32X_MMUTE, mute | STA32X_MMUTE_MMUTE);
         sta32x_sync_coef_shadow(codec);
-        rc = snd_soc_cache_sync(codec);
+        rc = regcache_sync(sta32x->regmap);
         snd_soc_write(codec, STA32X_MMUTE, mute);
         return rc;
 }
@@ -316,11 +354,11 @@ static void sta32x_watchdog(struct work_struct *work)
 
         /* check if sta32x has reset itself */
         confa_cached = snd_soc_read(codec, STA32X_CONFA);
-        codec->cache_bypass = 1;
+        regcache_cache_bypass(sta32x->regmap, true);
         confa = snd_soc_read(codec, STA32X_CONFA);
-        codec->cache_bypass = 0;
+        regcache_cache_bypass(sta32x->regmap, false);
         if (confa != confa_cached) {
-                codec->cache_sync = 1;
+                regcache_mark_dirty(sta32x->regmap);
                 sta32x_cache_sync(codec);
         }
 
@@ -825,31 +863,21 @@ static int sta32x_probe(struct snd_soc_codec *codec)
         sta32x->codec = codec;
         sta32x->pdata = dev_get_platdata(codec->dev);
 
-        /* regulators */
-        for (i = 0; i < ARRAY_SIZE(sta32x->supplies); i++)
-                sta32x->supplies[i].supply = sta32x_supply_names[i];
-
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(sta32x->supplies),
-                                 sta32x->supplies);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
-                goto err;
-        }
-
         ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
                                     sta32x->supplies);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
-                goto err_get;
+                return ret;
         }
 
         /* Tell ASoC what kind of I/O to use to read the registers.  ASoC will
          * then do the I2C transactions itself.
          */
-        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
+        codec->control_data = sta32x->regmap;
+        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "failed to set cache I/O (ret=%i)\n", ret);
-                return ret;
+                goto err;
         }
 
         /* Chip documentation explicitly requires that the reset values
@@ -858,13 +886,15 @@ static int sta32x_probe(struct snd_soc_codec *codec)
          * so the write to the these registers are suppressed by the cache
          * restore code when it skips writes of default registers.
          */
-        snd_soc_cache_write(codec, STA32X_CONFC, 0xc2);
-        snd_soc_cache_write(codec, STA32X_CONFE, 0xc2);
-        snd_soc_cache_write(codec, STA32X_CONFF, 0x5c);
-        snd_soc_cache_write(codec, STA32X_MMUTE, 0x10);
-        snd_soc_cache_write(codec, STA32X_AUTO1, 0x60);
-        snd_soc_cache_write(codec, STA32X_AUTO3, 0x00);
-        snd_soc_cache_write(codec, STA32X_C3CFG, 0x40);
+        regcache_cache_only(sta32x->regmap, true);
+        snd_soc_write(codec, STA32X_CONFC, 0xc2);
+        snd_soc_write(codec, STA32X_CONFE, 0xc2);
+        snd_soc_write(codec, STA32X_CONFF, 0x5c);
+        snd_soc_write(codec, STA32X_MMUTE, 0x10);
+        snd_soc_write(codec, STA32X_AUTO1, 0x60);
+        snd_soc_write(codec, STA32X_AUTO3, 0x00);
+        snd_soc_write(codec, STA32X_C3CFG, 0x40);
+        regcache_cache_only(sta32x->regmap, false);
 
         /* set thermal warning adjustment and recovery */
         if (!(sta32x->pdata->thermal_conf & STA32X_THERMAL_ADJUSTMENT_ENABLE))
@@ -915,9 +945,8 @@ static int sta32x_probe(struct snd_soc_codec *codec)
 
         return 0;
 
-err_get:
-        regulator_bulk_free(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
 err:
+        regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
         return ret;
 }
 
@@ -928,13 +957,11 @@ static int sta32x_remove(struct snd_soc_codec *codec)
         sta32x_watchdog_stop(sta32x);
         sta32x_set_bias_level(codec, SND_SOC_BIAS_OFF);
         regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
-        regulator_bulk_free(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
 
         return 0;
 }
 
-static int sta32x_reg_is_volatile(struct snd_soc_codec *codec,
-                                  unsigned int reg)
+static bool sta32x_reg_is_volatile(struct device *dev, unsigned int reg)
 {
         switch (reg) {
         case STA32X_CONFA ... STA32X_L2ATRT:
@@ -949,10 +976,6 @@ static const struct snd_soc_codec_driver sta32x_codec = {
         .remove =               sta32x_remove,
         .suspend =              sta32x_suspend,
         .resume =               sta32x_resume,
-        .reg_cache_size =       STA32X_REGISTER_COUNT,
-        .reg_word_size =        sizeof(u8),
-        .reg_cache_default =    sta32x_regs,
-        .volatile_register =    sta32x_reg_is_volatile,
         .set_bias_level =       sta32x_set_bias_level,
         .controls =             sta32x_snd_controls,
         .num_controls =         ARRAY_SIZE(sta32x_snd_controls),
@@ -962,17 +985,45 @@ static const struct snd_soc_codec_driver sta32x_codec = {
         .num_dapm_routes =      ARRAY_SIZE(sta32x_dapm_routes),
 };
 
+static const struct regmap_config sta32x_regmap = {
+        .reg_bits =             8,
+        .val_bits =             8,
+        .max_register =         STA32X_FDRC2,
+        .reg_defaults =         sta32x_regs,
+        .num_reg_defaults =     ARRAY_SIZE(sta32x_regs),
+        .cache_type =           REGCACHE_RBTREE,
+        .volatile_reg =         sta32x_reg_is_volatile,
+};
+
 static __devinit int sta32x_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
         struct sta32x_priv *sta32x;
-        int ret;
+        int ret, i;
 
         sta32x = devm_kzalloc(&i2c->dev, sizeof(struct sta32x_priv),
                               GFP_KERNEL);
         if (!sta32x)
                 return -ENOMEM;
 
+        /* regulators */
+        for (i = 0; i < ARRAY_SIZE(sta32x->supplies); i++)
+                sta32x->supplies[i].supply = sta32x_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(sta32x->supplies),
+                                      sta32x->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        sta32x->regmap = devm_regmap_init_i2c(i2c, &sta32x_regmap);
+        if (IS_ERR(sta32x->regmap)) {
+                ret = PTR_ERR(sta32x->regmap);
+                dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret);
+                return ret;
+        }
+
         i2c_set_clientdata(i2c, sta32x);
 
         ret = snd_soc_register_codec(&i2c->dev, &sta32x_codec, &sta32x_dai, 1);
@@ -1006,17 +1057,7 @@ static struct i2c_driver sta32x_i2c_driver = {
         .id_table = sta32x_i2c_id,
 };
 
-static int __init sta32x_init(void)
-{
-        return i2c_add_driver(&sta32x_i2c_driver);
-}
-module_init(sta32x_init);
-
-static void __exit sta32x_exit(void)
-{
-        i2c_del_driver(&sta32x_i2c_driver);
-}
-module_exit(sta32x_exit);
+module_i2c_driver(sta32x_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC STA32X driver");
 MODULE_AUTHOR("Johannes Stezenbach <js@sig21.net>");
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index 0c225cd569d2..9e3144862386 100644
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -358,7 +358,7 @@ static int sta529_resume(struct snd_soc_codec *codec)
         return 0;
 }
 
-struct snd_soc_codec_driver sta529_codec_driver = {
+static const struct snd_soc_codec_driver sta529_codec_driver = {
         .probe = sta529_probe,
         .remove = sta529_remove,
         .set_bias_level = sta529_set_bias_level,
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 33c0f3d39c87..982e437799a8 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -340,7 +340,6 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec)
 
         printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION);
 
-        codec->control_data = codec;    /* we don't use regmap! */
         ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
         if (ret < 0)
                 goto codec_err;
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 85944e953578..b1f6982c7c9c 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -444,14 +444,4 @@ static struct spi_driver aic26_spi = {
         .remove = aic26_spi_remove,
 };
 
-static int __init aic26_init(void)
-{
-        return spi_register_driver(&aic26_spi);
-}
-module_init(aic26_init);
-
-static void __exit aic26_exit(void)
-{
-        spi_unregister_driver(&aic26_spi);
-}
-module_exit(aic26_exit);
+module_spi_driver(aic26_spi);
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index b0a73d37ed52..f230292ba96b 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -746,24 +746,7 @@ static struct i2c_driver aic32x4_i2c_driver = {
         .id_table = aic32x4_i2c_id,
 };
 
-static int __init aic32x4_modinit(void)
-{
-        int ret = 0;
-
-        ret = i2c_add_driver(&aic32x4_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register aic32x4 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(aic32x4_modinit);
-
-static void __exit aic32x4_exit(void)
-{
-        i2c_del_driver(&aic32x4_i2c_driver);
-}
-module_exit(aic32x4_exit);
+module_i2c_driver(aic32x4_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC tlv320aic32x4 codec driver");
 MODULE_AUTHOR("Javier Martin <javier.martin@vista-silicon.com>");
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index dc78f5a4bcbf..5708a973a776 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -40,6 +40,7 @@
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
+#include <linux/of_gpio.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -1457,6 +1458,8 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
 {
         struct aic3x_pdata *pdata = i2c->dev.platform_data;
         struct aic3x_priv *aic3x;
+        struct aic3x_setup_data *ai3x_setup;
+        struct device_node *np = i2c->dev.of_node;
         int ret;
 
         aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
@@ -1471,6 +1474,25 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
         if (pdata) {
                 aic3x->gpio_reset = pdata->gpio_reset;
                 aic3x->setup = pdata->setup;
+        } else if (np) {
+                ai3x_setup = devm_kzalloc(&i2c->dev, sizeof(*ai3x_setup),
+                                                                GFP_KERNEL);
+                if (ai3x_setup == NULL) {
+                        dev_err(&i2c->dev, "failed to create private data\n");
+                        return -ENOMEM;
+                }
+
+                ret = of_get_named_gpio(np, "gpio-reset", 0);
+                if (ret >= 0)
+                        aic3x->gpio_reset = ret;
+                else
+                        aic3x->gpio_reset = -1;
+
+                if (of_property_read_u32_array(np, "ai3x-gpio-func",
+                                        ai3x_setup->gpio_func, 2) >= 0) {
+                        aic3x->setup = ai3x_setup;
+                }
+
         } else {
                 aic3x->gpio_reset = -1;
         }
@@ -1488,34 +1510,27 @@ static int aic3x_i2c_remove(struct i2c_client *client)
         return 0;
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id tlv320aic3x_of_match[] = {
+        { .compatible = "ti,tlv320aic3x", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, tlv320aic3x_of_match);
+#endif
+
 /* machine i2c codec control layer */
 static struct i2c_driver aic3x_i2c_driver = {
         .driver = {
                 .name = "tlv320aic3x-codec",
                 .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(tlv320aic3x_of_match),
         },
         .probe  = aic3x_i2c_probe,
         .remove = aic3x_i2c_remove,
         .id_table = aic3x_i2c_id,
 };
 
-static int __init aic3x_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&aic3x_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register TLV320AIC3x I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(aic3x_modinit);
-
-static void __exit aic3x_exit(void)
-{
-        i2c_del_driver(&aic3x_i2c_driver);
-}
-module_exit(aic3x_exit);
+module_i2c_driver(aic3x_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC TLV320AIC3X codec driver");
 MODULE_AUTHOR("Vladimir Barinov");
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 0dd41077ab79..d2e16c5d7d1f 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1621,24 +1621,7 @@ static struct i2c_driver tlv320dac33_i2c_driver = {
         .id_table       = tlv320dac33_i2c_id,
 };
 
-static int __init dac33_module_init(void)
-{
-        int r;
-        r = i2c_add_driver(&tlv320dac33_i2c_driver);
-        if (r < 0) {
-                printk(KERN_ERR "DAC33: driver registration failed\n");
-                return r;
-        }
-        return 0;
-}
-module_init(dac33_module_init);
-
-static void __exit dac33_module_exit(void)
-{
-        i2c_del_driver(&tlv320dac33_i2c_driver);
-}
-module_exit(dac33_module_exit);
-
+module_i2c_driver(tlv320dac33_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC TLV320DAC33 codec driver");
 MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 6fe4aa3ac544..565ff39ad3a3 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -487,19 +487,8 @@ static struct i2c_driver tpa6130a2_i2c_driver = {
         .id_table = tpa6130a2_id,
 };
 
-static int __init tpa6130a2_init(void)
-{
-        return i2c_add_driver(&tpa6130a2_i2c_driver);
-}
-
-static void __exit tpa6130a2_exit(void)
-{
-        i2c_del_driver(&tpa6130a2_i2c_driver);
-}
+module_i2c_driver(tpa6130a2_i2c_driver);
 
 MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
 MODULE_DESCRIPTION("TPA6130A2 Headphone amplifier driver");
 MODULE_LICENSE("GPL");
-
-module_init(tpa6130a2_init);
-module_exit(tpa6130a2_exit);
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 391fcfc7b63b..e7f608996c41 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -26,8 +26,11 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/i2c/twl.h>
 #include <linux/slab.h>
+#include <linux/gpio.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -152,8 +155,7 @@ struct twl4030_priv {
         u8 predrivel_enabled, predriver_enabled;
         u8 carkitl_enabled, carkitr_enabled;
 
-        /* Delay needed after enabling the digimic interface */
-        unsigned int digimic_delay;
+        struct twl4030_codec_data *pdata;
 };
 
 /*
@@ -295,13 +297,73 @@ static inline void twl4030_reset_registers(struct snd_soc_codec *codec)
 
 }
 
-static void twl4030_init_chip(struct snd_soc_codec *codec)
+static void twl4030_setup_pdata_of(struct twl4030_codec_data *pdata,
+                                   struct device_node *node)
+{
+        int value;
+
+        of_property_read_u32(node, "ti,digimic_delay",
+                             &pdata->digimic_delay);
+        of_property_read_u32(node, "ti,ramp_delay_value",
+                             &pdata->ramp_delay_value);
+        of_property_read_u32(node, "ti,offset_cncl_path",
+                             &pdata->offset_cncl_path);
+        if (!of_property_read_u32(node, "ti,hs_extmute", &value))
+                pdata->hs_extmute = value;
+
+        pdata->hs_extmute_gpio = of_get_named_gpio(node,
+                                                   "ti,hs_extmute_gpio", 0);
+        if (gpio_is_valid(pdata->hs_extmute_gpio))
+                pdata->hs_extmute = 1;
+}
+
+static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec)
 {
         struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);
+        struct device_node *twl4030_codec_node = NULL;
+
+        twl4030_codec_node = of_find_node_by_name(codec->dev->parent->of_node,
+                                                  "codec");
+
+        if (!pdata && twl4030_codec_node) {
+                pdata = devm_kzalloc(codec->dev,
+                                     sizeof(struct twl4030_codec_data),
+                                     GFP_KERNEL);
+                if (!pdata) {
+                        dev_err(codec->dev, "Can not allocate memory\n");
+                        return NULL;
+                }
+                twl4030_setup_pdata_of(pdata, twl4030_codec_node);
+        }
+
+        return pdata;
+}
+
+static void twl4030_init_chip(struct snd_soc_codec *codec)
+{
+        struct twl4030_codec_data *pdata;
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         u8 reg, byte;
         int i = 0;
 
+        pdata = twl4030_get_pdata(codec);
+
+        if (pdata && pdata->hs_extmute &&
+            gpio_is_valid(pdata->hs_extmute_gpio)) {
+                int ret;
+
+                if (!pdata->hs_extmute_gpio)
+                        dev_warn(codec->dev,
+                                 "Extmute GPIO is 0 is this correct?\n");
+
+                ret = gpio_request_one(pdata->hs_extmute_gpio,
+                                       GPIOF_OUT_INIT_LOW, "hs_extmute");
+                if (ret) {
+                        dev_err(codec->dev, "Failed to get hs_extmute GPIO\n");
+                        pdata->hs_extmute_gpio = -1;
+                }
+        }
+
         /* Check defaults, if instructed before anything else */
         if (pdata && pdata->check_defaults)
                 twl4030_check_defaults(codec);
@@ -331,7 +393,7 @@ static void twl4030_init_chip(struct snd_soc_codec *codec)
         if (!pdata)
                 return;
 
-        twl4030->digimic_delay = pdata->digimic_delay;
+        twl4030->pdata = pdata;
 
         reg = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET);
         reg &= ~TWL4030_RAMP_DELAY;
@@ -732,9 +794,9 @@ static int aif_event(struct snd_soc_dapm_widget *w,
 
 static void headset_ramp(struct snd_soc_codec *codec, int ramp)
 {
-        struct twl4030_codec_data *pdata = codec->dev->platform_data;
         unsigned char hs_gain, hs_pop;
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
+        struct twl4030_codec_data *pdata = twl4030->pdata;
         /* Base values for ramp delay calculation: 2^19 - 2^26 */
         unsigned int ramp_base[] = {524288, 1048576, 2097152, 4194304,
                                     8388608, 16777216, 33554432, 67108864};
@@ -748,8 +810,8 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
         /* Enable external mute control, this dramatically reduces
          * the pop-noise */
         if (pdata && pdata->hs_extmute) {
-                if (pdata->set_hs_extmute) {
-                        pdata->set_hs_extmute(1);
+                if (gpio_is_valid(pdata->hs_extmute_gpio)) {
+                        gpio_set_value(pdata->hs_extmute_gpio, 1);
                 } else {
                         hs_pop |= TWL4030_EXTMUTE;
                         twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);
@@ -786,8 +848,8 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
 
         /* Disable external mute */
         if (pdata && pdata->hs_extmute) {
-                if (pdata->set_hs_extmute) {
-                        pdata->set_hs_extmute(0);
+                if (gpio_is_valid(pdata->hs_extmute_gpio)) {
+                        gpio_set_value(pdata->hs_extmute_gpio, 0);
                 } else {
                         hs_pop &= ~TWL4030_EXTMUTE;
                         twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);
@@ -847,9 +909,10 @@ 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 twl4030_codec_data *pdata = twl4030->pdata;
 
-        if (twl4030->digimic_delay)
-                twl4030_wait_ms(twl4030->digimic_delay);
+        if (pdata && pdata->digimic_delay)
+                twl4030_wait_ms(pdata->digimic_delay);
         return 0;
 }
 
@@ -999,7 +1062,7 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned short val;
-        unsigned short mask, bitmask;
+        unsigned short mask;
 
         if (twl4030->configured) {
                 dev_err(codec->dev,
@@ -1007,18 +1070,16 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
                 return -EBUSY;
         }
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         if (ucontrol->value.enumerated.item[0] > e->max - 1)
                 return -EINVAL;
 
         val = ucontrol->value.enumerated.item[0] << e->shift_l;
-        mask = (bitmask - 1) << e->shift_l;
+        mask = e->mask << e->shift_l;
         if (e->shift_l != e->shift_r) {
                 if (ucontrol->value.enumerated.item[1] > e->max - 1)
                         return -EINVAL;
                 val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= (bitmask - 1) << e->shift_r;
+                mask |= e->mask << e->shift_r;
         }
 
         return snd_soc_update_bits(codec, e->reg, mask, val);
@@ -1239,16 +1300,11 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("Virtual Voice OUT"),
 
         /* DACs */
-        SND_SOC_DAPM_DAC("DAC Right1", "Right Front HiFi Playback",
-                        SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_DAC("DAC Left1", "Left Front HiFi Playback",
-                        SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_DAC("DAC Right2", "Right Rear HiFi Playback",
-                        SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_DAC("DAC Left2", "Left Rear HiFi Playback",
-                        SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_DAC("DAC Voice", "Voice Playback",
-                        SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DAC Right1", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DAC Left1", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DAC Right2", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DAC Left2", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DAC Voice", NULL, SND_SOC_NOPM, 0, 0),
 
         /* Analog bypasses */
         SND_SOC_DAPM_SWITCH("Right1 Analog Loopback", SND_SOC_NOPM, 0, 0,
@@ -1377,14 +1433,10 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
 
         /* Introducing four virtual ADC, since TWL4030 have four channel for
            capture */
-        SND_SOC_DAPM_ADC("ADC Virtual Left1", "Left Front Capture",
-                SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_ADC("ADC Virtual Right1", "Right Front Capture",
-                SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_ADC("ADC Virtual Left2", "Left Rear Capture",
-                SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_ADC("ADC Virtual Right2", "Right Rear Capture",
-                SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC Virtual Left1", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC Virtual Right1", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC Virtual Left2", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC Virtual Right2", NULL, SND_SOC_NOPM, 0, 0),
 
         /* Analog/Digital mic path selection.
            TX1 Left/Right: either analog Left/Right or Digimic0
@@ -1428,6 +1480,23 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
 };
 
 static const struct snd_soc_dapm_route intercon[] = {
+        /* Stream -> DAC mapping */
+        {"DAC Right1", NULL, "HiFi Playback"},
+        {"DAC Left1", NULL, "HiFi Playback"},
+        {"DAC Right2", NULL, "HiFi Playback"},
+        {"DAC Left2", NULL, "HiFi Playback"},
+        {"DAC Voice", NULL, "Voice Playback"},
+
+        /* ADC -> Stream mapping */
+        {"HiFi Capture", NULL, "ADC Virtual Left1"},
+        {"HiFi Capture", NULL, "ADC Virtual Right1"},
+        {"HiFi Capture", NULL, "ADC Virtual Left2"},
+        {"HiFi Capture", NULL, "ADC Virtual Right2"},
+        {"Voice Capture", NULL, "ADC Virtual Left1"},
+        {"Voice Capture", NULL, "ADC Virtual Right1"},
+        {"Voice Capture", NULL, "ADC Virtual Left2"},
+        {"Voice Capture", NULL, "ADC Virtual Right2"},
+
         {"Digital L1 Playback Mixer", NULL, "DAC Left1"},
         {"Digital R1 Playback Mixer", NULL, "DAC Right1"},
         {"Digital L2 Playback Mixer", NULL, "DAC Left2"},
@@ -2172,7 +2241,7 @@ static struct snd_soc_dai_driver twl4030_dai[] = {
                 .formats = TWL4030_FORMATS,
                 .sig_bits = 24,},
         .capture = {
-                .stream_name = "Capture",
+                .stream_name = "HiFi Capture",
                 .channels_min = 2,
                 .channels_max = 4,
                 .rates = TWL4030_RATES,
@@ -2189,7 +2258,7 @@ static struct snd_soc_dai_driver twl4030_dai[] = {
                 .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
         .capture = {
-                .stream_name = "Capture",
+                .stream_name = "Voice Capture",
                 .channels_min = 1,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000,
@@ -2214,7 +2283,8 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec)
 {
         struct twl4030_priv *twl4030;
 
-        twl4030 = kzalloc(sizeof(struct twl4030_priv), GFP_KERNEL);
+        twl4030 = devm_kzalloc(codec->dev, sizeof(struct twl4030_priv),
+                               GFP_KERNEL);
         if (twl4030 == NULL) {
                 dev_err(codec->dev, "Can not allocate memory\n");
                 return -ENOMEM;
@@ -2231,11 +2301,15 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec)
 static int twl4030_soc_remove(struct snd_soc_codec *codec)
 {
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
+        struct twl4030_codec_data *pdata = twl4030->pdata;
 
         /* Reset registers to their chip default before leaving */
         twl4030_reset_registers(codec);
         twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        kfree(twl4030);
+
+        if (pdata && pdata->hs_extmute && gpio_is_valid(pdata->hs_extmute_gpio))
+                gpio_free(pdata->hs_extmute_gpio);
+
         return 0;
 }
 
@@ -2262,13 +2336,6 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
 
 static int __devinit twl4030_codec_probe(struct platform_device *pdev)
 {
-        struct twl4030_codec_data *pdata = pdev->dev.platform_data;
-
-        if (!pdata) {
-                dev_err(&pdev->dev, "platform_data is missing\n");
-                return -EINVAL;
-        }
-
         return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl4030,
                         twl4030_dai, ARRAY_SIZE(twl4030_dai));
 }
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index c084c549942e..e8f97af75928 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -727,10 +727,8 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
                         TWL6040_REG_MICRCTL, 1, 0, NULL, 0),
 
         /* ADCs */
-        SND_SOC_DAPM_ADC("ADC Left", "Left Front Capture",
-                        TWL6040_REG_MICLCTL, 2, 0),
-        SND_SOC_DAPM_ADC("ADC Right", "Right Front Capture",
-                        TWL6040_REG_MICRCTL, 2, 0),
+        SND_SOC_DAPM_ADC("ADC Left", NULL, TWL6040_REG_MICLCTL, 2, 0),
+        SND_SOC_DAPM_ADC("ADC Right", NULL, TWL6040_REG_MICRCTL, 2, 0),
 
         /* Microphone bias */
         SND_SOC_DAPM_SUPPLY("Headset Mic Bias",
@@ -743,15 +741,12 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
                             TWL6040_REG_DMICBCTL, 4, 0, NULL, 0),
 
         /* DACs */
-        SND_SOC_DAPM_DAC("HSDAC Left", "Headset Playback", SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_DAC("HSDAC Right", "Headset Playback", SND_SOC_NOPM, 0, 0),
-        SND_SOC_DAPM_DAC("HFDAC Left", "Handsfree Playback",
-                         TWL6040_REG_HFLCTL, 0, 0),
-        SND_SOC_DAPM_DAC("HFDAC Right", "Handsfree Playback",
-                         TWL6040_REG_HFRCTL, 0, 0),
+        SND_SOC_DAPM_DAC("HSDAC Left", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("HSDAC Right", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("HFDAC Left", NULL, TWL6040_REG_HFLCTL, 0, 0),
+        SND_SOC_DAPM_DAC("HFDAC Right", NULL, TWL6040_REG_HFRCTL, 0, 0),
         /* Virtual DAC for vibra path (DL4 channel) */
-        SND_SOC_DAPM_DAC("VIBRA DAC", "Vibra Playback",
-                        SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("VIBRA DAC", NULL, SND_SOC_NOPM, 0, 0),
 
         SND_SOC_DAPM_MUX("Handsfree Left Playback",
                         SND_SOC_NOPM, 0, 0, &hfl_mux_controls),
@@ -810,6 +805,26 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
 };
 
 static const struct snd_soc_dapm_route intercon[] = {
+        /* Stream -> DAC mapping */
+        {"HSDAC Left", NULL, "Legacy Playback"},
+        {"HSDAC Left", NULL, "Headset Playback"},
+        {"HSDAC Right", NULL, "Legacy Playback"},
+        {"HSDAC Right", NULL, "Headset Playback"},
+
+        {"HFDAC Left", NULL, "Legacy Playback"},
+        {"HFDAC Left", NULL, "Handsfree Playback"},
+        {"HFDAC Right", NULL, "Legacy Playback"},
+        {"HFDAC Right", NULL, "Handsfree Playback"},
+
+        {"VIBRA DAC", NULL, "Legacy Playback"},
+        {"VIBRA DAC", NULL, "Vibra Playback"},
+
+        /* ADC -> Stream mapping */
+        {"ADC Left", NULL, "Legacy Capture"},
+        {"ADC Left", NULL, "Capture"},
+        {"ADC Right", NULL, "Legacy Capture"},
+        {"ADC Right", NULL, "Capture"},
+
         /* Capture path */
         {"Analog Left Capture Route", "Headset Mic", "HSMIC"},
         {"Analog Left Capture Route", "Main Mic", "MAINMIC"},
@@ -1028,14 +1043,14 @@ static struct snd_soc_dai_driver twl6040_dai[] = {
 {
         .name = "twl6040-legacy",
         .playback = {
-                .stream_name = "Playback",
+                .stream_name = "Legacy Playback",
                 .channels_min = 1,
                 .channels_max = 5,
                 .rates = TWL6040_RATES,
                 .formats = TWL6040_FORMATS,
         },
         .capture = {
-                .stream_name = "Capture",
+                .stream_name = "Legacy Capture",
                 .channels_min = 1,
                 .channels_max = 2,
                 .rates = TWL6040_RATES,
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
new file mode 100644
index 000000000000..f8d6c31db870
--- /dev/null
+++ b/sound/soc/codecs/wm0010.c
@@ -0,0 +1,944 @@
+/*
+ * wm0010.c  --  WM0010 DSP Driver
+ *
+ * Copyright 2012 Wolfson Microelectronics PLC.
+ *
+ * Authors: Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *          Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
+ *          Scott Ling <sl@opensource.wolfsonmicro.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/irqreturn.h>
+#include <linux/init.h>
+#include <linux/spi/spi.h>
+#include <linux/firmware.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/gpio.h>
+#include <linux/regulator/consumer.h>
+#include <linux/mutex.h>
+#include <linux/workqueue.h>
+
+#include <sound/soc.h>
+#include <sound/wm0010.h>
+
+#define DEVICE_ID_WM0010        10
+
+enum dfw_cmd {
+        DFW_CMD_FUSE = 0x01,
+        DFW_CMD_CODE_HDR,
+        DFW_CMD_CODE_DATA,
+        DFW_CMD_PLL,
+        DFW_CMD_INFO = 0xff
+};
+
+struct dfw_binrec {
+        u8 command;
+        u32 length:24;
+        u32 address;
+        uint8_t data[0];
+} __packed;
+
+struct dfw_pllrec {
+        u8 command;
+        u32 length:24;
+        u32 address;
+        u32 clkctrl1;
+        u32 clkctrl2;
+        u32 clkctrl3;
+        u32 ldetctrl;
+        u32 uart_div;
+        u32 spi_div;
+} __packed;
+
+static struct pll_clock_map {
+        int max_sysclk;
+        int max_pll_spi_speed;
+        u32 pll_clkctrl1;
+} pll_clock_map[] = {                      /* Dividers */
+        { 22000000, 26000000, 0x00201f11 }, /* 2,32,2  */
+        { 18000000, 26000000, 0x00203f21 }, /* 2,64,4  */
+        { 14000000, 26000000, 0x00202620 }, /* 1,39,4  */
+        { 10000000, 22000000, 0x00203120 }, /* 1,50,4  */
+        {  6500000, 22000000, 0x00204520 }, /* 1,70,4  */
+        {  5500000, 22000000, 0x00103f10 }, /* 1,64,2  */
+};
+
+enum wm0010_state {
+        WM0010_POWER_OFF,
+        WM0010_OUT_OF_RESET,
+        WM0010_BOOTROM,
+        WM0010_STAGE2,
+        WM0010_FIRMWARE,
+};
+
+struct wm0010_priv {
+        struct snd_soc_codec *codec;
+
+        struct mutex lock;
+        struct device *dev;
+
+        struct wm0010_pdata pdata;
+
+        int gpio_reset;
+        int gpio_reset_value;
+
+        struct regulator_bulk_data core_supplies[2];
+        struct regulator *dbvdd;
+
+        int sysclk;
+
+        enum wm0010_state state;
+        bool boot_failed;
+        int boot_done;
+        bool ready;
+        bool pll_running;
+        int max_spi_freq;
+        int board_max_spi_speed;
+        u32 pll_clkctrl1;
+
+        spinlock_t irq_lock;
+        int irq;
+
+        struct completion boot_completion;
+};
+
+struct wm0010_spi_msg {
+        struct spi_message m;
+        struct spi_transfer t;
+        u8 *tx_buf;
+        u8 *rx_buf;
+        size_t len;
+};
+
+static const struct snd_soc_dapm_widget wm0010_dapm_widgets[] = {
+SND_SOC_DAPM_SUPPLY("CLKIN",  SND_SOC_NOPM, 0, 0, NULL, 0),
+};
+
+static const struct snd_soc_dapm_route wm0010_dapm_routes[] = {
+        { "SDI2 Capture", NULL, "SDI1 Playback" },
+        { "SDI1 Capture", NULL, "SDI2 Playback" },
+
+        { "SDI1 Capture", NULL, "CLKIN" },
+        { "SDI2 Capture", NULL, "CLKIN" },
+        { "SDI1 Playback", NULL, "CLKIN" },
+        { "SDI2 Playback", NULL, "CLKIN" },
+};
+
+static const char *wm0010_state_to_str(enum wm0010_state state)
+{
+        const char *state_to_str[] = {
+                "Power off",
+                "Out of reset",
+                "Boot ROM",
+                "Stage2",
+                "Firmware"
+        };
+
+        if (state < 0 || state >= ARRAY_SIZE(state_to_str))
+                return "null";
+        return state_to_str[state];
+}
+
+/* Called with wm0010->lock held */
+static void wm0010_halt(struct snd_soc_codec *codec)
+{
+        struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec);
+        unsigned long flags;
+        enum wm0010_state state;
+
+        /* Fetch the wm0010 state */
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        state = wm0010->state;
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+
+        switch (state) {
+        case WM0010_POWER_OFF:
+                /* If there's nothing to do, bail out */
+                return;
+        case WM0010_OUT_OF_RESET:
+        case WM0010_BOOTROM:
+        case WM0010_STAGE2:
+        case WM0010_FIRMWARE:
+                /* Remember to put chip back into reset */
+                gpio_set_value(wm0010->gpio_reset, wm0010->gpio_reset_value);
+                /* Disable the regulators */
+                regulator_disable(wm0010->dbvdd);
+                regulator_bulk_disable(ARRAY_SIZE(wm0010->core_supplies),
+                                       wm0010->core_supplies);
+                break;
+        }
+
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        wm0010->state = WM0010_POWER_OFF;
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+}
+
+struct wm0010_boot_xfer {
+        struct list_head list;
+        struct snd_soc_codec *codec;
+        struct completion *done;
+        struct spi_message m;
+        struct spi_transfer t;
+};
+
+/* Called with wm0010->lock held */
+static void wm0010_mark_boot_failure(struct wm0010_priv *wm0010)
+{
+        enum wm0010_state state;
+        unsigned long flags;
+
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        state = wm0010->state;
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+
+        dev_err(wm0010->dev, "Failed to transition from `%s' state to `%s' state\n",
+                wm0010_state_to_str(state), wm0010_state_to_str(state + 1));
+
+        wm0010->boot_failed = true;
+}
+
+static void wm0010_boot_xfer_complete(void *data)
+{
+        struct wm0010_boot_xfer *xfer = data;
+        struct snd_soc_codec *codec = xfer->codec;
+        struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec);
+        u32 *out32 = xfer->t.rx_buf;
+        int i;
+
+        if (xfer->m.status != 0) {
+                dev_err(codec->dev, "SPI transfer failed: %d\n",
+                        xfer->m.status);
+                wm0010_mark_boot_failure(wm0010);
+                if (xfer->done)
+                        complete(xfer->done);
+                return;
+        }
+
+        for (i = 0; i < xfer->t.len / 4; i++) {
+                dev_dbg(codec->dev, "%d: %04x\n", i, out32[i]);
+
+                switch (be32_to_cpu(out32[i])) {
+                case 0xe0e0e0e0:
+                        dev_err(codec->dev,
+                                "%d: ROM error reported in stage 2\n", i);
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x55555555:
+                        if (wm0010->boot_done == 0)
+                                break;
+                        dev_err(codec->dev,
+                                "%d: ROM bootloader running in stage 2\n", i);
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x0fed0000:
+                        dev_dbg(codec->dev, "Stage2 loader running\n");
+                        break;
+
+                case 0x0fed0007:
+                        dev_dbg(codec->dev, "CODE_HDR packet received\n");
+                        break;
+
+                case 0x0fed0008:
+                        dev_dbg(codec->dev, "CODE_DATA packet received\n");
+                        break;
+
+                case 0x0fed0009:
+                        dev_dbg(codec->dev, "Download complete\n");
+                        break;
+
+                case 0x0fed000c:
+                        dev_dbg(codec->dev, "Application start\n");
+                        break;
+
+                case 0x0fed000e:
+                        dev_dbg(codec->dev, "PLL packet received\n");
+                        wm0010->pll_running = true;
+                        break;
+
+                case 0x0fed0025:
+                        dev_err(codec->dev, "Device reports image too long\n");
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x0fed002c:
+                        dev_err(codec->dev, "Device reports bad SPI packet\n");
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x0fed0031:
+                        dev_err(codec->dev, "Device reports SPI read overflow\n");
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x0fed0032:
+                        dev_err(codec->dev, "Device reports SPI underclock\n");
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x0fed0033:
+                        dev_err(codec->dev, "Device reports bad header packet\n");
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x0fed0034:
+                        dev_err(codec->dev, "Device reports invalid packet type\n");
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x0fed0035:
+                        dev_err(codec->dev, "Device reports data before header error\n");
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                case 0x0fed0038:
+                        dev_err(codec->dev, "Device reports invalid PLL packet\n");
+                        break;
+
+                case 0x0fed003a:
+                        dev_err(codec->dev, "Device reports packet alignment error\n");
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+
+                default:
+                        dev_err(codec->dev, "Unrecognised return 0x%x\n",
+                            be32_to_cpu(out32[i]));
+                        wm0010_mark_boot_failure(wm0010);
+                        break;
+                }
+
+                if (wm0010->boot_failed)
+                        break;
+        }
+
+        wm0010->boot_done++;
+        if (xfer->done)
+                complete(xfer->done);
+}
+
+static void byte_swap_64(u64 *data_in, u64 *data_out, u32 len)
+{
+        int i;
+
+        for (i = 0; i < len / 8; i++)
+                data_out[i] = cpu_to_be64(le64_to_cpu(data_in[i]));
+}
+
+static int wm0010_boot(struct snd_soc_codec *codec)
+{
+        struct spi_device *spi = to_spi_device(codec->dev);
+        struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec);
+        unsigned long flags;
+        struct list_head xfer_list;
+        struct wm0010_boot_xfer *xfer;
+        int ret;
+        struct completion done;
+        const struct firmware *fw;
+        const struct dfw_binrec *rec;
+        struct spi_message m;
+        struct spi_transfer t;
+        struct dfw_pllrec pll_rec;
+        u32 *img, *p;
+        u64 *img_swap;
+        u8 *out;
+        u32 len, offset;
+        int i;
+
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        if (wm0010->state != WM0010_POWER_OFF)
+                dev_warn(wm0010->dev, "DSP already powered up!\n");
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+
+        if (wm0010->sysclk > 26000000) {
+                dev_err(codec->dev, "Max DSP clock frequency is 26MHz\n");
+                ret = -ECANCELED;
+                goto err;
+        }
+
+        INIT_LIST_HEAD(&xfer_list);
+
+        mutex_lock(&wm0010->lock);
+        wm0010->pll_running = false;
+
+        dev_dbg(codec->dev, "max_spi_freq: %d\n", wm0010->max_spi_freq);
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(wm0010->core_supplies),
+                                    wm0010->core_supplies);
+        if (ret != 0) {
+                dev_err(&spi->dev, "Failed to enable core supplies: %d\n",
+                        ret);
+                mutex_unlock(&wm0010->lock);
+                goto err;
+        }
+
+        ret = regulator_enable(wm0010->dbvdd);
+        if (ret != 0) {
+                dev_err(&spi->dev, "Failed to enable DBVDD: %d\n", ret);
+                goto err_core;
+        }
+
+        /* Release reset */
+        gpio_set_value(wm0010->gpio_reset, !wm0010->gpio_reset_value);
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        wm0010->state = WM0010_OUT_OF_RESET;
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+
+        /* First the bootloader */
+        ret = request_firmware(&fw, "wm0010_stage2.bin", codec->dev);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to request stage2 loader: %d\n",
+                        ret);
+                goto abort;
+        }
+
+        if (!wait_for_completion_timeout(&wm0010->boot_completion,
+                                         msecs_to_jiffies(10)))
+                dev_err(codec->dev, "Failed to get interrupt from DSP\n");
+
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        wm0010->state = WM0010_BOOTROM;
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+
+        dev_dbg(codec->dev, "Downloading %zu byte stage 2 loader\n", fw->size);
+
+        /* Copy to local buffer first as vmalloc causes problems for dma */
+        img = kzalloc(fw->size, GFP_KERNEL);
+        if (!img) {
+                dev_err(codec->dev, "Failed to allocate image buffer\n");
+                goto abort;
+        }
+
+        out = kzalloc(fw->size, GFP_KERNEL);
+        if (!out) {
+                dev_err(codec->dev, "Failed to allocate output buffer\n");
+                goto abort;
+        }
+
+        memcpy(img, &fw->data[0], fw->size);
+
+        spi_message_init(&m);
+        memset(&t, 0, sizeof(t));
+        t.rx_buf = out;
+        t.tx_buf = img;
+        t.len = fw->size;
+        t.bits_per_word = 8;
+        t.speed_hz = wm0010->sysclk / 10;
+        spi_message_add_tail(&t, &m);
+
+        dev_dbg(codec->dev, "Starting initial download at %dHz\n",
+                t.speed_hz);
+
+        ret = spi_sync(spi, &m);
+        if (ret != 0) {
+                dev_err(codec->dev, "Initial download failed: %d\n", ret);
+                goto abort;
+        }
+
+        /* Look for errors from the boot ROM */
+        for (i = 0; i < fw->size; i++) {
+                if (out[i] != 0x55) {
+                        ret = -EBUSY;
+                        dev_err(codec->dev, "Boot ROM error: %x in %d\n",
+                                out[i], i);
+                        wm0010_mark_boot_failure(wm0010);
+                        goto abort;
+                }
+        }
+
+        release_firmware(fw);
+        kfree(img);
+        kfree(out);
+
+        if (!wait_for_completion_timeout(&wm0010->boot_completion,
+                                         msecs_to_jiffies(10)))
+                dev_err(codec->dev, "Failed to get interrupt from DSP loader.\n");
+
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        wm0010->state = WM0010_STAGE2;
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+
+        /* Only initialise PLL if max_spi_freq initialised */
+        if (wm0010->max_spi_freq) {
+
+                /* Initialise a PLL record */
+                memset(&pll_rec, 0, sizeof(pll_rec));
+                pll_rec.command = DFW_CMD_PLL;
+                pll_rec.length = (sizeof(pll_rec) - 8);
+
+                /* On wm0010 only the CLKCTRL1 value is used */
+                pll_rec.clkctrl1 = wm0010->pll_clkctrl1;
+
+                len = pll_rec.length + 8;
+                out = kzalloc(len, GFP_KERNEL);
+                if (!out) {
+                        dev_err(codec->dev,
+                                "Failed to allocate RX buffer\n");
+                        goto abort;
+                }
+
+                img_swap = kzalloc(len, GFP_KERNEL);
+                if (!img_swap) {
+                        dev_err(codec->dev,
+                                "Failed to allocate image buffer\n");
+                        goto abort;
+                }
+
+                /* We need to re-order for 0010 */
+                byte_swap_64((u64 *)&pll_rec, img_swap, len);
+
+                spi_message_init(&m);
+                memset(&t, 0, sizeof(t));
+                t.rx_buf = out;
+                t.tx_buf = img_swap;
+                t.len = len;
+                t.bits_per_word = 8;
+                t.speed_hz = wm0010->sysclk / 6;
+                spi_message_add_tail(&t, &m);
+
+                ret = spi_sync(spi, &m);
+                if (ret != 0) {
+                        dev_err(codec->dev, "First PLL write failed: %d\n", ret);
+                        goto abort;
+                }
+
+                /* Use a second send of the message to get the return status */
+                ret = spi_sync(spi, &m);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Second PLL write failed: %d\n", ret);
+                        goto abort;
+                }
+
+                p = (u32 *)out;
+
+                /* Look for PLL active code from the DSP */
+                for (i = 0; i < len / 4; i++) {
+                        if (*p == 0x0e00ed0f) {
+                                dev_dbg(codec->dev, "PLL packet received\n");
+                                wm0010->pll_running = true;
+                                break;
+                        }
+                        p++;
+                }
+
+                kfree(img_swap);
+                kfree(out);
+        } else
+                dev_dbg(codec->dev, "Not enabling DSP PLL.");
+
+        ret = request_firmware(&fw, "wm0010.dfw", codec->dev);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to request application: %d\n",
+                        ret);
+                goto abort;
+        }
+
+        rec = (const struct dfw_binrec *)fw->data;
+        offset = 0;
+        wm0010->boot_done = 0;
+        wm0010->boot_failed = false;
+        BUG_ON(!list_empty(&xfer_list));
+        init_completion(&done);
+
+        /* First record should be INFO */
+        if (rec->command != DFW_CMD_INFO) {
+                dev_err(codec->dev, "First record not INFO\r\n");
+                goto abort;
+        }
+
+        /* Check it's a 0010 file */
+        if (rec->data[0] != DEVICE_ID_WM0010) {
+                dev_err(codec->dev, "Not a WM0010 firmware file.\r\n");
+                goto abort;
+        }
+
+        /* Skip the info record as we don't need to send it */
+        offset += ((rec->length) + 8);
+        rec = (void *)&rec->data[rec->length];
+
+        while (offset < fw->size) {
+                dev_dbg(codec->dev,
+                        "Packet: command %d, data length = 0x%x\r\n",
+                        rec->command, rec->length);
+                len = rec->length + 8;
+
+                out = kzalloc(len, GFP_KERNEL);
+                if (!out) {
+                        dev_err(codec->dev,
+                                "Failed to allocate RX buffer\n");
+                        goto abort;
+                }
+
+                img_swap = kzalloc(len, GFP_KERNEL);
+                if (!img_swap) {
+                        dev_err(codec->dev,
+                                "Failed to allocate image buffer\n");
+                        goto abort;
+                }
+
+                /* We need to re-order for 0010 */
+                byte_swap_64((u64 *)&rec->command, img_swap, len);
+
+                xfer = kzalloc(sizeof(*xfer), GFP_KERNEL);
+                if (!xfer) {
+                        dev_err(codec->dev, "Failed to allocate xfer\n");
+                        goto abort;
+                }
+
+                xfer->codec = codec;
+                list_add_tail(&xfer->list, &xfer_list);
+
+                spi_message_init(&xfer->m);
+                xfer->m.complete = wm0010_boot_xfer_complete;
+                xfer->m.context = xfer;
+                xfer->t.tx_buf = img_swap;
+                xfer->t.rx_buf = out;
+                xfer->t.len = len;
+                xfer->t.bits_per_word = 8;
+
+                if (!wm0010->pll_running) {
+                        xfer->t.speed_hz = wm0010->sysclk / 6;
+                } else {
+                        xfer->t.speed_hz = wm0010->max_spi_freq;
+
+                        if (wm0010->board_max_spi_speed &&
+                           (wm0010->board_max_spi_speed < wm0010->max_spi_freq))
+                                        xfer->t.speed_hz = wm0010->board_max_spi_speed;
+                }
+
+                /* Store max usable spi frequency for later use */
+                wm0010->max_spi_freq = xfer->t.speed_hz;
+
+                spi_message_add_tail(&xfer->t, &xfer->m);
+
+                offset += ((rec->length) + 8);
+                rec = (void *)&rec->data[rec->length];
+
+                if (offset >= fw->size) {
+                        dev_dbg(codec->dev, "All transfers scheduled\n");
+                        xfer->done = &done;
+                }
+
+                ret = spi_async(spi, &xfer->m);
+                if (ret != 0) {
+                        dev_err(codec->dev, "Write failed: %d\n", ret);
+                        goto abort;
+                }
+
+                if (wm0010->boot_failed)
+                        goto abort;
+        }
+
+        wait_for_completion(&done);
+
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        wm0010->state = WM0010_FIRMWARE;
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+
+        mutex_unlock(&wm0010->lock);
+
+        release_firmware(fw);
+
+        while (!list_empty(&xfer_list)) {
+                xfer = list_first_entry(&xfer_list, struct wm0010_boot_xfer,
+                                        list);
+                kfree(xfer->t.rx_buf);
+                kfree(xfer->t.tx_buf);
+                list_del(&xfer->list);
+                kfree(xfer);
+        }
+
+        return 0;
+
+abort:
+        /* Put the chip back into reset */
+        wm0010_halt(codec);
+        mutex_unlock(&wm0010->lock);
+        return ret;
+
+err_core:
+        mutex_unlock(&wm0010->lock);
+        regulator_bulk_disable(ARRAY_SIZE(wm0010->core_supplies),
+                               wm0010->core_supplies);
+err:
+        return ret;
+}
+
+static int wm0010_set_bias_level(struct snd_soc_codec *codec,
+                                 enum snd_soc_bias_level level)
+{
+        struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec);
+
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE)
+                        wm0010_boot(codec);
+                break;
+        case SND_SOC_BIAS_PREPARE:
+                break;
+        case SND_SOC_BIAS_STANDBY:
+                if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE) {
+                        mutex_lock(&wm0010->lock);
+                        wm0010_halt(codec);
+                        mutex_unlock(&wm0010->lock);
+                }
+                break;
+        case SND_SOC_BIAS_OFF:
+                break;
+        }
+
+        codec->dapm.bias_level = level;
+
+        return 0;
+}
+
+static int wm0010_set_sysclk(struct snd_soc_codec *codec, int source,
+                             int clk_id, unsigned int freq, int dir)
+{
+        struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec);
+        unsigned int i;
+
+        wm0010->sysclk = freq;
+
+        if (freq < pll_clock_map[ARRAY_SIZE(pll_clock_map)-1].max_sysclk) {
+                wm0010->max_spi_freq = 0;
+        } else {
+                for (i = 0; i < ARRAY_SIZE(pll_clock_map); i++)
+                        if (freq >= pll_clock_map[i].max_sysclk)
+                                break;
+
+                wm0010->max_spi_freq = pll_clock_map[i].max_pll_spi_speed;
+                wm0010->pll_clkctrl1 = pll_clock_map[i].pll_clkctrl1;
+        }
+
+        return 0;
+}
+
+static int wm0010_probe(struct snd_soc_codec *codec);
+
+static struct snd_soc_codec_driver soc_codec_dev_wm0010 = {
+        .probe = wm0010_probe,
+        .set_bias_level = wm0010_set_bias_level,
+        .set_sysclk = wm0010_set_sysclk,
+        .idle_bias_off = true,
+
+        .dapm_widgets = wm0010_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(wm0010_dapm_widgets),
+        .dapm_routes = wm0010_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(wm0010_dapm_routes),
+};
+
+#define WM0010_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
+#define WM0010_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\
+                        SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE |\
+                        SNDRV_PCM_FMTBIT_S32_LE)
+
+static struct snd_soc_dai_driver wm0010_dai[] = {
+        {
+                .name = "wm0010-sdi1",
+                .playback = {
+                        .stream_name = "SDI1 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = WM0010_RATES,
+                        .formats = WM0010_FORMATS,
+                },
+                .capture = {
+                         .stream_name = "SDI1 Capture",
+                         .channels_min = 1,
+                         .channels_max = 2,
+                         .rates = WM0010_RATES,
+                         .formats = WM0010_FORMATS,
+                 },
+        },
+        {
+                .name = "wm0010-sdi2",
+                .playback = {
+                        .stream_name = "SDI2 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = WM0010_RATES,
+                        .formats = WM0010_FORMATS,
+                },
+                .capture = {
+                         .stream_name = "SDI2 Capture",
+                         .channels_min = 1,
+                         .channels_max = 2,
+                         .rates = WM0010_RATES,
+                         .formats = WM0010_FORMATS,
+                 },
+        },
+};
+
+static irqreturn_t wm0010_irq(int irq, void *data)
+{
+        struct wm0010_priv *wm0010 = data;
+
+        switch (wm0010->state) {
+        case WM0010_POWER_OFF:
+        case WM0010_OUT_OF_RESET:
+        case WM0010_BOOTROM:
+        case WM0010_STAGE2:
+                spin_lock(&wm0010->irq_lock);
+                complete(&wm0010->boot_completion);
+                spin_unlock(&wm0010->irq_lock);
+                return IRQ_HANDLED;
+        default:
+                return IRQ_NONE;
+        }
+
+        return IRQ_NONE;
+}
+
+static int wm0010_probe(struct snd_soc_codec *codec)
+{
+        struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec);
+
+        wm0010->codec = codec;
+
+        return 0;
+}
+
+static int __devinit wm0010_spi_probe(struct spi_device *spi)
+{
+        unsigned long flags;
+        unsigned long gpio_flags;
+        int ret;
+        int trigger;
+        int irq;
+        struct wm0010_priv *wm0010;
+
+        wm0010 = devm_kzalloc(&spi->dev, sizeof(*wm0010),
+                              GFP_KERNEL);
+        if (!wm0010)
+                return -ENOMEM;
+
+        mutex_init(&wm0010->lock);
+        spin_lock_init(&wm0010->irq_lock);
+
+        spi_set_drvdata(spi, wm0010);
+        wm0010->dev = &spi->dev;
+
+        if (dev_get_platdata(&spi->dev))
+                memcpy(&wm0010->pdata, dev_get_platdata(&spi->dev),
+                       sizeof(wm0010->pdata));
+
+        init_completion(&wm0010->boot_completion);
+
+        wm0010->core_supplies[0].supply = "AVDD";
+        wm0010->core_supplies[1].supply = "DCVDD";
+        ret = devm_regulator_bulk_get(wm0010->dev, ARRAY_SIZE(wm0010->core_supplies),
+                                      wm0010->core_supplies);
+        if (ret != 0) {
+                dev_err(wm0010->dev, "Failed to obtain core supplies: %d\n",
+                        ret);
+                return ret;
+        }
+
+        wm0010->dbvdd = devm_regulator_get(wm0010->dev, "DBVDD");
+        if (IS_ERR(wm0010->dbvdd)) {
+                ret = PTR_ERR(wm0010->dbvdd);
+                dev_err(wm0010->dev, "Failed to obtain DBVDD: %d\n", ret);
+                return ret;
+        }
+
+        if (wm0010->pdata.gpio_reset) {
+                wm0010->gpio_reset = wm0010->pdata.gpio_reset;
+
+                if (wm0010->pdata.reset_active_high)
+                        wm0010->gpio_reset_value = 1;
+                else
+                        wm0010->gpio_reset_value = 0;
+
+                if (wm0010->gpio_reset_value)
+                        gpio_flags = GPIOF_OUT_INIT_HIGH;
+                else
+                        gpio_flags = GPIOF_OUT_INIT_LOW;
+
+                ret = devm_gpio_request_one(wm0010->dev, wm0010->gpio_reset,
+                                            gpio_flags, "wm0010 reset");
+                if (ret < 0) {
+                        dev_err(wm0010->dev,
+                                "Failed to request GPIO for DSP reset: %d\n",
+                                ret);
+                        return ret;
+                }
+        } else {
+                dev_err(wm0010->dev, "No reset GPIO configured\n");
+                return -EINVAL;
+        }
+
+        irq = spi->irq;
+        if (wm0010->pdata.irq_flags)
+                trigger = wm0010->pdata.irq_flags;
+        else
+                trigger = IRQF_TRIGGER_FALLING;
+        trigger |= IRQF_ONESHOT;
+
+        ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger | IRQF_ONESHOT,
+                                   "wm0010", wm0010);
+        if (ret) {
+                dev_err(wm0010->dev, "Failed to request IRQ %d: %d\n",
+                        irq, ret);
+                return ret;
+        }
+        wm0010->irq = irq;
+
+        if (spi->max_speed_hz)
+                wm0010->board_max_spi_speed = spi->max_speed_hz;
+        else
+                wm0010->board_max_spi_speed = 0;
+
+        spin_lock_irqsave(&wm0010->irq_lock, flags);
+        wm0010->state = WM0010_POWER_OFF;
+        spin_unlock_irqrestore(&wm0010->irq_lock, flags);
+
+        ret = snd_soc_register_codec(&spi->dev,
+                                     &soc_codec_dev_wm0010, wm0010_dai,
+                                     ARRAY_SIZE(wm0010_dai));
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int __devexit wm0010_spi_remove(struct spi_device *spi)
+{
+        struct wm0010_priv *wm0010 = spi_get_drvdata(spi);
+
+        snd_soc_unregister_codec(&spi->dev);
+
+        if (wm0010->gpio_reset) {
+                /* Remember to put chip back into reset */
+                gpio_set_value(wm0010->gpio_reset, wm0010->gpio_reset_value);
+        }
+
+        if (wm0010->irq)
+                free_irq(wm0010->irq, wm0010);
+
+        return 0;
+}
+
+static struct spi_driver wm0010_spi_driver = {
+        .driver = {
+                .name   = "wm0010",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = wm0010_spi_probe,
+        .remove         = __devexit_p(wm0010_spi_remove),
+};
+
+module_spi_driver(wm0010_spi_driver);
+
+MODULE_DESCRIPTION("ASoC WM0010 driver");
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index 3fd5b29dc933..b723e910fcdc 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -31,6 +31,7 @@
 #include <linux/i2c.h>
 #include <linux/regmap.h>
 #include <linux/debugfs.h>
+#include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -43,6 +44,14 @@
 
 #include "wm2000.h"
 
+#define WM2000_NUM_SUPPLIES 3
+
+static const char *wm2000_supplies[WM2000_NUM_SUPPLIES] = {
+        "SPKVDD",
+        "DBVDD",
+        "DCVDD",
+};
+
 enum wm2000_anc_mode {
         ANC_ACTIVE = 0,
         ANC_BYPASS = 1,
@@ -54,6 +63,8 @@ struct wm2000_priv {
         struct i2c_client *i2c;
         struct regmap *regmap;
 
+        struct regulator_bulk_data supplies[WM2000_NUM_SUPPLIES];
+
         enum wm2000_anc_mode anc_mode;
 
         unsigned int anc_active:1;
@@ -126,6 +137,12 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
 
         dev_dbg(&i2c->dev, "Beginning power up\n");
 
+        ret = regulator_bulk_enable(WM2000_NUM_SUPPLIES, wm2000->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
         if (!wm2000->mclk_div) {
                 dev_dbg(&i2c->dev, "Disabling MCLK divider\n");
                 wm2000_write(i2c, WM2000_REG_SYS_CTL2,
@@ -143,12 +160,14 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
         if (!wm2000_poll_bit(i2c, WM2000_REG_ANC_STAT,
                              WM2000_ANC_ENG_IDLE)) {
                 dev_err(&i2c->dev, "ANC engine failed to reset\n");
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return -ETIMEDOUT;
         }
 
         if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS,
                              WM2000_STATUS_BOOT_COMPLETE)) {
                 dev_err(&i2c->dev, "ANC engine failed to initialise\n");
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return -ETIMEDOUT;
         }
 
@@ -163,11 +182,13 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
                               wm2000->anc_download_size);
         if (ret < 0) {
                 dev_err(&i2c->dev, "i2c_transfer() failed: %d\n", ret);
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return ret;
         }
         if (ret != wm2000->anc_download_size) {
                 dev_err(&i2c->dev, "i2c_transfer() failed, %d != %d\n",
                         ret, wm2000->anc_download_size);
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return -EIO;
         }
 
@@ -201,6 +222,7 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
         if (!wm2000_poll_bit(i2c, WM2000_REG_SYS_STATUS,
                              WM2000_STATUS_MOUSE_ACTIVE)) {
                 dev_err(&i2c->dev, "Timed out waiting for device\n");
+                regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
                 return -ETIMEDOUT;
         }
 
@@ -238,6 +260,8 @@ static int wm2000_power_down(struct i2c_client *i2c, int analogue)
                 return -ETIMEDOUT;
         }
 
+        regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
+
         dev_dbg(&i2c->dev, "powered off\n");
         wm2000->anc_mode = ANC_OFF;
 
@@ -747,7 +771,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         struct wm2000_platform_data *pdata;
         const char *filename;
         const struct firmware *fw = NULL;
-        int ret;
+        int ret, i;
         int reg;
         u16 id;
 
@@ -760,7 +784,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
 
         dev_set_drvdata(&i2c->dev, wm2000);
 
-        wm2000->regmap = regmap_init_i2c(i2c, &wm2000_regmap);
+        wm2000->regmap = devm_regmap_init_i2c(i2c, &wm2000_regmap);
         if (IS_ERR(wm2000->regmap)) {
                 ret = PTR_ERR(wm2000->regmap);
                 dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@@ -768,6 +792,22 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
                 goto out;
         }
 
+        for (i = 0; i < WM2000_NUM_SUPPLIES; i++)
+                wm2000->supplies[i].supply = wm2000_supplies[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, WM2000_NUM_SUPPLIES,
+                                      wm2000->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to get supplies: %d\n", ret);
+                return ret;
+        }
+
+        ret = regulator_bulk_enable(WM2000_NUM_SUPPLIES, wm2000->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
         /* Verify that this is a WM2000 */
         reg = wm2000_read(i2c, WM2000_REG_ID1);
         id = reg << 8;
@@ -777,7 +817,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         if (id != 0x2000) {
                 dev_err(&i2c->dev, "Device is not a WM2000 - ID %x\n", id);
                 ret = -ENODEV;
-                goto out_regmap_exit;
+                goto err_supplies;
         }
 
         reg = wm2000_read(i2c, WM2000_REG_REVISON);
@@ -796,7 +836,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         ret = request_firmware(&fw, filename, &i2c->dev);
         if (ret != 0) {
                 dev_err(&i2c->dev, "Failed to acquire ANC data: %d\n", ret);
-                goto out_regmap_exit;
+                goto err_supplies;
         }
 
         /* Pre-cook the concatenation of the register address onto the image */
@@ -807,7 +847,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         if (wm2000->anc_download == NULL) {
                 dev_err(&i2c->dev, "Out of memory\n");
                 ret = -ENOMEM;
-                goto out_regmap_exit;
+                goto err_supplies;
         }
 
         wm2000->anc_download[0] = 0x80;
@@ -822,11 +862,10 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         wm2000_reset(wm2000);
 
         ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000, NULL, 0);
-        if (!ret)
-                goto out;
 
-out_regmap_exit:
-        regmap_exit(wm2000->regmap);
+err_supplies:
+        regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies);
+
 out:
         release_firmware(fw);
         return ret;
@@ -834,10 +873,7 @@ out:
 
 static __devexit int wm2000_i2c_remove(struct i2c_client *i2c)
 {
-        struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev);
-
         snd_soc_unregister_codec(&i2c->dev);
-        regmap_exit(wm2000->regmap);
 
         return 0;
 }
@@ -858,17 +894,7 @@ static struct i2c_driver wm2000_i2c_driver = {
         .id_table = wm2000_i2c_id,
 };
 
-static int __init wm2000_init(void)
-{
-        return i2c_add_driver(&wm2000_i2c_driver);
-}
-module_init(wm2000_init);
-
-static void __exit wm2000_exit(void)
-{
-        i2c_del_driver(&wm2000_i2c_driver);
-}
-module_exit(wm2000_exit);
+module_i2c_driver(wm2000_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM2000 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfonmicro.com>");
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index 32682c1b7cde..efa93dbb0191 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1117,8 +1117,8 @@ SND_SOC_DAPM_SUPPLY("MICBIAS1", WM2200_MIC_BIAS_CTRL_1, WM2200_MICB1_ENA_SHIFT,
                     0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("MICBIAS2", WM2200_MIC_BIAS_CTRL_2, WM2200_MICB2_ENA_SHIFT,
                     0, NULL, 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20),
-SND_SOC_DAPM_REGULATOR_SUPPLY("AVDD", 20),
+SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("AVDD", 20, 0),
 
 SND_SOC_DAPM_INPUT("IN1L"),
 SND_SOC_DAPM_INPUT("IN1R"),
@@ -2270,17 +2270,7 @@ static struct i2c_driver wm2200_i2c_driver = {
         .id_table = wm2200_i2c_id,
 };
 
-static int __init wm2200_modinit(void)
-{
-        return i2c_add_driver(&wm2200_i2c_driver);
-}
-module_init(wm2200_modinit);
-
-static void __exit wm2200_exit(void)
-{
-        i2c_del_driver(&wm2200_i2c_driver);
-}
-module_exit(wm2200_exit);
+module_i2c_driver(wm2200_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM2200 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index f4817292ef45..4da1b92b22c2 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -848,9 +848,9 @@ SND_SOC_DAPM_SUPPLY("SYSCLK", WM5100_CLOCKING_3, WM5100_SYSCLK_ENA_SHIFT, 0,
 SND_SOC_DAPM_SUPPLY("ASYNCCLK", WM5100_CLOCKING_6, WM5100_ASYNC_CLK_ENA_SHIFT,
                     0, NULL, 0),
 
-SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20),
-SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD2", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD3", 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD2", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD3", 0, 0),
 
 SND_SOC_DAPM_SUPPLY("CP1", WM5100_HP_CHARGE_PUMP_1, WM5100_CP1_ENA_SHIFT, 0,
                     NULL, 0),
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index e33d327396ad..4a2db4e10885 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -274,18 +274,43 @@ ARIZONA_MIXER_ENUMS(ASRC1R, ARIZONA_ASRC1RMIX_INPUT_1_SOURCE);
 ARIZONA_MIXER_ENUMS(ASRC2L, ARIZONA_ASRC2LMIX_INPUT_1_SOURCE);
 ARIZONA_MIXER_ENUMS(ASRC2R, ARIZONA_ASRC2RMIX_INPUT_1_SOURCE);
 
+
+static const char *wm5102_aec_loopback_texts[] = {
+        "HPOUT1L", "HPOUT1R", "HPOUT2L", "HPOUT2R", "EPOUT",
+        "SPKOUTL", "SPKOUTR", "SPKDAT1L", "SPKDAT1R",
+};
+
+static const unsigned int wm5102_aec_loopback_values[] = {
+        0, 1, 2, 3, 4, 6, 7, 8, 9,
+};
+
+static const struct soc_enum wm5102_aec_loopback =
+        SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1,
+                              ARIZONA_AEC_LOOPBACK_SRC_SHIFT,
+                              ARIZONA_AEC_LOOPBACK_SRC_MASK,
+                              ARRAY_SIZE(wm5102_aec_loopback_texts),
+                              wm5102_aec_loopback_texts,
+                              wm5102_aec_loopback_values);
+
+static const struct snd_kcontrol_new wm5102_aec_loopback_mux =
+        SOC_DAPM_VALUE_ENUM("AEC Loopback", wm5102_aec_loopback);
+
 static const struct snd_soc_dapm_widget wm5102_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
                     0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,
                     ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),
-
-SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD2", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD3", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20),
-SND_SOC_DAPM_REGULATOR_SUPPLY("MICVDD", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDL", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDR", 0),
+SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,
+                    ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),
+SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,
+                    ARIZONA_OPCLK_ASYNC_ENA_SHIFT, 0, NULL, 0),
+
+SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD2", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD3", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("MICVDD", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDL", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDR", 0, 0),
 
 SND_SOC_DAPM_SIGGEN("TONE"),
 SND_SOC_DAPM_SIGGEN("NOISE"),
@@ -421,6 +446,9 @@ SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,
 SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,
                     ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),
 
+SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
+                       ARIZONA_AEC_LOOPBACK_ENA, 0, &wm5102_aec_loopback_mux),
+
 SND_SOC_DAPM_PGA_E("OUT1L", ARIZONA_OUTPUT_ENABLES_1,
                    ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
                    SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
@@ -516,6 +544,7 @@ SND_SOC_DAPM_OUTPUT("SPKDAT1R"),
         { name, "Noise Generator", "Noise Generator" }, \
         { name, "Tone Generator 1", "Tone Generator 1" }, \
         { name, "Tone Generator 2", "Tone Generator 2" }, \
+        { name, "AEC", "AEC Loopback" }, \
         { name, "IN1L", "IN1L PGA" }, \
         { name, "IN1R", "IN1R PGA" }, \
         { name, "IN2L", "IN2L PGA" }, \
@@ -681,21 +710,30 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = {
         ARIZONA_MIXER_ROUTES("ASRC2L", "ASRC2L"),
         ARIZONA_MIXER_ROUTES("ASRC2R", "ASRC2R"),
 
+        { "AEC Loopback", "HPOUT1L", "OUT1L" },
+        { "AEC Loopback", "HPOUT1R", "OUT1R" },
         { "HPOUT1L", NULL, "OUT1L" },
         { "HPOUT1R", NULL, "OUT1R" },
 
+        { "AEC Loopback", "HPOUT2L", "OUT2L" },
+        { "AEC Loopback", "HPOUT2R", "OUT2R" },
         { "HPOUT2L", NULL, "OUT2L" },
         { "HPOUT2R", NULL, "OUT2R" },
 
+        { "AEC Loopback", "EPOUT", "OUT3L" },
         { "EPOUTN", NULL, "OUT3L" },
         { "EPOUTP", NULL, "OUT3L" },
 
+        { "AEC Loopback", "SPKOUTL", "OUT4L" },
         { "SPKOUTLN", NULL, "OUT4L" },
         { "SPKOUTLP", NULL, "OUT4L" },
 
+        { "AEC Loopback", "SPKOUTR", "OUT4R" },
         { "SPKOUTRN", NULL, "OUT4R" },
         { "SPKOUTRP", NULL, "OUT4R" },
 
+        { "AEC Loopback", "SPKDAT1L", "OUT5L" },
+        { "AEC Loopback", "SPKDAT1R", "OUT5R" },
         { "SPKDAT1L", NULL, "OUT5L" },
         { "SPKDAT1R", NULL, "OUT5R" },
 };
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 01ebbcc5c6a4..bf47914234b3 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -305,13 +305,17 @@ SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
                     0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,
                     ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),
-
-SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD2", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD3", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20),
-SND_SOC_DAPM_REGULATOR_SUPPLY("MICVDD", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDL", 0),
-SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDR", 0),
+SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,
+                    ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),
+SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,
+                    ARIZONA_OPCLK_ASYNC_ENA_SHIFT, 0, NULL, 0),
+
+SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD2", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("DBVDD3", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("MICVDD", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDL", 0, 0),
+SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDR", 0, 0),
 
 SND_SOC_DAPM_SIGGEN("TONE"),
 SND_SOC_DAPM_SIGGEN("NOISE"),
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 56a049555e2c..c12a54e72e89 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -20,6 +20,7 @@
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -33,24 +34,75 @@
  * We can't read the WM8510 register space when we are
  * using 2 wire for device control, so we cache them instead.
  */
-static const u16 wm8510_reg[WM8510_CACHEREGNUM] = {
-        0x0000, 0x0000, 0x0000, 0x0000,
-        0x0050, 0x0000, 0x0140, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x00ff,
-        0x0000, 0x0000, 0x0100, 0x00ff,
-        0x0000, 0x0000, 0x012c, 0x002c,
-        0x002c, 0x002c, 0x002c, 0x0000,
-        0x0032, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000,
-        0x0038, 0x000b, 0x0032, 0x0000,
-        0x0008, 0x000c, 0x0093, 0x00e9,
-        0x0000, 0x0000, 0x0000, 0x0000,
-        0x0003, 0x0010, 0x0000, 0x0000,
-        0x0000, 0x0002, 0x0001, 0x0000,
-        0x0000, 0x0000, 0x0039, 0x0000,
-        0x0001,
+static const struct reg_default wm8510_reg_defaults[] = {
+        {  1, 0x0000 },
+        {  2, 0x0000 },
+        {  3, 0x0000 },
+        {  4, 0x0050 },
+        {  5, 0x0000 },
+        {  6, 0x0140 },
+        {  7, 0x0000 },
+        {  8, 0x0000 },
+        {  9, 0x0000 },
+        { 10, 0x0000 },
+        { 11, 0x00ff },
+        { 12, 0x0000 },
+        { 13, 0x0000 },
+        { 14, 0x0100 },
+        { 15, 0x00ff },
+        { 16, 0x0000 },
+        { 17, 0x0000 },
+        { 18, 0x012c },
+        { 19, 0x002c },
+        { 20, 0x002c },
+        { 21, 0x002c },
+        { 22, 0x002c },
+        { 23, 0x0000 },
+        { 24, 0x0032 },
+        { 25, 0x0000 },
+        { 26, 0x0000 },
+        { 27, 0x0000 },
+        { 28, 0x0000 },
+        { 29, 0x0000 },
+        { 30, 0x0000 },
+        { 31, 0x0000 },
+        { 32, 0x0038 },
+        { 33, 0x000b },
+        { 34, 0x0032 },
+        { 35, 0x0000 },
+        { 36, 0x0008 },
+        { 37, 0x000c },
+        { 38, 0x0093 },
+        { 39, 0x00e9 },
+        { 40, 0x0000 },
+        { 41, 0x0000 },
+        { 42, 0x0000 },
+        { 43, 0x0000 },
+        { 44, 0x0003 },
+        { 45, 0x0010 },
+        { 46, 0x0000 },
+        { 47, 0x0000 },
+        { 48, 0x0000 },
+        { 49, 0x0002 },
+        { 50, 0x0001 },
+        { 51, 0x0000 },
+        { 52, 0x0000 },
+        { 53, 0x0000 },
+        { 54, 0x0039 },
+        { 55, 0x0000 },
+        { 56, 0x0001 },
 };
 
+static bool wm8510_volatile(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case WM8510_RESET:
+                return true;
+        default:
+                return false;
+        }
+}
+
 #define WM8510_POWER1_BIASEN  0x08
 #define WM8510_POWER1_BUFIOEN 0x10
 
@@ -58,7 +110,7 @@ static const u16 wm8510_reg[WM8510_CACHEREGNUM] = {
 
 /* codec private data */
 struct wm8510_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
 };
 
 static const char *wm8510_companding[] = { "Off", "NC", "u-law", "A-law" };
@@ -454,6 +506,7 @@ static int wm8510_mute(struct snd_soc_dai *dai, int mute)
 static int wm8510_set_bias_level(struct snd_soc_codec *codec,
         enum snd_soc_bias_level level)
 {
+        struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec);
         u16 power1 = snd_soc_read(codec, WM8510_POWER1) & ~0x3;
 
         switch (level) {
@@ -467,7 +520,7 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec,
                 power1 |= WM8510_POWER1_BIASEN | WM8510_POWER1_BUFIOEN;
 
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                        snd_soc_cache_sync(codec);
+                        regcache_sync(wm8510->regmap);
 
                         /* Initial cap charge at VMID 5k */
                         snd_soc_write(codec, WM8510_POWER1, power1 | 0x3);
@@ -536,10 +589,9 @@ static int wm8510_resume(struct snd_soc_codec *codec)
 
 static int wm8510_probe(struct snd_soc_codec *codec)
 {
-        struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9,  wm8510->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -569,9 +621,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8510 = {
         .suspend =      wm8510_suspend,
         .resume =       wm8510_resume,
         .set_bias_level = wm8510_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8510_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default =wm8510_reg,
 
         .controls = wm8510_snd_controls,
         .num_controls = ARRAY_SIZE(wm8510_snd_controls),
@@ -586,23 +635,38 @@ static const struct of_device_id wm8510_of_match[] = {
         { },
 };
 
+static const struct regmap_config wm8510_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+        .max_register = WM8510_MONOMIX,
+
+        .reg_defaults = wm8510_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8510_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8510_volatile,
+};
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8510_spi_probe(struct spi_device *spi)
 {
         struct wm8510_priv *wm8510;
         int ret;
 
-        wm8510 = kzalloc(sizeof(struct wm8510_priv), GFP_KERNEL);
+        wm8510 = devm_kzalloc(&spi->dev, sizeof(struct wm8510_priv),
+                              GFP_KERNEL);
         if (wm8510 == NULL)
                 return -ENOMEM;
 
-        wm8510->control_type = SND_SOC_SPI;
+        wm8510->regmap = devm_regmap_init_spi(spi, &wm8510_regmap);
+        if (IS_ERR(wm8510->regmap))
+                return PTR_ERR(wm8510->regmap);
+
         spi_set_drvdata(spi, wm8510);
 
         ret = snd_soc_register_codec(&spi->dev,
                         &soc_codec_dev_wm8510, &wm8510_dai, 1);
-        if (ret < 0)
-                kfree(wm8510);
+
         return ret;
 }
 
@@ -630,17 +694,20 @@ static __devinit int wm8510_i2c_probe(struct i2c_client *i2c,
         struct wm8510_priv *wm8510;
         int ret;
 
-        wm8510 = kzalloc(sizeof(struct wm8510_priv), GFP_KERNEL);
+        wm8510 = devm_kzalloc(&i2c->dev, sizeof(struct wm8510_priv),
+                              GFP_KERNEL);
         if (wm8510 == NULL)
                 return -ENOMEM;
 
+        wm8510->regmap = devm_regmap_init_i2c(i2c, &wm8510_regmap);
+        if (IS_ERR(wm8510->regmap))
+                return PTR_ERR(wm8510->regmap);
+
         i2c_set_clientdata(i2c, wm8510);
-        wm8510->control_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8510, &wm8510_dai, 1);
-        if (ret < 0)
-                kfree(wm8510);
+
         return ret;
 }
 
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 1c3ffb290cdc..8d5c27673501 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
@@ -39,41 +40,34 @@ static const char *wm8523_supply_names[WM8523_NUM_SUPPLIES] = {
 
 /* codec private data */
 struct wm8523_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         struct regulator_bulk_data supplies[WM8523_NUM_SUPPLIES];
         unsigned int sysclk;
         unsigned int rate_constraint_list[WM8523_NUM_RATES];
         struct snd_pcm_hw_constraint_list rate_constraint;
 };
 
-static const u16 wm8523_reg[WM8523_REGISTER_COUNT] = {
-        0x8523,     /* R0 - DEVICE_ID */
-        0x0001,     /* R1 - REVISION */
-        0x0000,     /* R2 - PSCTRL1 */
-        0x1812,     /* R3 - AIF_CTRL1 */
-        0x0000,     /* R4 - AIF_CTRL2 */
-        0x0001,     /* R5 - DAC_CTRL3 */
-        0x0190,     /* R6 - DAC_GAINL */
-        0x0190,     /* R7 - DAC_GAINR */
-        0x0000,     /* R8 - ZERO_DETECT */
+static const struct reg_default wm8523_reg_defaults[] = {
+        { 2, 0x0000 },     /* R2 - PSCTRL1 */
+        { 3, 0x1812 },     /* R3 - AIF_CTRL1 */
+        { 4, 0x0000 },     /* R4 - AIF_CTRL2 */
+        { 5, 0x0001 },     /* R5 - DAC_CTRL3 */
+        { 6, 0x0190 },     /* R6 - DAC_GAINL */
+        { 7, 0x0190 },     /* R7 - DAC_GAINR */
+        { 8, 0x0000 },     /* R8 - ZERO_DETECT */
 };
 
-static int wm8523_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
+static bool wm8523_volatile_register(struct device *dev, unsigned int reg)
 {
         switch (reg) {
         case WM8523_DEVICE_ID:
         case WM8523_REVISION:
-                return 1;
+                return true;
         default:
-                return 0;
+                return false;
         }
 }
 
-static int wm8523_reset(struct snd_soc_codec *codec)
-{
-        return snd_soc_write(codec, WM8523_DEVICE_ID, 0);
-}
-
 static const DECLARE_TLV_DB_SCALE(dac_tlv, -10000, 25, 0);
 
 static const char *wm8523_zd_count_text[] = {
@@ -301,8 +295,7 @@ static int wm8523_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
         struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
-        u16 *reg_cache = codec->reg_cache;
-        int ret, i;
+        int ret;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
@@ -325,16 +318,13 @@ static int wm8523_set_bias_level(struct snd_soc_codec *codec,
                                 return ret;
                         }
 
+                        /* Sync back default/cached values */
+                        regcache_sync(wm8523->regmap);
+
                         /* Initial power up */
                         snd_soc_update_bits(codec, WM8523_PSCTRL1,
                                             WM8523_SYS_ENA_MASK, 1);
 
-                        /* Sync back default/cached values */
-                        for (i = WM8523_AIF_CTRL1;
-                             i < WM8523_MAX_REGISTER; i++)
-                                snd_soc_write(codec, i, reg_cache[i]);
-
-
                         msleep(100);
                 }
 
@@ -402,60 +392,18 @@ static int wm8523_resume(struct snd_soc_codec *codec)
 static int wm8523_probe(struct snd_soc_codec *codec)
 {
         struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
-        int ret, i;
+        int ret;
 
         wm8523->rate_constraint.list = &wm8523->rate_constraint_list[0];
         wm8523->rate_constraint.count =
                 ARRAY_SIZE(wm8523->rate_constraint_list);
 
-        ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm8523->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
-        for (i = 0; i < ARRAY_SIZE(wm8523->supplies); i++)
-                wm8523->supplies[i].supply = wm8523_supply_names[i];
-
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8523->supplies),
-                                 wm8523->supplies);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
-                return ret;
-        }
-
-        ret = regulator_bulk_enable(ARRAY_SIZE(wm8523->supplies),
-                                    wm8523->supplies);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
-                goto err_get;
-        }
-
-        ret = snd_soc_read(codec, WM8523_DEVICE_ID);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to read ID register\n");
-                goto err_enable;
-        }
-        if (ret != wm8523_reg[WM8523_DEVICE_ID]) {
-                dev_err(codec->dev, "Device is not a WM8523, ID is %x\n", ret);
-                ret = -EINVAL;
-                goto err_enable;
-        }
-
-        ret = snd_soc_read(codec, WM8523_REVISION);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to read revision register\n");
-                goto err_enable;
-        }
-        dev_info(codec->dev, "revision %c\n",
-                 (ret & WM8523_CHIP_REV_MASK) + 'A');
-
-        ret = wm8523_reset(codec);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to issue reset\n");
-                goto err_enable;
-        }
-
         /* Change some default settings - latch VU and enable ZC */
         snd_soc_update_bits(codec, WM8523_DAC_GAINR,
                             WM8523_DACR_VU, WM8523_DACR_VU);
@@ -463,25 +411,12 @@ static int wm8523_probe(struct snd_soc_codec *codec)
 
         wm8523_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        /* Bias level configuration will have done an extra enable */
-        regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);
-
         return 0;
-
-err_enable:
-        regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);
-err_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);
-
-        return ret;
 }
 
 static int wm8523_remove(struct snd_soc_codec *codec)
 {
-        struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);
-
         wm8523_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        regulator_bulk_free(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);
         return 0;
 }
 
@@ -491,10 +426,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8523 = {
         .suspend =      wm8523_suspend,
         .resume =       wm8523_resume,
         .set_bias_level = wm8523_set_bias_level,
-        .reg_cache_size = WM8523_REGISTER_COUNT,
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8523_reg,
-        .volatile_register = wm8523_volatile_register,
 
         .controls = wm8523_controls,
         .num_controls = ARRAY_SIZE(wm8523_controls),
@@ -509,32 +440,97 @@ static const struct of_device_id wm8523_of_match[] = {
         { },
 };
 
+static const struct regmap_config wm8523_regmap = {
+        .reg_bits = 8,
+        .val_bits = 16,
+        .max_register = WM8523_ZERO_DETECT,
+
+        .reg_defaults = wm8523_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8523_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8523_volatile_register,
+};
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
         struct wm8523_priv *wm8523;
-        int ret;
+        unsigned int val;
+        int ret, i;
 
-        wm8523 = kzalloc(sizeof(struct wm8523_priv), GFP_KERNEL);
+        wm8523 = devm_kzalloc(&i2c->dev, sizeof(struct wm8523_priv),
+                              GFP_KERNEL);
         if (wm8523 == NULL)
                 return -ENOMEM;
 
+        wm8523->regmap = devm_regmap_init_i2c(i2c, &wm8523_regmap);
+        if (IS_ERR(wm8523->regmap)) {
+                ret = PTR_ERR(wm8523->regmap);
+                dev_err(&i2c->dev, "Failed to create regmap: %d\n", ret);
+                return ret;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(wm8523->supplies); i++)
+                wm8523->supplies[i].supply = wm8523_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8523->supplies),
+                                      wm8523->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(wm8523->supplies),
+                                    wm8523->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_read(wm8523->regmap, WM8523_DEVICE_ID, &val);
+        if (ret < 0) {
+                dev_err(&i2c->dev, "Failed to read ID register\n");
+                goto err_enable;
+        }
+        if (val != 0x8523) {
+                dev_err(&i2c->dev, "Device is not a WM8523, ID is %x\n", ret);
+                ret = -EINVAL;
+                goto err_enable;
+        }
+
+        ret = regmap_read(wm8523->regmap, WM8523_REVISION, &val);
+        if (ret < 0) {
+                dev_err(&i2c->dev, "Failed to read revision register\n");
+                goto err_enable;
+        }
+        dev_info(&i2c->dev, "revision %c\n",
+                 (val & WM8523_CHIP_REV_MASK) + 'A');
+
+        ret = regmap_write(wm8523->regmap, WM8523_DEVICE_ID, 0x8523);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to reset device: %d\n", ret);
+                goto err_enable;
+        }
+
+        regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);
+
         i2c_set_clientdata(i2c, wm8523);
-        wm8523->control_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8523, &wm8523_dai, 1);
-        if (ret < 0)
-                kfree(wm8523);
+
         return ret;
 
+err_enable:
+        regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);
+        return ret;
 }
 
 static __devexit int wm8523_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 7c68226376e4..5e9c40fa7eb2 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -1,7 +1,7 @@
 /*
  * wm8580.c  --  WM8580 ALSA Soc Audio driver
  *
- * Copyright 2008-11 Wolfson Microelectronics PLC.
+ * Copyright 2008-12 Wolfson Microelectronics PLC.
  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
@@ -157,23 +158,72 @@
  * We can't read the WM8580 register space when we
  * are using 2 wire for device control, so we cache them instead.
  */
-static const u16 wm8580_reg[] = {
-        0x0121, 0x017e, 0x007d, 0x0014, /*R3*/
-        0x0121, 0x017e, 0x007d, 0x0194, /*R7*/
-        0x0010, 0x0002, 0x0002, 0x00c2, /*R11*/
-        0x0182, 0x0082, 0x000a, 0x0024, /*R15*/
-        0x0009, 0x0000, 0x00ff, 0x0000, /*R19*/
-        0x00ff, 0x00ff, 0x00ff, 0x00ff, /*R23*/
-        0x00ff, 0x00ff, 0x00ff, 0x00ff, /*R27*/
-        0x01f0, 0x0040, 0x0000, 0x0000, /*R31(0x1F)*/
-        0x0000, 0x0000, 0x0031, 0x000b, /*R35*/
-        0x0039, 0x0000, 0x0010, 0x0032, /*R39*/
-        0x0054, 0x0076, 0x0098, 0x0000, /*R43(0x2B)*/
-        0x0000, 0x0000, 0x0000, 0x0000, /*R47*/
-        0x0000, 0x0000, 0x005e, 0x003e, /*R51(0x33)*/
-        0x0000, 0x0000 /*R53*/
+static const struct reg_default wm8580_reg_defaults[] = {
+        {  0, 0x0121 },
+        {  1, 0x017e },
+        {  2, 0x007d },
+        {  3, 0x0014 },
+        {  4, 0x0121 },
+        {  5, 0x017e },
+        {  6, 0x007d },
+        {  7, 0x0194 },
+        {  8, 0x0010 },
+        {  9, 0x0002 },
+        { 10, 0x0002 },
+        { 11, 0x00c2 },
+        { 12, 0x0182 },
+        { 13, 0x0082 },
+        { 14, 0x000a },
+        { 15, 0x0024 },
+        { 16, 0x0009 },
+        { 17, 0x0000 },
+        { 18, 0x00ff },
+        { 19, 0x0000 },
+        { 20, 0x00ff },
+        { 21, 0x00ff },
+        { 22, 0x00ff },
+        { 23, 0x00ff },
+        { 24, 0x00ff },
+        { 25, 0x00ff },
+        { 26, 0x00ff },
+        { 27, 0x00ff },
+        { 28, 0x01f0 },
+        { 29, 0x0040 },
+        { 30, 0x0000 },
+        { 31, 0x0000 },
+        { 32, 0x0000 },
+        { 33, 0x0000 },
+        { 34, 0x0031 },
+        { 35, 0x000b },
+        { 36, 0x0039 },
+        { 37, 0x0000 },
+        { 38, 0x0010 },
+        { 39, 0x0032 },
+        { 40, 0x0054 },
+        { 41, 0x0076 },
+        { 42, 0x0098 },
+        { 43, 0x0000 },
+        { 44, 0x0000 },
+        { 45, 0x0000 },
+        { 46, 0x0000 },
+        { 47, 0x0000 },
+        { 48, 0x0000 },
+        { 49, 0x0000 },
+        { 50, 0x005e },
+        { 51, 0x003e },
+        { 52, 0x0000 },
 };
 
+static bool wm8580_volatile(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case WM8580_RESET:
+                return true;
+        default:
+                return false;
+        }
+}
+
 struct pll_state {
         unsigned int in;
         unsigned int out;
@@ -188,7 +238,7 @@ static const char *wm8580_supply_names[WM8580_NUM_SUPPLIES] = {
 
 /* codec private data */
 struct wm8580_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES];
         struct pll_state a;
         struct pll_state b;
@@ -203,14 +253,16 @@ static int wm8580_out_vu(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        u16 *reg_cache = codec->reg_cache;
+        struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         int ret;
 
-        /* Clear the register cache so we write without VU set */
-        reg_cache[reg] = 0;
-        reg_cache[reg2] = 0;
+        /* Clear the register cache VU so we write without VU set */
+        regcache_cache_only(wm8580->regmap, true);
+        regmap_update_bits(wm8580->regmap, reg, 0x100, 0x000);
+        regmap_update_bits(wm8580->regmap, reg2, 0x100, 0x000);
+        regcache_cache_only(wm8580->regmap, false);
 
         ret = snd_soc_put_volsw(kcontrol, ucontrol);
         if (ret < 0)
@@ -815,24 +867,14 @@ static struct snd_soc_dai_driver wm8580_dai[] = {
 static int wm8580_probe(struct snd_soc_codec *codec)
 {
         struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
-        int ret = 0,i;
+        int ret = 0;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8580->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
-        for (i = 0; i < ARRAY_SIZE(wm8580->supplies); i++)
-                wm8580->supplies[i].supply = wm8580_supply_names[i];
-
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8580->supplies),
-                                 wm8580->supplies);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
-                return ret;
-        }
-
         ret = regulator_bulk_enable(ARRAY_SIZE(wm8580->supplies),
                                     wm8580->supplies);
         if (ret != 0) {
@@ -854,7 +896,6 @@ static int wm8580_probe(struct snd_soc_codec *codec)
 err_regulator_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8580->supplies), wm8580->supplies);
 err_regulator_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8580->supplies), wm8580->supplies);
         return ret;
 }
 
@@ -866,7 +907,6 @@ static int wm8580_remove(struct snd_soc_codec *codec)
         wm8580_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         regulator_bulk_disable(ARRAY_SIZE(wm8580->supplies), wm8580->supplies);
-        regulator_bulk_free(ARRAY_SIZE(wm8580->supplies), wm8580->supplies);
 
         return 0;
 }
@@ -875,9 +915,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
         .probe =        wm8580_probe,
         .remove =       wm8580_remove,
         .set_bias_level = wm8580_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8580_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8580_reg,
 
         .controls = wm8580_snd_controls,
         .num_controls = ARRAY_SIZE(wm8580_snd_controls),
@@ -892,31 +929,55 @@ static const struct of_device_id wm8580_of_match[] = {
         { },
 };
 
+static const struct regmap_config wm8580_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+        .max_register = WM8580_MAX_REGISTER,
+
+        .reg_defaults = wm8580_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8580_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8580_volatile,
+};
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static int wm8580_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct wm8580_priv *wm8580;
-        int ret;
+        int ret, i;
 
-        wm8580 = kzalloc(sizeof(struct wm8580_priv), GFP_KERNEL);
+        wm8580 = devm_kzalloc(&i2c->dev, sizeof(struct wm8580_priv),
+                              GFP_KERNEL);
         if (wm8580 == NULL)
                 return -ENOMEM;
 
+        wm8580->regmap = devm_regmap_init_i2c(i2c, &wm8580_regmap);
+        if (IS_ERR(wm8580->regmap))
+                return PTR_ERR(wm8580->regmap);
+
+        for (i = 0; i < ARRAY_SIZE(wm8580->supplies); i++)
+                wm8580->supplies[i].supply = wm8580_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8580->supplies),
+                                      wm8580->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
         i2c_set_clientdata(i2c, wm8580);
-        wm8580->control_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai));
-        if (ret < 0)
-                kfree(wm8580);
+
         return ret;
 }
 
 static int wm8580_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 0b76d1dca5ea..8b8bb70f1eb9 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
@@ -32,7 +33,7 @@
 
 /* codec private data */
 struct wm8711_priv {
-        enum snd_soc_control_type bus_type;
+        struct regmap *regmap;
         unsigned int sysclk;
 };
 
@@ -42,11 +43,21 @@ struct wm8711_priv {
  * using 2 wire for device control, so we cache them instead.
  * There is no point in caching the reset register
  */
-static const u16 wm8711_reg[WM8711_CACHEREGNUM] = {
-        0x0079, 0x0079, 0x000a, 0x0008,
-        0x009f, 0x000a, 0x0000, 0x0000
+static const struct reg_default wm8711_reg_defaults[] = {
+        { 0, 0x0079 }, { 1, 0x0079 }, { 2, 0x000a }, { 3, 0x0008 },
+        { 4, 0x009f }, { 5, 0x000a }, { 6, 0x0000 }, { 7, 0x0000 },
 };
 
+static bool wm8711_volatile(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case WM8711_RESET:
+                return true;
+        default:
+                return false;
+        }
+}
+
 #define wm8711_reset(c) snd_soc_write(c, WM8711_RESET, 0)
 
 static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);
@@ -289,6 +300,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai,
 static int wm8711_set_bias_level(struct snd_soc_codec *codec,
         enum snd_soc_bias_level level)
 {
+        struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
         u16 reg = snd_soc_read(codec, WM8711_PWR) & 0xff7f;
 
         switch (level) {
@@ -299,7 +311,7 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec,
                 break;
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
-                        snd_soc_cache_sync(codec);
+                        regcache_sync(wm8711->regmap);
 
                 snd_soc_write(codec, WM8711_PWR, reg | 0x0040);
                 break;
@@ -353,10 +365,9 @@ static int wm8711_resume(struct snd_soc_codec *codec)
 
 static int wm8711_probe(struct snd_soc_codec *codec)
 {
-        struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8711->bus_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -391,9 +402,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = {
         .suspend =      wm8711_suspend,
         .resume =       wm8711_resume,
         .set_bias_level = wm8711_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8711_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8711_reg,
         .controls = wm8711_snd_controls,
         .num_controls = ARRAY_SIZE(wm8711_snd_controls),
         .dapm_widgets = wm8711_dapm_widgets,
@@ -408,30 +416,45 @@ static const struct of_device_id wm8711_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8711_of_match);
 
+static const struct regmap_config wm8711_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+        .max_register = WM8711_RESET,
+
+        .reg_defaults = wm8711_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8711_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8711_volatile,
+};
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8711_spi_probe(struct spi_device *spi)
 {
         struct wm8711_priv *wm8711;
         int ret;
 
-        wm8711 = kzalloc(sizeof(struct wm8711_priv), GFP_KERNEL);
+        wm8711 = devm_kzalloc(&spi->dev, sizeof(struct wm8711_priv),
+                              GFP_KERNEL);
         if (wm8711 == NULL)
                 return -ENOMEM;
 
+        wm8711->regmap = devm_regmap_init_spi(spi, &wm8711_regmap);
+        if (IS_ERR(wm8711->regmap))
+                return PTR_ERR(wm8711->regmap);
+
         spi_set_drvdata(spi, wm8711);
-        wm8711->bus_type = SND_SOC_SPI;
 
         ret = snd_soc_register_codec(&spi->dev,
                         &soc_codec_dev_wm8711, &wm8711_dai, 1);
-        if (ret < 0)
-                kfree(wm8711);
+
         return ret;
 }
 
 static int __devexit wm8711_spi_remove(struct spi_device *spi)
 {
         snd_soc_unregister_codec(&spi->dev);
-        kfree(spi_get_drvdata(spi));
+
         return 0;
 }
 
@@ -453,24 +476,26 @@ static __devinit int wm8711_i2c_probe(struct i2c_client *client,
         struct wm8711_priv *wm8711;
         int ret;
 
-        wm8711 = kzalloc(sizeof(struct wm8711_priv), GFP_KERNEL);
+        wm8711 = devm_kzalloc(&client->dev, sizeof(struct wm8711_priv),
+                              GFP_KERNEL);
         if (wm8711 == NULL)
                 return -ENOMEM;
 
+        wm8711->regmap = devm_regmap_init_i2c(client, &wm8711_regmap);
+        if (IS_ERR(wm8711->regmap))
+                return PTR_ERR(wm8711->regmap);
+
         i2c_set_clientdata(client, wm8711);
-        wm8711->bus_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&client->dev,
                         &soc_codec_dev_wm8711, &wm8711_dai, 1);
-        if (ret < 0)
-                kfree(wm8711);
+
         return ret;
 }
 
 static __devexit int wm8711_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index 1467f97dce21..00a12a0c3919 100644
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -17,6 +17,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
@@ -35,16 +36,16 @@
  * the volume update bits, mute the output and enable infinite zero
  * detect.
  */
-static const u16 wm8728_reg_defaults[] = {
-        0x1ff,
-        0x1ff,
-        0x001,
-        0x100,
+static const struct reg_default wm8728_reg_defaults[] = {
+        { 0, 0x1ff },
+        { 1, 0x1ff },
+        { 2, 0x001 },
+        { 3, 0x100 },
 };
 
 /* codec private data */
 struct wm8728_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
 };
 
 static const DECLARE_TLV_DB_SCALE(wm8728_tlv, -12750, 50, 1);
@@ -162,8 +163,8 @@ static int wm8728_set_dai_fmt(struct snd_soc_dai *codec_dai,
 static int wm8728_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
+        struct wm8728_priv *wm8728 = snd_soc_codec_get_drvdata(codec);
         u16 reg;
-        int i;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
@@ -175,9 +176,7 @@ static int wm8728_set_bias_level(struct snd_soc_codec *codec,
                         snd_soc_write(codec, WM8728_DACCTL, reg & ~0x4);
 
                         /* ..then sync in the register cache. */
-                        for (i = 0; i < ARRAY_SIZE(wm8728_reg_defaults); i++)
-                                snd_soc_write(codec, i,
-                                             snd_soc_read(codec, i));
+                        regcache_sync(wm8728->regmap);
                 }
                 break;
 
@@ -229,10 +228,9 @@ static int wm8728_resume(struct snd_soc_codec *codec)
 
 static int wm8728_probe(struct snd_soc_codec *codec)
 {
-        struct wm8728_priv *wm8728 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8728->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 printk(KERN_ERR "wm8728: failed to configure cache I/O: %d\n",
                        ret);
@@ -257,9 +255,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8728 = {
         .suspend =      wm8728_suspend,
         .resume =       wm8728_resume,
         .set_bias_level = wm8728_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8728_reg_defaults),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8728_reg_defaults,
         .controls = wm8728_snd_controls,
         .num_controls = ARRAY_SIZE(wm8728_snd_controls),
         .dapm_widgets = wm8728_dapm_widgets,
@@ -274,30 +269,43 @@ static const struct of_device_id wm8728_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8728_of_match);
 
+static const struct regmap_config wm8728_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+        .max_register = WM8728_IFCTL,
+
+        .reg_defaults = wm8728_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8728_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+};
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8728_spi_probe(struct spi_device *spi)
 {
         struct wm8728_priv *wm8728;
         int ret;
 
-        wm8728 = kzalloc(sizeof(struct wm8728_priv), GFP_KERNEL);
+        wm8728 = devm_kzalloc(&spi->dev, sizeof(struct wm8728_priv),
+                              GFP_KERNEL);
         if (wm8728 == NULL)
                 return -ENOMEM;
 
-        wm8728->control_type = SND_SOC_SPI;
+        wm8728->regmap = devm_regmap_init_spi(spi, &wm8728_regmap);
+        if (IS_ERR(wm8728->regmap))
+                return PTR_ERR(wm8728->regmap);
+
         spi_set_drvdata(spi, wm8728);
 
         ret = snd_soc_register_codec(&spi->dev,
                         &soc_codec_dev_wm8728, &wm8728_dai, 1);
-        if (ret < 0)
-                kfree(wm8728);
+
         return ret;
 }
 
 static int __devexit wm8728_spi_remove(struct spi_device *spi)
 {
         snd_soc_unregister_codec(&spi->dev);
-        kfree(spi_get_drvdata(spi));
+
         return 0;
 }
 
@@ -319,24 +327,26 @@ static __devinit int wm8728_i2c_probe(struct i2c_client *i2c,
         struct wm8728_priv *wm8728;
         int ret;
 
-        wm8728 = kzalloc(sizeof(struct wm8728_priv), GFP_KERNEL);
+        wm8728 = devm_kzalloc(&i2c->dev, sizeof(struct wm8728_priv),
+                              GFP_KERNEL);
         if (wm8728 == NULL)
                 return -ENOMEM;
 
+        wm8728->regmap = devm_regmap_init_i2c(i2c, &wm8728_regmap);
+        if (IS_ERR(wm8728->regmap))
+                return PTR_ERR(wm8728->regmap);
+
         i2c_set_clientdata(i2c, wm8728);
-        wm8728->control_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8728, &wm8728_dai, 1);
-        if (ret < 0)
-                kfree(wm8728);
+
         return ret;
 }
 
 static __devexit int wm8728_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c
index d0520124616d..5c9634f4c1f0 100644
--- a/sound/soc/codecs/wm8737.c
+++ b/sound/soc/codecs/wm8737.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
@@ -40,29 +41,39 @@ static const char *wm8737_supply_names[WM8737_NUM_SUPPLIES] = {
 
 /* codec private data */
 struct wm8737_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         struct regulator_bulk_data supplies[WM8737_NUM_SUPPLIES];
         unsigned int mclk;
 };
 
-static const u16 wm8737_reg[WM8737_REGISTER_COUNT] = {
-        0x00C3,     /* R0  - Left PGA volume */
-        0x00C3,     /* R1  - Right PGA volume */
-        0x0007,     /* R2  - AUDIO path L */
-        0x0007,     /* R3  - AUDIO path R */
-        0x0000,     /* R4  - 3D Enhance */
-        0x0000,     /* R5  - ADC Control */
-        0x0000,     /* R6  - Power Management */
-        0x000A,     /* R7  - Audio Format */
-        0x0000,     /* R8  - Clocking */
-        0x000F,     /* R9  - MIC Preamp Control */
-        0x0003,     /* R10 - Misc Bias Control */
-        0x0000,     /* R11 - Noise Gate */
-        0x007C,     /* R12 - ALC1 */
-        0x0000,     /* R13 - ALC2 */
-        0x0032,     /* R14 - ALC3 */
+static const struct reg_default wm8737_reg_defaults[] = {
+        {  0, 0x00C3 },     /* R0  - Left PGA volume */
+        {  1, 0x00C3 },     /* R1  - Right PGA volume */
+        {  2, 0x0007 },     /* R2  - AUDIO path L */
+        {  3, 0x0007 },     /* R3  - AUDIO path R */
+        {  4, 0x0000 },     /* R4  - 3D Enhance */
+        {  5, 0x0000 },     /* R5  - ADC Control */
+        {  6, 0x0000 },     /* R6  - Power Management */
+        {  7, 0x000A },     /* R7  - Audio Format */
+        {  8, 0x0000 },     /* R8  - Clocking */
+        {  9, 0x000F },     /* R9  - MIC Preamp Control */
+        { 10, 0x0003 },     /* R10 - Misc Bias Control */
+        { 11, 0x0000 },     /* R11 - Noise Gate */
+        { 12, 0x007C },     /* R12 - ALC1 */
+        { 13, 0x0000 },     /* R13 - ALC2 */
+        { 14, 0x0032 },     /* R14 - ALC3 */
 };
 
+static bool wm8737_volatile(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case WM8737_RESET:
+                return true;
+        default:
+                return false;
+        }
+}
+
 static int wm8737_reset(struct snd_soc_codec *codec)
 {
         return snd_soc_write(codec, WM8737_RESET, 0);
@@ -479,7 +490,7 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
                                 return ret;
                         }
 
-                        snd_soc_cache_sync(codec);
+                        regcache_sync(wm8737->regmap);
 
                         /* Fast VMID ramp at 2*2.5k */
                         snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL,
@@ -557,24 +568,14 @@ static int wm8737_resume(struct snd_soc_codec *codec)
 static int wm8737_probe(struct snd_soc_codec *codec)
 {
         struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec);
-        int ret, i;
+        int ret;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8737->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
-        for (i = 0; i < ARRAY_SIZE(wm8737->supplies); i++)
-                wm8737->supplies[i].supply = wm8737_supply_names[i];
-
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8737->supplies),
-                                 wm8737->supplies);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
-                return ret;
-        }
-
         ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies),
                                     wm8737->supplies);
         if (ret != 0) {
@@ -607,17 +608,12 @@ static int wm8737_probe(struct snd_soc_codec *codec)
 err_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies), wm8737->supplies);
 err_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8737->supplies), wm8737->supplies);
-
         return ret;
 }
 
 static int wm8737_remove(struct snd_soc_codec *codec)
 {
-        struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec);
-
         wm8737_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        regulator_bulk_free(ARRAY_SIZE(wm8737->supplies), wm8737->supplies);
         return 0;
 }
 
@@ -627,10 +623,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8737 = {
         .suspend        = wm8737_suspend,
         .resume         = wm8737_resume,
         .set_bias_level = wm8737_set_bias_level,
-
-        .reg_cache_size = WM8737_REGISTER_COUNT - 1, /* Skip reset */
-        .reg_word_size  = sizeof(u16),
-        .reg_cache_default = wm8737_reg,
 };
 
 static const struct of_device_id wm8737_of_match[] = {
@@ -640,24 +632,49 @@ static const struct of_device_id wm8737_of_match[] = {
 
 MODULE_DEVICE_TABLE(of, wm8737_of_match);
 
+static const struct regmap_config wm8737_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+        .max_register = WM8737_MAX_REGISTER,
+
+        .reg_defaults = wm8737_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8737_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8737_volatile,
+};
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8737_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
         struct wm8737_priv *wm8737;
-        int ret;
+        int ret, i;
 
-        wm8737 = kzalloc(sizeof(struct wm8737_priv), GFP_KERNEL);
+        wm8737 = devm_kzalloc(&i2c->dev, sizeof(struct wm8737_priv),
+                              GFP_KERNEL);
         if (wm8737 == NULL)
                 return -ENOMEM;
 
+        for (i = 0; i < ARRAY_SIZE(wm8737->supplies); i++)
+                wm8737->supplies[i].supply = wm8737_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8737->supplies),
+                                      wm8737->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        wm8737->regmap = devm_regmap_init_i2c(i2c, &wm8737_regmap);
+        if (IS_ERR(wm8737->regmap))
+                return PTR_ERR(wm8737->regmap);
+
         i2c_set_clientdata(i2c, wm8737);
-        wm8737->control_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&i2c->dev,
                                       &soc_codec_dev_wm8737, &wm8737_dai, 1);
-        if (ret < 0)
-                kfree(wm8737);
+
         return ret;
 
 }
@@ -665,7 +682,7 @@ static __devinit int wm8737_i2c_probe(struct i2c_client *i2c,
 static __devexit int wm8737_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
+
         return 0;
 }
 
@@ -691,26 +708,39 @@ static struct i2c_driver wm8737_i2c_driver = {
 static int __devinit wm8737_spi_probe(struct spi_device *spi)
 {
         struct wm8737_priv *wm8737;
-        int ret;
+        int ret, i;
 
-        wm8737 = kzalloc(sizeof(struct wm8737_priv), GFP_KERNEL);
+        wm8737 = devm_kzalloc(&spi->dev, sizeof(struct wm8737_priv),
+                              GFP_KERNEL);
         if (wm8737 == NULL)
                 return -ENOMEM;
 
-        wm8737->control_type = SND_SOC_SPI;
+        for (i = 0; i < ARRAY_SIZE(wm8737->supplies); i++)
+                wm8737->supplies[i].supply = wm8737_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&spi->dev, ARRAY_SIZE(wm8737->supplies),
+                                      wm8737->supplies);
+        if (ret != 0) {
+                dev_err(&spi->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        wm8737->regmap = devm_regmap_init_spi(spi, &wm8737_regmap);
+        if (IS_ERR(wm8737->regmap))
+                return PTR_ERR(wm8737->regmap);
+
         spi_set_drvdata(spi, wm8737);
 
         ret = snd_soc_register_codec(&spi->dev,
                                      &soc_codec_dev_wm8737, &wm8737_dai, 1);
-        if (ret < 0)
-                kfree(wm8737);
+
         return ret;
 }
 
 static int __devexit wm8737_spi_remove(struct spi_device *spi)
 {
         snd_soc_unregister_codec(&spi->dev);
-        kfree(spi_get_drvdata(spi));
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
index 35f3d23200e0..4281a0802138 100644
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
@@ -18,6 +18,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
+#include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
@@ -40,26 +41,43 @@ static const char *wm8741_supply_names[WM8741_NUM_SUPPLIES] = {
 
 /* codec private data */
 struct wm8741_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         struct regulator_bulk_data supplies[WM8741_NUM_SUPPLIES];
         unsigned int sysclk;
         struct snd_pcm_hw_constraint_list *sysclk_constraints;
 };
 
-static const u16 wm8741_reg_defaults[WM8741_REGISTER_COUNT] = {
-        0x0000,     /* R0  - DACLLSB Attenuation */
-        0x0000,     /* R1  - DACLMSB Attenuation */
-        0x0000,     /* R2  - DACRLSB Attenuation */
-        0x0000,     /* R3  - DACRMSB Attenuation */
-        0x0000,     /* R4  - Volume Control */
-        0x000A,     /* R5  - Format Control */
-        0x0000,     /* R6  - Filter Control */
-        0x0000,     /* R7  - Mode Control 1 */
-        0x0002,     /* R8  - Mode Control 2 */
-        0x0000,     /* R9  - Reset */
-        0x0002,     /* R32 - ADDITONAL_CONTROL_1 */
+static const struct reg_default wm8741_reg_defaults[] = {
+        {  0, 0x0000 },     /* R0  - DACLLSB Attenuation */
+        {  1, 0x0000 },     /* R1  - DACLMSB Attenuation */
+        {  2, 0x0000 },     /* R2  - DACRLSB Attenuation */
+        {  3, 0x0000 },     /* R3  - DACRMSB Attenuation */
+        {  4, 0x0000 },     /* R4  - Volume Control */
+        {  5, 0x000A },     /* R5  - Format Control */
+        {  6, 0x0000 },     /* R6  - Filter Control */
+        {  7, 0x0000 },     /* R7  - Mode Control 1 */
+        {  8, 0x0002 },     /* R8  - Mode Control 2 */
+        { 32, 0x0002 },     /* R32 - ADDITONAL_CONTROL_1 */
 };
 
+static bool wm8741_readable(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case WM8741_DACLLSB_ATTENUATION:
+        case WM8741_DACLMSB_ATTENUATION:
+        case WM8741_DACRLSB_ATTENUATION:
+        case WM8741_DACRMSB_ATTENUATION:
+        case WM8741_VOLUME_CONTROL:
+        case WM8741_FORMAT_CONTROL:
+        case WM8741_FILTER_CONTROL:
+        case WM8741_MODE_CONTROL_1:
+        case WM8741_MODE_CONTROL_2:
+        case WM8741_ADDITIONAL_CONTROL_1:
+                return true;
+        default:
+                return false;
+        }
+}
 
 static int wm8741_reset(struct snd_soc_codec *codec)
 {
@@ -403,17 +421,6 @@ static int wm8741_probe(struct snd_soc_codec *codec)
 {
         struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec);
         int ret = 0;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(wm8741->supplies); i++)
-                wm8741->supplies[i].supply = wm8741_supply_names[i];
-
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8741->supplies),
-                                 wm8741->supplies);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
-                goto err;
-        }
 
         ret = regulator_bulk_enable(ARRAY_SIZE(wm8741->supplies),
                                     wm8741->supplies);
@@ -422,7 +429,7 @@ static int wm8741_probe(struct snd_soc_codec *codec)
                 goto err_get;
         }
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8741->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 goto err_enable;
@@ -450,8 +457,6 @@ static int wm8741_probe(struct snd_soc_codec *codec)
 err_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8741->supplies), wm8741->supplies);
 err_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8741->supplies), wm8741->supplies);
-err:
         return ret;
 }
 
@@ -460,7 +465,6 @@ static int wm8741_remove(struct snd_soc_codec *codec)
         struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec);
 
         regulator_bulk_disable(ARRAY_SIZE(wm8741->supplies), wm8741->supplies);
-        regulator_bulk_free(ARRAY_SIZE(wm8741->supplies), wm8741->supplies);
 
         return 0;
 }
@@ -469,9 +473,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8741 = {
         .probe =        wm8741_probe,
         .remove =       wm8741_remove,
         .resume =       wm8741_resume,
-        .reg_cache_size = ARRAY_SIZE(wm8741_reg_defaults),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8741_reg_defaults,
 
         .controls = wm8741_snd_controls,
         .num_controls = ARRAY_SIZE(wm8741_snd_controls),
@@ -487,20 +488,48 @@ static const struct of_device_id wm8741_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8741_of_match);
 
+static const struct regmap_config wm8741_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+        .max_register = WM8741_MAX_REGISTER,
+
+        .reg_defaults = wm8741_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8741_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .readable_reg = wm8741_readable,
+};
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static int wm8741_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct wm8741_priv *wm8741;
-        int ret;
+        int ret, i;
 
         wm8741 = devm_kzalloc(&i2c->dev, sizeof(struct wm8741_priv),
                               GFP_KERNEL);
         if (wm8741 == NULL)
                 return -ENOMEM;
 
+        for (i = 0; i < ARRAY_SIZE(wm8741->supplies); i++)
+                wm8741->supplies[i].supply = wm8741_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8741->supplies),
+                                      wm8741->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        wm8741->regmap = regmap_init_i2c(i2c, &wm8741_regmap);
+        if (IS_ERR(wm8741->regmap)) {
+                ret = PTR_ERR(wm8741->regmap);
+                dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret);
+                return ret;
+        }
+
         i2c_set_clientdata(i2c, wm8741);
-        wm8741->control_type = SND_SOC_I2C;
 
         ret = snd_soc_register_codec(&i2c->dev,
                                      &soc_codec_dev_wm8741, &wm8741_dai, 1);
@@ -536,14 +565,30 @@ static struct i2c_driver wm8741_i2c_driver = {
 static int __devinit wm8741_spi_probe(struct spi_device *spi)
 {
         struct wm8741_priv *wm8741;
-        int ret;
+        int ret, i;
 
         wm8741 = devm_kzalloc(&spi->dev, sizeof(struct wm8741_priv),
                              GFP_KERNEL);
         if (wm8741 == NULL)
                 return -ENOMEM;
 
-        wm8741->control_type = SND_SOC_SPI;
+        for (i = 0; i < ARRAY_SIZE(wm8741->supplies); i++)
+                wm8741->supplies[i].supply = wm8741_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&spi->dev, ARRAY_SIZE(wm8741->supplies),
+                                      wm8741->supplies);
+        if (ret != 0) {
+                dev_err(&spi->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        wm8741->regmap = regmap_init_spi(spi, &wm8741_regmap);
+        if (IS_ERR(wm8741->regmap)) {
+                ret = PTR_ERR(wm8741->regmap);
+                dev_err(&spi->dev, "Failed to init regmap: %d\n", ret);
+                return ret;
+        }
+
         spi_set_drvdata(spi, wm8741);
 
         ret = snd_soc_register_codec(&spi->dev,
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c
index a5127b4ff9e1..c7c0034d3966 100644
--- a/sound/soc/codecs/wm8770.c
+++ b/sound/soc/codecs/wm8770.c
@@ -724,24 +724,7 @@ static struct spi_driver wm8770_spi_driver = {
         .remove = __devexit_p(wm8770_spi_remove)
 };
 
-static int __init wm8770_modinit(void)
-{
-        int ret = 0;
-
-        ret = spi_register_driver(&wm8770_spi_driver);
-        if (ret) {
-                printk(KERN_ERR "Failed to register wm8770 SPI driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8770_modinit);
-
-static void __exit wm8770_exit(void)
-{
-        spi_unregister_driver(&wm8770_spi_driver);
-}
-module_exit(wm8770_exit);
+module_spi_driver(wm8770_spi_driver);
 
 MODULE_DESCRIPTION("ASoC WM8770 driver");
 MODULE_AUTHOR("Dimitris Papastamos <dp@opensource.wolfsonmicro.com>");
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index 879c356a9045..c32249ddb2e0 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -19,6 +19,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/of_device.h>
+#include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -37,18 +38,46 @@ enum wm8776_chip_type {
 
 /* codec private data */
 struct wm8776_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         int sysclk[2];
 };
 
-static const u16 wm8776_reg[WM8776_CACHEREGNUM] = {
-        0x79, 0x79, 0x79, 0xff, 0xff,  /* 4 */
-        0xff, 0x00, 0x90, 0x00, 0x00,  /* 9 */
-        0x22, 0x22, 0x22, 0x08, 0xcf,  /* 14 */
-        0xcf, 0x7b, 0x00, 0x32, 0x00,  /* 19 */
-        0xa6, 0x01, 0x01
+static const struct reg_default wm8776_reg_defaults[] = {
+        {  0, 0x79 },
+        {  1, 0x79 },
+        {  2, 0x79 },
+        {  3, 0xff },
+        {  4, 0xff },
+        {  5, 0xff },
+        {  6, 0x00 },
+        {  7, 0x90 },
+        {  8, 0x00 },
+        {  9, 0x00 },
+        { 10, 0x22 },
+        { 11, 0x22 },
+        { 12, 0x22 },
+        { 13, 0x08 },
+        { 14, 0xcf },
+        { 15, 0xcf },
+        { 16, 0x7b },
+        { 17, 0x00 },
+        { 18, 0x32 },
+        { 19, 0x00 },
+        { 20, 0xa6 },
+        { 21, 0x01 },
+        { 22, 0x01 },
 };
 
+static bool wm8776_volatile(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case WM8776_RESET:
+                return true;
+        default:
+                return false;
+        }
+}
+
 static int wm8776_reset(struct snd_soc_codec *codec)
 {
         return snd_soc_write(codec, WM8776_RESET, 0);
@@ -306,6 +335,8 @@ static int wm8776_set_sysclk(struct snd_soc_dai *dai,
 static int wm8776_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
+        struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
+
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
@@ -313,7 +344,7 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec,
                 break;
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                        snd_soc_cache_sync(codec);
+                        regcache_sync(wm8776->regmap);
 
                         /* Disable the global powerdown; DAPM does the rest */
                         snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0);
@@ -396,10 +427,9 @@ static int wm8776_resume(struct snd_soc_codec *codec)
 
 static int wm8776_probe(struct snd_soc_codec *codec)
 {
-        struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
         int ret = 0;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -434,9 +464,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8776 = {
         .suspend =      wm8776_suspend,
         .resume =       wm8776_resume,
         .set_bias_level = wm8776_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8776_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8776_reg,
 
         .controls = wm8776_snd_controls,
         .num_controls = ARRAY_SIZE(wm8776_snd_controls),
@@ -452,6 +479,18 @@ static const struct of_device_id wm8776_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8776_of_match);
 
+static const struct regmap_config wm8776_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+        .max_register = WM8776_RESET,
+
+        .reg_defaults = wm8776_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8776_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8776_volatile,
+};
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8776_spi_probe(struct spi_device *spi)
 {
@@ -463,7 +502,10 @@ static int __devinit wm8776_spi_probe(struct spi_device *spi)
         if (wm8776 == NULL)
                 return -ENOMEM;
 
-        wm8776->control_type = SND_SOC_SPI;
+        wm8776->regmap = devm_regmap_init_spi(spi, &wm8776_regmap);
+        if (IS_ERR(wm8776->regmap))
+                return PTR_ERR(wm8776->regmap);
+
         spi_set_drvdata(spi, wm8776);
 
         ret = snd_soc_register_codec(&spi->dev,
@@ -501,8 +543,11 @@ static __devinit int wm8776_i2c_probe(struct i2c_client *i2c,
         if (wm8776 == NULL)
                 return -ENOMEM;
 
+        wm8776->regmap = devm_regmap_init_i2c(i2c, &wm8776_regmap);
+        if (IS_ERR(wm8776->regmap))
+                return PTR_ERR(wm8776->regmap);
+
         i2c_set_clientdata(i2c, wm8776);
-        wm8776->control_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai));
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 077c9628c70d..e781f865e5d7 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -137,7 +138,7 @@
 #define WM8900_LRC_MASK 0x03ff
 
 struct wm8900_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
 
         u32 fll_in; /* FLL input frequency */
         u32 fll_out; /* FLL output frequency */
@@ -147,54 +148,77 @@ struct wm8900_priv {
  * wm8900 register cache.  We can't read the entire register space and we
  * have slow control buses so we cache the registers.
  */
-static const u16 wm8900_reg_defaults[WM8900_MAXREG] = {
-        0x8900, 0x0000,
-        0xc000, 0x0000,
-        0x4050, 0x4000,
-        0x0008, 0x0000,
-        0x0040, 0x0040,
-        0x1004, 0x00c0,
-        0x00c0, 0x0000,
-        0x0100, 0x00c0,
-        0x00c0, 0x0000,
-        0xb001, 0x0000,
-        0x0000, 0x0044,
-        0x004c, 0x004c,
-        0x0044, 0x0044,
-        0x0000, 0x0044,
-        0x0000, 0x0000,
-        0x0002, 0x0000,
-        0x0000, 0x0000,
-        0x0000, 0x0000,
-        0x0008, 0x0000,
-        0x0000, 0x0008,
-        0x0097, 0x0100,
-        0x0000, 0x0000,
-        0x0050, 0x0050,
-        0x0055, 0x0055,
-        0x0055, 0x0000,
-        0x0000, 0x0079,
-        0x0079, 0x0079,
-        0x0079, 0x0000,
-        /* Remaining registers all zero */
+static const struct reg_default wm8900_reg_defaults[] = {
+        {  1, 0x0000 },
+        {  2, 0xc000 },
+        {  3, 0x0000 },
+        {  4, 0x4050 },
+        {  5, 0x4000 },
+        {  6, 0x0008 },
+        {  7, 0x0000 },
+        {  8, 0x0040 },
+        {  9, 0x0040 },
+        { 10, 0x1004 },
+        { 11, 0x00c0 },
+        { 12, 0x00c0 },
+        { 13, 0x0000 },
+        { 14, 0x0100 },
+        { 15, 0x00c0 },
+        { 16, 0x00c0 },
+        { 17, 0x0000 },
+        { 18, 0xb001 },
+        { 19, 0x0000 },
+        { 20, 0x0000 },
+        { 21, 0x0044 },
+        { 22, 0x004c },
+        { 23, 0x004c },
+        { 24, 0x0044 },
+        { 25, 0x0044 },
+        { 26, 0x0000 },
+        { 27, 0x0044 },
+        { 28, 0x0000 },
+        { 29, 0x0000 },
+        { 30, 0x0002 },
+        { 31, 0x0000 },
+        { 32, 0x0000 },
+        { 33, 0x0000 },
+        { 34, 0x0000 },
+        { 35, 0x0000 },
+        { 36, 0x0008 },
+        { 37, 0x0000 },
+        { 38, 0x0000 },
+        { 39, 0x0008 },
+        { 40, 0x0097 },
+        { 41, 0x0100 },
+        { 42, 0x0000 },
+        { 43, 0x0000 },
+        { 44, 0x0050 },
+        { 45, 0x0050 },
+        { 46, 0x0055 },
+        { 47, 0x0055 },
+        { 48, 0x0055 },
+        { 49, 0x0000 },
+        { 50, 0x0000 },
+        { 51, 0x0079 },
+        { 52, 0x0079 },
+        { 53, 0x0079 },
+        { 54, 0x0079 },
+        { 55, 0x0000 },
 };
 
-static int wm8900_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
+static bool wm8900_volatile_register(struct device *dev, unsigned int reg)
 {
         switch (reg) {
         case WM8900_REG_ID:
-                return 1;
+                return true;
         default:
-                return 0;
+                return false;
         }
 }
 
 static void wm8900_reset(struct snd_soc_codec *codec)
 {
         snd_soc_write(codec, WM8900_REG_RESET, 0);
-
-        memcpy(codec->reg_cache, wm8900_reg_defaults,
-               sizeof(wm8900_reg_defaults));
 }
 
 static int wm8900_hp_event(struct snd_soc_dapm_widget *w,
@@ -469,10 +493,10 @@ SOC_DAPM_SINGLE("RINPUT2 Switch", WM8900_REG_INCTL, 1, 1, 0),
 SOC_DAPM_SINGLE("RINPUT3 Switch", WM8900_REG_INCTL, 0, 1, 0),
 };
 
-static const char *wm9700_lp_mux[] = { "Disabled", "Enabled" };
+static const char *wm8900_lp_mux[] = { "Disabled", "Enabled" };
 
 static const struct soc_enum wm8900_lineout2_lp_mux =
-SOC_ENUM_SINGLE(WM8900_REG_LOUTMIXCTL1, 1, 2, wm9700_lp_mux);
+SOC_ENUM_SINGLE(WM8900_REG_LOUTMIXCTL1, 1, 2, wm8900_lp_mux);
 
 static const struct snd_kcontrol_new wm8900_lineout2_lp =
 SOC_DAPM_ENUM("Route", wm8900_lineout2_lp_mux);
@@ -1119,13 +1143,16 @@ static int wm8900_suspend(struct snd_soc_codec *codec)
 static int wm8900_resume(struct snd_soc_codec *codec)
 {
         struct wm8900_priv *wm8900 = snd_soc_codec_get_drvdata(codec);
-        u16 *cache;
-        int i, ret;
-
-        cache = kmemdup(codec->reg_cache, sizeof(wm8900_reg_defaults),
-                        GFP_KERNEL);
+        int ret;
 
         wm8900_reset(codec);
+
+        ret = regcache_sync(wm8900->regmap);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to restore cache: %d\n", ret);
+                return ret;
+        }
+
         wm8900_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Restart the FLL? */
@@ -1139,27 +1166,18 @@ static int wm8900_resume(struct snd_soc_codec *codec)
                 ret = wm8900_set_fll(codec, 0, fll_in, fll_out);
                 if (ret != 0) {
                         dev_err(codec->dev, "Failed to restart FLL\n");
-                        kfree(cache);
                         return ret;
                 }
         }
 
-        if (cache) {
-                for (i = 0; i < WM8900_MAXREG; i++)
-                        snd_soc_write(codec, i, cache[i]);
-                kfree(cache);
-        } else
-                dev_err(codec->dev, "Unable to allocate register cache\n");
-
         return 0;
 }
 
 static int wm8900_probe(struct snd_soc_codec *codec)
 {
-        struct wm8900_priv *wm8900 = snd_soc_codec_get_drvdata(codec);
         int ret = 0, reg;
 
-        ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm8900->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -1207,10 +1225,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8900 = {
         .suspend =      wm8900_suspend,
         .resume =       wm8900_resume,
         .set_bias_level = wm8900_set_bias_level,
-        .volatile_register = wm8900_volatile_register,
-        .reg_cache_size = ARRAY_SIZE(wm8900_reg_defaults),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8900_reg_defaults,
 
         .controls = wm8900_snd_controls,
         .num_controls = ARRAY_SIZE(wm8900_snd_controls),
@@ -1220,30 +1234,44 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8900 = {
         .num_dapm_routes = ARRAY_SIZE(wm8900_dapm_routes),
 };
 
+static const struct regmap_config wm8900_regmap = {
+        .reg_bits = 8,
+        .val_bits = 16,
+        .max_register = WM8900_MAXREG,
+
+        .reg_defaults = wm8900_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8900_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8900_volatile_register,
+};
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8900_spi_probe(struct spi_device *spi)
 {
         struct wm8900_priv *wm8900;
         int ret;
 
-        wm8900 = kzalloc(sizeof(struct wm8900_priv), GFP_KERNEL);
+        wm8900 = devm_kzalloc(&spi->dev, sizeof(struct wm8900_priv),
+                              GFP_KERNEL);
         if (wm8900 == NULL)
                 return -ENOMEM;
 
-        wm8900->control_type = SND_SOC_SPI;
+        wm8900->regmap = devm_regmap_init_spi(spi, &wm8900_regmap);
+        if (IS_ERR(wm8900->regmap))
+                return PTR_ERR(wm8900->regmap);
+
         spi_set_drvdata(spi, wm8900);
 
         ret = snd_soc_register_codec(&spi->dev,
                         &soc_codec_dev_wm8900, &wm8900_dai, 1);
-        if (ret < 0)
-                kfree(wm8900);
+
         return ret;
 }
 
 static int __devexit wm8900_spi_remove(struct spi_device *spi)
 {
         snd_soc_unregister_codec(&spi->dev);
-        kfree(spi_get_drvdata(spi));
         return 0;
 }
 
@@ -1264,24 +1292,26 @@ static __devinit int wm8900_i2c_probe(struct i2c_client *i2c,
         struct wm8900_priv *wm8900;
         int ret;
 
-        wm8900 = kzalloc(sizeof(struct wm8900_priv), GFP_KERNEL);
+        wm8900 = devm_kzalloc(&i2c->dev, sizeof(struct wm8900_priv),
+                              GFP_KERNEL);
         if (wm8900 == NULL)
                 return -ENOMEM;
 
+        wm8900->regmap = devm_regmap_init_i2c(i2c, &wm8900_regmap);
+        if (IS_ERR(wm8900->regmap))
+                return PTR_ERR(wm8900->regmap);
+
         i2c_set_clientdata(i2c, wm8900);
-        wm8900->control_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8900, &wm8900_dai, 1);
-        if (ret < 0)
-                kfree(wm8900);
+
         return ret;
 }
 
 static __devexit int wm8900_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 73f1c8d7bafb..839414f9e2ed 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -2241,23 +2241,7 @@ static struct i2c_driver wm8903_i2c_driver = {
         .id_table = wm8903_i2c_id,
 };
 
-static int __init wm8903_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&wm8903_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register wm8903 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8903_modinit);
-
-static void __exit wm8903_exit(void)
-{
-        i2c_del_driver(&wm8903_i2c_driver);
-}
-module_exit(wm8903_exit);
+module_i2c_driver(wm8903_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8903 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.cm>");
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index dc4262eea4b7..7c8df52a8d9d 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1185,8 +1185,6 @@ static int wm8904_add_widgets(struct snd_soc_codec *codec)
                 snd_soc_dapm_new_controls(dapm, wm8904_dapm_widgets,
                                           ARRAY_SIZE(wm8904_dapm_widgets));
 
-                snd_soc_dapm_add_routes(dapm, core_intercon,
-                                        ARRAY_SIZE(core_intercon));
                 snd_soc_dapm_add_routes(dapm, adc_intercon,
                                         ARRAY_SIZE(adc_intercon));
                 snd_soc_dapm_add_routes(dapm, dac_intercon,
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 481a3d9cfe48..b20aa4e7c3f9 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -785,23 +785,7 @@ static struct i2c_driver wm8940_i2c_driver = {
         .id_table = wm8940_i2c_id,
 };
 
-static int __init wm8940_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&wm8940_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register wm8940 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8940_modinit);
-
-static void __exit wm8940_exit(void)
-{
-        i2c_del_driver(&wm8940_i2c_driver);
-}
-module_exit(wm8940_exit);
+module_i2c_driver(wm8940_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8940 driver");
 MODULE_AUTHOR("Jonathan Cameron");
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 61fe97433e73..2f1c075755b1 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -1071,23 +1071,7 @@ static struct i2c_driver wm8955_i2c_driver = {
         .id_table = wm8955_i2c_id,
 };
 
-static int __init wm8955_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&wm8955_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register WM8955 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8955_modinit);
-
-static void __exit wm8955_exit(void)
-{
-        i2c_del_driver(&wm8955_i2c_driver);
-}
-module_exit(wm8955_exit);
+module_i2c_driver(wm8955_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8955 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index 1332692ef81b..00121ba36597 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -946,7 +946,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->mbc_texts = kmalloc(sizeof(char *)
                                             * pdata->num_mbc_cfgs, GFP_KERNEL);
                 if (!wm8994->mbc_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d MBC config texts\n",
                                 pdata->num_mbc_cfgs);
                         return;
@@ -958,9 +958,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->mbc_enum.max = pdata->num_mbc_cfgs;
                 wm8994->mbc_enum.texts = wm8994->mbc_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, control, 1);
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 control, 1);
                 if (ret != 0)
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to add MBC mode controls: %d\n", ret);
         }
 
@@ -974,7 +975,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->vss_texts = kmalloc(sizeof(char *)
                                             * pdata->num_vss_cfgs, GFP_KERNEL);
                 if (!wm8994->vss_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d VSS config texts\n",
                                 pdata->num_vss_cfgs);
                         return;
@@ -986,9 +987,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->vss_enum.max = pdata->num_vss_cfgs;
                 wm8994->vss_enum.texts = wm8994->vss_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, control, 1);
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 control, 1);
                 if (ret != 0)
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to add VSS mode controls: %d\n", ret);
         }
 
@@ -1003,7 +1005,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->vss_hpf_texts = kmalloc(sizeof(char *)
                                                 * pdata->num_vss_hpf_cfgs, GFP_KERNEL);
                 if (!wm8994->vss_hpf_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d VSS HPF config texts\n",
                                 pdata->num_vss_hpf_cfgs);
                         return;
@@ -1015,9 +1017,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->vss_hpf_enum.max = pdata->num_vss_hpf_cfgs;
                 wm8994->vss_hpf_enum.texts = wm8994->vss_hpf_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, control, 1);
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 control, 1);
                 if (ret != 0)
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to add VSS HPFmode controls: %d\n",
                                 ret);
         }
@@ -1033,7 +1036,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->enh_eq_texts = kmalloc(sizeof(char *)
                                                 * pdata->num_enh_eq_cfgs, GFP_KERNEL);
                 if (!wm8994->enh_eq_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d enhanced EQ config texts\n",
                                 pdata->num_enh_eq_cfgs);
                         return;
@@ -1045,9 +1048,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                 wm8994->enh_eq_enum.max = pdata->num_enh_eq_cfgs;
                 wm8994->enh_eq_enum.texts = wm8994->enh_eq_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, control, 1);
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 control, 1);
                 if (ret != 0)
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to add enhanced EQ controls: %d\n",
                                 ret);
         }
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 96518ac8e24c..f0f6f6601785 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -52,25 +52,72 @@
  * We can't read the WM8960 register space when we are
  * using 2 wire for device control, so we cache them instead.
  */
-static const u16 wm8960_reg[WM8960_CACHEREGNUM] = {
-        0x0097, 0x0097, 0x0000, 0x0000,
-        0x0000, 0x0008, 0x0000, 0x000a,
-        0x01c0, 0x0000, 0x00ff, 0x00ff,
-        0x0000, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x007b, 0x0100, 0x0032,
-        0x0000, 0x00c3, 0x00c3, 0x01c0,
-        0x0000, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000,
-        0x0100, 0x0100, 0x0050, 0x0050,
-        0x0050, 0x0050, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0040, 0x0000,
-        0x0000, 0x0050, 0x0050, 0x0000,
-        0x0002, 0x0037, 0x004d, 0x0080,
-        0x0008, 0x0031, 0x0026, 0x00e9,
+static const struct reg_default wm8960_reg_defaults[] = {
+        {  0x0, 0x0097 },
+        {  0x1, 0x0097 },
+        {  0x2, 0x0000 },
+        {  0x3, 0x0000 },
+        {  0x4, 0x0000 },
+        {  0x5, 0x0008 },
+        {  0x6, 0x0000 },
+        {  0x7, 0x000a },
+        {  0x8, 0x01c0 },
+        {  0x9, 0x0000 },
+        {  0xa, 0x00ff },
+        {  0xb, 0x00ff },
+
+        { 0x10, 0x0000 },
+        { 0x11, 0x007b },
+        { 0x12, 0x0100 },
+        { 0x13, 0x0032 },
+        { 0x14, 0x0000 },
+        { 0x15, 0x00c3 },
+        { 0x16, 0x00c3 },
+        { 0x17, 0x01c0 },
+        { 0x18, 0x0000 },
+        { 0x19, 0x0000 },
+        { 0x1a, 0x0000 },
+        { 0x1b, 0x0000 },
+        { 0x1c, 0x0000 },
+        { 0x1d, 0x0000 },
+
+        { 0x20, 0x0100 },
+        { 0x21, 0x0100 },
+        { 0x22, 0x0050 },
+
+        { 0x25, 0x0050 },
+        { 0x26, 0x0000 },
+        { 0x27, 0x0000 },
+        { 0x28, 0x0000 },
+        { 0x29, 0x0000 },
+        { 0x2a, 0x0040 },
+        { 0x2b, 0x0000 },
+        { 0x2c, 0x0000 },
+        { 0x2d, 0x0050 },
+        { 0x2e, 0x0050 },
+        { 0x2f, 0x0000 },
+        { 0x30, 0x0002 },
+        { 0x31, 0x0037 },
+
+        { 0x33, 0x0080 },
+        { 0x34, 0x0008 },
+        { 0x35, 0x0031 },
+        { 0x36, 0x0026 },
+        { 0x37, 0x00e9 },
 };
 
+static bool wm8960_volatile(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case WM8960_RESET:
+                return true;
+        default:
+                return false;
+        }
+}
+
 struct wm8960_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         int (*set_bias_level)(struct snd_soc_codec *,
                               enum snd_soc_bias_level level);
         struct snd_soc_dapm_widget *lout1;
@@ -510,18 +557,25 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_codec *codec = dai->codec;
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
         u16 iface = snd_soc_read(codec, WM8960_IFACE1) & 0xfff3;
+        snd_pcm_format_t format = params_format(params);
         int i;
 
         /* bit size */
-        switch (params_format(params)) {
+        switch (format) {
         case SNDRV_PCM_FORMAT_S16_LE:
+        case SNDRV_PCM_FORMAT_S16_BE:
                 break;
         case SNDRV_PCM_FORMAT_S20_3LE:
+        case SNDRV_PCM_FORMAT_S20_3BE:
                 iface |= 0x0004;
                 break;
         case SNDRV_PCM_FORMAT_S24_LE:
+        case SNDRV_PCM_FORMAT_S24_BE:
                 iface |= 0x0008;
                 break;
+        default:
+                dev_err(codec->dev, "unsupported format %i\n", format);
+                return -EINVAL;
         }
 
         /* Update filters for the new rate */
@@ -555,6 +609,8 @@ static int wm8960_mute(struct snd_soc_dai *dai, int mute)
 static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
                                       enum snd_soc_bias_level level)
 {
+        struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
+
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
@@ -566,7 +622,7 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
 
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                        snd_soc_cache_sync(codec);
+                        regcache_sync(wm8960->regmap);
 
                         /* Enable anti-pop features */
                         snd_soc_write(codec, WM8960_APOP1,
@@ -667,7 +723,7 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
                         break;
 
                 case SND_SOC_BIAS_OFF:
-                        snd_soc_cache_sync(codec);
+                        regcache_sync(wm8960->regmap);
                         break;
                 default:
                         break;
@@ -906,16 +962,11 @@ static int wm8960_probe(struct snd_soc_codec *codec)
         if (!pdata) {
                 dev_warn(codec->dev, "No platform data supplied\n");
         } else {
-                if (pdata->dres > WM8960_DRES_MAX) {
-                        dev_err(codec->dev, "Invalid DRES: %d\n", pdata->dres);
-                        pdata->dres = 0;
-                }
-
                 if (pdata->capless)
                         wm8960->set_bias_level = wm8960_set_bias_level_capless;
         }
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8960->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -963,14 +1014,24 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8960 = {
         .suspend =      wm8960_suspend,
         .resume =       wm8960_resume,
         .set_bias_level = wm8960_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8960_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8960_reg,
+};
+
+static const struct regmap_config wm8960_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+        .max_register = WM8960_PLL4,
+
+        .reg_defaults = wm8960_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8960_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8960_volatile,
 };
 
 static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
+        struct wm8960_data *pdata = dev_get_platdata(&i2c->dev);
         struct wm8960_priv *wm8960;
         int ret;
 
@@ -979,8 +1040,21 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
         if (wm8960 == NULL)
                 return -ENOMEM;
 
+        wm8960->regmap = regmap_init_i2c(i2c, &wm8960_regmap);
+        if (IS_ERR(wm8960->regmap))
+                return PTR_ERR(wm8960->regmap);
+
+        if (pdata && pdata->shared_lrclk) {
+                ret = regmap_update_bits(wm8960->regmap, WM8960_ADDCTL2,
+                                         0x4, 0x4);
+                if (ret != 0) {
+                        dev_err(&i2c->dev, "Failed to enable LRCM: %d\n",
+                                ret);
+                        return ret;
+                }
+        }
+
         i2c_set_clientdata(i2c, wm8960);
-        wm8960->control_type = SND_SOC_I2C;
 
         ret = snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8960, &wm8960_dai, 1);
@@ -1010,23 +1084,7 @@ static struct i2c_driver wm8960_i2c_driver = {
         .id_table = wm8960_i2c_id,
 };
 
-static int __init wm8960_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&wm8960_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register WM8960 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8960_modinit);
-
-static void __exit wm8960_exit(void)
-{
-        i2c_del_driver(&wm8960_i2c_driver);
-}
-module_exit(wm8960_exit);
+module_i2c_driver(wm8960_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8960 driver");
 MODULE_AUTHOR("Liam Girdwood");
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index 01edbcc754d2..f387670d0d75 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -19,6 +19,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -31,283 +32,159 @@
 
 #define WM8961_MAX_REGISTER                     0xFC
 
-static u16 wm8961_reg_defaults[] = {
-        0x009F,     /* R0   - Left Input volume */
-        0x009F,     /* R1   - Right Input volume */
-        0x0000,     /* R2   - LOUT1 volume */
-        0x0000,     /* R3   - ROUT1 volume */
-        0x0020,     /* R4   - Clocking1 */
-        0x0008,     /* R5   - ADC & DAC Control 1 */
-        0x0000,     /* R6   - ADC & DAC Control 2 */
-        0x000A,     /* R7   - Audio Interface 0 */
-        0x01F4,     /* R8   - Clocking2 */
-        0x0000,     /* R9   - Audio Interface 1 */
-        0x00FF,     /* R10  - Left DAC volume */
-        0x00FF,     /* R11  - Right DAC volume */
-        0x0000,     /* R12 */
-        0x0000,     /* R13 */
-        0x0040,     /* R14  - Audio Interface 2 */
-        0x0000,     /* R15  - Software Reset */
-        0x0000,     /* R16 */
-        0x007B,     /* R17  - ALC1 */
-        0x0000,     /* R18  - ALC2 */
-        0x0032,     /* R19  - ALC3 */
-        0x0000,     /* R20  - Noise Gate */
-        0x00C0,     /* R21  - Left ADC volume */
-        0x00C0,     /* R22  - Right ADC volume */
-        0x0120,     /* R23  - Additional control(1) */
-        0x0000,     /* R24  - Additional control(2) */
-        0x0000,     /* R25  - Pwr Mgmt (1) */
-        0x0000,     /* R26  - Pwr Mgmt (2) */
-        0x0000,     /* R27  - Additional Control (3) */
-        0x0000,     /* R28  - Anti-pop */
-        0x0000,     /* R29 */
-        0x005F,     /* R30  - Clocking 3 */
-        0x0000,     /* R31 */
-        0x0000,     /* R32  - ADCL signal path */
-        0x0000,     /* R33  - ADCR signal path */
-        0x0000,     /* R34 */
-        0x0000,     /* R35 */
-        0x0000,     /* R36 */
-        0x0000,     /* R37 */
-        0x0000,     /* R38 */
-        0x0000,     /* R39 */
-        0x0000,     /* R40  - LOUT2 volume */
-        0x0000,     /* R41  - ROUT2 volume */
-        0x0000,     /* R42 */
-        0x0000,     /* R43 */
-        0x0000,     /* R44 */
-        0x0000,     /* R45 */
-        0x0000,     /* R46 */
-        0x0000,     /* R47  - Pwr Mgmt (3) */
-        0x0023,     /* R48  - Additional Control (4) */
-        0x0000,     /* R49  - Class D Control 1 */
-        0x0000,     /* R50 */
-        0x0003,     /* R51  - Class D Control 2 */
-        0x0000,     /* R52 */
-        0x0000,     /* R53 */
-        0x0000,     /* R54 */
-        0x0000,     /* R55 */
-        0x0106,     /* R56  - Clocking 4 */
-        0x0000,     /* R57  - DSP Sidetone 0 */
-        0x0000,     /* R58  - DSP Sidetone 1 */
-        0x0000,     /* R59 */
-        0x0000,     /* R60  - DC Servo 0 */
-        0x0000,     /* R61  - DC Servo 1 */
-        0x0000,     /* R62 */
-        0x015E,     /* R63  - DC Servo 3 */
-        0x0010,     /* R64 */
-        0x0010,     /* R65  - DC Servo 5 */
-        0x0000,     /* R66 */
-        0x0001,     /* R67 */
-        0x0003,     /* R68  - Analogue PGA Bias */
-        0x0000,     /* R69  - Analogue HP 0 */
-        0x0060,     /* R70 */
-        0x01FB,     /* R71  - Analogue HP 2 */
-        0x0000,     /* R72  - Charge Pump 1 */
-        0x0065,     /* R73 */
-        0x005F,     /* R74 */
-        0x0059,     /* R75 */
-        0x006B,     /* R76 */
-        0x0038,     /* R77 */
-        0x000C,     /* R78 */
-        0x000A,     /* R79 */
-        0x006B,     /* R80 */
-        0x0000,     /* R81 */
-        0x0000,     /* R82  - Charge Pump B */
-        0x0087,     /* R83 */
-        0x0000,     /* R84 */
-        0x005C,     /* R85 */
-        0x0000,     /* R86 */
-        0x0000,     /* R87  - Write Sequencer 1 */
-        0x0000,     /* R88  - Write Sequencer 2 */
-        0x0000,     /* R89  - Write Sequencer 3 */
-        0x0000,     /* R90  - Write Sequencer 4 */
-        0x0000,     /* R91  - Write Sequencer 5 */
-        0x0000,     /* R92  - Write Sequencer 6 */
-        0x0000,     /* R93  - Write Sequencer 7 */
-        0x0000,     /* R94 */
-        0x0000,     /* R95 */
-        0x0000,     /* R96 */
-        0x0000,     /* R97 */
-        0x0000,     /* R98 */
-        0x0000,     /* R99 */
-        0x0000,     /* R100 */
-        0x0000,     /* R101 */
-        0x0000,     /* R102 */
-        0x0000,     /* R103 */
-        0x0000,     /* R104 */
-        0x0000,     /* R105 */
-        0x0000,     /* R106 */
-        0x0000,     /* R107 */
-        0x0000,     /* R108 */
-        0x0000,     /* R109 */
-        0x0000,     /* R110 */
-        0x0000,     /* R111 */
-        0x0000,     /* R112 */
-        0x0000,     /* R113 */
-        0x0000,     /* R114 */
-        0x0000,     /* R115 */
-        0x0000,     /* R116 */
-        0x0000,     /* R117 */
-        0x0000,     /* R118 */
-        0x0000,     /* R119 */
-        0x0000,     /* R120 */
-        0x0000,     /* R121 */
-        0x0000,     /* R122 */
-        0x0000,     /* R123 */
-        0x0000,     /* R124 */
-        0x0000,     /* R125 */
-        0x0000,     /* R126 */
-        0x0000,     /* R127 */
-        0x0000,     /* R128 */
-        0x0000,     /* R129 */
-        0x0000,     /* R130 */
-        0x0000,     /* R131 */
-        0x0000,     /* R132 */
-        0x0000,     /* R133 */
-        0x0000,     /* R134 */
-        0x0000,     /* R135 */
-        0x0000,     /* R136 */
-        0x0000,     /* R137 */
-        0x0000,     /* R138 */
-        0x0000,     /* R139 */
-        0x0000,     /* R140 */
-        0x0000,     /* R141 */
-        0x0000,     /* R142 */
-        0x0000,     /* R143 */
-        0x0000,     /* R144 */
-        0x0000,     /* R145 */
-        0x0000,     /* R146 */
-        0x0000,     /* R147 */
-        0x0000,     /* R148 */
-        0x0000,     /* R149 */
-        0x0000,     /* R150 */
-        0x0000,     /* R151 */
-        0x0000,     /* R152 */
-        0x0000,     /* R153 */
-        0x0000,     /* R154 */
-        0x0000,     /* R155 */
-        0x0000,     /* R156 */
-        0x0000,     /* R157 */
-        0x0000,     /* R158 */
-        0x0000,     /* R159 */
-        0x0000,     /* R160 */
-        0x0000,     /* R161 */
-        0x0000,     /* R162 */
-        0x0000,     /* R163 */
-        0x0000,     /* R164 */
-        0x0000,     /* R165 */
-        0x0000,     /* R166 */
-        0x0000,     /* R167 */
-        0x0000,     /* R168 */
-        0x0000,     /* R169 */
-        0x0000,     /* R170 */
-        0x0000,     /* R171 */
-        0x0000,     /* R172 */
-        0x0000,     /* R173 */
-        0x0000,     /* R174 */
-        0x0000,     /* R175 */
-        0x0000,     /* R176 */
-        0x0000,     /* R177 */
-        0x0000,     /* R178 */
-        0x0000,     /* R179 */
-        0x0000,     /* R180 */
-        0x0000,     /* R181 */
-        0x0000,     /* R182 */
-        0x0000,     /* R183 */
-        0x0000,     /* R184 */
-        0x0000,     /* R185 */
-        0x0000,     /* R186 */
-        0x0000,     /* R187 */
-        0x0000,     /* R188 */
-        0x0000,     /* R189 */
-        0x0000,     /* R190 */
-        0x0000,     /* R191 */
-        0x0000,     /* R192 */
-        0x0000,     /* R193 */
-        0x0000,     /* R194 */
-        0x0000,     /* R195 */
-        0x0030,     /* R196 */
-        0x0006,     /* R197 */
-        0x0000,     /* R198 */
-        0x0060,     /* R199 */
-        0x0000,     /* R200 */
-        0x003F,     /* R201 */
-        0x0000,     /* R202 */
-        0x0000,     /* R203 */
-        0x0000,     /* R204 */
-        0x0001,     /* R205 */
-        0x0000,     /* R206 */
-        0x0181,     /* R207 */
-        0x0005,     /* R208 */
-        0x0008,     /* R209 */
-        0x0008,     /* R210 */
-        0x0000,     /* R211 */
-        0x013B,     /* R212 */
-        0x0000,     /* R213 */
-        0x0000,     /* R214 */
-        0x0000,     /* R215 */
-        0x0000,     /* R216 */
-        0x0070,     /* R217 */
-        0x0000,     /* R218 */
-        0x0000,     /* R219 */
-        0x0000,     /* R220 */
-        0x0000,     /* R221 */
-        0x0000,     /* R222 */
-        0x0003,     /* R223 */
-        0x0000,     /* R224 */
-        0x0000,     /* R225 */
-        0x0001,     /* R226 */
-        0x0008,     /* R227 */
-        0x0000,     /* R228 */
-        0x0000,     /* R229 */
-        0x0000,     /* R230 */
-        0x0000,     /* R231 */
-        0x0004,     /* R232 */
-        0x0000,     /* R233 */
-        0x0000,     /* R234 */
-        0x0000,     /* R235 */
-        0x0000,     /* R236 */
-        0x0000,     /* R237 */
-        0x0080,     /* R238 */
-        0x0000,     /* R239 */
-        0x0000,     /* R240 */
-        0x0000,     /* R241 */
-        0x0000,     /* R242 */
-        0x0000,     /* R243 */
-        0x0000,     /* R244 */
-        0x0052,     /* R245 */
-        0x0110,     /* R246 */
-        0x0040,     /* R247 */
-        0x0000,     /* R248 */
-        0x0030,     /* R249 */
-        0x0000,     /* R250 */
-        0x0000,     /* R251 */
-        0x0001,     /* R252 - General test 1 */
+static const struct reg_default wm8961_reg_defaults[] = {
+        {  0, 0x009F },     /* R0   - Left Input volume */
+        {  1, 0x009F },     /* R1   - Right Input volume */
+        {  2, 0x0000 },     /* R2   - LOUT1 volume */
+        {  3, 0x0000 },     /* R3   - ROUT1 volume */
+        {  4, 0x0020 },     /* R4   - Clocking1 */
+        {  5, 0x0008 },     /* R5   - ADC & DAC Control 1 */
+        {  6, 0x0000 },     /* R6   - ADC & DAC Control 2 */
+        {  7, 0x000A },     /* R7   - Audio Interface 0 */
+        {  8, 0x01F4 },     /* R8   - Clocking2 */
+        {  9, 0x0000 },     /* R9   - Audio Interface 1 */
+        { 10, 0x00FF },     /* R10  - Left DAC volume */
+        { 11, 0x00FF },     /* R11  - Right DAC volume */
+
+        { 14, 0x0040 },     /* R14  - Audio Interface 2 */
+
+        { 17, 0x007B },     /* R17  - ALC1 */
+        { 18, 0x0000 },     /* R18  - ALC2 */
+        { 19, 0x0032 },     /* R19  - ALC3 */
+        { 20, 0x0000 },     /* R20  - Noise Gate */
+        { 21, 0x00C0 },     /* R21  - Left ADC volume */
+        { 22, 0x00C0 },     /* R22  - Right ADC volume */
+        { 23, 0x0120 },     /* R23  - Additional control(1) */
+        { 24, 0x0000 },     /* R24  - Additional control(2) */
+        { 25, 0x0000 },     /* R25  - Pwr Mgmt (1) */
+        { 26, 0x0000 },     /* R26  - Pwr Mgmt (2) */
+        { 27, 0x0000 },     /* R27  - Additional Control (3) */
+        { 28, 0x0000 },     /* R28  - Anti-pop */
+
+        { 30, 0x005F },     /* R30  - Clocking 3 */
+
+        { 32, 0x0000 },     /* R32  - ADCL signal path */
+        { 33, 0x0000 },     /* R33  - ADCR signal path */
+
+        { 40, 0x0000 },     /* R40  - LOUT2 volume */
+        { 41, 0x0000 },     /* R41  - ROUT2 volume */
+
+        { 47, 0x0000 },     /* R47  - Pwr Mgmt (3) */
+        { 48, 0x0023 },     /* R48  - Additional Control (4) */
+        { 49, 0x0000 },     /* R49  - Class D Control 1 */
+
+        { 51, 0x0003 },     /* R51  - Class D Control 2 */
+
+        { 56, 0x0106 },     /* R56  - Clocking 4 */
+        { 57, 0x0000 },     /* R57  - DSP Sidetone 0 */
+        { 58, 0x0000 },     /* R58  - DSP Sidetone 1 */
+
+        { 60, 0x0000 },     /* R60  - DC Servo 0 */
+        { 61, 0x0000 },     /* R61  - DC Servo 1 */
+
+        { 63, 0x015E },     /* R63  - DC Servo 3 */
+
+        { 65, 0x0010 },     /* R65  - DC Servo 5 */
+
+        { 68, 0x0003 },     /* R68  - Analogue PGA Bias */
+        { 69, 0x0000 },     /* R69  - Analogue HP 0 */
+
+        { 71, 0x01FB },     /* R71  - Analogue HP 2 */
+        { 72, 0x0000 },     /* R72  - Charge Pump 1 */
+
+        { 82, 0x0000 },     /* R82  - Charge Pump B */
+
+        { 87, 0x0000 },     /* R87  - Write Sequencer 1 */
+        { 88, 0x0000 },     /* R88  - Write Sequencer 2 */
+        { 89, 0x0000 },     /* R89  - Write Sequencer 3 */
+        { 90, 0x0000 },     /* R90  - Write Sequencer 4 */
+        { 91, 0x0000 },     /* R91  - Write Sequencer 5 */
+        { 92, 0x0000 },     /* R92  - Write Sequencer 6 */
+        { 93, 0x0000 },     /* R93  - Write Sequencer 7 */
+
+        { 252, 0x0001 },     /* R252 - General test 1 */
 };
 
 struct wm8961_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         int sysclk;
 };
 
-static int wm8961_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
+static bool wm8961_volatile(struct device *dev, unsigned int reg)
 {
         switch (reg) {
         case WM8961_SOFTWARE_RESET:
         case WM8961_WRITE_SEQUENCER_7:
         case WM8961_DC_SERVO_1:
-                return 1;
+                return true;
 
         default:
-                return 0;
+                return false;
         }
 }
 
-static int wm8961_reset(struct snd_soc_codec *codec)
+static bool wm8961_readable(struct device *dev, unsigned int reg)
 {
-        return snd_soc_write(codec, WM8961_SOFTWARE_RESET, 0);
+        switch (reg) {
+        case WM8961_LEFT_INPUT_VOLUME:
+        case WM8961_RIGHT_INPUT_VOLUME:
+        case WM8961_LOUT1_VOLUME:
+        case WM8961_ROUT1_VOLUME:
+        case WM8961_CLOCKING1:
+        case WM8961_ADC_DAC_CONTROL_1:
+        case WM8961_ADC_DAC_CONTROL_2:
+        case WM8961_AUDIO_INTERFACE_0:
+        case WM8961_CLOCKING2:
+        case WM8961_AUDIO_INTERFACE_1:
+        case WM8961_LEFT_DAC_VOLUME:
+        case WM8961_RIGHT_DAC_VOLUME:
+        case WM8961_AUDIO_INTERFACE_2:
+        case WM8961_SOFTWARE_RESET:
+        case WM8961_ALC1:
+        case WM8961_ALC2:
+        case WM8961_ALC3:
+        case WM8961_NOISE_GATE:
+        case WM8961_LEFT_ADC_VOLUME:
+        case WM8961_RIGHT_ADC_VOLUME:
+        case WM8961_ADDITIONAL_CONTROL_1:
+        case WM8961_ADDITIONAL_CONTROL_2:
+        case WM8961_PWR_MGMT_1:
+        case WM8961_PWR_MGMT_2:
+        case WM8961_ADDITIONAL_CONTROL_3:
+        case WM8961_ANTI_POP:
+        case WM8961_CLOCKING_3:
+        case WM8961_ADCL_SIGNAL_PATH:
+        case WM8961_ADCR_SIGNAL_PATH:
+        case WM8961_LOUT2_VOLUME:
+        case WM8961_ROUT2_VOLUME:
+        case WM8961_PWR_MGMT_3:
+        case WM8961_ADDITIONAL_CONTROL_4:
+        case WM8961_CLASS_D_CONTROL_1:
+        case WM8961_CLASS_D_CONTROL_2:
+        case WM8961_CLOCKING_4:
+        case WM8961_DSP_SIDETONE_0:
+        case WM8961_DSP_SIDETONE_1:
+        case WM8961_DC_SERVO_0:
+        case WM8961_DC_SERVO_1:
+        case WM8961_DC_SERVO_3:
+        case WM8961_DC_SERVO_5:
+        case WM8961_ANALOGUE_PGA_BIAS:
+        case WM8961_ANALOGUE_HP_0:
+        case WM8961_ANALOGUE_HP_2:
+        case WM8961_CHARGE_PUMP_1:
+        case WM8961_CHARGE_PUMP_B:
+        case WM8961_WRITE_SEQUENCER_1:
+        case WM8961_WRITE_SEQUENCER_2:
+        case WM8961_WRITE_SEQUENCER_3:
+        case WM8961_WRITE_SEQUENCER_4:
+        case WM8961_WRITE_SEQUENCER_5:
+        case WM8961_WRITE_SEQUENCER_6:
+        case WM8961_WRITE_SEQUENCER_7:
+        case WM8961_GENERAL_TEST_1:
+                return true;
+        default:
+                return false;
+        }
 }
 
 /*
@@ -962,33 +839,12 @@ static int wm8961_probe(struct snd_soc_codec *codec)
         int ret = 0;
         u16 reg;
 
-        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
-        reg = snd_soc_read(codec, WM8961_SOFTWARE_RESET);
-        if (reg != 0x1801) {
-                dev_err(codec->dev, "Device is not a WM8961: ID=0x%x\n", reg);
-                return -EINVAL;
-        }
-
-        /* This isn't volatile - readback doesn't correspond to write */
-        codec->cache_bypass = 1;
-        reg = snd_soc_read(codec, WM8961_RIGHT_INPUT_VOLUME);
-        codec->cache_bypass = 0;
-        dev_info(codec->dev, "WM8961 family %d revision %c\n",
-                 (reg & WM8961_DEVICE_ID_MASK) >> WM8961_DEVICE_ID_SHIFT,
-                 ((reg & WM8961_CHIP_REV_MASK) >> WM8961_CHIP_REV_SHIFT)
-                 + 'A');
-
-        ret = wm8961_reset(codec);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to issue reset\n");
-                return ret;
-        }
-
         /* Enable class W */
         reg = snd_soc_read(codec, WM8961_CHARGE_PUMP_B);
         reg |= WM8961_CP_DYN_PWR_MASK;
@@ -1066,16 +922,26 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8961 = {
         .suspend =      wm8961_suspend,
         .resume =       wm8961_resume,
         .set_bias_level = wm8961_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8961_reg_defaults),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8961_reg_defaults,
-        .volatile_register = wm8961_volatile_register,
+};
+
+static const struct regmap_config wm8961_regmap = {
+        .reg_bits = 8,
+        .val_bits = 16,
+        .max_register = WM8961_MAX_REGISTER,
+
+        .reg_defaults = wm8961_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8961_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm8961_volatile,
+        .readable_reg = wm8961_readable,
 };
 
 static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
         struct wm8961_priv *wm8961;
+        unsigned int val;
         int ret;
 
         wm8961 = devm_kzalloc(&i2c->dev, sizeof(struct wm8961_priv),
@@ -1083,6 +949,42 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
         if (wm8961 == NULL)
                 return -ENOMEM;
 
+        wm8961->regmap = devm_regmap_init_i2c(i2c, &wm8961_regmap);
+        if (IS_ERR(wm8961->regmap))
+                return PTR_ERR(wm8961->regmap);
+
+        ret = regmap_read(wm8961->regmap, WM8961_SOFTWARE_RESET, &val);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to read chip ID: %d\n", ret);
+                return ret;
+        }
+
+        if (val != 0x1801) {
+                dev_err(&i2c->dev, "Device is not a WM8961: ID=0x%x\n", val);
+                return -EINVAL;
+        }
+
+        /* This isn't volatile - readback doesn't correspond to write */
+        regcache_cache_bypass(wm8961->regmap, true);
+        ret = regmap_read(wm8961->regmap, WM8961_RIGHT_INPUT_VOLUME, &val);
+        regcache_cache_bypass(wm8961->regmap, false);
+
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to read chip revision: %d\n", ret);
+                return ret;
+        }
+
+        dev_info(&i2c->dev, "WM8961 family %d revision %c\n",
+                 (val & WM8961_DEVICE_ID_MASK) >> WM8961_DEVICE_ID_SHIFT,
+                 ((val & WM8961_CHIP_REV_MASK) >> WM8961_CHIP_REV_SHIFT)
+                 + 'A');
+
+        ret = regmap_write(wm8961->regmap, WM8961_SOFTWARE_RESET, 0x1801);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to issue reset: %d\n", ret);
+                return ret;
+        }
+
         i2c_set_clientdata(i2c, wm8961);
 
         ret = snd_soc_register_codec(&i2c->dev,
@@ -1114,23 +1016,7 @@ static struct i2c_driver wm8961_i2c_driver = {
         .id_table = wm8961_i2c_id,
 };
 
-static int __init wm8961_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&wm8961_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register wm8961 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8961_modinit);
-
-static void __exit wm8961_exit(void)
-{
-        i2c_del_driver(&wm8961_i2c_driver);
-}
-module_exit(wm8961_exit);
+module_i2c_driver(wm8961_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8961 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index eef783f6b6d6..5ce647758443 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -721,23 +721,7 @@ static struct i2c_driver wm8971_i2c_driver = {
         .id_table = wm8971_i2c_id,
 };
 
-static int __init wm8971_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&wm8971_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register WM8971 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8971_modinit);
-
-static void __exit wm8971_exit(void)
-{
-        i2c_del_driver(&wm8971_i2c_driver);
-}
-module_exit(wm8971_exit);
+module_i2c_driver(wm8971_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8971 driver");
 MODULE_AUTHOR("Lab126");
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index d93c03f820c9..9a39511af52a 100644
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -659,23 +659,7 @@ static struct i2c_driver wm8974_i2c_driver = {
         .id_table = wm8974_i2c_id,
 };
 
-static int __init wm8974_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&wm8974_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register wm8974 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8974_modinit);
-
-static void __exit wm8974_exit(void)
-{
-        i2c_del_driver(&wm8974_i2c_driver);
-}
-module_exit(wm8974_exit);
+module_i2c_driver(wm8974_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8974 driver");
 MODULE_AUTHOR("Liam Girdwood");
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index a5be3adecf75..5421fd9fbcb5 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -1105,23 +1105,7 @@ static struct i2c_driver wm8978_i2c_driver = {
         .id_table = wm8978_i2c_id,
 };
 
-static int __init wm8978_modinit(void)
-{
-        int ret = 0;
-        ret = i2c_add_driver(&wm8978_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register WM8978 I2C driver: %d\n",
-                       ret);
-        }
-        return ret;
-}
-module_init(wm8978_modinit);
-
-static void __exit wm8978_exit(void)
-{
-        i2c_del_driver(&wm8978_i2c_driver);
-}
-module_exit(wm8978_exit);
+module_i2c_driver(wm8978_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8978 codec driver");
 MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index 367388fdc486..d8879f262d27 100644
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -27,61 +28,60 @@
 
 #include "wm8983.h"
 
-static const u16 wm8983_reg_defs[WM8983_MAX_REGISTER + 1] = {
-        [0x00] = 0x0000,     /* R0  - Software Reset */
-        [0x01] = 0x0000,     /* R1  - Power management 1 */
-        [0x02] = 0x0000,     /* R2  - Power management 2 */
-        [0x03] = 0x0000,     /* R3  - Power management 3 */
-        [0x04] = 0x0050,     /* R4  - Audio Interface */
-        [0x05] = 0x0000,     /* R5  - Companding control */
-        [0x06] = 0x0140,     /* R6  - Clock Gen control */
-        [0x07] = 0x0000,     /* R7  - Additional control */
-        [0x08] = 0x0000,     /* R8  - GPIO Control */
-        [0x09] = 0x0000,     /* R9  - Jack Detect Control 1 */
-        [0x0A] = 0x0000,     /* R10 - DAC Control */
-        [0x0B] = 0x00FF,     /* R11 - Left DAC digital Vol */
-        [0x0C] = 0x00FF,     /* R12 - Right DAC digital vol */
-        [0x0D] = 0x0000,     /* R13 - Jack Detect Control 2 */
-        [0x0E] = 0x0100,     /* R14 - ADC Control */
-        [0x0F] = 0x00FF,     /* R15 - Left ADC Digital Vol */
-        [0x10] = 0x00FF,     /* R16 - Right ADC Digital Vol */
-        [0x12] = 0x012C,     /* R18 - EQ1 - low shelf */
-        [0x13] = 0x002C,     /* R19 - EQ2 - peak 1 */
-        [0x14] = 0x002C,     /* R20 - EQ3 - peak 2 */
-        [0x15] = 0x002C,     /* R21 - EQ4 - peak 3 */
-        [0x16] = 0x002C,     /* R22 - EQ5 - high shelf */
-        [0x18] = 0x0032,     /* R24 - DAC Limiter 1 */
-        [0x19] = 0x0000,     /* R25 - DAC Limiter 2 */
-        [0x1B] = 0x0000,     /* R27 - Notch Filter 1 */
-        [0x1C] = 0x0000,     /* R28 - Notch Filter 2 */
-        [0x1D] = 0x0000,     /* R29 - Notch Filter 3 */
-        [0x1E] = 0x0000,     /* R30 - Notch Filter 4 */
-        [0x20] = 0x0038,     /* R32 - ALC control 1 */
-        [0x21] = 0x000B,     /* R33 - ALC control 2 */
-        [0x22] = 0x0032,     /* R34 - ALC control 3 */
-        [0x23] = 0x0000,     /* R35 - Noise Gate */
-        [0x24] = 0x0008,     /* R36 - PLL N */
-        [0x25] = 0x000C,     /* R37 - PLL K 1 */
-        [0x26] = 0x0093,     /* R38 - PLL K 2 */
-        [0x27] = 0x00E9,     /* R39 - PLL K 3 */
-        [0x29] = 0x0000,     /* R41 - 3D control */
-        [0x2A] = 0x0000,     /* R42 - OUT4 to ADC */
-        [0x2B] = 0x0000,     /* R43 - Beep control */
-        [0x2C] = 0x0033,     /* R44 - Input ctrl */
-        [0x2D] = 0x0010,     /* R45 - Left INP PGA gain ctrl */
-        [0x2E] = 0x0010,     /* R46 - Right INP PGA gain ctrl */
-        [0x2F] = 0x0100,     /* R47 - Left ADC BOOST ctrl */
-        [0x30] = 0x0100,     /* R48 - Right ADC BOOST ctrl */
-        [0x31] = 0x0002,     /* R49 - Output ctrl */
-        [0x32] = 0x0001,     /* R50 - Left mixer ctrl */
-        [0x33] = 0x0001,     /* R51 - Right mixer ctrl */
-        [0x34] = 0x0039,     /* R52 - LOUT1 (HP) volume ctrl */
-        [0x35] = 0x0039,     /* R53 - ROUT1 (HP) volume ctrl */
-        [0x36] = 0x0039,     /* R54 - LOUT2 (SPK) volume ctrl */
-        [0x37] = 0x0039,     /* R55 - ROUT2 (SPK) volume ctrl */
-        [0x38] = 0x0001,     /* R56 - OUT3 mixer ctrl */
-        [0x39] = 0x0001,     /* R57 - OUT4 (MONO) mix ctrl */
-        [0x3D] = 0x0000      /* R61 - BIAS CTRL */
+static const struct reg_default wm8983_defaults[] = {
+        { 0x01, 0x0000 },     /* R1  - Power management 1 */
+        { 0x02, 0x0000 },     /* R2  - Power management 2 */
+        { 0x03, 0x0000 },     /* R3  - Power management 3 */
+        { 0x04, 0x0050 },     /* R4  - Audio Interface */
+        { 0x05, 0x0000 },     /* R5  - Companding control */
+        { 0x06, 0x0140 },     /* R6  - Clock Gen control */
+        { 0x07, 0x0000 },     /* R7  - Additional control */
+        { 0x08, 0x0000 },     /* R8  - GPIO Control */
+        { 0x09, 0x0000 },     /* R9  - Jack Detect Control 1 */
+        { 0x0A, 0x0000 },     /* R10 - DAC Control */
+        { 0x0B, 0x00FF },     /* R11 - Left DAC digital Vol */
+        { 0x0C, 0x00FF },     /* R12 - Right DAC digital vol */
+        { 0x0D, 0x0000 },     /* R13 - Jack Detect Control 2 */
+        { 0x0E, 0x0100 },     /* R14 - ADC Control */
+        { 0x0F, 0x00FF },     /* R15 - Left ADC Digital Vol */
+        { 0x10, 0x00FF },     /* R16 - Right ADC Digital Vol */
+        { 0x12, 0x012C },     /* R18 - EQ1 - low shelf */
+        { 0x13, 0x002C },     /* R19 - EQ2 - peak 1 */
+        { 0x14, 0x002C },     /* R20 - EQ3 - peak 2 */
+        { 0x15, 0x002C },     /* R21 - EQ4 - peak 3 */
+        { 0x16, 0x002C },     /* R22 - EQ5 - high shelf */
+        { 0x18, 0x0032 },     /* R24 - DAC Limiter 1 */
+        { 0x19, 0x0000 },     /* R25 - DAC Limiter 2 */
+        { 0x1B, 0x0000 },     /* R27 - Notch Filter 1 */
+        { 0x1C, 0x0000 },     /* R28 - Notch Filter 2 */
+        { 0x1D, 0x0000 },     /* R29 - Notch Filter 3 */
+        { 0x1E, 0x0000 },     /* R30 - Notch Filter 4 */
+        { 0x20, 0x0038 },     /* R32 - ALC control 1 */
+        { 0x21, 0x000B },     /* R33 - ALC control 2 */
+        { 0x22, 0x0032 },     /* R34 - ALC control 3 */
+        { 0x23, 0x0000 },     /* R35 - Noise Gate */
+        { 0x24, 0x0008 },     /* R36 - PLL N */
+        { 0x25, 0x000C },     /* R37 - PLL K 1 */
+        { 0x26, 0x0093 },     /* R38 - PLL K 2 */
+        { 0x27, 0x00E9 },     /* R39 - PLL K 3 */
+        { 0x29, 0x0000 },     /* R41 - 3D control */
+        { 0x2A, 0x0000 },     /* R42 - OUT4 to ADC */
+        { 0x2B, 0x0000 },     /* R43 - Beep control */
+        { 0x2C, 0x0033 },     /* R44 - Input ctrl */
+        { 0x2D, 0x0010 },     /* R45 - Left INP PGA gain ctrl */
+        { 0x2E, 0x0010 },     /* R46 - Right INP PGA gain ctrl */
+        { 0x2F, 0x0100 },     /* R47 - Left ADC BOOST ctrl */
+        { 0x30, 0x0100 },     /* R48 - Right ADC BOOST ctrl */
+        { 0x31, 0x0002 },     /* R49 - Output ctrl */
+        { 0x32, 0x0001 },     /* R50 - Left mixer ctrl */
+        { 0x33, 0x0001 },     /* R51 - Right mixer ctrl */
+        { 0x34, 0x0039 },     /* R52 - LOUT1 (HP) volume ctrl */
+        { 0x35, 0x0039 },     /* R53 - ROUT1 (HP) volume ctrl */
+        { 0x36, 0x0039 },     /* R54 - LOUT2 (SPK) volume ctrl */
+        { 0x37, 0x0039 },     /* R55 - ROUT2 (SPK) volume ctrl */
+        { 0x38, 0x0001 },     /* R56 - OUT3 mixer ctrl */
+        { 0x39, 0x0001 },     /* R57 - OUT4 (MONO) mix ctrl */
+        { 0x3D, 0x0000 },      /* R61 - BIAS CTRL */
 };
 
 static const struct wm8983_reg_access {
@@ -159,7 +159,7 @@ static const int vol_update_regs[] = {
 };
 
 struct wm8983_priv {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         u32 sysclk;
         u32 bclk;
 };
@@ -610,7 +610,7 @@ static int eqmode_put(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static int wm8983_readable(struct snd_soc_codec *codec, unsigned int reg)
+static bool wm8983_readable(struct device *dev, unsigned int reg)
 {
         if (reg > WM8983_MAX_REGISTER)
                 return 0;
@@ -905,6 +905,7 @@ static int wm8983_set_sysclk(struct snd_soc_dai *dai,
 static int wm8983_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
+        struct wm8983_priv *wm8983 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
         switch (level) {
@@ -917,7 +918,7 @@ static int wm8983_set_bias_level(struct snd_soc_codec *codec,
                 break;
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                        ret = snd_soc_cache_sync(codec);
+                        ret = regcache_sync(wm8983->regmap);
                         if (ret < 0) {
                                 dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
                                 return ret;
@@ -994,10 +995,9 @@ static int wm8983_remove(struct snd_soc_codec *codec)
 static int wm8983_probe(struct snd_soc_codec *codec)
 {
         int ret;
-        struct wm8983_priv *wm8983 = snd_soc_codec_get_drvdata(codec);
         int i;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8983->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret);
                 return ret;
@@ -1067,16 +1067,23 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8983 = {
         .suspend = wm8983_suspend,
         .resume = wm8983_resume,
         .set_bias_level = wm8983_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(wm8983_reg_defs),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = wm8983_reg_defs,
         .controls = wm8983_snd_controls,
         .num_controls = ARRAY_SIZE(wm8983_snd_controls),
         .dapm_widgets = wm8983_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(wm8983_dapm_widgets),
         .dapm_routes = wm8983_audio_map,
         .num_dapm_routes = ARRAY_SIZE(wm8983_audio_map),
-        .readable_register = wm8983_readable
+};
+
+static const struct regmap_config wm8983_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+
+        .reg_defaults = wm8983_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm8983_defaults),
+        .cache_type = REGCACHE_RBTREE,
+
+        .readable_reg = wm8983_readable,
 };
 
 #if defined(CONFIG_SPI_MASTER)
@@ -1085,24 +1092,27 @@ static int __devinit wm8983_spi_probe(struct spi_device *spi)
         struct wm8983_priv *wm8983;
         int ret;
 
-        wm8983 = kzalloc(sizeof *wm8983, GFP_KERNEL);
+        wm8983 = devm_kzalloc(&spi->dev, sizeof *wm8983, GFP_KERNEL);
         if (!wm8983)
                 return -ENOMEM;
 
-        wm8983->control_type = SND_SOC_SPI;
+        wm8983->regmap = devm_regmap_init_spi(spi, &wm8983_regmap);
+        if (IS_ERR(wm8983->regmap)) {
+                ret = PTR_ERR(wm8983->regmap);
+                dev_err(&spi->dev, "Failed to init regmap: %d\n", ret);
+                return ret;
+        }
+
         spi_set_drvdata(spi, wm8983);
 
         ret = snd_soc_register_codec(&spi->dev,
                                      &soc_codec_dev_wm8983, &wm8983_dai, 1);
-        if (ret < 0)
-                kfree(wm8983);
         return ret;
 }
 
 static int __devexit wm8983_spi_remove(struct spi_device *spi)
 {
         snd_soc_unregister_codec(&spi->dev);
-        kfree(spi_get_drvdata(spi));
         return 0;
 }
 
@@ -1123,24 +1133,28 @@ static __devinit int wm8983_i2c_probe(struct i2c_client *i2c,
         struct wm8983_priv *wm8983;
         int ret;
 
-        wm8983 = kzalloc(sizeof *wm8983, GFP_KERNEL);
+        wm8983 = devm_kzalloc(&i2c->dev, sizeof *wm8983, GFP_KERNEL);
         if (!wm8983)
                 return -ENOMEM;
 
-        wm8983->control_type = SND_SOC_I2C;
+        wm8983->regmap = devm_regmap_init_i2c(i2c, &wm8983_regmap);
+        if (IS_ERR(wm8983->regmap)) {
+                ret = PTR_ERR(wm8983->regmap);
+                dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret);
+                return ret;
+        }
+
         i2c_set_clientdata(i2c, wm8983);
 
         ret = snd_soc_register_codec(&i2c->dev,
                                      &soc_codec_dev_wm8983, &wm8983_dai, 1);
-        if (ret < 0)
-                kfree(wm8983);
+
         return ret;
 }
 
 static __devexit int wm8983_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index db63c97ddf51..c28c83e5395d 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1388,7 +1388,8 @@ static __devinit int wm8990_i2c_probe(struct i2c_client *i2c,
         struct wm8990_priv *wm8990;
         int ret;
 
-        wm8990 = kzalloc(sizeof(struct wm8990_priv), GFP_KERNEL);
+        wm8990 = devm_kzalloc(&i2c->dev, sizeof(struct wm8990_priv),
+                              GFP_KERNEL);
         if (wm8990 == NULL)
                 return -ENOMEM;
 
@@ -1396,15 +1397,14 @@ static __devinit int wm8990_i2c_probe(struct i2c_client *i2c,
 
         ret = snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8990, &wm8990_dai, 1);
-        if (ret < 0)
-                kfree(wm8990);
+
         return ret;
 }
 
 static __devexit int wm8990_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index 9ac31ba9b82e..fe439f027e10 100644
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -1363,7 +1363,7 @@ static __devinit int wm8991_i2c_probe(struct i2c_client *i2c,
         struct wm8991_priv *wm8991;
         int ret;
 
-        wm8991 = kzalloc(sizeof *wm8991, GFP_KERNEL);
+        wm8991 = devm_kzalloc(&i2c->dev, sizeof(*wm8991), GFP_KERNEL);
         if (!wm8991)
                 return -ENOMEM;
 
@@ -1372,15 +1372,14 @@ static __devinit int wm8991_i2c_probe(struct i2c_client *i2c,
 
         ret = snd_soc_register_codec(&i2c->dev,
                                      &soc_codec_dev_wm8991, &wm8991_dai, 1);
-        if (ret < 0)
-                kfree(wm8991);
+
         return ret;
 }
 
 static __devexit int wm8991_i2c_remove(struct i2c_client *client)
 {
         snd_soc_unregister_codec(&client->dev);
-        kfree(i2c_get_clientdata(client));
+
         return 0;
 }
 
@@ -1400,23 +1399,7 @@ static struct i2c_driver wm8991_i2c_driver = {
         .id_table = wm8991_i2c_id,
 };
 
-static int __init wm8991_modinit(void)
-{
-        int ret;
-        ret = i2c_add_driver(&wm8991_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register WM8991 I2C driver: %d\n",
-                       ret);
-        }
-        return 0;
-}
-module_init(wm8991_modinit);
-
-static void __exit wm8991_exit(void)
-{
-        i2c_del_driver(&wm8991_i2c_driver);
-}
-module_exit(wm8991_exit);
+module_i2c_driver(wm8991_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8991 driver");
 MODULE_AUTHOR("Graeme Gregory");
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 9fd80d688979..94737a30716b 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1520,6 +1520,8 @@ static int wm8993_probe(struct snd_soc_codec *codec)
                                       wm8993->pdata.lineout2fb,
                                       wm8993->pdata.jd_scthr,
                                       wm8993->pdata.jd_thr,
+                                      wm8993->pdata.micbias1_delay,
+                                      wm8993->pdata.micbias2_delay,
                                       wm8993->pdata.micbias1_lvl,
                                       wm8993->pdata.micbias2_lvl);
 
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 6c9eeca85b95..2b2dadc54dac 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -671,6 +671,18 @@ SOC_SINGLE_TLV("AIF2 EQ5 Volume", WM8994_AIF2_EQ_GAINS_2, 6, 31, 0,
                eq_tlv),
 };
 
+static const struct snd_kcontrol_new wm8994_drc_controls[] = {
+SND_SOC_BYTES_MASK("AIF1.1 DRC", WM8994_AIF1_DRC1_1, 5,
+                   WM8994_AIF1DAC1_DRC_ENA | WM8994_AIF1ADC1L_DRC_ENA |
+                   WM8994_AIF1ADC1R_DRC_ENA),
+SND_SOC_BYTES_MASK("AIF1.2 DRC", WM8994_AIF1_DRC2_1, 5,
+                   WM8994_AIF1DAC2_DRC_ENA | WM8994_AIF1ADC2L_DRC_ENA |
+                   WM8994_AIF1ADC2R_DRC_ENA),
+SND_SOC_BYTES_MASK("AIF2 DRC", WM8994_AIF2_DRC_1, 5,
+                   WM8994_AIF2DAC_DRC_ENA | WM8994_AIF2ADCL_DRC_ENA |
+                   WM8994_AIF2ADCR_DRC_ENA),
+};
+
 static const char *wm8958_ng_text[] = {
         "30ms", "125ms", "250ms", "500ms",
 };
@@ -789,11 +801,27 @@ 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 wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
                 return configure_clock(codec);
 
+        case SND_SOC_DAPM_POST_PMU:
+                /*
+                 * JACKDET won't run until we start the clock and it
+                 * only reports deltas, make sure we notify the state
+                 * up the stack on startup.  Use a *very* generous
+                 * timeout for paranoia, there's no urgency and we
+                 * don't want false reports.
+                 */
+                if (wm8994->jackdet && !wm8994->clk_has_run) {
+                        schedule_delayed_work(&wm8994->jackdet_bootstrap,
+                                              msecs_to_jiffies(1000));
+                        wm8994->clk_has_run = true;
+                }
+                break;
+
         case SND_SOC_DAPM_POST_PMD:
                 configure_clock(codec);
                 break;
@@ -1632,7 +1660,8 @@ SND_SOC_DAPM_SUPPLY("VMID", SND_SOC_NOPM, 0, 0, vmid_event,
                     SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 
 SND_SOC_DAPM_SUPPLY("CLK_SYS", SND_SOC_NOPM, 0, 0, clk_sys_event,
-                    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                    SND_SOC_DAPM_PRE_PMD),
 
 SND_SOC_DAPM_SUPPLY("DSP1CLK", SND_SOC_NOPM, 3, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("DSP2CLK", SND_SOC_NOPM, 2, 0, NULL, 0),
@@ -2102,6 +2131,10 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
         case WM8994_FLL_SRC_LRCLK:
         case WM8994_FLL_SRC_BCLK:
                 break;
+        case WM8994_FLL_SRC_INTERNAL:
+                freq_in = 12000000;
+                freq_out = 12000000;
+                break;
         default:
                 return -EINVAL;
         }
@@ -2161,12 +2194,14 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
 
         snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_4 + reg_offset,
                             WM8994_FLL1_N_MASK,
-                                    fll.n << WM8994_FLL1_N_SHIFT);
+                            fll.n << WM8994_FLL1_N_SHIFT);
 
         snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_5 + reg_offset,
-                            WM8958_FLL1_BYP |
+                            WM8994_FLL1_FRC_NCO | WM8958_FLL1_BYP |
                             WM8994_FLL1_REFCLK_DIV_MASK |
                             WM8994_FLL1_REFCLK_SRC_MASK,
+                            ((src == WM8994_FLL_SRC_INTERNAL)
+                             << WM8994_FLL1_FRC_NCO_SHIFT) |
                             (fll.clk_ref_div << WM8994_FLL1_REFCLK_DIV_SHIFT) |
                             (src - 1));
 
@@ -2192,13 +2227,16 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
                         }
                 }
 
+                reg = WM8994_FLL1_ENA;
+
                 if (fll.k)
-                        reg = WM8994_FLL1_ENA | WM8994_FLL1_FRAC;
-                else
-                        reg = WM8994_FLL1_ENA;
+                        reg |= WM8994_FLL1_FRAC;
+                if (src == WM8994_FLL_SRC_INTERNAL)
+                        reg |= WM8994_FLL1_OSC_ENA;
+
                 snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset,
-                                    WM8994_FLL1_ENA | WM8994_FLL1_FRAC,
-                                    reg);
+                                    WM8994_FLL1_ENA | WM8994_FLL1_OSC_ENA |
+                                    WM8994_FLL1_FRAC, reg);
 
                 if (wm8994->fll_locked_irq) {
                         timeout = wait_for_completion_timeout(&wm8994->fll_locked[id],
@@ -3027,7 +3065,7 @@ static int wm8994_codec_resume(struct snd_soc_codec *codec)
 
 static void wm8994_handle_retune_mobile_pdata(struct wm8994_priv *wm8994)
 {
-        struct snd_soc_codec *codec = wm8994->codec;
+        struct snd_soc_codec *codec = wm8994->hubs.codec;
         struct wm8994_pdata *pdata = wm8994->pdata;
         struct snd_kcontrol_new controls[] = {
                 SOC_ENUM_EXT("AIF1.1 EQ Mode",
@@ -3085,16 +3123,16 @@ static void wm8994_handle_retune_mobile_pdata(struct wm8994_priv *wm8994)
         wm8994->retune_mobile_enum.max = wm8994->num_retune_mobile_texts;
         wm8994->retune_mobile_enum.texts = wm8994->retune_mobile_texts;
 
-        ret = snd_soc_add_codec_controls(wm8994->codec, controls,
+        ret = snd_soc_add_codec_controls(wm8994->hubs.codec, controls,
                                    ARRAY_SIZE(controls));
         if (ret != 0)
-                dev_err(wm8994->codec->dev,
+                dev_err(wm8994->hubs.codec->dev,
                         "Failed to add ReTune Mobile controls: %d\n", ret);
 }
 
 static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
 {
-        struct snd_soc_codec *codec = wm8994->codec;
+        struct snd_soc_codec *codec = wm8994->hubs.codec;
         struct wm8994_pdata *pdata = wm8994->pdata;
         int ret, i;
 
@@ -3107,6 +3145,8 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
                                       pdata->lineout2fb,
                                       pdata->jd_scthr,
                                       pdata->jd_thr,
+                                      pdata->micb1_delay,
+                                      pdata->micb2_delay,
                                       pdata->micbias1_lvl,
                                       pdata->micbias2_lvl);
 
@@ -3123,10 +3163,10 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
                 };
 
                 /* We need an array of texts for the enum API */
-                wm8994->drc_texts = devm_kzalloc(wm8994->codec->dev,
+                wm8994->drc_texts = devm_kzalloc(wm8994->hubs.codec->dev,
                             sizeof(char *) * pdata->num_drc_cfgs, GFP_KERNEL);
                 if (!wm8994->drc_texts) {
-                        dev_err(wm8994->codec->dev,
+                        dev_err(wm8994->hubs.codec->dev,
                                 "Failed to allocate %d DRC config texts\n",
                                 pdata->num_drc_cfgs);
                         return;
@@ -3138,23 +3178,28 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
                 wm8994->drc_enum.max = pdata->num_drc_cfgs;
                 wm8994->drc_enum.texts = wm8994->drc_texts;
 
-                ret = snd_soc_add_codec_controls(wm8994->codec, controls,
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec, controls,
                                            ARRAY_SIZE(controls));
-                if (ret != 0)
-                        dev_err(wm8994->codec->dev,
-                                "Failed to add DRC mode controls: %d\n", ret);
-
                 for (i = 0; i < WM8994_NUM_DRC; i++)
                         wm8994_set_drc(codec, i);
+        } else {
+                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
+                                                 wm8994_drc_controls,
+                                                 ARRAY_SIZE(wm8994_drc_controls));
         }
 
+        if (ret != 0)
+                dev_err(wm8994->hubs.codec->dev,
+                        "Failed to add DRC mode controls: %d\n", ret);
+
+
         dev_dbg(codec->dev, "%d ReTune Mobile configurations\n",
                 pdata->num_retune_mobile_cfgs);
 
         if (pdata->num_retune_mobile_cfgs)
                 wm8994_handle_retune_mobile_pdata(wm8994);
         else
-                snd_soc_add_codec_controls(wm8994->codec, wm8994_eq_controls,
+                snd_soc_add_codec_controls(wm8994->hubs.codec, wm8994_eq_controls,
                                      ARRAY_SIZE(wm8994_eq_controls));
 
         for (i = 0; i < ARRAY_SIZE(pdata->micbias); i++) {
@@ -3236,6 +3281,12 @@ int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
 
         snd_soc_update_bits(codec, WM8994_MICBIAS, WM8994_MICD_ENA, reg);
 
+        /* enable MICDET and MICSHRT deboune */
+        snd_soc_update_bits(codec, WM8994_IRQ_DEBOUNCE,
+                            WM8994_MIC1_DET_DB_MASK | WM8994_MIC1_SHRT_DB_MASK |
+                            WM8994_MIC2_DET_DB_MASK | WM8994_MIC2_SHRT_DB_MASK,
+                            WM8994_MIC1_DET_DB | WM8994_MIC1_SHRT_DB);
+
         snd_soc_dapm_sync(&codec->dapm);
 
         return 0;
@@ -3309,7 +3360,7 @@ static void wm8994_mic_work(struct work_struct *work)
 static irqreturn_t wm8994_mic_irq(int irq, void *data)
 {
         struct wm8994_priv *priv = data;
-        struct snd_soc_codec *codec = priv->codec;
+        struct snd_soc_codec *codec = priv->hubs.codec;
 
 #ifndef CONFIG_SND_SOC_WM8994_MODULE
         trace_snd_soc_jack_irq(dev_name(codec->dev));
@@ -3345,7 +3396,7 @@ static void wm8958_default_micdet(u16 status, void *data)
 
                         snd_soc_jack_report(wm8994->micdet[0].jack, 0,
                                             wm8994->btn_mask |
-                                             SND_JACK_HEADSET);
+                                            SND_JACK_HEADSET);
                 }
                 return;
         }
@@ -3422,7 +3473,7 @@ static void wm8958_default_micdet(u16 status, void *data)
 static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
 {
         struct wm8994_priv *wm8994 = data;
-        struct snd_soc_codec *codec = wm8994->codec;
+        struct snd_soc_codec *codec = wm8994->hubs.codec;
         int reg;
         bool present;
 
@@ -3499,10 +3550,22 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
                                     SND_JACK_MECHANICAL | SND_JACK_HEADSET |
                                     wm8994->btn_mask);
 
+        /* Since we only report deltas force an update, ensures we
+         * avoid bootstrapping issues with the core. */
+        snd_soc_jack_report(wm8994->micdet[0].jack, 0, 0);
+
         pm_runtime_put(codec->dev);
         return IRQ_HANDLED;
 }
 
+static void wm1811_jackdet_bootstrap(struct work_struct *work)
+{
+        struct wm8994_priv *wm8994 = container_of(work,
+                                                struct wm8994_priv,
+                                                jackdet_bootstrap.work);
+        wm1811_jackdet_irq(0, wm8994);
+}
+
 /**
  * wm8958_mic_detect - Enable microphone detection via the WM8958 IRQ
  *
@@ -3573,6 +3636,10 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
                  * otherwise jump straight to microphone detection.
                  */
                 if (wm8994->jackdet) {
+                        /* Disable debounce for the initial detect */
+                        snd_soc_update_bits(codec, WM1811_JACKDET_CTRL,
+                                            WM1811_JACKDET_DB, 0);
+
                         snd_soc_update_bits(codec, WM8958_MICBIAS2,
                                             WM8958_MICB2_DISCH,
                                             WM8958_MICB2_DISCH);
@@ -3600,7 +3667,7 @@ EXPORT_SYMBOL_GPL(wm8958_mic_detect);
 static irqreturn_t wm8958_mic_irq(int irq, void *data)
 {
         struct wm8994_priv *wm8994 = data;
-        struct snd_soc_codec *codec = wm8994->codec;
+        struct snd_soc_codec *codec = wm8994->hubs.codec;
         int reg, count;
 
         /*
@@ -3690,15 +3757,15 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
         unsigned int reg;
         int ret, i;
 
-        wm8994->codec = codec;
+        wm8994->hubs.codec = codec;
         codec->control_data = control->regmap;
 
         snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP);
 
-        wm8994->codec = codec;
-
         mutex_init(&wm8994->accdet_lock);
         INIT_DELAYED_WORK(&wm8994->mic_work, wm8994_mic_work);
+        INIT_DELAYED_WORK(&wm8994->jackdet_bootstrap,
+                          wm1811_jackdet_bootstrap);
 
         for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++)
                 init_completion(&wm8994->fll_locked[i]);
@@ -3756,14 +3823,17 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                 wm8994->hubs.no_cache_dac_hp_direct = true;
                 wm8994->fll_byp = true;
 
-                switch (wm8994->revision) {
+                switch (control->cust_id) {
                 case 0:
-                case 1:
                 case 2:
-                case 3:
                         wm8994->hubs.dcs_codes_l = -9;
                         wm8994->hubs.dcs_codes_r = -7;
                         break;
+                case 1:
+                case 3:
+                        wm8994->hubs.dcs_codes_l = -8;
+                        wm8994->hubs.dcs_codes_r = -7;
+                        break;
                 default:
                         break;
                 }
@@ -3852,7 +3922,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 
         switch (control->type) {
         case WM1811:
-                if (wm8994->revision > 1) {
+                if (control->cust_id > 1 || wm8994->revision > 1) {
                         ret = wm8994_request_irq(wm8994->wm8994,
                                                  WM8994_IRQ_GPIO(6),
                                                  wm1811_jackdet_irq, "JACKDET",
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h
index d77e06f0a675..f142ec198db3 100644
--- a/sound/soc/codecs/wm8994.h
+++ b/sound/soc/codecs/wm8994.h
@@ -28,10 +28,11 @@
 #define WM8994_FLL1 1
 #define WM8994_FLL2 2
 
-#define WM8994_FLL_SRC_MCLK1  1
-#define WM8994_FLL_SRC_MCLK2  2
-#define WM8994_FLL_SRC_LRCLK  3
-#define WM8994_FLL_SRC_BCLK   4
+#define WM8994_FLL_SRC_MCLK1    1
+#define WM8994_FLL_SRC_MCLK2    2
+#define WM8994_FLL_SRC_LRCLK    3
+#define WM8994_FLL_SRC_BCLK     4
+#define WM8994_FLL_SRC_INTERNAL 5
 
 enum wm8994_vmid_mode {
         WM8994_VMID_NORMAL,
@@ -72,7 +73,6 @@ struct wm8994;
 struct wm8994_priv {
         struct wm_hubs_data hubs;
         struct wm8994 *wm8994;
-        struct snd_soc_codec *codec;
         int sysclk[2];
         int sysclk_rate[2];
         int mclk[2];
@@ -81,6 +81,7 @@ struct wm8994_priv {
         struct completion fll_locked[2];
         bool fll_locked_irq;
         bool fll_byp;
+        bool clk_has_run;
 
         int vmid_refcount;
         int active_refcount;
@@ -134,6 +135,7 @@ struct wm8994_priv {
         int btn_mask;
         bool jackdet;
         int jackdet_mode;
+        struct delayed_work jackdet_bootstrap;
 
         wm8958_micdet_cb jack_cb;
         void *jack_cb_data;
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 00f183dfa454..6dcb02c3666f 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -931,7 +931,7 @@ SND_SOC_DAPM_INPUT("IN2RP"),
 SND_SOC_DAPM_INPUT("DMIC1DAT"),
 SND_SOC_DAPM_INPUT("DMIC2DAT"),
 
-SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20),
+SND_SOC_DAPM_REGULATOR_SUPPLY("CPVDD", 20, 0),
 SND_SOC_DAPM_SUPPLY_S("SYSCLK", 1, WM8996_AIF_CLOCKING_1, 0, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY_S("SYSDSPCLK", 2, WM8996_CLOCKING_1, 1, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY_S("AIFCLK", 2, WM8996_CLOCKING_1, 2, 0, NULL, 0),
diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c
index 2c2346fdd637..c7ddc56175d1 100644
--- a/sound/soc/codecs/wm9090.c
+++ b/sound/soc/codecs/wm9090.c
@@ -695,17 +695,7 @@ static struct i2c_driver wm9090_i2c_driver = {
         .id_table = wm9090_id,
 };
 
-static int __init wm9090_init(void)
-{
-        return i2c_add_driver(&wm9090_i2c_driver);
-}
-module_init(wm9090_init);
-
-static void __exit wm9090_exit(void)
-{
-        i2c_del_driver(&wm9090_i2c_driver);
-}
-module_exit(wm9090_exit);
+module_i2c_driver(wm9090_i2c_driver);
 
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_DESCRIPTION("WM9090 ASoC driver");
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index c6d2076a796b..4dd73ea08d0b 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -132,8 +132,9 @@ SOC_SINGLE("Aux Playback Phone Volume", AC97_CD, 4, 7, 1),
 SOC_SINGLE("Phone Volume", AC97_PHONE, 0, 15, 1),
 SOC_DOUBLE("Line Capture Volume", AC97_LINE, 8, 0, 31, 1),
 
-SOC_SINGLE("Capture 20dB Boost Switch", AC97_REC_SEL, 14, 1, 0),
-SOC_SINGLE("Capture to Phone 20dB Boost Switch", AC97_REC_SEL, 11, 1, 1),
+SOC_SINGLE_TLV("Capture Boost Switch", AC97_REC_SEL, 14, 1, 0, boost_tlv),
+SOC_SINGLE_TLV("Capture to Phone Boost Switch", AC97_REC_SEL, 11, 1, 1,
+               boost_tlv),
 
 SOC_SINGLE("3D Upper Cut-off Switch", AC97_3D_CONTROL, 5, 1, 1),
 SOC_SINGLE("3D Lower Cut-off Switch", AC97_3D_CONTROL, 4, 1, 1),
@@ -146,7 +147,7 @@ SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0),
 SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1),
 SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1),
 
-SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1),
+SOC_SINGLE("Capture Switch", AC97_REC_GAIN, 15, 1, 1),
 SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),
 SOC_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 0),
 SOC_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0),
@@ -634,7 +635,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
 {
         int ret = 0;
 
-        codec->control_data = codec;    /* we don't use regmap! */
         ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
         if (ret < 0) {
                 printk(KERN_ERR "wm9712: failed to register AC97 codec\n");
@@ -699,8 +699,8 @@ static int __devexit wm9712_remove(struct platform_device *pdev)
 
 static struct platform_driver wm9712_codec_driver = {
         .driver = {
-                        .name = "wm9712-codec",
-                        .owner = THIS_MODULE,
+                .name = "wm9712-codec",
+                .owner = THIS_MODULE,
         },
 
         .probe = wm9712_probe,
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index d0b8a3287a85..3eb19fb71d17 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1196,7 +1196,6 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec)
         if (wm9713 == NULL)
                 return -ENOMEM;
         snd_soc_codec_set_drvdata(codec, wm9713);
-        codec->control_data = wm9713;   /* we don't use regmap! */
 
         ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
         if (ret < 0)
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 61baa48823cb..7a773a835b8e 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -199,15 +199,56 @@ static void wm_hubs_dcs_cache_set(struct snd_soc_codec *codec, u16 dcs_cfg)
         list_add_tail(&cache->list, &hubs->dcs_cache);
 }
 
+static void wm_hubs_read_dc_servo(struct snd_soc_codec *codec,
+                                  u16 *reg_l, u16 *reg_r)
+{
+        struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
+        u16 dcs_reg, reg;
+
+        switch (hubs->dcs_readback_mode) {
+        case 2:
+                dcs_reg = WM8994_DC_SERVO_4E;
+                break;
+        case 1:
+                dcs_reg = WM8994_DC_SERVO_READBACK;
+                break;
+        default:
+                dcs_reg = WM8993_DC_SERVO_3;
+                break;
+        }
+
+        /* Different chips in the family support different readback
+         * methods.
+         */
+        switch (hubs->dcs_readback_mode) {
+        case 0:
+                *reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1)
+                        & WM8993_DCS_INTEG_CHAN_0_MASK;
+                *reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2)
+                        & WM8993_DCS_INTEG_CHAN_1_MASK;
+                break;
+        case 2:
+        case 1:
+                reg = snd_soc_read(codec, dcs_reg);
+                *reg_r = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK)
+                        >> WM8993_DCS_DAC_WR_VAL_1_SHIFT;
+                *reg_l = reg & WM8993_DCS_DAC_WR_VAL_0_MASK;
+                break;
+        default:
+                WARN(1, "Unknown DCS readback method\n");
+                return;
+        }
+}
+
 /*
  * Startup calibration of the DC servo
  */
-static void calibrate_dc_servo(struct snd_soc_codec *codec)
+static void enable_dc_servo(struct snd_soc_codec *codec)
 {
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
         struct wm_hubs_dcs_cache *cache;
         s8 offset;
-        u16 reg, reg_l, reg_r, dcs_cfg, dcs_reg;
+        u16 reg_l, reg_r, dcs_cfg, dcs_reg;
 
         switch (hubs->dcs_readback_mode) {
         case 2:
@@ -245,27 +286,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
                                   WM8993_DCS_TRIG_STARTUP_1);
         }
 
-        /* Different chips in the family support different readback
-         * methods.
-         */
-        switch (hubs->dcs_readback_mode) {
-        case 0:
-                reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1)
-                        & WM8993_DCS_INTEG_CHAN_0_MASK;
-                reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2)
-                        & WM8993_DCS_INTEG_CHAN_1_MASK;
-                break;
-        case 2:
-        case 1:
-                reg = snd_soc_read(codec, dcs_reg);
-                reg_r = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK)
-                        >> WM8993_DCS_DAC_WR_VAL_1_SHIFT;
-                reg_l = reg & WM8993_DCS_DAC_WR_VAL_0_MASK;
-                break;
-        default:
-                WARN(1, "Unknown DCS readback method\n");
-                return;
-        }
+        wm_hubs_read_dc_servo(codec, &reg_l, &reg_r);
 
         dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r);
 
@@ -276,12 +297,16 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
                         hubs->dcs_codes_l, hubs->dcs_codes_r);
 
                 /* HPOUT1R */
-                offset = reg_r;
+                offset = (s8)reg_r;
+                dev_dbg(codec->dev, "DCS right %d->%d\n", offset,
+                        offset + hubs->dcs_codes_r);
                 offset += hubs->dcs_codes_r;
                 dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
 
                 /* HPOUT1L */
-                offset = reg_l;
+                offset = (s8)reg_l;
+                dev_dbg(codec->dev, "DCS left %d->%d\n", offset,
+                        offset + hubs->dcs_codes_l);
                 offset += hubs->dcs_codes_l;
                 dcs_cfg |= (u8)offset;
 
@@ -535,7 +560,7 @@ static int hp_event(struct snd_soc_dapm_widget *w,
                 snd_soc_update_bits(codec, WM8993_DC_SERVO_1,
                                     WM8993_DCS_TIMER_PERIOD_01_MASK, 0);
 
-                calibrate_dc_servo(codec);
+                enable_dc_servo(codec);
 
                 reg |= WM8993_HPOUT1R_OUTP | WM8993_HPOUT1R_RMV_SHORT |
                         WM8993_HPOUT1L_OUTP | WM8993_HPOUT1L_RMV_SHORT;
@@ -619,6 +644,28 @@ static int lineout_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
+static int micbias_event(struct snd_soc_dapm_widget *w,
+                         struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
+
+        switch (w->shift) {
+        case WM8993_MICB1_ENA_SHIFT:
+                if (hubs->micb1_delay)
+                        msleep(hubs->micb1_delay);
+                break;
+        case WM8993_MICB2_ENA_SHIFT:
+                if (hubs->micb2_delay)
+                        msleep(hubs->micb2_delay);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 void wm_hubs_update_class_w(struct snd_soc_codec *codec)
 {
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
@@ -809,8 +856,10 @@ SND_SOC_DAPM_INPUT("IN1RP"),
 SND_SOC_DAPM_INPUT("IN2RN"),
 SND_SOC_DAPM_INPUT("IN2RP:VXRP"),
 
-SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0, NULL, 0),
-SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0, NULL, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0,
+                    micbias_event, SND_SOC_DAPM_POST_PMU),
+SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0,
+                    micbias_event, SND_SOC_DAPM_POST_PMU),
 
 SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0,
                    in1l_pga, ARRAY_SIZE(in1l_pga)),
@@ -1112,6 +1161,8 @@ int wm_hubs_add_analogue_routes(struct snd_soc_codec *codec,
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
         struct snd_soc_dapm_context *dapm = &codec->dapm;
 
+        hubs->codec = codec;
+
         INIT_LIST_HEAD(&hubs->dcs_cache);
         init_completion(&hubs->dcs_done);
 
@@ -1143,13 +1194,16 @@ EXPORT_SYMBOL_GPL(wm_hubs_add_analogue_routes);
 int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *codec,
                                   int lineout1_diff, int lineout2_diff,
                                   int lineout1fb, int lineout2fb,
-                                  int jd_scthr, int jd_thr, int micbias1_lvl,
-                                  int micbias2_lvl)
+                                  int jd_scthr, int jd_thr,
+                                  int micbias1_delay, int micbias2_delay,
+                                  int micbias1_lvl, int micbias2_lvl)
 {
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
 
         hubs->lineout1_se = !lineout1_diff;
         hubs->lineout2_se = !lineout2_diff;
+        hubs->micb1_delay = micbias1_delay;
+        hubs->micb2_delay = micbias2_delay;
 
         if (!lineout1_diff)
                 snd_soc_update_bits(codec, WM8993_LINE_MIXER1,
diff --git a/sound/soc/codecs/wm_hubs.h b/sound/soc/codecs/wm_hubs.h
index da2dc899ce6d..24c763df21f9 100644
--- a/sound/soc/codecs/wm_hubs.h
+++ b/sound/soc/codecs/wm_hubs.h
@@ -36,6 +36,9 @@ struct wm_hubs_data {
         struct list_head dcs_cache;
         bool (*check_class_w_digital)(struct snd_soc_codec *);
 
+        int micb1_delay;
+        int micb2_delay;
+
         bool lineout1_se;
         bool lineout1n_ena;
         bool lineout1p_ena;
@@ -46,6 +49,8 @@ struct wm_hubs_data {
 
         bool dcs_done_irq;
         struct completion dcs_done;
+
+        struct snd_soc_codec *codec;
 };
 
 extern int wm_hubs_add_analogue_controls(struct snd_soc_codec *);
@@ -54,6 +59,7 @@ extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *,
                                          int lineout1_diff, int lineout2_diff,
                                          int lineout1fb, int lineout2fb,
                                          int jd_scthr, int jd_thr,
+                                         int micbias1_dly, int micbias2_dly,
                                          int micbias1_lvl, int micbias2_lvl);
 
 extern irqreturn_t wm_hubs_dcs_done(int irq, void *data);
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 10a2d8c788b7..6fac5af13298 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -22,10 +22,6 @@
 #include <asm/dma.h>
 #include <asm/mach-types.h>
 
-#include <mach/asp.h>
-#include <mach/edma.h>
-#include <mach/mux.h>
-
 #include "davinci-pcm.h"
 #include "davinci-i2s.h"
 #include "davinci-mcasp.h"
@@ -160,7 +156,7 @@ static struct snd_soc_dai_link dm6446_evm_dai = {
         .cpu_dai_name = "davinci-mcbsp",
         .codec_dai_name = "tlv320aic3x-hifi",
         .codec_name = "tlv320aic3x-codec.1-001b",
-        .platform_name = "davinci-pcm-audio",
+        .platform_name = "davinci-mcbsp",
         .init = evm_aic3x_init,
         .ops = &evm_ops,
 };
@@ -171,7 +167,7 @@ static struct snd_soc_dai_link dm355_evm_dai = {
         .cpu_dai_name = "davinci-mcbsp.1",
         .codec_dai_name = "tlv320aic3x-hifi",
         .codec_name = "tlv320aic3x-codec.1-001b",
-        .platform_name = "davinci-pcm-audio",
+        .platform_name = "davinci-mcbsp.1",
         .init = evm_aic3x_init,
         .ops = &evm_ops,
 };
@@ -185,14 +181,15 @@ static struct snd_soc_dai_link dm365_evm_dai = {
         .init = evm_aic3x_init,
         .codec_name = "tlv320aic3x-codec.1-0018",
         .ops = &evm_ops,
+        .platform_name = "davinci-mcbsp",
 #elif defined(CONFIG_SND_DM365_VOICE_CODEC)
         .name = "Voice Codec - CQ93VC",
         .stream_name = "CQ93",
         .cpu_dai_name = "davinci-vcif",
         .codec_dai_name = "cq93vc-hifi",
         .codec_name = "cq93vc-codec",
+        .platform_name = "davinci-vcif",
 #endif
-        .platform_name = "davinci-pcm-audio",
 };
 
 static struct snd_soc_dai_link dm6467_evm_dai[] = {
@@ -201,7 +198,7 @@ static struct snd_soc_dai_link dm6467_evm_dai[] = {
                 .stream_name = "AIC3X",
                 .cpu_dai_name= "davinci-mcasp.0",
                 .codec_dai_name = "tlv320aic3x-hifi",
-                .platform_name ="davinci-pcm-audio",
+                .platform_name = "davinci-mcasp.0",
                 .codec_name = "tlv320aic3x-codec.0-001a",
                 .init = evm_aic3x_init,
                 .ops = &evm_ops,
@@ -212,7 +209,7 @@ static struct snd_soc_dai_link dm6467_evm_dai[] = {
                 .cpu_dai_name= "davinci-mcasp.1",
                 .codec_dai_name = "dit-hifi",
                 .codec_name = "spdif_dit",
-                .platform_name = "davinci-pcm-audio",
+                .platform_name = "davinci-mcasp.1",
                 .ops = &evm_spdif_ops,
         },
 };
@@ -223,7 +220,7 @@ static struct snd_soc_dai_link da830_evm_dai = {
         .cpu_dai_name = "davinci-mcasp.1",
         .codec_dai_name = "tlv320aic3x-hifi",
         .codec_name = "tlv320aic3x-codec.1-0018",
-        .platform_name = "davinci-pcm-audio",
+        .platform_name = "davinci-mcasp.1",
         .init = evm_aic3x_init,
         .ops = &evm_ops,
 };
@@ -234,7 +231,7 @@ static struct snd_soc_dai_link da850_evm_dai = {
         .cpu_dai_name= "davinci-mcasp.0",
         .codec_dai_name = "tlv320aic3x-hifi",
         .codec_name = "tlv320aic3x-codec.1-0018",
-        .platform_name = "davinci-pcm-audio",
+        .platform_name = "davinci-mcasp.0",
         .init = evm_aic3x_init,
         .ops = &evm_ops,
 };
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 0a74b9587a2c..821831207180 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/clk.h>
+#include <linux/platform_data/davinci_asp.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -23,8 +24,6 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <mach/asp.h>
-
 #include "davinci-pcm.h"
 #include "davinci-i2s.h"
 
@@ -732,8 +731,16 @@ static int davinci_i2s_probe(struct platform_device *pdev)
         if (ret != 0)
                 goto err_release_clk;
 
+        ret = davinci_soc_platform_register(&pdev->dev);
+        if (ret) {
+                dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
+                goto err_unregister_dai;
+        }
+
         return 0;
 
+err_unregister_dai:
+        snd_soc_unregister_dai(&pdev->dev);
 err_release_clk:
         clk_disable(dev->clk);
         clk_put(dev->clk);
@@ -745,6 +752,8 @@ static int davinci_i2s_remove(struct platform_device *pdev)
         struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev);
 
         snd_soc_unregister_dai(&pdev->dev);
+        davinci_soc_platform_unregister(&pdev->dev);
+
         clk_disable(dev->clk);
         clk_put(dev->clk);
         dev->clk = NULL;
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index ce5e5cd254dd..714e51e5be5b 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -21,7 +21,10 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/clk.h>
+#include <linux/pm_runtime.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/of_device.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -108,6 +111,10 @@
 #define DAVINCI_MCASP_WFIFOSTS          (0x1014)
 #define DAVINCI_MCASP_RFIFOCTL          (0x1018)
 #define DAVINCI_MCASP_RFIFOSTS          (0x101C)
+#define MCASP_VER3_WFIFOCTL             (0x1000)
+#define MCASP_VER3_WFIFOSTS             (0x1004)
+#define MCASP_VER3_RFIFOCTL             (0x1008)
+#define MCASP_VER3_RFIFOSTS             (0x100C)
 
 /*
  * DAVINCI_MCASP_PWREMUMGT_REG - Power Down and Emulation Management
@@ -381,18 +388,36 @@ static void davinci_mcasp_start(struct davinci_audio_dev *dev, int stream)
 {
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 if (dev->txnumevt) {    /* enable FIFO */
-                        mcasp_clr_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,
+                        switch (dev->version) {
+                        case MCASP_VERSION_3:
+                                mcasp_clr_bits(dev->base + MCASP_VER3_WFIFOCTL,
                                                                 FIFO_ENABLE);
-                        mcasp_set_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,
+                                mcasp_set_bits(dev->base + MCASP_VER3_WFIFOCTL,
                                                                 FIFO_ENABLE);
+                                break;
+                        default:
+                                mcasp_clr_bits(dev->base +
+                                        DAVINCI_MCASP_WFIFOCTL, FIFO_ENABLE);
+                                mcasp_set_bits(dev->base +
+                                        DAVINCI_MCASP_WFIFOCTL, FIFO_ENABLE);
+                        }
                 }
                 mcasp_start_tx(dev);
         } else {
                 if (dev->rxnumevt) {    /* enable FIFO */
-                        mcasp_clr_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,
+                        switch (dev->version) {
+                        case MCASP_VERSION_3:
+                                mcasp_clr_bits(dev->base + MCASP_VER3_RFIFOCTL,
                                                                 FIFO_ENABLE);
-                        mcasp_set_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,
+                                mcasp_set_bits(dev->base + MCASP_VER3_RFIFOCTL,
                                                                 FIFO_ENABLE);
+                                break;
+                        default:
+                                mcasp_clr_bits(dev->base +
+                                        DAVINCI_MCASP_RFIFOCTL, FIFO_ENABLE);
+                                mcasp_set_bits(dev->base +
+                                        DAVINCI_MCASP_RFIFOCTL, FIFO_ENABLE);
+                        }
                 }
                 mcasp_start_rx(dev);
         }
@@ -413,14 +438,31 @@ static void mcasp_stop_tx(struct davinci_audio_dev *dev)
 static void davinci_mcasp_stop(struct davinci_audio_dev *dev, int stream)
 {
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                if (dev->txnumevt)      /* disable FIFO */
-                        mcasp_clr_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,
+                if (dev->txnumevt) {    /* disable FIFO */
+                        switch (dev->version) {
+                        case MCASP_VERSION_3:
+                                mcasp_clr_bits(dev->base + MCASP_VER3_WFIFOCTL,
                                                                 FIFO_ENABLE);
+                                break;
+                        default:
+                                mcasp_clr_bits(dev->base +
+                                        DAVINCI_MCASP_WFIFOCTL, FIFO_ENABLE);
+                        }
+                }
                 mcasp_stop_tx(dev);
         } else {
-                if (dev->rxnumevt)      /* disable FIFO */
-                        mcasp_clr_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,
+                if (dev->rxnumevt) {    /* disable FIFO */
+                        switch (dev->version) {
+                        case MCASP_VERSION_3:
+                                mcasp_clr_bits(dev->base + MCASP_VER3_RFIFOCTL,
                                                                 FIFO_ENABLE);
+                        break;
+
+                        default:
+                                mcasp_clr_bits(dev->base +
+                                        DAVINCI_MCASP_RFIFOCTL, FIFO_ENABLE);
+                        }
+                }
                 mcasp_stop_rx(dev);
         }
 }
@@ -619,20 +661,37 @@ static void davinci_hw_common_param(struct davinci_audio_dev *dev, int stream)
                 if (dev->txnumevt * tx_ser > 64)
                         dev->txnumevt = 1;
 
-                mcasp_mod_bits(dev->base + DAVINCI_MCASP_WFIFOCTL, tx_ser,
+                switch (dev->version) {
+                case MCASP_VERSION_3:
+                        mcasp_mod_bits(dev->base + MCASP_VER3_WFIFOCTL, tx_ser,
                                                                 NUMDMA_MASK);
-                mcasp_mod_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,
+                        mcasp_mod_bits(dev->base + MCASP_VER3_WFIFOCTL,
                                 ((dev->txnumevt * tx_ser) << 8), NUMEVT_MASK);
+                        break;
+                default:
+                        mcasp_mod_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,
+                                                        tx_ser, NUMDMA_MASK);
+                        mcasp_mod_bits(dev->base + DAVINCI_MCASP_WFIFOCTL,
+                                ((dev->txnumevt * tx_ser) << 8), NUMEVT_MASK);
+                }
         }
 
         if (dev->rxnumevt && stream == SNDRV_PCM_STREAM_CAPTURE) {
                 if (dev->rxnumevt * rx_ser > 64)
                         dev->rxnumevt = 1;
-
-                mcasp_mod_bits(dev->base + DAVINCI_MCASP_RFIFOCTL, rx_ser,
+                switch (dev->version) {
+                case MCASP_VERSION_3:
+                        mcasp_mod_bits(dev->base + MCASP_VER3_RFIFOCTL, rx_ser,
                                                                 NUMDMA_MASK);
-                mcasp_mod_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,
+                        mcasp_mod_bits(dev->base + MCASP_VER3_RFIFOCTL,
                                 ((dev->rxnumevt * rx_ser) << 8), NUMEVT_MASK);
+                        break;
+                default:
+                        mcasp_mod_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,
+                                                        rx_ser, NUMDMA_MASK);
+                        mcasp_mod_bits(dev->base + DAVINCI_MCASP_RFIFOCTL,
+                                ((dev->rxnumevt * rx_ser) << 8), NUMEVT_MASK);
+                }
         }
 }
 
@@ -782,20 +841,17 @@ static int davinci_mcasp_trigger(struct snd_pcm_substream *substream,
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                if (!dev->clk_active) {
-                        clk_enable(dev->clk);
-                        dev->clk_active = 1;
-                }
+                ret = pm_runtime_get_sync(dev->dev);
+                if (IS_ERR_VALUE(ret))
+                        dev_err(dev->dev, "pm_runtime_get_sync() failed\n");
                 davinci_mcasp_start(dev, substream->stream);
                 break;
 
         case SNDRV_PCM_TRIGGER_SUSPEND:
                 davinci_mcasp_stop(dev, substream->stream);
-                if (dev->clk_active) {
-                        clk_disable(dev->clk);
-                        dev->clk_active = 0;
-                }
-
+                ret = pm_runtime_put_sync(dev->dev);
+                if (IS_ERR_VALUE(ret))
+                        dev_err(dev->dev, "pm_runtime_put_sync() failed\n");
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
@@ -865,6 +921,118 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = {
 
 };
 
+static const struct of_device_id mcasp_dt_ids[] = {
+        {
+                .compatible = "ti,dm646x-mcasp-audio",
+                .data = (void *)MCASP_VERSION_1,
+        },
+        {
+                .compatible = "ti,da830-mcasp-audio",
+                .data = (void *)MCASP_VERSION_2,
+        },
+        {
+                .compatible = "ti,omap2-mcasp-audio",
+                .data = (void *)MCASP_VERSION_3,
+        },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mcasp_dt_ids);
+
+static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
+                                                struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        struct snd_platform_data *pdata = NULL;
+        const struct of_device_id *match =
+                        of_match_device(of_match_ptr(mcasp_dt_ids), &pdev->dev);
+
+        const u32 *of_serial_dir32;
+        u8 *of_serial_dir;
+        u32 val;
+        int i, ret = 0;
+
+        if (pdev->dev.platform_data) {
+                pdata = pdev->dev.platform_data;
+                return pdata;
+        } else if (match) {
+                pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+                if (!pdata) {
+                        ret = -ENOMEM;
+                        goto nodata;
+                }
+        } else {
+                /* control shouldn't reach here. something is wrong */
+                ret = -EINVAL;
+                goto nodata;
+        }
+
+        if (match->data)
+                pdata->version = (u8)((int)match->data);
+
+        ret = of_property_read_u32(np, "op-mode", &val);
+        if (ret >= 0)
+                pdata->op_mode = val;
+
+        ret = of_property_read_u32(np, "tdm-slots", &val);
+        if (ret >= 0)
+                pdata->tdm_slots = val;
+
+        ret = of_property_read_u32(np, "num-serializer", &val);
+        if (ret >= 0)
+                pdata->num_serializer = val;
+
+        of_serial_dir32 = of_get_property(np, "serial-dir", &val);
+        val /= sizeof(u32);
+        if (val != pdata->num_serializer) {
+                dev_err(&pdev->dev,
+                                "num-serializer(%d) != serial-dir size(%d)\n",
+                                pdata->num_serializer, val);
+                ret = -EINVAL;
+                goto nodata;
+        }
+
+        if (of_serial_dir32) {
+                of_serial_dir = devm_kzalloc(&pdev->dev,
+                                                (sizeof(*of_serial_dir) * val),
+                                                GFP_KERNEL);
+                if (!of_serial_dir) {
+                        ret = -ENOMEM;
+                        goto nodata;
+                }
+
+                for (i = 0; i < pdata->num_serializer; i++)
+                        of_serial_dir[i] = be32_to_cpup(&of_serial_dir32[i]);
+
+                pdata->serial_dir = of_serial_dir;
+        }
+
+        ret = of_property_read_u32(np, "tx-num-evt", &val);
+        if (ret >= 0)
+                pdata->txnumevt = val;
+
+        ret = of_property_read_u32(np, "rx-num-evt", &val);
+        if (ret >= 0)
+                pdata->rxnumevt = val;
+
+        ret = of_property_read_u32(np, "sram-size-playback", &val);
+        if (ret >= 0)
+                pdata->sram_size_playback = val;
+
+        ret = of_property_read_u32(np, "sram-size-capture", &val);
+        if (ret >= 0)
+                pdata->sram_size_capture = val;
+
+        return  pdata;
+
+nodata:
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Error populating platform data, err %d\n",
+                        ret);
+                pdata = NULL;
+        }
+        return  pdata;
+}
+
 static int davinci_mcasp_probe(struct platform_device *pdev)
 {
         struct davinci_pcm_dma_params *dma_data;
@@ -873,11 +1041,22 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         struct davinci_audio_dev *dev;
         int ret;
 
+        if (!pdev->dev.platform_data && !pdev->dev.of_node) {
+                dev_err(&pdev->dev, "No platform data supplied\n");
+                return -EINVAL;
+        }
+
         dev = devm_kzalloc(&pdev->dev, sizeof(struct davinci_audio_dev),
                            GFP_KERNEL);
         if (!dev)
                 return  -ENOMEM;
 
+        pdata = davinci_mcasp_set_pdata_from_of(pdev);
+        if (!pdata) {
+                dev_err(&pdev->dev, "no platform data\n");
+                return -EINVAL;
+        }
+
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!mem) {
                 dev_err(&pdev->dev, "no mem resource?\n");
@@ -891,13 +1070,13 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
                 return -EBUSY;
         }
 
-        pdata = pdev->dev.platform_data;
-        dev->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(dev->clk))
-                return -ENODEV;
+        pm_runtime_enable(&pdev->dev);
 
-        clk_enable(dev->clk);
-        dev->clk_active = 1;
+        ret = pm_runtime_get_sync(&pdev->dev);
+        if (IS_ERR_VALUE(ret)) {
+                dev_err(&pdev->dev, "pm_runtime_get_sync() failed\n");
+                return ret;
+        }
 
         dev->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
         if (!dev->base) {
@@ -914,6 +1093,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         dev->version = pdata->version;
         dev->txnumevt = pdata->txnumevt;
         dev->rxnumevt = pdata->rxnumevt;
+        dev->dev = &pdev->dev;
 
         dma_data = &dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK];
         dma_data->asp_chan_q = pdata->asp_chan_q;
@@ -952,22 +1132,31 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 
         if (ret != 0)
                 goto err_release_clk;
+
+        ret = davinci_soc_platform_register(&pdev->dev);
+        if (ret) {
+                dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
+                goto err_unregister_dai;
+        }
+
         return 0;
 
+err_unregister_dai:
+        snd_soc_unregister_dai(&pdev->dev);
 err_release_clk:
-        clk_disable(dev->clk);
-        clk_put(dev->clk);
+        pm_runtime_put_sync(&pdev->dev);
+        pm_runtime_disable(&pdev->dev);
         return ret;
 }
 
 static int davinci_mcasp_remove(struct platform_device *pdev)
 {
-        struct davinci_audio_dev *dev = dev_get_drvdata(&pdev->dev);
 
         snd_soc_unregister_dai(&pdev->dev);
-        clk_disable(dev->clk);
-        clk_put(dev->clk);
-        dev->clk = NULL;
+        davinci_soc_platform_unregister(&pdev->dev);
+
+        pm_runtime_put_sync(&pdev->dev);
+        pm_runtime_disable(&pdev->dev);
 
         return 0;
 }
@@ -978,6 +1167,7 @@ static struct platform_driver davinci_mcasp_driver = {
         .driver         = {
                 .name   = "davinci-mcasp",
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(mcasp_dt_ids),
         },
 };
 
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 4681acc63606..0de9ed6ce038 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -19,7 +19,8 @@
 #define DAVINCI_MCASP_H
 
 #include <linux/io.h>
-#include <mach/asp.h>
+#include <linux/platform_data/davinci_asp.h>
+
 #include "davinci-pcm.h"
 
 #define DAVINCI_MCASP_RATES     SNDRV_PCM_RATE_8000_96000
@@ -40,9 +41,8 @@ struct davinci_audio_dev {
         struct davinci_pcm_dma_params dma_params[2];
         void __iomem *base;
         int sample_rate;
-        struct clk *clk;
+        struct device *dev;
         unsigned int codec_fmt;
-        u8 clk_active;
 
         /* McASP specific data */
         int     tdm_slots;
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 97d77b298968..93ea3bf567e1 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -23,7 +23,6 @@
 #include <sound/soc.h>
 
 #include <asm/dma.h>
-#include <mach/edma.h>
 #include <mach/sram.h>
 
 #include "davinci-pcm.h"
@@ -864,28 +863,17 @@ static struct snd_soc_platform_driver davinci_soc_platform = {
         .pcm_free =     davinci_pcm_free,
 };
 
-static int __devinit davinci_soc_platform_probe(struct platform_device *pdev)
+int davinci_soc_platform_register(struct device *dev)
 {
-        return snd_soc_register_platform(&pdev->dev, &davinci_soc_platform);
+        return snd_soc_register_platform(dev, &davinci_soc_platform);
 }
+EXPORT_SYMBOL_GPL(davinci_soc_platform_register);
 
-static int __devexit davinci_soc_platform_remove(struct platform_device *pdev)
+void davinci_soc_platform_unregister(struct device *dev)
 {
-        snd_soc_unregister_platform(&pdev->dev);
-        return 0;
+        snd_soc_unregister_platform(dev);
 }
-
-static struct platform_driver davinci_pcm_driver = {
-        .driver = {
-                        .name = "davinci-pcm-audio",
-                        .owner = THIS_MODULE,
-        },
-
-        .probe = davinci_soc_platform_probe,
-        .remove = __devexit_p(davinci_soc_platform_remove),
-};
-
-module_platform_driver(davinci_pcm_driver);
+EXPORT_SYMBOL_GPL(davinci_soc_platform_unregister);
 
 MODULE_AUTHOR("Vladimir Barinov");
 MODULE_DESCRIPTION("TI DAVINCI PCM DMA module");
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
index c0d6c9be4b4d..fc4d01cdd8c9 100644
--- a/sound/soc/davinci/davinci-pcm.h
+++ b/sound/soc/davinci/davinci-pcm.h
@@ -12,9 +12,8 @@
 #ifndef _DAVINCI_PCM_H
 #define _DAVINCI_PCM_H
 
+#include <linux/platform_data/davinci_asp.h>
 #include <mach/edma.h>
-#include <mach/asp.h>
-
 
 struct davinci_pcm_dma_params {
         int channel;                    /* sync dma channel ID */
@@ -28,4 +27,7 @@ struct davinci_pcm_dma_params {
         unsigned int fifo_level;
 };
 
+int davinci_soc_platform_register(struct device *dev);
+void davinci_soc_platform_unregister(struct device *dev);
+
 #endif
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c
index f71175b29e38..5be65aae7e0e 100644
--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@@ -86,7 +86,7 @@ static struct snd_soc_dai_link sffsdr_dai = {
         .cpu_dai_name = "davinci-mcbsp",
         .codec_dai_name = "pcm3008-hifi",
         .codec_name = "pcm3008-codec",
-        .platform_name = "davinci-pcm-audio",
+        .platform_name = "davinci-mcbsp",
         .ops = &sffsdr_ops,
 };
 
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c
index da030ff883d5..07bde2e6f84e 100644
--- a/sound/soc/davinci/davinci-vcif.c
+++ b/sound/soc/davinci/davinci-vcif.c
@@ -240,12 +240,20 @@ static int davinci_vcif_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        ret = davinci_soc_platform_register(&pdev->dev);
+        if (ret) {
+                dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
+                snd_soc_unregister_dai(&pdev->dev);
+                return ret;
+        }
+
         return 0;
 }
 
 static int davinci_vcif_remove(struct platform_device *pdev)
 {
         snd_soc_unregister_dai(&pdev->dev);
+        davinci_soc_platform_unregister(&pdev->dev);
 
         return 0;
 }
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index d70133086ac3..4563b28bd625 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -6,7 +6,7 @@ config SND_SOC_FSL_UTILS
 
 menuconfig SND_POWERPC_SOC
         tristate "SoC Audio for Freescale PowerPC CPUs"
-        depends on FSL_SOC
+        depends on FSL_SOC || PPC_MPC52xx
         help
           Say Y or M if you want to add support for codecs attached to
           the PowerPC CPUs.
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 96bb92dd174c..6feb26500580 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -823,12 +823,6 @@ static int fsl_dma_close(struct snd_pcm_substream *substream)
                 if (dma_private->irq)
                         free_irq(dma_private->irq, dma_private);
 
-                if (dma_private->ld_buf_phys) {
-                        dma_unmap_single(dev, dma_private->ld_buf_phys,
-                                         sizeof(dma_private->link),
-                                         DMA_TO_DEVICE);
-                }
-
                 /* Deallocate the fsl_dma_private structure */
                 dma_free_coherent(dev, sizeof(struct fsl_dma_private),
                                   dma_private, dma_private->ld_buf_phys);
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index e7c800ebbd75..524ce6210cee 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -74,9 +74,6 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
         if (!buf)
                 return -ENOMEM;
 
-        if (!audmux_base)
-                return -ENOSYS;
-
         if (audmux_clk)
                 clk_prepare_enable(audmux_clk);
 
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index 48f9d886f020..9a15bc4bd570 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -109,6 +109,9 @@ static int snd_imx_open(struct snd_pcm_substream *substream)
         dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
         dma_data = kzalloc(sizeof(*dma_data), GFP_KERNEL);
+        if (!dma_data)
+                return -ENOMEM;
+
         dma_data->peripheral_type = dma_params->shared_peripheral ?
                                         IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI;
         dma_data->priority = DMA_PRIO_HIGH;
@@ -117,7 +120,7 @@ static int snd_imx_open(struct snd_pcm_substream *substream)
         ret = snd_dmaengine_pcm_open(substream, filter, dma_data);
         if (ret) {
                 kfree(dma_data);
-                return 0;
+                return ret;
         }
 
         snd_dmaengine_pcm_set_data(substream, dma_data);
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 81d7728cf67f..3c520c46fa4a 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -380,14 +380,13 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai)
 static struct snd_soc_dai_driver imx_ssi_dai = {
         .probe = imx_ssi_dai_probe,
         .playback = {
-                /* The SSI does not support monaural audio. */
-                .channels_min = 2,
+                .channels_min = 1,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_96000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
         },
         .capture = {
-                .channels_min = 2,
+                .channels_min = 1,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_96000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -524,7 +523,7 @@ static int imx_ssi_probe(struct platform_device *pdev)
         int ret = 0;
         struct snd_soc_dai_driver *dai;
 
-        ssi = kzalloc(sizeof(*ssi), GFP_KERNEL);
+        ssi = devm_kzalloc(&pdev->dev, sizeof(*ssi), GFP_KERNEL);
         if (!ssi)
                 return -ENOMEM;
         dev_set_drvdata(&pdev->dev, ssi);
@@ -537,7 +536,7 @@ static int imx_ssi_probe(struct platform_device *pdev)
 
         ssi->irq = platform_get_irq(pdev, 0);
 
-        ssi->clk = clk_get(&pdev->dev, NULL);
+        ssi->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(ssi->clk)) {
                 ret = PTR_ERR(ssi->clk);
                 dev_err(&pdev->dev, "Cannot get the clock: %d\n",
@@ -552,23 +551,18 @@ static int imx_ssi_probe(struct platform_device *pdev)
                 goto failed_get_resource;
         }
 
-        if (!request_mem_region(res->start, resource_size(res), DRV_NAME)) {
-                dev_err(&pdev->dev, "request_mem_region failed\n");
-                ret = -EBUSY;
-                goto failed_get_resource;
-        }
-
-        ssi->base = ioremap(res->start, resource_size(res));
+        ssi->base = devm_request_and_ioremap(&pdev->dev, res);
         if (!ssi->base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENODEV;
-                goto failed_ioremap;
+                goto failed_register;
         }
 
         if (ssi->flags & IMX_SSI_USE_AC97) {
                 if (ac97_ssi) {
+                        dev_err(&pdev->dev, "AC'97 SSI already registered\n");
                         ret = -EBUSY;
-                        goto failed_ac97;
+                        goto failed_register;
                 }
                 ac97_ssi = ssi;
                 setup_channel_to_ac97(ssi);
@@ -637,15 +631,10 @@ failed_pdev_fiq_add:
 failed_pdev_fiq_alloc:
         snd_soc_unregister_dai(&pdev->dev);
 failed_register:
-failed_ac97:
-        iounmap(ssi->base);
-failed_ioremap:
         release_mem_region(res->start, resource_size(res));
 failed_get_resource:
         clk_disable_unprepare(ssi->clk);
-        clk_put(ssi->clk);
 failed_clk:
-        kfree(ssi);
 
         return ret;
 }
@@ -663,11 +652,8 @@ static int __devexit imx_ssi_remove(struct platform_device *pdev)
         if (ssi->flags & IMX_SSI_USE_AC97)
                 ac97_ssi = NULL;
 
-        iounmap(ssi->base);
         release_mem_region(res->start, resource_size(res));
         clk_disable_unprepare(ssi->clk);
-        clk_put(ssi->clk);
-        kfree(ssi);
 
         return 0;
 }
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 9a3f7c5ab687..9997c039bb24 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -370,7 +370,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
         .pcm_free       = &psc_dma_free,
 };
 
-static int mpc5200_hpcd_probe(struct platform_device *op)
+int mpc5200_audio_dma_create(struct platform_device *op)
 {
         phys_addr_t fifo;
         struct psc_dma *psc_dma;
@@ -487,8 +487,9 @@ out_unmap:
         iounmap(regs);
         return ret;
 }
+EXPORT_SYMBOL_GPL(mpc5200_audio_dma_create);
 
-static int mpc5200_hpcd_remove(struct platform_device *op)
+int mpc5200_audio_dma_destroy(struct platform_device *op)
 {
         struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);
 
@@ -510,24 +511,7 @@ static int mpc5200_hpcd_remove(struct platform_device *op)
 
         return 0;
 }
-
-static struct of_device_id mpc5200_hpcd_match[] = {
-        { .compatible = "fsl,mpc5200-pcm", },
-        {}
-};
-MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
-
-static struct platform_driver mpc5200_hpcd_of_driver = {
-        .probe          = mpc5200_hpcd_probe,
-        .remove         = mpc5200_hpcd_remove,
-        .driver = {
-                .owner          = THIS_MODULE,
-                .name           = "mpc5200-pcm-audio",
-                .of_match_table    = mpc5200_hpcd_match,
-        }
-};
-
-module_platform_driver(mpc5200_hpcd_of_driver);
+EXPORT_SYMBOL_GPL(mpc5200_audio_dma_destroy);
 
 MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
 MODULE_DESCRIPTION("Freescale MPC5200 PSC in DMA mode ASoC Driver");
diff --git a/sound/soc/fsl/mpc5200_dma.h b/sound/soc/fsl/mpc5200_dma.h
index a3c0cd5382fb..dff253fde29a 100644
--- a/sound/soc/fsl/mpc5200_dma.h
+++ b/sound/soc/fsl/mpc5200_dma.h
@@ -81,4 +81,7 @@ to_psc_dma_stream(struct snd_pcm_substream *substream, struct psc_dma *psc_dma)
         return &psc_dma->playback;
 }
 
+int mpc5200_audio_dma_create(struct platform_device *op);
+int mpc5200_audio_dma_destroy(struct platform_device *op);
+
 #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index ffa00a2eb770..a313c0ae36db 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -237,15 +237,18 @@ static const struct snd_soc_dai_ops psc_ac97_digital_ops = {
 
 static struct snd_soc_dai_driver psc_ac97_dai[] = {
 {
+        .name = "mpc5200-psc-ac97.0",
         .ac97_control = 1,
         .probe  = psc_ac97_probe,
         .playback = {
+                .stream_name    = "AC97 Playback",
                 .channels_min   = 1,
                 .channels_max   = 6,
                 .rates          = SNDRV_PCM_RATE_8000_48000,
                 .formats = SNDRV_PCM_FMTBIT_S32_BE,
         },
         .capture = {
+                .stream_name    = "AC97 Capture",
                 .channels_min   = 1,
                 .channels_max   = 2,
                 .rates          = SNDRV_PCM_RATE_8000_48000,
@@ -254,8 +257,10 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
         .ops = &psc_ac97_analog_ops,
 },
 {
+        .name = "mpc5200-psc-ac97.1",
         .ac97_control = 1,
         .playback = {
+                .stream_name    = "AC97 SPDIF",
                 .channels_min   = 1,
                 .channels_max   = 2,
                 .rates          = SNDRV_PCM_RATE_32000 | \
@@ -278,6 +283,10 @@ static int __devinit psc_ac97_of_probe(struct platform_device *op)
         struct snd_ac97 ac97;
         struct mpc52xx_psc __iomem *regs;
 
+        rc = mpc5200_audio_dma_create(op);
+        if (rc != 0)
+                return rc;
+
         rc = snd_soc_register_dais(&op->dev, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai));
         if (rc != 0) {
                 dev_err(&op->dev, "Failed to register DAI\n");
@@ -303,6 +312,7 @@ static int __devinit psc_ac97_of_probe(struct platform_device *op)
 
 static int __devexit psc_ac97_of_remove(struct platform_device *op)
 {
+        mpc5200_audio_dma_destroy(op);
         snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai));
         return 0;
 }
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 7b530327553a..ba1f0a66358f 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -130,13 +130,16 @@ static const struct snd_soc_dai_ops psc_i2s_dai_ops = {
 };
 
 static struct snd_soc_dai_driver psc_i2s_dai[] = {{
+        .name = "mpc5200-psc-i2s.0",
         .playback = {
+                .stream_name = "I2S Playback",
                 .channels_min = 2,
                 .channels_max = 2,
                 .rates = PSC_I2S_RATES,
                 .formats = PSC_I2S_FORMATS,
         },
         .capture = {
+                .stream_name = "I2S Capture",
                 .channels_min = 2,
                 .channels_max = 2,
                 .rates = PSC_I2S_RATES,
@@ -156,6 +159,10 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op)
         struct psc_dma *psc_dma;
         struct mpc52xx_psc __iomem *regs;
 
+        rc = mpc5200_audio_dma_create(op);
+        if (rc != 0)
+                return rc;
+
         rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));
         if (rc != 0) {
                 pr_err("Failed to register DAI\n");
@@ -200,6 +207,7 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op)
 
 static int __devexit psc_i2s_of_remove(struct platform_device *op)
 {
+        mpc5200_audio_dma_destroy(op);
         snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai));
         return 0;
 }
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 60bcba1bc30e..9ff9318c52b9 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -192,7 +192,6 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
                 container_of(dev, struct platform_device, dev);
         struct device_node *np = ssi_pdev->dev.of_node;
         struct device_node *codec_np = NULL;
-        struct platform_device *sound_device = NULL;
         struct mpc8610_hpcd_data *machine_data;
         int ret = -ENODEV;
         const char *sprop;
@@ -341,34 +340,22 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
         machine_data->card.probe = mpc8610_hpcd_machine_probe;
         machine_data->card.remove = mpc8610_hpcd_machine_remove;
         machine_data->card.name = pdev->name; /* The platform driver name */
+        machine_data->card.owner = THIS_MODULE;
+        machine_data->card.dev = &pdev->dev;
         machine_data->card.num_links = 2;
         machine_data->card.dai_link = machine_data->dai;
 
-        /* Allocate a new audio platform device structure */
-        sound_device = platform_device_alloc("soc-audio", -1);
-        if (!sound_device) {
-                dev_err(&pdev->dev, "platform device alloc failed\n");
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        /* Associate the card data with the sound device */
-        platform_set_drvdata(sound_device, &machine_data->card);
-
         /* Register with ASoC */
-        ret = platform_device_add(sound_device);
+        ret = snd_soc_register_card(&machine_data->card);
         if (ret) {
-                dev_err(&pdev->dev, "platform device add failed\n");
-                goto error_sound;
+                dev_err(&pdev->dev, "could not register card\n");
+                goto error;
         }
-        dev_set_drvdata(&pdev->dev, sound_device);
 
         of_node_put(codec_np);
 
         return 0;
 
-error_sound:
-        platform_device_put(sound_device);
 error:
         kfree(machine_data);
 error_alloc:
@@ -383,17 +370,12 @@ error_alloc:
  */
 static int __devexit mpc8610_hpcd_remove(struct platform_device *pdev)
 {
-        struct platform_device *sound_device = dev_get_drvdata(&pdev->dev);
-        struct snd_soc_card *card = platform_get_drvdata(sound_device);
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
         struct mpc8610_hpcd_data *machine_data =
                 container_of(card, struct mpc8610_hpcd_data, card);
 
-        platform_device_unregister(sound_device);
-
+        snd_soc_unregister_card(card);
         kfree(machine_data);
-        sound_device->dev.platform_data = NULL;
-
-        dev_set_drvdata(&pdev->dev, NULL);
 
         return 0;
 }
diff --git a/sound/soc/fsl/mx27vis-aic32x4.c b/sound/soc/fsl/mx27vis-aic32x4.c
index f6d04ad4bb39..2b76877b1789 100644
--- a/sound/soc/fsl/mx27vis-aic32x4.c
+++ b/sound/soc/fsl/mx27vis-aic32x4.c
@@ -26,13 +26,13 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
+#include <linux/platform_data/asoc-mx27vis.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <asm/mach-types.h>
-#include <mach/iomux-mx27.h>
 
 #include "../codecs/tlv320aic32x4.h"
 #include "imx-ssi.h"
@@ -41,20 +41,12 @@
 #define MX27VIS_AMP_GAIN        0
 #define MX27VIS_AMP_MUTE        1
 
-#define MX27VIS_PIN_G0          (GPIO_PORTF + 9)
-#define MX27VIS_PIN_G1          (GPIO_PORTF + 8)
-#define MX27VIS_PIN_SDL         (GPIO_PORTE + 5)
-#define MX27VIS_PIN_SDR         (GPIO_PORTF + 7)
-
 static int mx27vis_amp_gain;
 static int mx27vis_amp_mute;
-
-static const int mx27vis_amp_pins[] = {
-        MX27VIS_PIN_G0 | GPIO_GPIO | GPIO_OUT,
-        MX27VIS_PIN_G1 | GPIO_GPIO | GPIO_OUT,
-        MX27VIS_PIN_SDL | GPIO_GPIO | GPIO_OUT,
-        MX27VIS_PIN_SDR | GPIO_GPIO | GPIO_OUT,
-};
+static int mx27vis_amp_gain0_gpio;
+static int mx27vis_amp_gain1_gpio;
+static int mx27vis_amp_mutel_gpio;
+static int mx27vis_amp_muter_gpio;
 
 static int mx27vis_aic32x4_hw_params(struct snd_pcm_substream *substream,
                             struct snd_pcm_hw_params *params)
@@ -109,13 +101,13 @@ static int mx27vis_amp_set(struct snd_kcontrol *kcontrol,
 
         switch (reg) {
         case MX27VIS_AMP_GAIN:
-                gpio_set_value(MX27VIS_PIN_G0, value & 1);
-                gpio_set_value(MX27VIS_PIN_G1, value >> 1);
+                gpio_set_value(mx27vis_amp_gain0_gpio, value & 1);
+                gpio_set_value(mx27vis_amp_gain1_gpio, value >> 1);
                 mx27vis_amp_gain = value;
                 break;
         case MX27VIS_AMP_MUTE:
-                gpio_set_value(MX27VIS_PIN_SDL, value & 1);
-                gpio_set_value(MX27VIS_PIN_SDR, value >> 1);
+                gpio_set_value(mx27vis_amp_mutel_gpio, value & 1);
+                gpio_set_value(mx27vis_amp_muter_gpio, value >> 1);
                 mx27vis_amp_mute = value;
                 break;
         }
@@ -190,8 +182,19 @@ static struct snd_soc_card mx27vis_aic32x4 = {
 
 static int __devinit mx27vis_aic32x4_probe(struct platform_device *pdev)
 {
+        struct snd_mx27vis_platform_data *pdata = pdev->dev.platform_data;
         int ret;
 
+        if (!pdata) {
+                dev_err(&pdev->dev, "No platform data supplied\n");
+                return -EINVAL;
+        }
+
+        mx27vis_amp_gain0_gpio = pdata->amp_gain0_gpio;
+        mx27vis_amp_gain1_gpio = pdata->amp_gain1_gpio;
+        mx27vis_amp_mutel_gpio = pdata->amp_mutel_gpio;
+        mx27vis_amp_muter_gpio = pdata->amp_muter_gpio;
+
         mx27vis_aic32x4.dev = &pdev->dev;
         ret = snd_soc_register_card(&mx27vis_aic32x4);
         if (ret) {
@@ -213,11 +216,6 @@ static int __devinit mx27vis_aic32x4_probe(struct platform_device *pdev)
                         IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0)
         );
 
-        ret = mxc_gpio_setup_multiple_pins(mx27vis_amp_pins,
-                        ARRAY_SIZE(mx27vis_amp_pins), "MX27VIS_AMP");
-        if (ret)
-                printk(KERN_ERR "ASoC: unable to setup gpios\n");
-
         return ret;
 }
 
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 50adf4032bcc..144d49603637 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -202,7 +202,6 @@ static int p1022_ds_probe(struct platform_device *pdev)
                 container_of(dev, struct platform_device, dev);
         struct device_node *np = ssi_pdev->dev.of_node;
         struct device_node *codec_np = NULL;
-        struct platform_device *sound_device = NULL;
         struct machine_data *mdata;
         int ret = -ENODEV;
         const char *sprop;
@@ -349,36 +348,23 @@ static int p1022_ds_probe(struct platform_device *pdev)
         mdata->card.probe = p1022_ds_machine_probe;
         mdata->card.remove = p1022_ds_machine_remove;
         mdata->card.name = pdev->name; /* The platform driver name */
+        mdata->card.owner = THIS_MODULE;
+        mdata->card.dev = &pdev->dev;
         mdata->card.num_links = 2;
         mdata->card.dai_link = mdata->dai;
 
-        /* Allocate a new audio platform device structure */
-        sound_device = platform_device_alloc("soc-audio", -1);
-        if (!sound_device) {
-                dev_err(&pdev->dev, "platform device alloc failed\n");
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        /* Associate the card data with the sound device */
-        platform_set_drvdata(sound_device, &mdata->card);
-
         /* Register with ASoC */
-        ret = platform_device_add(sound_device);
+        ret = snd_soc_register_card(&mdata->card);
         if (ret) {
-                dev_err(&pdev->dev, "platform device add failed\n");
+                dev_err(&pdev->dev, "could not register card\n");
                 goto error;
         }
-        dev_set_drvdata(&pdev->dev, sound_device);
 
         of_node_put(codec_np);
 
         return 0;
 
 error:
-        if (sound_device)
-                platform_device_put(sound_device);
-
         kfree(mdata);
 error_put:
         of_node_put(codec_np);
@@ -392,17 +378,12 @@ error_put:
  */
 static int __devexit p1022_ds_remove(struct platform_device *pdev)
 {
-        struct platform_device *sound_device = dev_get_drvdata(&pdev->dev);
-        struct snd_soc_card *card = platform_get_drvdata(sound_device);
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
         struct machine_data *mdata =
                 container_of(card, struct machine_data, card);
 
-        platform_device_unregister(sound_device);
-
+        snd_soc_unregister_card(card);
         kfree(mdata);
-        sound_device->dev.platform_data = NULL;
-
-        dev_set_drvdata(&pdev->dev, NULL);
 
         return 0;
 }
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c
index b3af55dcde9d..4b63ec8eb372 100644
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
@@ -12,32 +12,27 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/interrupt.h>
 #include <linux/device.h>
-#include <linux/delay.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
-#include <linux/dma-mapping.h>
 
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/initval.h>
 #include <sound/soc.h>
 
 #include "mpc5200_dma.h"
-#include "mpc5200_psc_ac97.h"
-#include "../codecs/wm9712.h"
 
 #define DRV_NAME "pcm030-audio-fabric"
 
+struct pcm030_audio_data {
+        struct snd_soc_card *card;
+        struct platform_device *codec_device;
+};
+
 static struct snd_soc_dai_link pcm030_fabric_dai[] = {
 {
         .name = "AC97",
         .stream_name = "AC97 Analog",
         .codec_dai_name = "wm9712-hifi",
         .cpu_dai_name = "mpc5200-psc-ac97.0",
-        .platform_name = "mpc5200-pcm-audio",
         .codec_name = "wm9712-codec",
 },
 {
@@ -45,44 +40,95 @@ static struct snd_soc_dai_link pcm030_fabric_dai[] = {
         .stream_name = "AC97 IEC958",
         .codec_dai_name = "wm9712-aux",
         .cpu_dai_name = "mpc5200-psc-ac97.1",
-        .platform_name = "mpc5200-pcm-audio",
         .codec_name = "wm9712-codec",
 },
 };
 
-static struct snd_soc_card card = {
+static struct snd_soc_card pcm030_card = {
         .name = "pcm030",
         .owner = THIS_MODULE,
         .dai_link = pcm030_fabric_dai,
         .num_links = ARRAY_SIZE(pcm030_fabric_dai),
 };
 
-static __init int pcm030_fabric_init(void)
+static int __init pcm030_fabric_probe(struct platform_device *op)
 {
-        struct platform_device *pdev;
-        int rc;
+        struct device_node *np = op->dev.of_node;
+        struct device_node *platform_np;
+        struct snd_soc_card *card = &pcm030_card;
+        struct pcm030_audio_data *pdata;
+        int ret;
+        int i;
 
         if (!of_machine_is_compatible("phytec,pcm030"))
                 return -ENODEV;
 
-        pdev = platform_device_alloc("soc-audio", 1);
-        if (!pdev) {
-                pr_err("pcm030_fabric_init: platform_device_alloc() failed\n");
-                return -ENODEV;
-        }
+        pdata = devm_kzalloc(&op->dev, sizeof(struct pcm030_audio_data),
+                             GFP_KERNEL);
+        if (!pdata)
+                return -ENOMEM;
+
+        card->dev = &op->dev;
+        platform_set_drvdata(op, pdata);
 
-        platform_set_drvdata(pdev, &card);
+        pdata->card = card;
 
-        rc = platform_device_add(pdev);
-        if (rc) {
-                pr_err("pcm030_fabric_init: platform_device_add() failed\n");
-                platform_device_put(pdev);
+        platform_np = of_parse_phandle(np, "asoc-platform", 0);
+        if (!platform_np) {
+                dev_err(&op->dev, "ac97 not registered\n");
                 return -ENODEV;
         }
-        return 0;
+
+        for (i = 0; i < card->num_links; i++)
+                card->dai_link[i].platform_of_node = platform_np;
+
+        ret = request_module("snd-soc-wm9712");
+        if (ret)
+                dev_err(&op->dev, "request_module returned: %d\n", ret);
+
+        pdata->codec_device = platform_device_alloc("wm9712-codec", -1);
+        if (!pdata->codec_device)
+                dev_err(&op->dev, "platform_device_alloc() failed\n");
+
+        ret = platform_device_add(pdata->codec_device);
+        if (ret)
+                dev_err(&op->dev, "platform_device_add() failed: %d\n", ret);
+
+        ret = snd_soc_register_card(card);
+        if (ret)
+                dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret);
+
+        return ret;
+}
+
+static int __devexit pcm030_fabric_remove(struct platform_device *op)
+{
+        struct pcm030_audio_data *pdata = platform_get_drvdata(op);
+        int ret;
+
+        ret = snd_soc_unregister_card(pdata->card);
+        platform_device_unregister(pdata->codec_device);
+
+        return ret;
 }
 
-module_init(pcm030_fabric_init);
+static struct of_device_id pcm030_audio_match[] = {
+        { .compatible = "phytec,pcm030-audio-fabric", },
+        {}
+};
+MODULE_DEVICE_TABLE(of, pcm030_audio_match);
+
+static struct platform_driver pcm030_fabric_driver = {
+        .probe          = pcm030_fabric_probe,
+        .remove         = __devexit_p(pcm030_fabric_remove),
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+                .of_match_table    = pcm030_audio_match,
+        },
+};
+
+module_platform_driver(pcm030_fabric_driver);
 
 
 MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>");
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index 2937e54da49e..2cc7782714b5 100644
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -318,6 +318,15 @@ static struct snd_soc_dai_link mfld_msic_dailink[] = {
                 .platform_name = "sst-platform",
                 .init = NULL,
         },
+        {
+                .name = "Medfield Compress",
+                .stream_name = "Speaker",
+                .cpu_dai_name = "Compress-cpu-dai",
+                .codec_dai_name = "SN95031 Speaker",
+                .codec_name = "sn95031",
+                .platform_name = "sst-platform",
+                .init = NULL,
+        },
 };
 
 /* SoC card */
diff --git a/sound/soc/mid-x86/sst_dsp.h b/sound/soc/mid-x86/sst_dsp.h
new file mode 100644
index 000000000000..0fce1de284ff
--- /dev/null
+++ b/sound/soc/mid-x86/sst_dsp.h
@@ -0,0 +1,134 @@
+#ifndef __SST_DSP_H__
+#define __SST_DSP_H__
+/*
+ *  sst_dsp.h - Intel SST Driver for audio engine
+ *
+ *  Copyright (C) 2008-12 Intel Corporation
+ *  Authors:    Vinod Koul <vinod.koul@linux.intel.com>
+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+enum sst_codec_types {
+        /*  AUDIO/MUSIC CODEC Type Definitions */
+        SST_CODEC_TYPE_UNKNOWN = 0,
+        SST_CODEC_TYPE_PCM,     /* Pass through Audio codec */
+        SST_CODEC_TYPE_MP3,
+        SST_CODEC_TYPE_MP24,
+        SST_CODEC_TYPE_AAC,
+        SST_CODEC_TYPE_AACP,
+        SST_CODEC_TYPE_eAACP,
+};
+
+enum stream_type {
+        SST_STREAM_TYPE_NONE = 0,
+        SST_STREAM_TYPE_MUSIC = 1,
+};
+
+struct snd_pcm_params {
+        u16 codec;      /* codec type */
+        u8 num_chan;    /* 1=Mono, 2=Stereo */
+        u8 pcm_wd_sz;   /* 16/24 - bit*/
+        u32 reserved;   /* Bitrate in bits per second */
+        u32 sfreq;      /* Sampling rate in Hz */
+        u8 use_offload_path;
+        u8 reserved2;
+        u16 reserved3;
+        u8 channel_map[8];
+} __packed;
+
+/* MP3 Music Parameters Message */
+struct snd_mp3_params {
+        u16 codec;
+        u8  num_chan;   /* 1=Mono, 2=Stereo     */
+        u8  pcm_wd_sz; /* 16/24 - bit*/
+        u8  crc_check; /* crc_check - disable (0) or enable (1) */
+        u8  reserved1; /* unused*/
+        u16 reserved2;  /* Unused */
+} __packed;
+
+#define AAC_BIT_STREAM_ADTS             0
+#define AAC_BIT_STREAM_ADIF             1
+#define AAC_BIT_STREAM_RAW              2
+
+/* AAC Music Parameters Message */
+struct snd_aac_params {
+        u16 codec;
+        u8 num_chan; /* 1=Mono, 2=Stereo*/
+        u8 pcm_wd_sz; /* 16/24 - bit*/
+        u8 bdownsample; /*SBR downsampling 0 - disable 1 -enabled AAC+ only */
+        u8 bs_format; /* input bit stream format adts=0, adif=1, raw=2 */
+        u16  reser2;
+        u32 externalsr; /*sampling rate of basic AAC raw bit stream*/
+        u8 sbr_signalling;/*disable/enable/set automode the SBR tool.AAC+*/
+        u8 reser1;
+        u16  reser3;
+} __packed;
+
+/* WMA Music Parameters Message */
+struct snd_wma_params {
+        u16 codec;
+        u8  num_chan;   /* 1=Mono, 2=Stereo */
+        u8  pcm_wd_sz;  /* 16/24 - bit*/
+        u32 brate;      /* Use the hard coded value. */
+        u32 sfreq;      /* Sampling freq eg. 8000, 441000, 48000 */
+        u32 channel_mask;  /* Channel Mask */
+        u16 format_tag; /* Format Tag */
+        u16 block_align;        /* packet size */
+        u16 wma_encode_opt;/* Encoder option */
+        u8 op_align;    /* op align 0- 16 bit, 1- MSB, 2 LSB */
+        u8 reserved;    /* reserved */
+} __packed;
+
+/* Codec params struture */
+union  snd_sst_codec_params {
+        struct snd_pcm_params pcm_params;
+        struct snd_mp3_params mp3_params;
+        struct snd_aac_params aac_params;
+        struct snd_wma_params wma_params;
+} __packed;
+
+/* Address and size info of a frame buffer */
+struct sst_address_info {
+        u32 addr; /* Address at IA */
+        u32 size; /* Size of the buffer */
+};
+
+struct snd_sst_alloc_params_ext {
+        struct sst_address_info  ring_buf_info[8];
+        u8 sg_count;
+        u8 reserved;
+        u16 reserved2;
+        u32 frag_size;  /*Number of samples after which period elapsed
+                                  message is sent valid only if path  = 0*/
+} __packed;
+
+struct snd_sst_stream_params {
+        union snd_sst_codec_params uc;
+} __packed;
+
+struct snd_sst_params {
+        u32 stream_id;
+        u8 codec;
+        u8 ops;
+        u8 stream_type;
+        u8 device_type;
+        struct snd_sst_stream_params sparams;
+        struct snd_sst_alloc_params_ext aparams;
+};
+
+#endif /* __SST_DSP_H__ */
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index d34563b12c3b..a263cbed8624 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -1,7 +1,7 @@
 /*
  *  sst_platform.c - Intel MID Platform driver
  *
- *  Copyright (C) 2010 Intel Corp
+ *  Copyright (C) 2010-2012 Intel Corp
  *  Author: Vinod Koul <vinod.koul@intel.com>
  *  Author: Harsha Priya <priya.harsha@intel.com>
  *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -32,6 +32,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/compress_driver.h>
 #include "sst_platform.h"
 
 static struct sst_device *sst;
@@ -152,6 +153,16 @@ static struct snd_soc_dai_driver sst_platform_dai[] = {
                 .formats = SNDRV_PCM_FMTBIT_S24_LE,
         },
 },
+{
+        .name = "Compress-cpu-dai",
+        .compress_dai = 1,
+        .playback = {
+                .channels_min = SST_STEREO,
+                .channels_max = SST_STEREO,
+                .rates = SNDRV_PCM_RATE_44100|SNDRV_PCM_RATE_48000,
+                .formats = SNDRV_PCM_FMTBIT_S16_LE,
+        },
+},
 };
 
 /* helper functions */
@@ -463,8 +474,199 @@ static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd)
         }
         return retval;
 }
+
+/* compress stream operations */
+static void sst_compr_fragment_elapsed(void *arg)
+{
+        struct snd_compr_stream *cstream = (struct snd_compr_stream *)arg;
+
+        pr_debug("fragment elapsed by driver\n");
+        if (cstream)
+                snd_compr_fragment_elapsed(cstream);
+}
+
+static int sst_platform_compr_open(struct snd_compr_stream *cstream)
+{
+
+        int ret_val = 0;
+        struct snd_compr_runtime *runtime = cstream->runtime;
+        struct sst_runtime_stream *stream;
+
+        stream = kzalloc(sizeof(*stream), GFP_KERNEL);
+        if (!stream)
+                return -ENOMEM;
+
+        spin_lock_init(&stream->status_lock);
+
+        /* get the sst ops */
+        if (!sst || !try_module_get(sst->dev->driver->owner)) {
+                pr_err("no device available to run\n");
+                ret_val = -ENODEV;
+                goto out_ops;
+        }
+        stream->compr_ops = sst->compr_ops;
+
+        stream->id = 0;
+        sst_set_stream_status(stream, SST_PLATFORM_INIT);
+        runtime->private_data = stream;
+        return 0;
+out_ops:
+        kfree(stream);
+        return ret_val;
+}
+
+static int sst_platform_compr_free(struct snd_compr_stream *cstream)
+{
+        struct sst_runtime_stream *stream;
+        int ret_val = 0, str_id;
+
+        stream = cstream->runtime->private_data;
+        /*need to check*/
+        str_id = stream->id;
+        if (str_id)
+                ret_val = stream->compr_ops->close(str_id);
+        module_put(sst->dev->driver->owner);
+        kfree(stream);
+        pr_debug("%s: %d\n", __func__, ret_val);
+        return 0;
+}
+
+static int sst_platform_compr_set_params(struct snd_compr_stream *cstream,
+                                        struct snd_compr_params *params)
+{
+        struct sst_runtime_stream *stream;
+        int retval;
+        struct snd_sst_params str_params;
+        struct sst_compress_cb cb;
+
+        stream = cstream->runtime->private_data;
+        /* construct fw structure for this*/
+        memset(&str_params, 0, sizeof(str_params));
+
+        str_params.ops = STREAM_OPS_PLAYBACK;
+        str_params.stream_type = SST_STREAM_TYPE_MUSIC;
+        str_params.device_type = SND_SST_DEVICE_COMPRESS;
+
+        switch (params->codec.id) {
+        case SND_AUDIOCODEC_MP3: {
+                str_params.codec = SST_CODEC_TYPE_MP3;
+                str_params.sparams.uc.mp3_params.codec = SST_CODEC_TYPE_MP3;
+                str_params.sparams.uc.mp3_params.num_chan = params->codec.ch_in;
+                str_params.sparams.uc.mp3_params.pcm_wd_sz = 16;
+                break;
+        }
+
+        case SND_AUDIOCODEC_AAC: {
+                str_params.codec = SST_CODEC_TYPE_AAC;
+                str_params.sparams.uc.aac_params.codec = SST_CODEC_TYPE_AAC;
+                str_params.sparams.uc.aac_params.num_chan = params->codec.ch_in;
+                str_params.sparams.uc.aac_params.pcm_wd_sz = 16;
+                if (params->codec.format == SND_AUDIOSTREAMFORMAT_MP4ADTS)
+                        str_params.sparams.uc.aac_params.bs_format =
+                                                        AAC_BIT_STREAM_ADTS;
+                else if (params->codec.format == SND_AUDIOSTREAMFORMAT_RAW)
+                        str_params.sparams.uc.aac_params.bs_format =
+                                                        AAC_BIT_STREAM_RAW;
+                else {
+                        pr_err("Undefined format%d\n", params->codec.format);
+                        return -EINVAL;
+                }
+                str_params.sparams.uc.aac_params.externalsr =
+                                                params->codec.sample_rate;
+                break;
+        }
+
+        default:
+                pr_err("codec not supported, id =%d\n", params->codec.id);
+                return -EINVAL;
+        }
+
+        str_params.aparams.ring_buf_info[0].addr  =
+                                        virt_to_phys(cstream->runtime->buffer);
+        str_params.aparams.ring_buf_info[0].size =
+                                        cstream->runtime->buffer_size;
+        str_params.aparams.sg_count = 1;
+        str_params.aparams.frag_size = cstream->runtime->fragment_size;
+
+        cb.param = cstream;
+        cb.compr_cb = sst_compr_fragment_elapsed;
+
+        retval = stream->compr_ops->open(&str_params, &cb);
+        if (retval < 0) {
+                pr_err("stream allocation failed %d\n", retval);
+                return retval;
+        }
+
+        stream->id = retval;
+        return 0;
+}
+
+static int sst_platform_compr_trigger(struct snd_compr_stream *cstream, int cmd)
+{
+        struct sst_runtime_stream *stream =
+                cstream->runtime->private_data;
+
+        return stream->compr_ops->control(cmd, stream->id);
+}
+
+static int sst_platform_compr_pointer(struct snd_compr_stream *cstream,
+                                        struct snd_compr_tstamp *tstamp)
+{
+        struct sst_runtime_stream *stream;
+
+        stream  = cstream->runtime->private_data;
+        stream->compr_ops->tstamp(stream->id, tstamp);
+        tstamp->byte_offset = tstamp->copied_total %
+                                 (u32)cstream->runtime->buffer_size;
+        pr_debug("calc bytes offset/copied bytes as %d\n", tstamp->byte_offset);
+        return 0;
+}
+
+static int sst_platform_compr_ack(struct snd_compr_stream *cstream,
+                                        size_t bytes)
+{
+        struct sst_runtime_stream *stream;
+
+        stream  = cstream->runtime->private_data;
+        stream->compr_ops->ack(stream->id, (unsigned long)bytes);
+        stream->bytes_written += bytes;
+
+        return 0;
+}
+
+static int sst_platform_compr_get_caps(struct snd_compr_stream *cstream,
+                                        struct snd_compr_caps *caps)
+{
+        struct sst_runtime_stream *stream =
+                cstream->runtime->private_data;
+
+        return stream->compr_ops->get_caps(caps);
+}
+
+static int sst_platform_compr_get_codec_caps(struct snd_compr_stream *cstream,
+                                        struct snd_compr_codec_caps *codec)
+{
+        struct sst_runtime_stream *stream =
+                cstream->runtime->private_data;
+
+        return stream->compr_ops->get_codec_caps(codec);
+}
+
+static struct snd_compr_ops sst_platform_compr_ops = {
+
+        .open = sst_platform_compr_open,
+        .free = sst_platform_compr_free,
+        .set_params = sst_platform_compr_set_params,
+        .trigger = sst_platform_compr_trigger,
+        .pointer = sst_platform_compr_pointer,
+        .ack = sst_platform_compr_ack,
+        .get_caps = sst_platform_compr_get_caps,
+        .get_codec_caps = sst_platform_compr_get_codec_caps,
+};
+
 static struct snd_soc_platform_driver sst_soc_platform_drv = {
         .ops            = &sst_platform_ops,
+        .compr_ops      = &sst_platform_compr_ops,
         .pcm_new        = sst_pcm_new,
         .pcm_free       = sst_pcm_free,
 };
diff --git a/sound/soc/mid-x86/sst_platform.h b/sound/soc/mid-x86/sst_platform.h
index f04f4f72daa0..d61c5d514ffa 100644
--- a/sound/soc/mid-x86/sst_platform.h
+++ b/sound/soc/mid-x86/sst_platform.h
@@ -27,6 +27,8 @@
 #ifndef __SST_PLATFORMDRV_H__
 #define __SST_PLATFORMDRV_H__
 
+#include "sst_dsp.h"
+
 #define SST_MONO                1
 #define SST_STEREO              2
 #define SST_MAX_CAP             5
@@ -42,7 +44,6 @@
 #define SST_MIN_PERIODS         2
 #define SST_MAX_PERIODS         (1024*2)
 #define SST_FIFO_SIZE           0
-#define SST_CODEC_TYPE_PCM      1
 
 struct pcm_stream_info {
         int str_id;
@@ -83,6 +84,7 @@ enum sst_audio_device_type {
         SND_SST_DEVICE_VIBRA,
         SND_SST_DEVICE_HAPTIC,
         SND_SST_DEVICE_CAPTURE,
+        SND_SST_DEVICE_COMPRESS,
 };
 
 /* PCM Parameters */
@@ -107,6 +109,24 @@ struct sst_stream_params {
         struct sst_pcm_params sparams;
 };
 
+struct sst_compress_cb {
+        void *param;
+        void (*compr_cb)(void *param);
+};
+
+struct compress_sst_ops {
+        const char *name;
+        int (*open) (struct snd_sst_params *str_params,
+                        struct sst_compress_cb *cb);
+        int (*control) (unsigned int cmd, unsigned int str_id);
+        int (*tstamp) (unsigned int str_id, struct snd_compr_tstamp *tstamp);
+        int (*ack) (unsigned int str_id, unsigned long bytes);
+        int (*close) (unsigned int str_id);
+        int (*get_caps) (struct snd_compr_caps *caps);
+        int (*get_codec_caps) (struct snd_compr_codec_caps *codec);
+
+};
+
 struct sst_ops {
         int (*open) (struct sst_stream_params *str_param);
         int (*device_control) (int cmd, void *arg);
@@ -115,8 +135,11 @@ struct sst_ops {
 
 struct sst_runtime_stream {
         int     stream_status;
+        unsigned int id;
+        size_t bytes_written;
         struct pcm_stream_info stream_info;
         struct sst_ops *ops;
+        struct compress_sst_ops *compr_ops;
         spinlock_t      status_lock;
 };
 
@@ -124,6 +147,7 @@ struct sst_device {
         char *name;
         struct device *dev;
         struct sst_ops *ops;
+        struct compress_sst_ops *compr_ops;
 };
 
 int sst_register_dsp(struct sst_device *sst);
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index b3030718c228..aa037b292f3d 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -704,7 +704,7 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        saif->clk = clk_get(&pdev->dev, NULL);
+        saif->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(saif->clk)) {
                 ret = PTR_ERR(saif->clk);
                 dev_err(&pdev->dev, "Cannot get the clock: %d\n",
@@ -717,8 +717,7 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
         saif->base = devm_request_and_ioremap(&pdev->dev, iores);
         if (!saif->base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
-                ret = -ENODEV;
-                goto failed_get_resource;
+                return -ENODEV;
         }
 
         dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
@@ -731,7 +730,7 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
                                            &saif->dma_param.chan_num);
                 if (ret) {
                         dev_err(&pdev->dev, "failed to get dma channel\n");
-                        goto failed_get_resource;
+                        return ret;
                 }
         } else {
                 saif->dma_param.chan_num = dmares->start;
@@ -742,7 +741,7 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
                 ret = saif->irq;
                 dev_err(&pdev->dev, "failed to get irq resource: %d\n",
                         ret);
-                goto failed_get_resource;
+                return ret;
         }
 
         saif->dev = &pdev->dev;
@@ -750,7 +749,7 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
                                "mxs-saif", saif);
         if (ret) {
                 dev_err(&pdev->dev, "failed to request irq\n");
-                goto failed_get_resource;
+                return ret;
         }
 
         saif->dma_param.chan_irq = platform_get_irq(pdev, 1);
@@ -758,7 +757,7 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
                 ret = saif->dma_param.chan_irq;
                 dev_err(&pdev->dev, "failed to get dma irq resource: %d\n",
                         ret);
-                goto failed_get_resource;
+                return ret;
         }
 
         platform_set_drvdata(pdev, saif);
@@ -766,7 +765,7 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
         ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai);
         if (ret) {
                 dev_err(&pdev->dev, "register DAI failed\n");
-                goto failed_get_resource;
+                return ret;
         }
 
         ret = mxs_pcm_platform_register(&pdev->dev);
@@ -779,19 +778,14 @@ static int __devinit mxs_saif_probe(struct platform_device *pdev)
 
 failed_pdev_alloc:
         snd_soc_unregister_dai(&pdev->dev);
-failed_get_resource:
-        clk_put(saif->clk);
 
         return ret;
 }
 
 static int __devexit mxs_saif_remove(struct platform_device *pdev)
 {
-        struct mxs_saif *saif = platform_get_drvdata(pdev);
-
         mxs_pcm_platform_unregister(&pdev->dev);
         snd_soc_unregister_dai(&pdev->dev);
-        clk_put(saif->clk);
 
         return 0;
 }
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 57a2fa751085..7048137f9a33 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -1,6 +1,7 @@
 config SND_OMAP_SOC
         tristate "SoC Audio for the Texas Instruments OMAP chips"
-        depends on ARCH_OMAP
+        depends on ARCH_OMAP && DMA_OMAP
+        select SND_SOC_DMAENGINE_PCM
 
 config SND_OMAP_SOC_DMIC
         tristate
@@ -60,23 +61,6 @@ config SND_OMAP_SOC_OSK5912
         help
           Say Y if you want to add support for SoC audio on osk5912.
 
-config SND_OMAP_SOC_OVERO
-        tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35"
-        depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35)
-        select SND_OMAP_SOC_MCBSP
-        select SND_SOC_TWL4030
-        help
-          Say Y if you want to add support for SoC audio on the
-          Gumstix Overo or CompuLab CM-T35
-
-config SND_OMAP_SOC_OMAP3EVM
-        tristate "SoC Audio support for OMAP3EVM board"
-        depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3EVM
-        select SND_OMAP_SOC_MCBSP
-        select SND_SOC_TWL4030
-        help
-          Say Y if you want to add support for SoC audio on the omap3evm board.
-
 config SND_OMAP_SOC_AM3517EVM
         tristate "SoC Audio support for OMAP3517 / AM3517 EVM"
         depends on SND_OMAP_SOC && MACH_OMAP3517EVM && I2C
@@ -95,6 +79,19 @@ config SND_OMAP_SOC_SDP3430
           Say Y if you want to add support for SoC audio on Texas Instruments
           SDP3430.
 
+config SND_OMAP_SOC_OMAP_TWL4030
+        tristate "SoC Audio support for TI SoC based boards with twl4030 codec"
+        depends on TWL4030_CORE && SND_OMAP_SOC
+        select SND_OMAP_SOC_MCBSP
+        select SND_SOC_TWL4030
+        help
+          Say Y if you want to add support for SoC audio on TI SoC based boards
+          using twl4030 as c codec. This driver currently supports:
+          - Beagleboard or Devkit8000
+          - Gumstix Overo or CompuLab CM-T35/CM-T3730
+          - IGEP v2
+          - OMAP3EVM
+
 config SND_OMAP_SOC_OMAP_ABE_TWL6040
         tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
         depends on TWL6040_CORE && SND_OMAP_SOC && ARCH_OMAP4
@@ -127,16 +124,6 @@ config SND_OMAP_SOC_OMAP3_PANDORA
         help
           Say Y if you want to add support for SoC audio on the OMAP3 Pandora.
 
-config SND_OMAP_SOC_OMAP3_BEAGLE
-        tristate "SoC Audio support for OMAP3 Beagle and Devkit8000"
-        depends on TWL4030_CORE && SND_OMAP_SOC
-        depends on (MACH_OMAP3_BEAGLE || MACH_DEVKIT8000)
-        select SND_OMAP_SOC_MCBSP
-        select SND_SOC_TWL4030
-        help
-          Say Y if you want to add support for SoC audio on the Beagleboard or
-          the clone Devkit8000.
-
 config SND_OMAP_SOC_ZOOM2
         tristate "SoC Audio support for Zoom2"
         depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_ZOOM2
@@ -144,11 +131,3 @@ config SND_OMAP_SOC_ZOOM2
         select SND_SOC_TWL4030
         help
           Say Y if you want to add support for Soc audio on Zoom2 board.
-
-config SND_OMAP_SOC_IGEP0020
-        tristate "SoC Audio support for IGEP v2"
-        depends on TWL4030_CORE && SND_OMAP_SOC && MACH_IGEP0020
-        select SND_OMAP_SOC_MCBSP
-        select SND_SOC_TWL4030
-        help
-          Say Y if you want to add support for Soc audio on IGEP v2 board.
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index 0e14dd322565..19637e55ea48 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -16,29 +16,23 @@ snd-soc-n810-objs := n810.o
 snd-soc-rx51-objs := rx51.o
 snd-soc-ams-delta-objs := ams-delta.o
 snd-soc-osk5912-objs := osk5912.o
-snd-soc-overo-objs := overo.o
-snd-soc-omap3evm-objs := omap3evm.o
 snd-soc-am3517evm-objs := am3517evm.o
 snd-soc-sdp3430-objs := sdp3430.o
 snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o
+snd-soc-omap-twl4030-objs := omap-twl4030.o
 snd-soc-omap3pandora-objs := omap3pandora.o
-snd-soc-omap3beagle-objs := omap3beagle.o
 snd-soc-zoom2-objs := zoom2.o
-snd-soc-igep0020-objs := igep0020.o
 snd-soc-omap-hdmi-card-objs := omap-hdmi-card.o
 
 obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
 obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o
 obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o
 obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o
-obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o
-obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o
 obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o
 obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) += snd-soc-omap-twl4030.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
-obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o
 obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o
-obj-$(CONFIG_SND_OMAP_SOC_IGEP0020) += snd-soc-igep0020.o
 obj-$(CONFIG_SND_OMAP_SOC_OMAP_HDMI) += snd-soc-omap-hdmi-card.o
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index df65f98211ec..77a87012977c 100644
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -41,32 +41,15 @@ static int am3517evm_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret;
 
         /* Set the codec system clock for DAC and ADC */
         ret = snd_soc_dai_set_sysclk(codec_dai, 0,
                         CODEC_CLOCK, SND_SOC_CLOCK_IN);
-        if (ret < 0) {
+        if (ret < 0)
                 printk(KERN_ERR "can't set codec system clock\n");
-                return ret;
-        }
-
-        ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_CLKR_SRC_CLKX, 0,
-                                SND_SOC_CLOCK_IN);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_CLKR_SRC_CLKX\n");
-                return ret;
-        }
 
-        ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_FSR_SRC_FSX, 0,
-                                SND_SOC_CLOCK_IN);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_FSR_SRC_FSX\n");
-                return ret;
-        }
-
-        return 0;
+        return ret;
 }
 
 static struct snd_soc_ops am3517evm_ops = {
diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c
deleted file mode 100644
index e8357819175b..000000000000
--- a/sound/soc/omap/igep0020.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * igep0020.c  --  SoC audio for IGEP v2
- *
- * Based on sound/soc/omap/overo.c by Steve Sakoman
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <linux/clk.h>
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-
-#include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
-
-#include "omap-mcbsp.h"
-#include "omap-pcm.h"
-
-static int igep2_hw_params(struct snd_pcm_substream *substream,
-        struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        int ret;
-
-        /* Set the codec system clock for DAC and ADC */
-        ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
-                                            SND_SOC_CLOCK_IN);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set codec system clock\n");
-                return ret;
-        }
-
-        return 0;
-}
-
-static struct snd_soc_ops igep2_ops = {
-        .hw_params = igep2_hw_params,
-};
-
-/* Digital audio interface glue - connects codec <--> CPU */
-static struct snd_soc_dai_link igep2_dai = {
-        .name = "TWL4030",
-        .stream_name = "TWL4030",
-        .cpu_dai_name = "omap-mcbsp.2",
-        .codec_dai_name = "twl4030-hifi",
-        .platform_name = "omap-pcm-audio",
-        .codec_name = "twl4030-codec",
-        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                   SND_SOC_DAIFMT_CBM_CFM,
-        .ops = &igep2_ops,
-};
-
-/* Audio machine driver */
-static struct snd_soc_card snd_soc_card_igep2 = {
-        .name = "igep2",
-        .owner = THIS_MODULE,
-        .dai_link = &igep2_dai,
-        .num_links = 1,
-};
-
-static struct platform_device *igep2_snd_device;
-
-static int __init igep2_soc_init(void)
-{
-        int ret;
-
-        if (!machine_is_igep0020())
-                return -ENODEV;
-        printk(KERN_INFO "IGEP v2 SoC init\n");
-
-        igep2_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!igep2_snd_device) {
-                printk(KERN_ERR "Platform device allocation failed\n");
-                return -ENOMEM;
-        }
-
-        platform_set_drvdata(igep2_snd_device, &snd_soc_card_igep2);
-
-        ret = platform_device_add(igep2_snd_device);
-        if (ret)
-                goto err1;
-
-        return 0;
-
-err1:
-        printk(KERN_ERR "Unable to add platform device\n");
-        platform_device_put(igep2_snd_device);
-
-        return ret;
-}
-module_init(igep2_soc_init);
-
-static void __exit igep2_soc_exit(void)
-{
-        platform_device_unregister(igep2_snd_device);
-}
-module_exit(igep2_soc_exit);
-
-MODULE_AUTHOR("Enric Balletbo i Serra <eballetbo@iseebcn.com>");
-MODULE_DESCRIPTION("ALSA SoC IGEP v2");
-MODULE_LICENSE("GPL");
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index d33c48baaf71..bc06175e6367 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
 
 #include <plat/mcbsp.h>
 
@@ -726,50 +727,39 @@ void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int tx, int rx)
 
 int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id)
 {
+        struct clk *fck_src;
         const char *src;
+        int r;
 
         if (fck_src_id == MCBSP_CLKS_PAD_SRC)
-                src = "clks_ext";
+                src = "pad_fck";
         else if (fck_src_id == MCBSP_CLKS_PRCM_SRC)
-                src = "clks_fclk";
+                src = "prcm_fck";
         else
                 return -EINVAL;
 
-        if (mcbsp->pdata->set_clk_src)
-                return mcbsp->pdata->set_clk_src(mcbsp->dev, mcbsp->fclk, src);
-        else
+        fck_src = clk_get(mcbsp->dev, src);
+        if (IS_ERR(fck_src)) {
+                dev_err(mcbsp->dev, "CLKS: could not clk_get() %s\n", src);
                 return -EINVAL;
-}
-
-int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
-{
-        const char *signal, *src;
+        }
 
-        if (!mcbsp->pdata->mux_signal)
-                return -EINVAL;
+        pm_runtime_put_sync(mcbsp->dev);
 
-        switch (mux) {
-        case CLKR_SRC_CLKR:
-                signal = "clkr";
-                src = "clkr";
-                break;
-        case CLKR_SRC_CLKX:
-                signal = "clkr";
-                src = "clkx";
-                break;
-        case FSR_SRC_FSR:
-                signal = "fsr";
-                src = "fsr";
-                break;
-        case FSR_SRC_FSX:
-                signal = "fsr";
-                src = "fsx";
-                break;
-        default:
-                return -EINVAL;
+        r = clk_set_parent(mcbsp->fclk, fck_src);
+        if (r) {
+                dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n",
+                        src);
+                clk_put(fck_src);
+                return r;
         }
 
-        return mcbsp->pdata->mux_signal(mcbsp->dev, signal, src);
+        pm_runtime_get_sync(mcbsp->dev);
+
+        clk_put(fck_src);
+
+        return 0;
+
 }
 
 #define max_thres(m)                    (mcbsp->pdata->buffer_size)
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
index 262a6152111f..49a67259ce5a 100644
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -334,9 +334,6 @@ void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int tx, int rx);
 /* McBSP functional clock source changing function */
 int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id);
 
-/* McBSP signal muxing API */
-int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux);
-
 /* Sidetone specific API */
 int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain);
 int omap_st_get_chgain(struct omap_mcbsp *mcbsp, int channel, s16 *chgain);
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 9d93793d3077..be525dfe9faa 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -25,6 +25,7 @@
 #include <linux/mfd/twl6040.h>
 #include <linux/platform_data/omap-abe-twl6040.h>
 #include <linux/module.h>
+#include <linux/of.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -43,6 +44,8 @@
 struct abe_twl6040 {
         int     jack_detection; /* board can detect jack events */
         int     mclk_freq;      /* MCLK frequency speed for twl6040 */
+
+        struct platform_device *dmic_codec_dev;
 };
 
 static int omap_abe_hw_params(struct snd_pcm_substream *substream,
@@ -185,17 +188,6 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
         int hs_trim;
         int ret = 0;
 
-        /* Disable not connected paths if not used */
-        twl6040_disconnect_pin(dapm, pdata->has_hs, "Headset Stereophone");
-        twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk");
-        twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk");
-        twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out");
-        twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator");
-        twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic");
-        twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic");
-        twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic");
-        twl6040_disconnect_pin(dapm, pdata->has_afm, "Line In");
-
         /*
          * Configure McPDM offset cancellation based on the HSOTRIM value from
          * twl6040.
@@ -216,6 +208,24 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
                 twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET);
         }
 
+        /*
+         * NULL pdata means we booted with DT. In this case the routing is
+         * provided and the card is fully routed, no need to mark pins.
+         */
+        if (!pdata)
+                return ret;
+
+        /* Disable not connected paths if not used */
+        twl6040_disconnect_pin(dapm, pdata->has_hs, "Headset Stereophone");
+        twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk");
+        twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk");
+        twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out");
+        twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator");
+        twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic");
+        twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic");
+        twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic");
+        twl6040_disconnect_pin(dapm, pdata->has_afm, "Line In");
+
         return ret;
 }
 
@@ -270,52 +280,116 @@ static struct snd_soc_card omap_abe_card = {
 static __devinit int omap_abe_probe(struct platform_device *pdev)
 {
         struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev);
+        struct device_node *node = pdev->dev.of_node;
         struct snd_soc_card *card = &omap_abe_card;
         struct abe_twl6040 *priv;
         int num_links = 0;
-        int ret;
+        int ret = 0;
 
         card->dev = &pdev->dev;
 
-        if (!pdata) {
-                dev_err(&pdev->dev, "Missing pdata\n");
-                return -ENODEV;
-        }
-
         priv = devm_kzalloc(&pdev->dev, sizeof(struct abe_twl6040), GFP_KERNEL);
         if (priv == NULL)
                 return -ENOMEM;
 
-        if (pdata->card_name) {
-                card->name = pdata->card_name;
+        priv->dmic_codec_dev = ERR_PTR(-EINVAL);
+
+        if (node) {
+                struct device_node *dai_node;
+
+                if (snd_soc_of_parse_card_name(card, "ti,model")) {
+                        dev_err(&pdev->dev, "Card name is not provided\n");
+                        return -ENODEV;
+                }
+
+                ret = snd_soc_of_parse_audio_routing(card,
+                                                "ti,audio-routing");
+                if (ret) {
+                        dev_err(&pdev->dev,
+                                "Error while parsing DAPM routing\n");
+                        return ret;
+                }
+
+                dai_node = of_parse_phandle(node, "ti,mcpdm", 0);
+                if (!dai_node) {
+                        dev_err(&pdev->dev, "McPDM node is not provided\n");
+                        return -EINVAL;
+                }
+                abe_twl6040_dai_links[0].cpu_dai_name  = NULL;
+                abe_twl6040_dai_links[0].cpu_of_node = dai_node;
+
+                dai_node = of_parse_phandle(node, "ti,dmic", 0);
+                if (dai_node) {
+                        num_links = 2;
+                        abe_twl6040_dai_links[1].cpu_dai_name  = NULL;
+                        abe_twl6040_dai_links[1].cpu_of_node = dai_node;
+
+                        priv->dmic_codec_dev = platform_device_register_simple(
+                                                "dmic-codec", -1, NULL, 0);
+                        if (IS_ERR(priv->dmic_codec_dev)) {
+                                dev_err(&pdev->dev,
+                                        "Can't instantiate dmic-codec\n");
+                                return PTR_ERR(priv->dmic_codec_dev);
+                        }
+                } else {
+                        num_links = 1;
+                }
+
+                of_property_read_u32(node, "ti,jack-detection",
+                                     &priv->jack_detection);
+                of_property_read_u32(node, "ti,mclk-freq",
+                                     &priv->mclk_freq);
+                if (!priv->mclk_freq) {
+                        dev_err(&pdev->dev, "MCLK frequency not provided\n");
+                        ret = -EINVAL;
+                        goto err_unregister;
+                }
+
+                omap_abe_card.fully_routed = 1;
+        } else if (pdata) {
+                if (pdata->card_name) {
+                        card->name = pdata->card_name;
+                } else {
+                        dev_err(&pdev->dev, "Card name is not provided\n");
+                        return -ENODEV;
+                }
+
+                if (pdata->has_dmic)
+                        num_links = 2;
+                else
+                        num_links = 1;
+
+                priv->jack_detection = pdata->jack_detection;
+                priv->mclk_freq = pdata->mclk_freq;
         } else {
-                dev_err(&pdev->dev, "Card name is not provided\n");
+                dev_err(&pdev->dev, "Missing pdata\n");
                 return -ENODEV;
         }
 
-        priv->jack_detection = pdata->jack_detection;
-        priv->mclk_freq = pdata->mclk_freq;
-
 
         if (!priv->mclk_freq) {
                 dev_err(&pdev->dev, "MCLK frequency missing\n");
-                return -ENODEV;
+                ret = -ENODEV;
+                goto err_unregister;
         }
 
-        if (pdata->has_dmic)
-                num_links = 2;
-        else
-                num_links = 1;
-
         card->dai_link = abe_twl6040_dai_links;
         card->num_links = num_links;
 
         snd_soc_card_set_drvdata(card, priv);
 
         ret = snd_soc_register_card(card);
-        if (ret)
+        if (ret) {
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
+                goto err_unregister;
+        }
+
+        return 0;
+
+err_unregister:
+        if (!IS_ERR(priv->dmic_codec_dev))
+                platform_device_unregister(priv->dmic_codec_dev);
 
         return ret;
 }
@@ -323,17 +397,28 @@ static __devinit int omap_abe_probe(struct platform_device *pdev)
 static int __devexit omap_abe_remove(struct platform_device *pdev)
 {
         struct snd_soc_card *card = platform_get_drvdata(pdev);
+        struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
 
         snd_soc_unregister_card(card);
 
+        if (!IS_ERR(priv->dmic_codec_dev))
+                platform_device_unregister(priv->dmic_codec_dev);
+
         return 0;
 }
 
+static const struct of_device_id omap_abe_of_match[] = {
+        {.compatible = "ti,abe-twl6040", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, omap_abe_of_match);
+
 static struct platform_driver omap_abe_driver = {
         .driver = {
                 .name = "omap-abe-twl6040",
                 .owner = THIS_MODULE,
                 .pm = &snd_soc_pm_ops,
+                .of_match_table = omap_abe_of_match,
         },
         .probe = omap_abe_probe,
         .remove = __devexit_p(omap_abe_remove),
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 75f5dca0e8d2..68f2cd1a9206 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -33,7 +33,6 @@
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
 #include <linux/of_device.h>
-#include <plat/dma.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -63,8 +62,6 @@ struct omap_dmic {
  */
 static struct omap_pcm_dma_data omap_dmic_dai_dma_params = {
         .name           = "DMIC capture",
-        .data_type      = OMAP_DMA_DATA_TYPE_S32,
-        .sync_mode      = OMAP_DMA_SYNC_PACKET,
 };
 
 static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val)
@@ -121,6 +118,7 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
 
         mutex_unlock(&dmic->mutex);
 
+        snd_soc_dai_set_dma_data(dai, substream, &omap_dmic_dai_dma_params);
         return ret;
 }
 
@@ -205,6 +203,7 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream,
                                     struct snd_soc_dai *dai)
 {
         struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai);
+        struct omap_pcm_dma_data *dma_data;
         int channels;
 
         dmic->clk_div = omap_dmic_select_divider(dmic, params_rate(params));
@@ -230,8 +229,8 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream,
         }
 
         /* packet size is threshold * channels */
-        omap_dmic_dai_dma_params.packet_size = dmic->threshold * channels;
-        snd_soc_dai_set_dma_data(dai, substream, &omap_dmic_dai_dma_params);
+        dma_data = snd_soc_dai_get_dma_data(dai, substream);
+        dma_data->packet_size = dmic->threshold * channels;
 
         return 0;
 }
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index a08245d9203c..f59c69fb400e 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -34,7 +34,6 @@
 #include <sound/asoundef.h>
 #include <video/omapdss.h>
 
-#include <plat/dma.h>
 #include "omap-pcm.h"
 #include "omap-hdmi.h"
 
@@ -68,6 +67,9 @@ static int omap_hdmi_dai_startup(struct snd_pcm_substream *substream,
                 dev_err(dai->dev, "audio not supported\n");
                 return -ENODEV;
         }
+
+        snd_soc_dai_set_dma_data(dai, substream, &priv->dma_params);
+
         return 0;
 }
 
@@ -86,24 +88,24 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream,
         struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai);
         struct snd_aes_iec958 *iec = &priv->iec;
         struct snd_cea_861_aud_if *cea = &priv->cea;
+        struct omap_pcm_dma_data *dma_data;
         int err = 0;
 
+        dma_data = snd_soc_dai_get_dma_data(dai, substream);
+
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
-                priv->dma_params.packet_size = 16;
+                dma_data->packet_size = 16;
                 break;
         case SNDRV_PCM_FORMAT_S24_LE:
-                priv->dma_params.packet_size = 32;
+                dma_data->packet_size = 32;
                 break;
         default:
                 dev_err(dai->dev, "format not supported!\n");
                 return -EINVAL;
         }
 
-        priv->dma_params.data_type = OMAP_DMA_DATA_TYPE_S32;
-
-        snd_soc_dai_set_dma_data(dai, substream,
-                                 &priv->dma_params);
+        dma_data->data_type = 32;
 
         /*
          * fill the IEC-60958 channel status word
@@ -290,7 +292,6 @@ static __devinit int omap_hdmi_probe(struct platform_device *pdev)
 
         hdmi_data->dma_params.dma_req =  hdmi_rsrc->start;
         hdmi_data->dma_params.name = "HDMI playback";
-        hdmi_data->dma_params.sync_mode = OMAP_DMA_SYNC_PACKET;
 
         /*
          * TODO: We assume that there is only one DSS HDMI device. Future
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index acdd3ef14e08..fef2f5933bb2 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -26,13 +26,14 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <plat/dma.h>
 #include <plat/mcbsp.h>
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
@@ -79,9 +80,6 @@ static void omap_mcbsp_set_threshold(struct snd_pcm_substream *substream)
          */
         if (dma_data->packet_size)
                 words = dma_data->packet_size;
-        else if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD)
-                words = snd_pcm_lib_period_bytes(substream) /
-                                                (mcbsp->wlen / 8);
         else
                 words = 1;
 
@@ -153,6 +151,9 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream,
                                            SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 2);
         }
 
+        snd_soc_dai_set_dma_data(cpu_dai, substream,
+                                 &mcbsp->dma_data[substream->stream]);
+
         return err;
 }
 
@@ -226,20 +227,18 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
         struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
         struct omap_mcbsp_reg_cfg *regs = &mcbsp->cfg_regs;
         struct omap_pcm_dma_data *dma_data;
-        int wlen, channels, wpf, sync_mode = OMAP_DMA_SYNC_ELEMENT;
+        int wlen, channels, wpf;
         int pkt_size = 0;
         unsigned int format, div, framesize, master;
 
-        dma_data = &mcbsp->dma_data[substream->stream];
+        dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream);
         channels = params_channels(params);
 
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
-                dma_data->data_type = OMAP_DMA_DATA_TYPE_S16;
                 wlen = 16;
                 break;
         case SNDRV_PCM_FORMAT_S32_LE:
-                dma_data->data_type = OMAP_DMA_DATA_TYPE_S32;
                 wlen = 32;
                 break;
         default:
@@ -249,6 +248,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                 dma_data->set_threshold = omap_mcbsp_set_threshold;
                 if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {
                         int period_words, max_thrsh;
+                        int divider = 0;
 
                         period_words = params_period_bytes(params) / (wlen / 8);
                         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
@@ -256,46 +256,30 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                         else
                                 max_thrsh = mcbsp->max_rx_thres;
                         /*
-                         * If the period contains less or equal number of words,
-                         * we are using the original threshold mode setup:
-                         * McBSP threshold = sDMA frame size = period_size
-                         * Otherwise we switch to sDMA packet mode:
-                         * McBSP threshold = sDMA packet size
-                         * sDMA frame size = period size
+                         * Use sDMA packet mode if McBSP is in threshold mode:
+                         * If period words less than the FIFO size the packet
+                         * size is set to the number of period words, otherwise
+                         * Look for the biggest threshold value which divides
+                         * the period size evenly.
                          */
-                        if (period_words > max_thrsh) {
-                                int divider = 0;
-
-                                /*
-                                 * Look for the biggest threshold value, which
-                                 * divides the period size evenly.
-                                 */
-                                divider = period_words / max_thrsh;
-                                if (period_words % max_thrsh)
-                                        divider++;
-                                while (period_words % divider &&
-                                        divider < period_words)
-                                        divider++;
-                                if (divider == period_words)
-                                        return -EINVAL;
-
-                                pkt_size = period_words / divider;
-                                sync_mode = OMAP_DMA_SYNC_PACKET;
-                        } else {
-                                sync_mode = OMAP_DMA_SYNC_FRAME;
-                        }
+                        divider = period_words / max_thrsh;
+                        if (period_words % max_thrsh)
+                                divider++;
+                        while (period_words % divider &&
+                                divider < period_words)
+                                divider++;
+                        if (divider == period_words)
+                                return -EINVAL;
+
+                        pkt_size = period_words / divider;
                 } else if (channels > 1) {
                         /* Use packet mode for non mono streams */
                         pkt_size = channels;
-                        sync_mode = OMAP_DMA_SYNC_PACKET;
                 }
         }
 
-        dma_data->sync_mode = sync_mode;
         dma_data->packet_size = pkt_size;
 
-        snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
-
         if (mcbsp->configured) {
                 /* McBSP already configured by another stream */
                 return 0;
@@ -398,12 +382,14 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
         /* Generic McBSP register settings */
         regs->spcr2     |= XINTM(3) | FREE;
         regs->spcr1     |= RINTM(3);
-        /* RFIG and XFIG are not defined in 34xx */
-        if (!cpu_is_omap34xx() && !cpu_is_omap44xx()) {
+        /* RFIG and XFIG are not defined in 2430 and on OMAP3+ */
+        if (!mcbsp->pdata->has_ccr) {
                 regs->rcr2      |= RFIG;
                 regs->xcr2      |= XFIG;
         }
-        if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
+
+        /* Configure XCCR/RCCR only for revisions which have ccr registers */
+        if (mcbsp->pdata->has_ccr) {
                 regs->xccr = DXENDLY(1) | XDMAEN | XDISABLE;
                 regs->rccr = RFULL_CYCLE | RDMAEN | RDISABLE;
         }
@@ -516,21 +502,9 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
                         return -EBUSY;
         }
 
-        if (clk_id == OMAP_MCBSP_SYSCLK_CLK ||
-            clk_id == OMAP_MCBSP_SYSCLK_CLKS_FCLK ||
-            clk_id == OMAP_MCBSP_SYSCLK_CLKS_EXT ||
-            clk_id == OMAP_MCBSP_SYSCLK_CLKX_EXT ||
-            clk_id == OMAP_MCBSP_SYSCLK_CLKR_EXT) {
-                mcbsp->in_freq = freq;
-                regs->srgr2     &= ~CLKSM;
-                regs->pcr0      &= ~SCLKME;
-        } else if (cpu_class_is_omap1()) {
-                /*
-                 * McBSP CLKR/FSR signal muxing functions are only available on
-                 * OMAP2 or newer versions
-                 */
-                return -EINVAL;
-        }
+        mcbsp->in_freq = freq;
+        regs->srgr2 &= ~CLKSM;
+        regs->pcr0 &= ~SCLKME;
 
         switch (clk_id) {
         case OMAP_MCBSP_SYSCLK_CLK:
@@ -558,20 +532,6 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
         case OMAP_MCBSP_SYSCLK_CLKR_EXT:
                 regs->pcr0      |= SCLKME;
                 break;
-
-
-        case OMAP_MCBSP_CLKR_SRC_CLKR:
-                err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKR);
-                break;
-        case OMAP_MCBSP_CLKR_SRC_CLKX:
-                err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKX);
-                break;
-        case OMAP_MCBSP_FSR_SRC_FSR:
-                err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSR);
-                break;
-        case OMAP_MCBSP_FSR_SRC_FSX:
-                err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSX);
-                break;
         default:
                 err = -ENODEV;
         }
@@ -641,9 +601,9 @@ static int omap_mcbsp_st_info_volsw(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-#define OMAP_MCBSP_ST_SET_CHANNEL_VOLUME(channel)                       \
+#define OMAP_MCBSP_ST_CHANNEL_VOLUME(channel)                           \
 static int                                                              \
-omap_mcbsp_set_st_ch##channel##_volume(struct snd_kcontrol *kc, \
+omap_mcbsp_set_st_ch##channel##_volume(struct snd_kcontrol *kc,         \
                                         struct snd_ctl_elem_value *uc)  \
 {                                                                       \
         struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kc);            \
@@ -659,11 +619,10 @@ omap_mcbsp_set_st_ch##channel##_volume(struct snd_kcontrol *kc,	\
                                                                         \
         /* OMAP McBSP implementation uses index values 0..4 */          \
         return omap_st_set_chgain(mcbsp, channel, val);                 \
-}
-
-#define OMAP_MCBSP_ST_GET_CHANNEL_VOLUME(channel)                       \
+}                                                                       \
+                                                                        \
 static int                                                              \
-omap_mcbsp_get_st_ch##channel##_volume(struct snd_kcontrol *kc, \
+omap_mcbsp_get_st_ch##channel##_volume(struct snd_kcontrol *kc,         \
                                         struct snd_ctl_elem_value *uc)  \
 {                                                                       \
         struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kc);            \
@@ -677,10 +636,8 @@ omap_mcbsp_get_st_ch##channel##_volume(struct snd_kcontrol *kc,	\
         return 0;                                                       \
 }
 
-OMAP_MCBSP_ST_SET_CHANNEL_VOLUME(0)
-OMAP_MCBSP_ST_SET_CHANNEL_VOLUME(1)
-OMAP_MCBSP_ST_GET_CHANNEL_VOLUME(0)
-OMAP_MCBSP_ST_GET_CHANNEL_VOLUME(1)
+OMAP_MCBSP_ST_CHANNEL_VOLUME(0)
+OMAP_MCBSP_ST_CHANNEL_VOLUME(1)
 
 static int omap_mcbsp_st_put_mode(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
@@ -710,41 +667,34 @@ static int omap_mcbsp_st_get_mode(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static const struct snd_kcontrol_new omap_mcbsp2_st_controls[] = {
-        SOC_SINGLE_EXT("McBSP2 Sidetone Switch", 1, 0, 1, 0,
-                        omap_mcbsp_st_get_mode, omap_mcbsp_st_put_mode),
-        OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP2 Sidetone Channel 0 Volume",
-                                      -32768, 32767,
-                                      omap_mcbsp_get_st_ch0_volume,
-                                      omap_mcbsp_set_st_ch0_volume),
-        OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP2 Sidetone Channel 1 Volume",
-                                      -32768, 32767,
-                                      omap_mcbsp_get_st_ch1_volume,
-                                      omap_mcbsp_set_st_ch1_volume),
-};
+#define OMAP_MCBSP_ST_CONTROLS(port)                                      \
+static const struct snd_kcontrol_new omap_mcbsp##port##_st_controls[] = { \
+SOC_SINGLE_EXT("McBSP" #port " Sidetone Switch", 1, 0, 1, 0,              \
+               omap_mcbsp_st_get_mode, omap_mcbsp_st_put_mode),           \
+OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP" #port " Sidetone Channel 0 Volume", \
+                              -32768, 32767,                              \
+                              omap_mcbsp_get_st_ch0_volume,               \
+                              omap_mcbsp_set_st_ch0_volume),              \
+OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP" #port " Sidetone Channel 1 Volume", \
+                              -32768, 32767,                              \
+                              omap_mcbsp_get_st_ch1_volume,               \
+                              omap_mcbsp_set_st_ch1_volume),              \
+}
 
-static const struct snd_kcontrol_new omap_mcbsp3_st_controls[] = {
-        SOC_SINGLE_EXT("McBSP3 Sidetone Switch", 2, 0, 1, 0,
-                        omap_mcbsp_st_get_mode, omap_mcbsp_st_put_mode),
-        OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP3 Sidetone Channel 0 Volume",
-                                      -32768, 32767,
-                                      omap_mcbsp_get_st_ch0_volume,
-                                      omap_mcbsp_set_st_ch0_volume),
-        OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP3 Sidetone Channel 1 Volume",
-                                      -32768, 32767,
-                                      omap_mcbsp_get_st_ch1_volume,
-                                      omap_mcbsp_set_st_ch1_volume),
-};
+OMAP_MCBSP_ST_CONTROLS(2);
+OMAP_MCBSP_ST_CONTROLS(3);
 
 int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
 
-        if (!mcbsp->st_data)
-                return -ENODEV;
+        if (!mcbsp->st_data) {
+                dev_warn(mcbsp->dev, "No sidetone data for port\n");
+                return 0;
+        }
 
-        switch (cpu_dai->id) {
+        switch (mcbsp->id) {
         case 2: /* McBSP 2 */
                 return snd_soc_add_dai_controls(cpu_dai,
                                         omap_mcbsp2_st_controls,
@@ -761,13 +711,74 @@ int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)
 }
 EXPORT_SYMBOL_GPL(omap_mcbsp_st_add_controls);
 
+static struct omap_mcbsp_platform_data omap2420_pdata = {
+        .reg_step = 4,
+        .reg_size = 2,
+};
+
+static struct omap_mcbsp_platform_data omap2430_pdata = {
+        .reg_step = 4,
+        .reg_size = 4,
+        .has_ccr = true,
+};
+
+static struct omap_mcbsp_platform_data omap3_pdata = {
+        .reg_step = 4,
+        .reg_size = 4,
+        .has_ccr = true,
+        .has_wakeup = true,
+};
+
+static struct omap_mcbsp_platform_data omap4_pdata = {
+        .reg_step = 4,
+        .reg_size = 4,
+        .has_ccr = true,
+        .has_wakeup = true,
+};
+
+static const struct of_device_id omap_mcbsp_of_match[] = {
+        {
+                .compatible = "ti,omap2420-mcbsp",
+                .data = &omap2420_pdata,
+        },
+        {
+                .compatible = "ti,omap2430-mcbsp",
+                .data = &omap2430_pdata,
+        },
+        {
+                .compatible = "ti,omap3-mcbsp",
+                .data = &omap3_pdata,
+        },
+        {
+                .compatible = "ti,omap4-mcbsp",
+                .data = &omap4_pdata,
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(of, omap_mcbsp_of_match);
+
 static __devinit int asoc_mcbsp_probe(struct platform_device *pdev)
 {
         struct omap_mcbsp_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct omap_mcbsp *mcbsp;
+        const struct of_device_id *match;
         int ret;
 
-        if (!pdata) {
+        match = of_match_device(omap_mcbsp_of_match, &pdev->dev);
+        if (match) {
+                struct device_node *node = pdev->dev.of_node;
+                int buffer_size;
+
+                pdata = devm_kzalloc(&pdev->dev,
+                                     sizeof(struct omap_mcbsp_platform_data),
+                                     GFP_KERNEL);
+                if (!pdata)
+                        return -ENOMEM;
+
+                memcpy(pdata, match->data, sizeof(*pdata));
+                if (!of_property_read_u32(node, "ti,buffer-size", &buffer_size))
+                        pdata->buffer_size = buffer_size;
+        } else if (!pdata) {
                 dev_err(&pdev->dev, "missing platform data.\n");
                 return -EINVAL;
         }
@@ -809,6 +820,7 @@ static struct platform_driver asoc_mcbsp_driver = {
         .driver = {
                         .name = "omap-mcbsp",
                         .owner = THIS_MODULE,
+                        .of_match_table = omap_mcbsp_of_match,
         },
 
         .probe = asoc_mcbsp_probe,
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index f877b16f19c9..ba8386a0d8dc 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -32,10 +32,6 @@ enum omap_mcbsp_clksrg_clk {
         OMAP_MCBSP_SYSCLK_CLK,          /* Internal ICLK */
         OMAP_MCBSP_SYSCLK_CLKX_EXT,     /* External CLKX pin */
         OMAP_MCBSP_SYSCLK_CLKR_EXT,     /* External CLKR pin */
-        OMAP_MCBSP_CLKR_SRC_CLKR,       /* CLKR from CLKR pin */
-        OMAP_MCBSP_CLKR_SRC_CLKX,       /* CLKR from CLKX pin */
-        OMAP_MCBSP_FSR_SRC_FSR,         /* FSR from FSR pin */
-        OMAP_MCBSP_FSR_SRC_FSX,         /* FSR from FSX pin */
 };
 
 /* McBSP dividers */
@@ -43,22 +39,6 @@ enum omap_mcbsp_div {
         OMAP_MCBSP_CLKGDV,              /* Sample rate generator divider */
 };
 
-#if defined(CONFIG_SOC_OMAP2420)
-#define NUM_LINKS       2
-#endif
-#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
-#undef  NUM_LINKS
-#define NUM_LINKS       3
-#endif
-#if defined(CONFIG_ARCH_OMAP4)
-#undef  NUM_LINKS
-#define NUM_LINKS       4
-#endif
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
-#undef  NUM_LINKS
-#define NUM_LINKS       5
-#endif
-
 int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd);
 
 #endif
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 2c66e2498a45..775565032ce3 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -40,7 +40,6 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <plat/dma.h>
 #include <plat/omap_hwmod.h>
 #include "omap-mcpdm.h"
 #include "omap-pcm.h"
@@ -71,17 +70,9 @@ struct omap_mcpdm {
 static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = {
         {
                 .name = "Audio playback",
-                .dma_req = OMAP44XX_DMA_MCPDM_DL,
-                .data_type = OMAP_DMA_DATA_TYPE_S32,
-                .sync_mode = OMAP_DMA_SYNC_PACKET,
-                .port_addr = OMAP44XX_MCPDM_L3_BASE + MCPDM_REG_DN_DATA,
         },
         {
                 .name = "Audio capture",
-                .dma_req = OMAP44XX_DMA_MCPDM_UP,
-                .data_type = OMAP_DMA_DATA_TYPE_S32,
-                .sync_mode = OMAP_DMA_SYNC_PACKET,
-                .port_addr = OMAP44XX_MCPDM_L3_BASE + MCPDM_REG_UP_DATA,
         },
 };
 
@@ -276,9 +267,11 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
                 }
                 omap_mcpdm_open_streams(mcpdm);
         }
-
         mutex_unlock(&mcpdm->mutex);
 
+        snd_soc_dai_set_dma_data(dai, substream,
+                                 &omap_mcpdm_dai_dma_params[substream->stream]);
+
         return 0;
 }
 
@@ -333,7 +326,7 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        dma_data = &omap_mcpdm_dai_dma_params[stream];
+        dma_data = snd_soc_dai_get_dma_data(dai, substream);
 
         /* Configure McPDM channels, and DMA packet size */
         if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -345,8 +338,6 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
                 dma_data->packet_size = mcpdm->up_threshold * channels;
         }
 
-        snd_soc_dai_set_dma_data(dai, substream, dma_data);
-
         return 0;
 }
 
@@ -445,9 +436,8 @@ static __devinit int asoc_mcpdm_probe(struct platform_device *pdev)
 {
         struct omap_mcpdm *mcpdm;
         struct resource *res;
-        int ret = 0;
 
-        mcpdm = kzalloc(sizeof(struct omap_mcpdm), GFP_KERNEL);
+        mcpdm = devm_kzalloc(&pdev->dev, sizeof(struct omap_mcpdm), GFP_KERNEL);
         if (!mcpdm)
                 return -ENOMEM;
 
@@ -455,56 +445,54 @@ static __devinit int asoc_mcpdm_probe(struct platform_device *pdev)
 
         mutex_init(&mcpdm->mutex);
 
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dma");
+        if (res == NULL)
+                return -ENOMEM;
+
+        omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA;
+        omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA;
+
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "no resource\n");
-                goto err_res;
-        }
+        if (res == NULL)
+                return -ENOMEM;
 
-        if (!request_mem_region(res->start, resource_size(res), "McPDM")) {
-                ret = -EBUSY;
-                goto err_res;
-        }
+        res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link");
+        if (!res)
+                return -ENODEV;
 
-        mcpdm->io_base = ioremap(res->start, resource_size(res));
-        if (!mcpdm->io_base) {
-                ret = -ENOMEM;
-                goto err_iomap;
-        }
+        omap_mcpdm_dai_dma_params[0].dma_req = res->start;
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "up_link");
+        if (!res)
+                return -ENODEV;
+
+        omap_mcpdm_dai_dma_params[1].dma_req = res->start;
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
+        if (res == NULL)
+                return -ENOMEM;
+
+        if (!devm_request_mem_region(&pdev->dev, res->start,
+                                     resource_size(res), "McPDM"))
+                return -EBUSY;
+
+        mcpdm->io_base = devm_ioremap(&pdev->dev, res->start,
+                                      resource_size(res));
+        if (!mcpdm->io_base)
+                return -ENOMEM;
 
         mcpdm->irq = platform_get_irq(pdev, 0);
-        if (mcpdm->irq < 0) {
-                ret = mcpdm->irq;
-                goto err_irq;
-        }
+        if (mcpdm->irq < 0)
+                return mcpdm->irq;
 
         mcpdm->dev = &pdev->dev;
 
-        ret = snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai);
-        if (!ret)
-                return 0;
-
-err_irq:
-        iounmap(mcpdm->io_base);
-err_iomap:
-        release_mem_region(res->start, resource_size(res));
-err_res:
-        kfree(mcpdm);
-        return ret;
+        return snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai);
 }
 
 static int __devexit asoc_mcpdm_remove(struct platform_device *pdev)
 {
-        struct omap_mcpdm *mcpdm = platform_get_drvdata(pdev);
-        struct resource *res;
-
         snd_soc_unregister_dai(&pdev->dev);
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        iounmap(mcpdm->io_base);
-        release_mem_region(res->start, resource_size(res));
-
-        kfree(mcpdm);
         return 0;
 }
 
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index f0feb06615f8..a2636f6b8362 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -25,12 +25,13 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/omap-dma.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
+#include <sound/dmaengine_pcm.h>
 #include <sound/soc.h>
 
-#include <plat/dma.h>
 #include "omap-pcm.h"
 
 static const struct snd_pcm_hardware omap_pcm_hardware = {
@@ -49,61 +50,34 @@ static const struct snd_pcm_hardware omap_pcm_hardware = {
         .buffer_bytes_max       = 128 * 1024,
 };
 
-struct omap_runtime_data {
-        spinlock_t                      lock;
-        struct omap_pcm_dma_data        *dma_data;
-        int                             dma_ch;
-        int                             period_index;
-};
-
-static void omap_pcm_dma_irq(int ch, u16 stat, void *data)
+static int omap_pcm_get_dma_buswidth(int num_bits)
 {
-        struct snd_pcm_substream *substream = data;
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct omap_runtime_data *prtd = runtime->private_data;
-        unsigned long flags;
-
-        if ((cpu_is_omap1510())) {
-                /*
-                 * OMAP1510 doesn't fully support DMA progress counter
-                 * and there is no software emulation implemented yet,
-                 * so have to maintain our own progress counters
-                 * that can be used by omap_pcm_pointer() instead.
-                 */
-                spin_lock_irqsave(&prtd->lock, flags);
-                if ((stat == OMAP_DMA_LAST_IRQ) &&
-                                (prtd->period_index == runtime->periods - 1)) {
-                        /* we are in sync, do nothing */
-                        spin_unlock_irqrestore(&prtd->lock, flags);
-                        return;
-                }
-                if (prtd->period_index >= 0) {
-                        if (stat & OMAP_DMA_BLOCK_IRQ) {
-                                /* end of buffer reached, loop back */
-                                prtd->period_index = 0;
-                        } else if (stat & OMAP_DMA_LAST_IRQ) {
-                                /* update the counter for the last period */
-                                prtd->period_index = runtime->periods - 1;
-                        } else if (++prtd->period_index >= runtime->periods) {
-                                /* end of buffer missed? loop back */
-                                prtd->period_index = 0;
-                        }
-                }
-                spin_unlock_irqrestore(&prtd->lock, flags);
-        }
+        int buswidth;
 
-        snd_pcm_period_elapsed(substream);
+        switch (num_bits) {
+        case 16:
+                buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;
+                break;
+        case 32:
+                buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;
+                break;
+        default:
+                buswidth = -EINVAL;
+                break;
+        }
+        return buswidth;
 }
 
+
 /* this may get called several times by oss emulation */
 static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
                               struct snd_pcm_hw_params *params)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct omap_runtime_data *prtd = runtime->private_data;
         struct omap_pcm_dma_data *dma_data;
-
+        struct dma_slave_config config;
+        struct dma_chan *chan;
         int err = 0;
 
         dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
@@ -116,162 +90,78 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
         snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
         runtime->dma_bytes = params_buffer_bytes(params);
 
-        if (prtd->dma_data)
-                return 0;
-        prtd->dma_data = dma_data;
-        err = omap_request_dma(dma_data->dma_req, dma_data->name,
-                               omap_pcm_dma_irq, substream, &prtd->dma_ch);
-        if (!err) {
-                /*
-                 * Link channel with itself so DMA doesn't need any
-                 * reprogramming while looping the buffer
-                 */
-                omap_dma_link_lch(prtd->dma_ch, prtd->dma_ch);
-        }
+        chan = snd_dmaengine_pcm_get_chan(substream);
+        if (!chan)
+                return -EINVAL;
 
-        return err;
-}
+        /* fills in addr_width and direction */
+        err = snd_hwparams_to_dma_slave_config(substream, params, &config);
+        if (err)
+                return err;
 
-static int omap_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct omap_runtime_data *prtd = runtime->private_data;
+        /* Override the *_dma addr_width if requested by the DAI driver */
+        if (dma_data->data_type) {
+                int buswidth = omap_pcm_get_dma_buswidth(dma_data->data_type);
 
-        if (prtd->dma_data == NULL)
-                return 0;
-
-        omap_dma_unlink_lch(prtd->dma_ch, prtd->dma_ch);
-        omap_free_dma(prtd->dma_ch);
-        prtd->dma_data = NULL;
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                        config.dst_addr_width = buswidth;
+                else
+                        config.src_addr_width = buswidth;
+        }
 
-        snd_pcm_set_runtime_buffer(substream, NULL);
+        config.src_addr = dma_data->port_addr;
+        config.dst_addr = dma_data->port_addr;
+        config.src_maxburst = dma_data->packet_size;
+        config.dst_maxburst = dma_data->packet_size;
 
-        return 0;
+        return dmaengine_slave_config(chan, &config);
 }
 
-static int omap_pcm_prepare(struct snd_pcm_substream *substream)
+static int omap_pcm_hw_free(struct snd_pcm_substream *substream)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct omap_runtime_data *prtd = runtime->private_data;
-        struct omap_pcm_dma_data *dma_data = prtd->dma_data;
-        struct omap_dma_channel_params dma_params;
-        int bytes;
-
-        /* return if this is a bufferless transfer e.g.
-         * codec <--> BT codec or GSM modem -- lg FIXME */
-        if (!prtd->dma_data)
-                return 0;
-
-        memset(&dma_params, 0, sizeof(dma_params));
-        dma_params.data_type                    = dma_data->data_type;
-        dma_params.trigger                      = dma_data->dma_req;
-        dma_params.sync_mode                    = dma_data->sync_mode;
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                dma_params.src_amode            = OMAP_DMA_AMODE_POST_INC;
-                dma_params.dst_amode            = OMAP_DMA_AMODE_CONSTANT;
-                dma_params.src_or_dst_synch     = OMAP_DMA_DST_SYNC;
-                dma_params.src_start            = runtime->dma_addr;
-                dma_params.dst_start            = dma_data->port_addr;
-                dma_params.dst_port             = OMAP_DMA_PORT_MPUI;
-                dma_params.dst_fi               = dma_data->packet_size;
-        } else {
-                dma_params.src_amode            = OMAP_DMA_AMODE_CONSTANT;
-                dma_params.dst_amode            = OMAP_DMA_AMODE_POST_INC;
-                dma_params.src_or_dst_synch     = OMAP_DMA_SRC_SYNC;
-                dma_params.src_start            = dma_data->port_addr;
-                dma_params.dst_start            = runtime->dma_addr;
-                dma_params.src_port             = OMAP_DMA_PORT_MPUI;
-                dma_params.src_fi               = dma_data->packet_size;
-        }
-        /*
-         * Set DMA transfer frame size equal to ALSA period size and frame
-         * count as no. of ALSA periods. Then with DMA frame interrupt enabled,
-         * we can transfer the whole ALSA buffer with single DMA transfer but
-         * still can get an interrupt at each period bounary
-         */
-        bytes = snd_pcm_lib_period_bytes(substream);
-        dma_params.elem_count   = bytes >> dma_data->data_type;
-        dma_params.frame_count  = runtime->periods;
-        omap_set_dma_params(prtd->dma_ch, &dma_params);
-
-        if ((cpu_is_omap1510()))
-                omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ |
-                              OMAP_DMA_LAST_IRQ | OMAP_DMA_BLOCK_IRQ);
-        else if (!substream->runtime->no_period_wakeup)
-                omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ);
-        else {
-                /*
-                 * No period wakeup:
-                 * we need to disable BLOCK_IRQ, which is enabled by the omap
-                 * dma core at request dma time.
-                 */
-                omap_disable_dma_irq(prtd->dma_ch, OMAP_DMA_BLOCK_IRQ);
-        }
-
-        if (!(cpu_class_is_omap1())) {
-                omap_set_dma_src_burst_mode(prtd->dma_ch,
-                                                OMAP_DMA_DATA_BURST_16);
-                omap_set_dma_dest_burst_mode(prtd->dma_ch,
-                                                OMAP_DMA_DATA_BURST_16);
-        }
-
+        snd_pcm_set_runtime_buffer(substream, NULL);
         return 0;
 }
 
 static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct omap_runtime_data *prtd = runtime->private_data;
-        struct omap_pcm_dma_data *dma_data = prtd->dma_data;
-        unsigned long flags;
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct omap_pcm_dma_data *dma_data;
         int ret = 0;
 
-        spin_lock_irqsave(&prtd->lock, flags);
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                prtd->period_index = 0;
                 /* Configure McBSP internal buffer usage */
                 if (dma_data->set_threshold)
                         dma_data->set_threshold(substream);
-
-                omap_start_dma(prtd->dma_ch);
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                prtd->period_index = -1;
-                omap_stop_dma(prtd->dma_ch);
                 break;
         default:
                 ret = -EINVAL;
         }
-        spin_unlock_irqrestore(&prtd->lock, flags);
+
+        if (ret == 0)
+                ret = snd_dmaengine_pcm_trigger(substream, cmd);
 
         return ret;
 }
 
 static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct omap_runtime_data *prtd = runtime->private_data;
-        dma_addr_t ptr;
         snd_pcm_uframes_t offset;
 
-        if (cpu_is_omap1510()) {
-                offset = prtd->period_index * runtime->period_size;
-        } else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
-                ptr = omap_get_dma_dst_pos(prtd->dma_ch);
-                offset = bytes_to_frames(runtime, ptr - runtime->dma_addr);
-        } else {
-                ptr = omap_get_dma_src_pos(prtd->dma_ch);
-                offset = bytes_to_frames(runtime, ptr - runtime->dma_addr);
-        }
-
-        if (offset >= runtime->buffer_size)
-                offset = 0;
+        if (cpu_is_omap1510())
+                offset = snd_dmaengine_pcm_pointer_no_residue(substream);
+        else
+                offset = snd_dmaengine_pcm_pointer(substream);
 
         return offset;
 }
@@ -279,7 +169,8 @@ static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)
 static int omap_pcm_open(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
-        struct omap_runtime_data *prtd;
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct omap_pcm_dma_data *dma_data;
         int ret;
 
         snd_soc_set_runtime_hwparams(substream, &omap_pcm_hardware);
@@ -288,25 +179,17 @@ static int omap_pcm_open(struct snd_pcm_substream *substream)
         ret = snd_pcm_hw_constraint_integer(runtime,
                                             SNDRV_PCM_HW_PARAM_PERIODS);
         if (ret < 0)
-                goto out;
+                return ret;
 
-        prtd = kzalloc(sizeof(*prtd), GFP_KERNEL);
-        if (prtd == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        spin_lock_init(&prtd->lock);
-        runtime->private_data = prtd;
-
-out:
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+        ret = snd_dmaengine_pcm_open(substream, omap_dma_filter_fn,
+                                     &dma_data->dma_req);
         return ret;
 }
 
 static int omap_pcm_close(struct snd_pcm_substream *substream)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-
-        kfree(runtime->private_data);
+        snd_dmaengine_pcm_close(substream);
         return 0;
 }
 
@@ -327,7 +210,6 @@ static struct snd_pcm_ops omap_pcm_ops = {
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = omap_pcm_hw_params,
         .hw_free        = omap_pcm_hw_free,
-        .prepare        = omap_pcm_prepare,
         .trigger        = omap_pcm_trigger,
         .pointer        = omap_pcm_pointer,
         .mmap           = omap_pcm_mmap,
diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h
index b92248cbd47a..cabe74c4068b 100644
--- a/sound/soc/omap/omap-pcm.h
+++ b/sound/soc/omap/omap-pcm.h
@@ -32,8 +32,8 @@ struct omap_pcm_dma_data {
         int             dma_req;        /* DMA request line */
         unsigned long   port_addr;      /* transmit/receive register */
         void (*set_threshold)(struct snd_pcm_substream *substream);
-        int             data_type;      /* data type 8,16,32 */
-        int             sync_mode;      /* DMA sync mode */
+        int             data_type;      /* 8, 16, 32 (bits) or 0 to let omap-pcm
+                                         * to decide the sDMA data type */
         int             packet_size;    /* packet size only in PACKET mode */
 };
 
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
new file mode 100644
index 000000000000..3b97b87971f5
--- /dev/null
+++ b/sound/soc/omap/omap-twl4030.c
@@ -0,0 +1,188 @@
+/*
+ * omap-twl4030.c  --  SoC audio for TI SoC based boards with twl4030 codec
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ * All rights reserved.
+ *
+ * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
+ *
+ * This driver replaces the following machine drivers:
+ * omap3beagle (Author: Steve Sakoman <steve@sakoman.com>)
+ * omap3evm (Author: Anuj Aggarwal <anuj.aggarwal@ti.com>)
+ * overo (Author: Steve Sakoman <steve@sakoman.com>)
+ * igep0020 (Author: Enric Balletbo i Serra <eballetbo@iseebcn.com>)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/platform_data/omap-twl4030.h>
+#include <linux/module.h>
+#include <linux/of.h>
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+
+#include "omap-mcbsp.h"
+#include "omap-pcm.h"
+
+static int omap_twl4030_hw_params(struct snd_pcm_substream *substream,
+        struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_card *card = codec->card;
+        unsigned int fmt;
+        int ret;
+
+        switch (params_channels(params)) {
+        case 2: /* Stereo I2S mode */
+                fmt =   SND_SOC_DAIFMT_I2S |
+                        SND_SOC_DAIFMT_NB_NF |
+                        SND_SOC_DAIFMT_CBM_CFM;
+                break;
+        case 4: /* Four channel TDM mode */
+                fmt =   SND_SOC_DAIFMT_DSP_A |
+                        SND_SOC_DAIFMT_IB_NF |
+                        SND_SOC_DAIFMT_CBM_CFM;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* Set codec DAI configuration */
+        ret = snd_soc_dai_set_fmt(codec_dai, fmt);
+        if (ret < 0) {
+                dev_err(card->dev, "can't set codec DAI configuration\n");
+                return ret;
+        }
+
+        /* Set cpu DAI configuration */
+        ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
+        if (ret < 0) {
+                dev_err(card->dev, "can't set cpu DAI configuration\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static struct snd_soc_ops omap_twl4030_ops = {
+        .hw_params = omap_twl4030_hw_params,
+};
+
+/* Digital audio interface glue - connects codec <--> CPU */
+static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
+        {
+                .name = "TWL4030",
+                .stream_name = "TWL4030",
+                .cpu_dai_name = "omap-mcbsp.2",
+                .codec_dai_name = "twl4030-hifi",
+                .platform_name = "omap-pcm-audio",
+                .codec_name = "twl4030-codec",
+                .ops = &omap_twl4030_ops,
+        },
+};
+
+/* Audio machine driver */
+static struct snd_soc_card omap_twl4030_card = {
+        .owner = THIS_MODULE,
+        .dai_link = omap_twl4030_dai_links,
+        .num_links = ARRAY_SIZE(omap_twl4030_dai_links),
+};
+
+static __devinit int omap_twl4030_probe(struct platform_device *pdev)
+{
+        struct omap_tw4030_pdata *pdata = dev_get_platdata(&pdev->dev);
+        struct device_node *node = pdev->dev.of_node;
+        struct snd_soc_card *card = &omap_twl4030_card;
+        int ret = 0;
+
+        card->dev = &pdev->dev;
+
+        if (node) {
+                struct device_node *dai_node;
+
+                if (snd_soc_of_parse_card_name(card, "ti,model")) {
+                        dev_err(&pdev->dev, "Card name is not provided\n");
+                        return -ENODEV;
+                }
+
+                dai_node = of_parse_phandle(node, "ti,mcbsp", 0);
+                if (!dai_node) {
+                        dev_err(&pdev->dev, "McBSP node is not provided\n");
+                        return -EINVAL;
+                }
+                omap_twl4030_dai_links[0].cpu_dai_name  = NULL;
+                omap_twl4030_dai_links[0].cpu_of_node = dai_node;
+
+        } else if (pdata) {
+                if (pdata->card_name) {
+                        card->name = pdata->card_name;
+                } else {
+                        dev_err(&pdev->dev, "Card name is not provided\n");
+                        return -ENODEV;
+                }
+        } else {
+                dev_err(&pdev->dev, "Missing pdata\n");
+                return -ENODEV;
+        }
+
+        ret = snd_soc_register_card(card);
+        if (ret) {
+                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
+                        ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int __devexit omap_twl4030_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
+
+        return 0;
+}
+
+static const struct of_device_id omap_twl4030_of_match[] = {
+        {.compatible = "ti,omap-twl4030", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, omap_twl4030_of_match);
+
+static struct platform_driver omap_twl4030_driver = {
+        .driver = {
+                .name = "omap-twl4030",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+                .of_match_table = omap_twl4030_of_match,
+        },
+        .probe = omap_twl4030_probe,
+        .remove = __devexit_p(omap_twl4030_remove),
+};
+
+module_platform_driver(omap_twl4030_driver);
+
+MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
+MODULE_DESCRIPTION("ALSA SoC for TI SoC based boards with twl4030 codec");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:omap-twl4030");
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
deleted file mode 100644
index 2830dfd05661..000000000000
--- a/sound/soc/omap/omap3beagle.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * omap3beagle.c  --  SoC audio for OMAP3 Beagle
- *
- * Author: Steve Sakoman <steve@sakoman.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <linux/clk.h>
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-
-#include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
-
-#include "omap-mcbsp.h"
-#include "omap-pcm.h"
-
-static int omap3beagle_hw_params(struct snd_pcm_substream *substream,
-        struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        unsigned int fmt;
-        int ret;
-
-        switch (params_channels(params)) {
-        case 2: /* Stereo I2S mode */
-                fmt =   SND_SOC_DAIFMT_I2S |
-                        SND_SOC_DAIFMT_NB_NF |
-                        SND_SOC_DAIFMT_CBM_CFM;
-                break;
-        case 4: /* Four channel TDM mode */
-                fmt =   SND_SOC_DAIFMT_DSP_A |
-                        SND_SOC_DAIFMT_IB_NF |
-                        SND_SOC_DAIFMT_CBM_CFM;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        /* Set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai, fmt);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set codec DAI configuration\n");
-                return ret;
-        }
-
-        /* Set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set cpu DAI configuration\n");
-                return ret;
-        }
-
-        /* Set the codec system clock for DAC and ADC */
-        ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
-                                     SND_SOC_CLOCK_IN);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set codec system clock\n");
-                return ret;
-        }
-
-        return 0;
-}
-
-static struct snd_soc_ops omap3beagle_ops = {
-        .hw_params = omap3beagle_hw_params,
-};
-
-/* Digital audio interface glue - connects codec <--> CPU */
-static struct snd_soc_dai_link omap3beagle_dai = {
-        .name = "TWL4030",
-        .stream_name = "TWL4030",
-        .cpu_dai_name = "omap-mcbsp.2",
-        .platform_name = "omap-pcm-audio",
-        .codec_dai_name = "twl4030-hifi",
-        .codec_name = "twl4030-codec",
-        .ops = &omap3beagle_ops,
-};
-
-/* Audio machine driver */
-static struct snd_soc_card snd_soc_omap3beagle = {
-        .name = "omap3beagle",
-        .owner = THIS_MODULE,
-        .dai_link = &omap3beagle_dai,
-        .num_links = 1,
-};
-
-static struct platform_device *omap3beagle_snd_device;
-
-static int __init omap3beagle_soc_init(void)
-{
-        int ret;
-
-        if (!(machine_is_omap3_beagle() || machine_is_devkit8000()))
-                return -ENODEV;
-        pr_info("OMAP3 Beagle/Devkit8000 SoC init\n");
-
-        omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!omap3beagle_snd_device) {
-                printk(KERN_ERR "Platform device allocation failed\n");
-                return -ENOMEM;
-        }
-
-        platform_set_drvdata(omap3beagle_snd_device, &snd_soc_omap3beagle);
-
-        ret = platform_device_add(omap3beagle_snd_device);
-        if (ret)
-                goto err1;
-
-        return 0;
-
-err1:
-        printk(KERN_ERR "Unable to add platform device\n");
-        platform_device_put(omap3beagle_snd_device);
-
-        return ret;
-}
-
-static void __exit omap3beagle_soc_exit(void)
-{
-        platform_device_unregister(omap3beagle_snd_device);
-}
-
-module_init(omap3beagle_soc_init);
-module_exit(omap3beagle_soc_exit);
-
-MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>");
-MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle");
-MODULE_LICENSE("GPL");
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c
deleted file mode 100644
index 3d468c9179d7..000000000000
--- a/sound/soc/omap/omap3evm.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * omap3evm.c  -- ALSA SoC support for OMAP3 EVM
- *
- * Author: Anuj Aggarwal <anuj.aggarwal@ti.com>
- *
- * Based on sound/soc/omap/beagle.c by Steve Sakoman
- *
- * Copyright (C) 2008 Texas Instruments, Incorporated
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
- * whether express or implied; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#include <linux/clk.h>
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-
-#include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
-
-#include "omap-mcbsp.h"
-#include "omap-pcm.h"
-
-static int omap3evm_hw_params(struct snd_pcm_substream *substream,
-        struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        int ret;
-
-        /* Set the codec system clock for DAC and ADC */
-        ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
-                                     SND_SOC_CLOCK_IN);
-        if (ret < 0) {
-                printk(KERN_ERR "Can't set codec system clock\n");
-                return ret;
-        }
-
-        return 0;
-}
-
-static struct snd_soc_ops omap3evm_ops = {
-        .hw_params = omap3evm_hw_params,
-};
-
-/* Digital audio interface glue - connects codec <--> CPU */
-static struct snd_soc_dai_link omap3evm_dai = {
-        .name           = "TWL4030",
-        .stream_name    = "TWL4030",
-        .cpu_dai_name = "omap-mcbsp.2",
-        .codec_dai_name = "twl4030-hifi",
-        .platform_name = "omap-pcm-audio",
-        .codec_name = "twl4030-codec",
-        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                   SND_SOC_DAIFMT_CBM_CFM,
-        .ops            = &omap3evm_ops,
-};
-
-/* Audio machine driver */
-static struct snd_soc_card snd_soc_omap3evm = {
-        .name = "omap3evm",
-        .owner = THIS_MODULE,
-        .dai_link = &omap3evm_dai,
-        .num_links = 1,
-};
-
-static struct platform_device *omap3evm_snd_device;
-
-static int __init omap3evm_soc_init(void)
-{
-        int ret;
-
-        if (!machine_is_omap3evm())
-                return -ENODEV;
-        pr_info("OMAP3 EVM SoC init\n");
-
-        omap3evm_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!omap3evm_snd_device) {
-                printk(KERN_ERR "Platform device allocation failed\n");
-                return -ENOMEM;
-        }
-
-        platform_set_drvdata(omap3evm_snd_device, &snd_soc_omap3evm);
-        ret = platform_device_add(omap3evm_snd_device);
-        if (ret)
-                goto err1;
-
-        return 0;
-
-err1:
-        printk(KERN_ERR "Unable to add platform device\n");
-        platform_device_put(omap3evm_snd_device);
-
-        return ret;
-}
-
-static void __exit omap3evm_soc_exit(void)
-{
-        platform_device_unregister(omap3evm_snd_device);
-}
-
-module_init(omap3evm_soc_init);
-module_exit(omap3evm_soc_exit);
-
-MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>");
-MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM");
-MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c
deleted file mode 100644
index 6ac3e0c3c282..000000000000
--- a/sound/soc/omap/overo.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * overo.c  --  SoC audio for Gumstix Overo
- *
- * Author: Steve Sakoman <steve@sakoman.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <linux/clk.h>
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-
-#include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <plat/mcbsp.h>
-
-#include "omap-mcbsp.h"
-#include "omap-pcm.h"
-
-static int overo_hw_params(struct snd_pcm_substream *substream,
-        struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        int ret;
-
-        /* Set the codec system clock for DAC and ADC */
-        ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
-                                            SND_SOC_CLOCK_IN);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set codec system clock\n");
-                return ret;
-        }
-
-        return 0;
-}
-
-static struct snd_soc_ops overo_ops = {
-        .hw_params = overo_hw_params,
-};
-
-/* Digital audio interface glue - connects codec <--> CPU */
-static struct snd_soc_dai_link overo_dai = {
-        .name = "TWL4030",
-        .stream_name = "TWL4030",
-        .cpu_dai_name = "omap-mcbsp.2",
-        .codec_dai_name = "twl4030-hifi",
-        .platform_name = "omap-pcm-audio",
-        .codec_name = "twl4030-codec",
-        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                   SND_SOC_DAIFMT_CBM_CFM,
-        .ops = &overo_ops,
-};
-
-/* Audio machine driver */
-static struct snd_soc_card snd_soc_card_overo = {
-        .name = "overo",
-        .owner = THIS_MODULE,
-        .dai_link = &overo_dai,
-        .num_links = 1,
-};
-
-static struct platform_device *overo_snd_device;
-
-static int __init overo_soc_init(void)
-{
-        int ret;
-
-        if (!(machine_is_overo() || machine_is_cm_t35())) {
-                pr_debug("Incomatible machine!\n");
-                return -ENODEV;
-        }
-        printk(KERN_INFO "overo SoC init\n");
-
-        overo_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!overo_snd_device) {
-                printk(KERN_ERR "Platform device allocation failed\n");
-                return -ENOMEM;
-        }
-
-        platform_set_drvdata(overo_snd_device, &snd_soc_card_overo);
-
-        ret = platform_device_add(overo_snd_device);
-        if (ret)
-                goto err1;
-
-        return 0;
-
-err1:
-        printk(KERN_ERR "Unable to add platform device\n");
-        platform_device_put(overo_snd_device);
-
-        return ret;
-}
-module_init(overo_soc_init);
-
-static void __exit overo_soc_exit(void)
-{
-        platform_device_unregister(overo_snd_device);
-}
-module_exit(overo_soc_exit);
-
-MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>");
-MODULE_DESCRIPTION("ALSA SoC overo");
-MODULE_LICENSE("GPL");
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 920e0d9e03db..df97a4196cd3 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -191,9 +191,6 @@ static int __init zoom2_soc_init(void)
         BUG_ON(gpio_request(ZOOM2_HEADSET_MUX_GPIO, "hs_mux") < 0);
         gpio_direction_output(ZOOM2_HEADSET_MUX_GPIO, 0);
 
-        BUG_ON(gpio_request(ZOOM2_HEADSET_EXTMUTE_GPIO, "ext_mute") < 0);
-        gpio_direction_output(ZOOM2_HEADSET_EXTMUTE_GPIO, 0);
-
         return 0;
 
 err1:
@@ -207,7 +204,6 @@ module_init(zoom2_soc_init);
 static void __exit zoom2_soc_exit(void)
 {
         gpio_free(ZOOM2_HEADSET_MUX_GPIO);
-        gpio_free(ZOOM2_HEADSET_EXTMUTE_GPIO);
 
         platform_device_unregister(zoom2_snd_device);
 }
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index fe3995ce9b38..e7b83179aca2 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -1,6 +1,6 @@
 config SND_SOC_SAMSUNG
         tristate "ASoC support for Samsung"
-        depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_EXYNOS4
+        depends on PLAT_SAMSUNG
         select S3C64XX_DMA if ARCH_S3C64XX
         select S3C2410_DMA if ARCH_S3C24XX
         help
@@ -191,6 +191,7 @@ config SND_SOC_SPEYSIDE
         select SND_SAMSUNG_I2S
         select SND_SOC_WM8996
         select SND_SOC_WM9081
+        select SND_SOC_WM0010
         select SND_SOC_WM1250_EV1
 
 config SND_SOC_TOBERMORY
@@ -199,6 +200,14 @@ config SND_SOC_TOBERMORY
         select SND_SAMSUNG_I2S
         select SND_SOC_WM8962
 
+config SND_SOC_BELLS
+        tristate "Audio support for Wolfson Bells"
+        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+        select SND_SAMSUNG_I2S
+        select SND_SOC_WM5102
+        select SND_SOC_WM5110
+        select SND_SOC_WM9081
+
 config SND_SOC_LOWLAND
         tristate "Audio support for Wolfson Lowland"
         depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 9d03beb40c86..709f6059ad67 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -42,6 +42,7 @@ snd-soc-speyside-objs := speyside.o
 snd-soc-tobermory-objs := tobermory.o
 snd-soc-lowland-objs := lowland.o
 snd-soc-littlemill-objs := littlemill.o
+snd-soc-bells-objs := bells.o
 
 obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
@@ -65,3 +66,4 @@ obj-$(CONFIG_SND_SOC_SPEYSIDE) += snd-soc-speyside.o
 obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o
 obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o
 obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
+obj-$(CONFIG_SND_SOC_BELLS) += snd-soc-bells.o
diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
new file mode 100644
index 000000000000..5dc10dfc0d42
--- /dev/null
+++ b/sound/soc/samsung/bells.c
@@ -0,0 +1,346 @@
+/*
+ * Bells audio support
+ *
+ * Copyright 2012 Wolfson Microelectronics
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/jack.h>
+#include <linux/gpio.h>
+#include <linux/module.h>
+
+#include "../codecs/wm5102.h"
+#include "../codecs/wm9081.h"
+
+/*
+ * 44.1kHz based clocks for the SYSCLK domain, use a very high clock
+ * to allow all the DSP functionality to be enabled if desired.
+ */
+#define SYSCLK_RATE (44100 * 1024)
+
+/* 48kHz based clocks for the ASYNC domain */
+#define ASYNCCLK_RATE (48000 * 512)
+
+/* BCLK2 is fixed at this currently */
+#define BCLK2_RATE (64 * 8000)
+
+/*
+ * Expect a 24.576MHz crystal if one is fitted (the driver will function
+ * if this is not fitted).
+ */
+#define MCLK_RATE 24576000
+
+#define WM9081_AUDIO_RATE 44100
+#define WM9081_MCLK_RATE  (WM9081_AUDIO_RATE * 256)
+
+static int bells_set_bias_level(struct snd_soc_card *card,
+                                struct snd_soc_dapm_context *dapm,
+                                enum snd_soc_bias_level level)
+{
+        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
+        struct snd_soc_codec *codec = codec_dai->codec;
+        int ret;
+
+        if (dapm->dev != codec_dai->dev)
+                return 0;
+
+        switch (level) {
+        case SND_SOC_BIAS_PREPARE:
+                if (dapm->bias_level == SND_SOC_BIAS_STANDBY) {
+                        ret = snd_soc_codec_set_pll(codec, WM5102_FLL1,
+                                                    ARIZONA_FLL_SRC_MCLK1,
+                                                    MCLK_RATE,
+                                                    SYSCLK_RATE);
+                        if (ret < 0)
+                                pr_err("Failed to start FLL: %d\n", ret);
+
+                        ret = snd_soc_codec_set_pll(codec, WM5102_FLL2,
+                                                    ARIZONA_FLL_SRC_AIF2BCLK,
+                                                    BCLK2_RATE,
+                                                    ASYNCCLK_RATE);
+                        if (ret < 0)
+                                pr_err("Failed to start FLL: %d\n", ret);
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static int bells_set_bias_level_post(struct snd_soc_card *card,
+                                     struct snd_soc_dapm_context *dapm,
+                                     enum snd_soc_bias_level level)
+{
+        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
+        struct snd_soc_codec *codec = codec_dai->codec;
+        int ret;
+
+        if (dapm->dev != codec_dai->dev)
+                return 0;
+
+        switch (level) {
+        case SND_SOC_BIAS_STANDBY:
+                ret = snd_soc_codec_set_pll(codec, WM5102_FLL1, 0, 0, 0);
+                if (ret < 0) {
+                        pr_err("Failed to stop FLL: %d\n", ret);
+                        return ret;
+                }
+
+                ret = snd_soc_codec_set_pll(codec, WM5102_FLL2, 0, 0, 0);
+                if (ret < 0) {
+                        pr_err("Failed to stop FLL: %d\n", ret);
+                        return ret;
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        dapm->bias_level = level;
+
+        return 0;
+}
+
+static int bells_late_probe(struct snd_soc_card *card)
+{
+        struct snd_soc_codec *codec = card->rtd[0].codec;
+        struct snd_soc_dai *aif1_dai = card->rtd[0].codec_dai;
+        struct snd_soc_dai *aif2_dai = card->rtd[1].cpu_dai;
+        struct snd_soc_dai *aif3_dai = card->rtd[2].cpu_dai;
+        struct snd_soc_dai *wm9081_dai = card->rtd[2].codec_dai;
+        int ret;
+
+        ret = snd_soc_dai_set_sysclk(aif1_dai, ARIZONA_CLK_SYSCLK, 0, 0);
+        if (ret != 0) {
+                dev_err(aif1_dai->dev, "Failed to set AIF1 clock: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_dai_set_sysclk(aif2_dai, ARIZONA_CLK_ASYNCCLK, 0, 0);
+        if (ret != 0) {
+                dev_err(aif2_dai->dev, "Failed to set AIF2 clock: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_dai_set_sysclk(aif3_dai, ARIZONA_CLK_SYSCLK, 0, 0);
+        if (ret != 0) {
+                dev_err(aif1_dai->dev, "Failed to set AIF1 clock: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_sysclk(codec, ARIZONA_CLK_SYSCLK,
+                                       ARIZONA_CLK_SRC_FLL1, SYSCLK_RATE,
+                                       SND_SOC_CLOCK_IN);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to set SYSCLK: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_sysclk(codec, ARIZONA_CLK_OPCLK, 0,
+                                       WM9081_MCLK_RATE, SND_SOC_CLOCK_OUT);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to set OPCLK: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_sysclk(codec, ARIZONA_CLK_ASYNCCLK,
+                                       ARIZONA_CLK_SRC_FLL2, ASYNCCLK_RATE,
+                                       SND_SOC_CLOCK_IN);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to set SYSCLK: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_sysclk(wm9081_dai->codec, WM9081_SYSCLK_MCLK,
+                                       0, WM9081_MCLK_RATE, 0);
+        if (ret != 0) {
+                dev_err(wm9081_dai->dev, "Failed to set MCLK: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static const struct snd_soc_pcm_stream baseband_params = {
+        .formats = SNDRV_PCM_FMTBIT_S32_LE,
+        .rate_min = 8000,
+        .rate_max = 8000,
+        .channels_min = 2,
+        .channels_max = 2,
+};
+
+static const struct snd_soc_pcm_stream sub_params = {
+        .formats = SNDRV_PCM_FMTBIT_S32_LE,
+        .rate_min = WM9081_AUDIO_RATE,
+        .rate_max = WM9081_AUDIO_RATE,
+        .channels_min = 2,
+        .channels_max = 2,
+};
+
+static struct snd_soc_dai_link bells_dai_wm5102[] = {
+        {
+                .name = "CPU",
+                .stream_name = "CPU",
+                .cpu_dai_name = "samsung-i2s.0",
+                .codec_dai_name = "wm5102-aif1",
+                .platform_name = "samsung-audio",
+                .codec_name = "wm5102-codec",
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                                | SND_SOC_DAIFMT_CBM_CFM,
+        },
+        {
+                .name = "Baseband",
+                .stream_name = "Baseband",
+                .cpu_dai_name = "wm5102-aif2",
+                .codec_dai_name = "wm1250-ev1",
+                .codec_name = "wm1250-ev1.1-0027",
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                                | SND_SOC_DAIFMT_CBM_CFM,
+                .ignore_suspend = 1,
+                .params = &baseband_params,
+        },
+        {
+                .name = "Sub",
+                .stream_name = "Sub",
+                .cpu_dai_name = "wm5102-aif3",
+                .codec_dai_name = "wm9081-hifi",
+                .codec_name = "wm9081.1-006c",
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                                | SND_SOC_DAIFMT_CBS_CFS,
+                .ignore_suspend = 1,
+                .params = &sub_params,
+        },
+};
+
+static struct snd_soc_dai_link bells_dai_wm5110[] = {
+        {
+                .name = "CPU",
+                .stream_name = "CPU",
+                .cpu_dai_name = "samsung-i2s.0",
+                .codec_dai_name = "wm5110-aif1",
+                .platform_name = "samsung-audio",
+                .codec_name = "wm5110-codec",
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                                | SND_SOC_DAIFMT_CBM_CFM,
+        },
+        {
+                .name = "Baseband",
+                .stream_name = "Baseband",
+                .cpu_dai_name = "wm5110-aif2",
+                .codec_dai_name = "wm1250-ev1",
+                .codec_name = "wm1250-ev1.1-0027",
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                                | SND_SOC_DAIFMT_CBM_CFM,
+                .ignore_suspend = 1,
+                .params = &baseband_params,
+        },
+        {
+                .name = "Sub",
+                .stream_name = "Sub",
+                .cpu_dai_name = "wm5102-aif3",
+                .codec_dai_name = "wm9081-hifi",
+                .codec_name = "wm9081.1-006c",
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                                | SND_SOC_DAIFMT_CBS_CFS,
+                .ignore_suspend = 1,
+                .params = &sub_params,
+        },
+};
+
+static struct snd_soc_codec_conf bells_codec_conf[] = {
+        {
+                .dev_name = "wm9081.1-006c",
+                .name_prefix = "Sub",
+        },
+};
+
+static struct snd_soc_dapm_route bells_routes[] = {
+        { "Sub CLK_SYS", NULL, "OPCLK" },
+};
+
+static struct snd_soc_card bells_cards[] = {
+        {
+                .name = "Bells WM5102",
+                .owner = THIS_MODULE,
+                .dai_link = bells_dai_wm5102,
+                .num_links = ARRAY_SIZE(bells_dai_wm5102),
+                .codec_conf = bells_codec_conf,
+                .num_configs = ARRAY_SIZE(bells_codec_conf),
+
+                .late_probe = bells_late_probe,
+
+                .dapm_routes = bells_routes,
+                .num_dapm_routes = ARRAY_SIZE(bells_routes),
+
+                .set_bias_level = bells_set_bias_level,
+                .set_bias_level_post = bells_set_bias_level_post,
+        },
+        {
+                .name = "Bells WM5110",
+                .owner = THIS_MODULE,
+                .dai_link = bells_dai_wm5110,
+                .num_links = ARRAY_SIZE(bells_dai_wm5110),
+                .codec_conf = bells_codec_conf,
+                .num_configs = ARRAY_SIZE(bells_codec_conf),
+
+                .late_probe = bells_late_probe,
+
+                .dapm_routes = bells_routes,
+                .num_dapm_routes = ARRAY_SIZE(bells_routes),
+
+                .set_bias_level = bells_set_bias_level,
+                .set_bias_level_post = bells_set_bias_level_post,
+        },
+};
+
+
+static __devinit int bells_probe(struct platform_device *pdev)
+{
+        int ret;
+
+        bells_cards[pdev->id].dev = &pdev->dev;
+
+        ret = snd_soc_register_card(&bells_cards[pdev->id]);
+        if (ret) {
+                dev_err(&pdev->dev,
+                        "snd_soc_register_card(%s) failed: %d\n",
+                        bells_cards[pdev->id].name, ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int __devexit bells_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_card(&bells_cards[pdev->id]);
+
+        return 0;
+}
+
+static struct platform_driver bells_driver = {
+        .driver = {
+                .name = "bells",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+        },
+        .probe = bells_probe,
+        .remove = __devexit_p(bells_remove),
+};
+
+module_platform_driver(bells_driver);
+
+MODULE_DESCRIPTION("Bells audio support");
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bells");
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index a4a9fc7e8c76..c7e1c28528a4 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -25,7 +25,7 @@ static int speyside_set_bias_level(struct snd_soc_card *card,
                                    struct snd_soc_dapm_context *dapm,
                                    enum snd_soc_bias_level level)
 {
-        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
+        struct snd_soc_dai *codec_dai = card->rtd[1].codec_dai;
         int ret;
 
         if (dapm->dev != codec_dai->dev)
@@ -57,7 +57,7 @@ static int speyside_set_bias_level_post(struct snd_soc_card *card,
                                         struct snd_soc_dapm_context *dapm,
                                         enum snd_soc_bias_level level)
 {
-        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
+        struct snd_soc_dai *codec_dai = card->rtd[1].codec_dai;
         int ret;
 
         if (dapm->dev != codec_dai->dev)
@@ -126,6 +126,18 @@ static void speyside_set_polarity(struct snd_soc_codec *codec,
         snd_soc_dapm_sync(&codec->dapm);
 }
 
+static int speyside_wm0010_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_dai *dai = rtd->codec_dai;
+        int ret;
+
+        ret = snd_soc_dai_set_sysclk(dai, 0, MCLK_AUDIO_RATE, 0);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
 static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_dai *dai = rtd->codec_dai;
@@ -172,17 +184,37 @@ static int speyside_late_probe(struct snd_soc_card *card)
         return 0;
 }
 
+static const struct snd_soc_pcm_stream dsp_codec_params = {
+        .formats = SNDRV_PCM_FMTBIT_S32_LE,
+        .rate_min = 48000,
+        .rate_max = 48000,
+        .channels_min = 2,
+        .channels_max = 2,
+};
+
 static struct snd_soc_dai_link speyside_dai[] = {
         {
-                .name = "CPU",
-                .stream_name = "CPU",
+                .name = "CPU-DSP",
+                .stream_name = "CPU-DSP",
                 .cpu_dai_name = "samsung-i2s.0",
-                .codec_dai_name = "wm8996-aif1",
+                .codec_dai_name = "wm0010-sdi1",
                 .platform_name = "samsung-audio",
+                .codec_name = "spi0.0",
+                .init = speyside_wm0010_init,
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                                | SND_SOC_DAIFMT_CBM_CFM,
+        },
+        {
+                .name = "DSP-CODEC",
+                .stream_name = "DSP-CODEC",
+                .cpu_dai_name = "wm0010-sdi2",
+                .codec_dai_name = "wm8996-aif1",
                 .codec_name = "wm8996.1-001a",
                 .init = speyside_wm8996_init,
                 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                 | SND_SOC_DAIFMT_CBM_CFM,
+                .params = &dsp_codec_params,
+                .ignore_suspend = 1,
         },
         {
                 .name = "Baseband",
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 0540408a9fa9..5328ae5539f1 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1655,22 +1655,20 @@ static int fsi_probe(struct platform_device *pdev)
         irq = platform_get_irq(pdev, 0);
         if (!res || (int)irq <= 0) {
                 dev_err(&pdev->dev, "Not enough FSI platform resources.\n");
-                ret = -ENODEV;
-                goto exit;
+                return -ENODEV;
         }
 
-        master = kzalloc(sizeof(*master), GFP_KERNEL);
+        master = devm_kzalloc(&pdev->dev, sizeof(*master), GFP_KERNEL);
         if (!master) {
                 dev_err(&pdev->dev, "Could not allocate master\n");
-                ret = -ENOMEM;
-                goto exit;
+                return -ENOMEM;
         }
 
-        master->base = ioremap_nocache(res->start, resource_size(res));
+        master->base = devm_ioremap_nocache(&pdev->dev,
+                                            res->start, resource_size(res));
         if (!master->base) {
-                ret = -ENXIO;
                 dev_err(&pdev->dev, "Unable to ioremap FSI registers.\n");
-                goto exit_kfree;
+                return -ENXIO;
         }
 
         /* master setting */
@@ -1686,7 +1684,7 @@ static int fsi_probe(struct platform_device *pdev)
         ret = fsi_stream_probe(&master->fsia, &pdev->dev);
         if (ret < 0) {
                 dev_err(&pdev->dev, "FSIA stream probe failed\n");
-                goto exit_iounmap;
+                return ret;
         }
 
         /* FSI B setting */
@@ -1730,16 +1728,11 @@ exit_snd_soc:
 exit_free_irq:
         free_irq(irq, master);
 exit_fsib:
+        pm_runtime_disable(&pdev->dev);
         fsi_stream_remove(&master->fsib);
 exit_fsia:
         fsi_stream_remove(&master->fsia);
-exit_iounmap:
-        iounmap(master->base);
-        pm_runtime_disable(&pdev->dev);
-exit_kfree:
-        kfree(master);
-        master = NULL;
-exit:
+
         return ret;
 }
 
@@ -1758,9 +1751,6 @@ static int fsi_remove(struct platform_device *pdev)
         fsi_stream_remove(&master->fsia);
         fsi_stream_remove(&master->fsib);
 
-        iounmap(master->base);
-        kfree(master);
-
         return 0;
 }
 
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
new file mode 100644
index 000000000000..967d0e173e1b
--- /dev/null
+++ b/sound/soc/soc-compress.c
@@ -0,0 +1,294 @@
+/*
+ * soc-compress.c  --  ALSA SoC Compress
+ *
+ * Copyright (C) 2012 Intel Corp.
+ *
+ * Authors: Namarta Kohli <namartax.kohli@intel.com>
+ *          Ramesh Babu K V <ramesh.babu@linux.intel.com>
+ *          Vinod Koul <vinod.koul@linux.intel.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <sound/core.h>
+#include <sound/compress_params.h>
+#include <sound/compress_driver.h>
+#include <sound/soc.h>
+#include <sound/initval.h>
+
+static int soc_compr_open(struct snd_compr_stream *cstream)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->open) {
+                ret = platform->driver->compr_ops->open(cstream);
+                if (ret < 0) {
+                        pr_err("compress asoc: can't open platform %s\n", platform->name);
+                        goto out;
+                }
+        }
+
+        if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->startup) {
+                ret = rtd->dai_link->compr_ops->startup(cstream);
+                if (ret < 0) {
+                        pr_err("compress asoc: %s startup failed\n", rtd->dai_link->name);
+                        goto machine_err;
+                }
+        }
+
+        if (cstream->direction == SND_COMPRESS_PLAYBACK) {
+                cpu_dai->playback_active++;
+                codec_dai->playback_active++;
+        } else {
+                cpu_dai->capture_active++;
+                codec_dai->capture_active++;
+        }
+
+        cpu_dai->active++;
+        codec_dai->active++;
+        rtd->codec->active++;
+
+        return 0;
+
+machine_err:
+        if (platform->driver->compr_ops && platform->driver->compr_ops->free)
+                platform->driver->compr_ops->free(cstream);
+out:
+        return ret;
+}
+
+static int soc_compr_free(struct snd_compr_stream *cstream)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_codec *codec = rtd->codec;
+
+        if (cstream->direction == SND_COMPRESS_PLAYBACK) {
+                cpu_dai->playback_active--;
+                codec_dai->playback_active--;
+        } else {
+                cpu_dai->capture_active--;
+                codec_dai->capture_active--;
+        }
+
+        snd_soc_dai_digital_mute(codec_dai, 1);
+
+        cpu_dai->active--;
+        codec_dai->active--;
+        codec->active--;
+
+        if (!cpu_dai->active)
+                cpu_dai->rate = 0;
+
+        if (!codec_dai->active)
+                codec_dai->rate = 0;
+
+
+        if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown)
+                rtd->dai_link->compr_ops->shutdown(cstream);
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->free)
+                platform->driver->compr_ops->free(cstream);
+        cpu_dai->runtime = NULL;
+
+        if (cstream->direction == SND_COMPRESS_PLAYBACK) {
+                if (!rtd->pmdown_time || codec->ignore_pmdown_time ||
+                    rtd->dai_link->ignore_pmdown_time) {
+                        snd_soc_dapm_stream_event(rtd,
+                                        SNDRV_PCM_STREAM_PLAYBACK,
+                                        SND_SOC_DAPM_STREAM_STOP);
+                } else
+                        codec_dai->pop_wait = 1;
+                        schedule_delayed_work(&rtd->delayed_work,
+                                msecs_to_jiffies(rtd->pmdown_time));
+        } else {
+                /* capture streams can be powered down now */
+                snd_soc_dapm_stream_event(rtd,
+                        SNDRV_PCM_STREAM_CAPTURE,
+                        SND_SOC_DAPM_STREAM_STOP);
+        }
+
+        return 0;
+}
+
+static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
+{
+
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->trigger) {
+                ret = platform->driver->compr_ops->trigger(cstream, cmd);
+                if (ret < 0)
+                        return ret;
+        }
+
+        if (cmd == SNDRV_PCM_TRIGGER_START)
+                snd_soc_dai_digital_mute(codec_dai, 0);
+        else if (cmd == SNDRV_PCM_TRIGGER_STOP)
+                snd_soc_dai_digital_mute(codec_dai, 1);
+
+        return ret;
+}
+
+static int soc_compr_set_params(struct snd_compr_stream *cstream,
+                                        struct snd_compr_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        /* first we call set_params for the platform driver
+         * this should configure the soc side
+         * if the machine has compressed ops then we call that as well
+         * expectation is that platform and machine will configure everything
+         * for this compress path, like configuring pcm port for codec
+         */
+        if (platform->driver->compr_ops && platform->driver->compr_ops->set_params) {
+                ret = platform->driver->compr_ops->set_params(cstream, params);
+                if (ret < 0)
+                        return ret;
+        }
+
+        if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->set_params) {
+                ret = rtd->dai_link->compr_ops->set_params(cstream);
+                if (ret < 0)
+                        return ret;
+        }
+
+        snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
+                                SND_SOC_DAPM_STREAM_START);
+
+        return ret;
+}
+
+static int soc_compr_get_params(struct snd_compr_stream *cstream,
+                                        struct snd_codec *params)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->get_params)
+                ret = platform->driver->compr_ops->get_params(cstream, params);
+
+        return ret;
+}
+
+static int soc_compr_get_caps(struct snd_compr_stream *cstream,
+                                struct snd_compr_caps *caps)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->get_caps)
+                ret = platform->driver->compr_ops->get_caps(cstream, caps);
+
+        return ret;
+}
+
+static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream,
+                                struct snd_compr_codec_caps *codec)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->get_codec_caps)
+                ret = platform->driver->compr_ops->get_codec_caps(cstream, codec);
+
+        return ret;
+}
+
+static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+        int ret = 0;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->ack)
+                ret = platform->driver->compr_ops->ack(cstream, bytes);
+
+        return ret;
+}
+
+static int soc_compr_pointer(struct snd_compr_stream *cstream,
+                        struct snd_compr_tstamp *tstamp)
+{
+        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+        struct snd_soc_platform *platform = rtd->platform;
+
+        if (platform->driver->compr_ops && platform->driver->compr_ops->pointer)
+                 platform->driver->compr_ops->pointer(cstream, tstamp);
+
+        return 0;
+}
+
+/* ASoC Compress operations */
+static struct snd_compr_ops soc_compr_ops = {
+        .open           = soc_compr_open,
+        .free           = soc_compr_free,
+        .set_params     = soc_compr_set_params,
+        .get_params     = soc_compr_get_params,
+        .trigger        = soc_compr_trigger,
+        .pointer        = soc_compr_pointer,
+        .ack            = soc_compr_ack,
+        .get_caps       = soc_compr_get_caps,
+        .get_codec_caps = soc_compr_get_codec_caps
+};
+
+/* create a new compress */
+int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
+{
+        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_compr *compr;
+        char new_name[64];
+        int ret = 0, direction = 0;
+
+        /* check client and interface hw capabilities */
+        snprintf(new_name, sizeof(new_name), "%s %s-%d",
+                        rtd->dai_link->stream_name, codec_dai->name, num);
+        direction = SND_COMPRESS_PLAYBACK;
+        compr = kzalloc(sizeof(*compr), GFP_KERNEL);
+        if (compr == NULL) {
+                snd_printk(KERN_ERR "Cannot allocate compr\n");
+                return -ENOMEM;
+        }
+
+        compr->ops = &soc_compr_ops;
+        mutex_init(&compr->lock);
+        ret = snd_compress_new(rtd->card->snd_card, num, direction, compr);
+        if (ret < 0) {
+                pr_err("compress asoc: can't create compress for codec %s\n",
+                        codec->name);
+                kfree(compr);
+                return ret;
+        }
+
+        rtd->compr = compr;
+        compr->private_data = rtd;
+
+        printk(KERN_INFO "compress asoc: %s <-> %s mapping ok\n", codec_dai->name,
+                cpu_dai->name);
+        return ret;
+}
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index c501af6d8dbe..9a6daf997319 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -609,6 +609,10 @@ int snd_soc_suspend(struct device *dev)
                                           SND_SOC_DAPM_STREAM_SUSPEND);
         }
 
+        /* Recheck all analogue paths too */
+        dapm_mark_io_dirty(&card->dapm);
+        snd_soc_dapm_sync(&card->dapm);
+
         /* suspend all CODECs */
         list_for_each_entry(codec, &card->codec_dev_list, card_list) {
                 /* If there are paths active then the CODEC will be held with
@@ -631,6 +635,8 @@ int snd_soc_suspend(struct device *dev)
                                 codec->driver->suspend(codec);
                                 codec->suspended = 1;
                                 codec->cache_sync = 1;
+                                if (codec->using_regmap)
+                                        regcache_mark_dirty(codec->control_data);
                                 break;
                         default:
                                 dev_dbg(codec->dev, "CODEC is on over suspend\n");
@@ -756,6 +762,10 @@ static void soc_resume_deferred(struct work_struct *work)
 
         /* userspace can access us now we are back as we were before */
         snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D0);
+
+        /* Recheck all analogue paths too */
+        dapm_mark_io_dirty(&card->dapm);
+        snd_soc_dapm_sync(&card->dapm);
 }
 
 /* powers up audio subsystem after a suspend */
@@ -1388,37 +1398,48 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
         if (ret < 0)
                 pr_warn("asoc: failed to add pmdown_time sysfs:%d\n", ret);
 
-        if (!dai_link->params) {
-                /* create the pcm */
-                ret = soc_new_pcm(rtd, num);
+        if (cpu_dai->driver->compress_dai) {
+                /*create compress_device"*/
+                ret = soc_new_compress(rtd, num);
                 if (ret < 0) {
-                        pr_err("asoc: can't create pcm %s :%d\n",
-                               dai_link->stream_name, ret);
+                        pr_err("asoc: can't create compress %s\n",
+                                         dai_link->stream_name);
                         return ret;
                 }
         } else {
-                /* link the DAI widgets */
-                play_w = codec_dai->playback_widget;
-                capture_w = cpu_dai->capture_widget;
-                if (play_w && capture_w) {
-                        ret = snd_soc_dapm_new_pcm(card, dai_link->params,
-                                                   capture_w, play_w);
-                        if (ret != 0) {
-                                dev_err(card->dev, "Can't link %s to %s: %d\n",
-                                        play_w->name, capture_w->name, ret);
+
+                if (!dai_link->params) {
+                        /* create the pcm */
+                        ret = soc_new_pcm(rtd, num);
+                        if (ret < 0) {
+                                pr_err("asoc: can't create pcm %s :%d\n",
+                                       dai_link->stream_name, ret);
                                 return ret;
                         }
-                }
+                } else {
+                        /* link the DAI widgets */
+                        play_w = codec_dai->playback_widget;
+                        capture_w = cpu_dai->capture_widget;
+                        if (play_w && capture_w) {
+                                ret = snd_soc_dapm_new_pcm(card, dai_link->params,
+                                                   capture_w, play_w);
+                                if (ret != 0) {
+                                        dev_err(card->dev, "Can't link %s to %s: %d\n",
+                                                play_w->name, capture_w->name, ret);
+                                        return ret;
+                                }
+                        }
 
-                play_w = cpu_dai->playback_widget;
-                capture_w = codec_dai->capture_widget;
-                if (play_w && capture_w) {
-                        ret = snd_soc_dapm_new_pcm(card, dai_link->params,
+                        play_w = cpu_dai->playback_widget;
+                        capture_w = codec_dai->capture_widget;
+                        if (play_w && capture_w) {
+                                ret = snd_soc_dapm_new_pcm(card, dai_link->params,
                                                    capture_w, play_w);
-                        if (ret != 0) {
-                                dev_err(card->dev, "Can't link %s to %s: %d\n",
-                                        play_w->name, capture_w->name, ret);
-                                return ret;
+                                if (ret != 0) {
+                                        dev_err(card->dev, "Can't link %s to %s: %d\n",
+                                                play_w->name, capture_w->name, ret);
+                                        return ret;
+                                }
                         }
                 }
         }
@@ -1816,7 +1837,6 @@ base_error:
 static int soc_probe(struct platform_device *pdev)
 {
         struct snd_soc_card *card = platform_get_drvdata(pdev);
-        int ret = 0;
 
         /*
          * no card, so machine driver should be registering card
@@ -1832,13 +1852,7 @@ static int soc_probe(struct platform_device *pdev)
         /* Bodge while we unpick instantiation */
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret != 0) {
-                dev_err(&pdev->dev, "Failed to register card\n");
-                return ret;
-        }
-
-        return 0;
+        return snd_soc_register_card(card);
 }
 
 static int soc_cleanup_card_resources(struct snd_soc_card *card)
@@ -2399,16 +2413,14 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-        unsigned int val, bitmask;
+        unsigned int val;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         val = snd_soc_read(codec, e->reg);
         ucontrol->value.enumerated.item[0]
-                = (val >> e->shift_l) & (bitmask - 1);
+                = (val >> e->shift_l) & e->mask;
         if (e->shift_l != e->shift_r)
                 ucontrol->value.enumerated.item[1] =
-                        (val >> e->shift_r) & (bitmask - 1);
+                        (val >> e->shift_r) & e->mask;
 
         return 0;
 }
@@ -2429,19 +2441,17 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val;
-        unsigned int mask, bitmask;
+        unsigned int mask;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         if (ucontrol->value.enumerated.item[0] > e->max - 1)
                 return -EINVAL;
         val = ucontrol->value.enumerated.item[0] << e->shift_l;
-        mask = (bitmask - 1) << e->shift_l;
+        mask = e->mask << e->shift_l;
         if (e->shift_l != e->shift_r) {
                 if (ucontrol->value.enumerated.item[1] > e->max - 1)
                         return -EINVAL;
                 val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= (bitmask - 1) << e->shift_r;
+                mask |= e->mask << e->shift_r;
         }
 
         return snd_soc_update_bits_locked(codec, e->reg, mask, val);
@@ -3717,6 +3727,9 @@ int snd_soc_register_dai(struct device *dev,
                 }
         }
 
+        if (!dai->codec)
+                dai->dapm.idle_bias_off = 1;
+
         list_add(&dai->list, &dai_list);
 
         mutex_unlock(&client_mutex);
@@ -3805,6 +3818,9 @@ int snd_soc_register_dais(struct device *dev,
                         }
                 }
 
+                if (!dai->codec)
+                        dai->dapm.idle_bias_off = 1;
+
                 list_add(&dai->list, &dai_list);
 
                 mutex_unlock(&client_mutex);
@@ -4034,8 +4050,6 @@ int snd_soc_register_codec(struct device *dev,
         return 0;
 
 fail:
-        kfree(codec->reg_def_copy);
-        codec->reg_def_copy = NULL;
         kfree(codec->name);
         kfree(codec);
         return ret;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index f90139b5f50d..873e6e76ee87 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -141,6 +141,28 @@ void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason)
 }
 EXPORT_SYMBOL_GPL(dapm_mark_dirty);
 
+void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm)
+{
+        struct snd_soc_card *card = dapm->card;
+        struct snd_soc_dapm_widget *w;
+
+        mutex_lock(&card->dapm_mutex);
+
+        list_for_each_entry(w, &card->widgets, list) {
+                switch (w->id) {
+                case snd_soc_dapm_input:
+                case snd_soc_dapm_output:
+                        dapm_mark_dirty(w, "Rechecking inputs and outputs");
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        mutex_unlock(&card->dapm_mutex);
+}
+EXPORT_SYMBOL_GPL(dapm_mark_io_dirty);
+
 /* create a new dapm widget */
 static inline struct snd_soc_dapm_widget *dapm_cnew_widget(
         const struct snd_soc_dapm_widget *_widget)
@@ -336,12 +358,10 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
         case snd_soc_dapm_mux: {
                 struct soc_enum *e = (struct soc_enum *)
                         w->kcontrol_news[i].private_value;
-                int val, item, bitmask;
+                int val, item;
 
-                for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                        ;
                 val = soc_widget_read(w, e->reg);
-                item = (val >> e->shift_l) & (bitmask - 1);
+                item = (val >> e->shift_l) & e->mask;
 
                 p->connect = 0;
                 for (i = 0; i < e->max; i++) {
@@ -2658,15 +2678,13 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
         struct snd_soc_dapm_widget *widget = wlist->widgets[0];
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-        unsigned int val, bitmask;
+        unsigned int val;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         val = snd_soc_read(widget->codec, e->reg);
-        ucontrol->value.enumerated.item[0] = (val >> e->shift_l) & (bitmask - 1);
+        ucontrol->value.enumerated.item[0] = (val >> e->shift_l) & e->mask;
         if (e->shift_l != e->shift_r)
                 ucontrol->value.enumerated.item[1] =
-                        (val >> e->shift_r) & (bitmask - 1);
+                        (val >> e->shift_r) & e->mask;
 
         return 0;
 }
@@ -2690,22 +2708,20 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_soc_card *card = codec->card;
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val, mux, change;
-        unsigned int mask, bitmask;
+        unsigned int mask;
         struct snd_soc_dapm_update update;
         int wi;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         if (ucontrol->value.enumerated.item[0] > e->max - 1)
                 return -EINVAL;
         mux = ucontrol->value.enumerated.item[0];
         val = mux << e->shift_l;
-        mask = (bitmask - 1) << e->shift_l;
+        mask = e->mask << e->shift_l;
         if (e->shift_l != e->shift_r) {
                 if (ucontrol->value.enumerated.item[1] > e->max - 1)
                         return -EINVAL;
                 val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= (bitmask - 1) << e->shift_r;
+                mask |= e->mask << e->shift_r;
         }
 
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 0c172938b82a..fa0fd8ddae90 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -83,11 +83,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
         jack->status &= ~mask;
         jack->status |= status & mask;
 
-        /* The DAPM sync is expensive enough to be worth skipping.
-         * However, empty mask means pin synchronization is desired. */
-        if (mask && (jack->status == oldstatus))
-                goto out;
-
         trace_snd_soc_jack_notify(jack, status);
 
         list_for_each_entry(pin, &jack->pins, list) {
@@ -109,7 +104,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 
         snd_jack_report(jack->jack, jack->status);
 
-out:
         mutex_unlock(&jack->mutex);
 }
 EXPORT_SYMBOL_GPL(snd_soc_jack_report);
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index d4f14e492341..cee13b7bfb94 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -34,13 +34,12 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 
-#include <mach/tegra_wm8903_pdata.h>
-
 #include <sound/core.h>
 #include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/tegra_wm8903.h>
 
 #include "../codecs/wm8903.h"
 
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 45e43b4057b0..be94bf9bf94f 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -760,6 +760,9 @@ static int __devinit ux500_msp_drv_probe(struct platform_device *pdev)
         drvdata = devm_kzalloc(&pdev->dev,
                                 sizeof(struct ux500_msp_i2s_drvdata),
                                 GFP_KERNEL);
+        if (!drvdata)
+                return -ENOMEM;
+
         drvdata->fmt = 0;
         drvdata->slots = 1;
         drvdata->tx_mask = 0x01;
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index e5c79ca42518..b7c996e77570 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -689,6 +689,8 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev,
 
         *msp_p = devm_kzalloc(&pdev->dev, sizeof(struct ux500_msp), GFP_KERNEL);
         msp = *msp_p;
+        if (!msp)
+                return -ENOMEM;
 
         if (np) {
                 if (!platform_data) {