34 files changed, 895 insertions, 373 deletions
diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c
index 44b8dcecf571..d6f7694fcad4 100644
--- a/sound/soc/au1x/ac97c.c
+++ b/sound/soc/au1x/ac97c.c
@@ -179,13 +179,12 @@ static void au1xac97c_ac97_cold_reset(struct snd_ac97 *ac97)
 }
 /* AC97 controller operations */
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops ac97c_bus_ops = {
        .read           = au1xac97c_ac97_read,
        .write          = au1xac97c_ac97_write,
        .reset          = au1xac97c_ac97_cold_reset,
        .warm_reset     = au1xac97c_ac97_warm_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);        /* globals be gone! */
 static int alchemy_ac97c_startup(struct snd_pcm_substream *substream,
                                 struct snd_soc_dai *dai)
@@ -272,6 +271,10 @@ static int au1xac97c_drvprobe(struct platform_device *pdev)
        platform_set_drvdata(pdev, ctx);
+        ret = snd_soc_set_ac97_ops(&ac97c_bus_ops);
+        if (ret)
+                return ret;
        ret = snd_soc_register_component(&pdev->dev, &au1xac97c_component,
                                         &au1xac97c_dai_driver, 1);
        if (ret)
@@ -338,19 +341,7 @@ static struct platform_driver au1xac97c_driver = {
        .remove         = au1xac97c_drvremove,
 };
-static int __init au1xac97c_load(void)
+module_platform_driver(&au1xac97c_driver);
-{
-        ac97c_workdata = NULL;
-        return platform_driver_register(&au1xac97c_driver);
-}
-static void __exit au1xac97c_unload(void)
-{
-        platform_driver_unregister(&au1xac97c_driver);
-}
-module_init(au1xac97c_load);
-module_exit(au1xac97c_unload);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Au1000/1500/1100 AC97C ASoC driver");
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index 8f1862aa7333..a822ab822bb7 100644
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -201,13 +201,12 @@ static void au1xpsc_ac97_cold_reset(struct snd_ac97 *ac97)
 }
 /* AC97 controller operations */
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops psc_ac97_ops = {
        .read           = au1xpsc_ac97_read,
        .write          = au1xpsc_ac97_write,
        .reset          = au1xpsc_ac97_cold_reset,
        .warm_reset     = au1xpsc_ac97_warm_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream,
                                  struct snd_pcm_hw_params *params,
@@ -383,15 +382,9 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
        if (!iores)
                return -ENODEV;
-        if (!devm_request_mem_region(&pdev->dev, iores->start,
+        wd->mmio = devm_ioremap_resource(&pdev->dev, iores);
-                                     resource_size(iores),
+        if (IS_ERR(wd->mmio))
-                                     pdev->name))
+                return PTR_ERR(wd->mmio);
-                return -EBUSY;
-        wd->mmio = devm_ioremap(&pdev->dev, iores->start,
-                                resource_size(iores));
-        if (!wd->mmio)
-                return -EBUSY;
        dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
        if (!dmares)
@@ -423,6 +416,10 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
        platform_set_drvdata(pdev, wd);
+        ret = snd_soc_set_ac97_ops(&psc_ac97_ops);
+        if (ret)
+                return ret;
        ret = snd_soc_register_component(&pdev->dev, &au1xpsc_ac97_component,
                                         &wd->dai_drv, 1);
        if (ret)
@@ -503,19 +500,7 @@ static struct platform_driver au1xpsc_ac97_driver = {
        .remove         = au1xpsc_ac97_drvremove,
 };
-static int __init au1xpsc_ac97_load(void)
+module_platform_driver(au1xpsc_ac97_driver);
-{
-        au1xpsc_ac97_workdata = NULL;
-        return platform_driver_register(&au1xpsc_ac97_driver);
-}
-static void __exit au1xpsc_ac97_unload(void)
-{
-        platform_driver_unregister(&au1xpsc_ac97_driver);
-}
-module_init(au1xpsc_ac97_load);
-module_exit(au1xpsc_ac97_unload);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Au12x0/Au1550 PSC AC97 ALSA ASoC audio driver");
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index c66bef826ac5..efb1daecd0dd 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -198,13 +198,12 @@ static void bf5xx_ac97_cold_reset(struct snd_ac97 *ac97)
 #endif
 }
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops bf5xx_ac97_ops = {
        .read   = bf5xx_ac97_read,
        .write  = bf5xx_ac97_write,
        .warm_reset     = bf5xx_ac97_warm_reset,
        .reset  = bf5xx_ac97_cold_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 #ifdef CONFIG_PM
 static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)
@@ -293,13 +292,14 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
 #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
        /* Request PB3 as reset pin */
-        if (gpio_request(CONFIG_SND_BF5XX_RESET_GPIO_NUM, "SND_AD198x RESET")) {
+        ret = devm_gpio_request_one(&pdev->dev,
-                pr_err("Failed to request GPIO_%d for reset\n",
+                                    CONFIG_SND_BF5XX_RESET_GPIO_NUM,
-                                CONFIG_SND_BF5XX_RESET_GPIO_NUM);
+                                    GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET") {
-                ret =  -1;
+                dev_err(&pdev->dev,
+                        "Failed to request GPIO_%d for reset: %d\n",
+                        CONFIG_SND_BF5XX_RESET_GPIO_NUM, ret);
                goto gpio_err;
        }
-        gpio_direction_output(CONFIG_SND_BF5XX_RESET_GPIO_NUM, 1);
 #endif
        sport_handle = sport_init(pdev, 2, sizeof(struct ac97_frame),
@@ -335,6 +335,12 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
                goto sport_config_err;
        }
+        ret = snd_soc_set_ac97_ops(&bf5xx_ac97_ops);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
+                goto sport_config_err;
+        }
        ret = snd_soc_register_component(&pdev->dev, &bfin_ac97_component,
                                         &bfin_ac97_dai, 1);
        if (ret) {
@@ -349,10 +355,7 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
 sport_config_err:
        sport_done(sport_handle);
 sport_err:
-#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
+        snd_soc_set_ac97_ops(NULL);
-        gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
-gpio_err:
-#endif
        return ret;
 }
@@ -363,9 +366,7 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev)
        snd_soc_unregister_component(&pdev->dev);
        sport_done(sport_handle);
-#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
+        snd_soc_set_ac97_ops(NULL);
-        gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
-#endif
        return 0;
 }
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
index 3f4f88877c84..ac73c607410a 100644
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@ -237,13 +237,12 @@ static irqreturn_t ep93xx_ac97_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops ep93xx_ac97_ops = {
        .read           = ep93xx_ac97_read,
        .write          = ep93xx_ac97_write,
        .reset          = ep93xx_ac97_cold_reset,
        .warm_reset     = ep93xx_ac97_warm_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static int ep93xx_ac97_trigger(struct snd_pcm_substream *substream,
                               int cmd, struct snd_soc_dai *dai)
@@ -389,6 +388,10 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
        ep93xx_ac97_info = info;
        platform_set_drvdata(pdev, info);
+        ret = snd_soc_set_ac97_ops(&ep93xx_ac97_ops);
+        if (ret)
+                goto fail;
        ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component,
                                         &ep93xx_ac97_dai, 1);
        if (ret)
@@ -398,7 +401,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
 fail:
        ep93xx_ac97_info = NULL;
-        dev_set_drvdata(&pdev->dev, NULL);
+        snd_soc_set_ac97_ops(NULL);
        return ret;
 }
@@ -412,7 +415,8 @@ static int ep93xx_ac97_remove(struct platform_device *pdev)
        ep93xx_ac97_write_reg(info, AC97GCR, 0);
        ep93xx_ac97_info = NULL;
-        dev_set_drvdata(&pdev->dev, NULL);
+        snd_soc_set_ac97_ops(NULL);
        return 0;
 }
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index 1382f3f3f4bf..8af04343cc1a 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -120,10 +120,8 @@
 * before DAC & PGA in DAPM power-off sequence.
 */
 #define PM860X_DAPM_OUTPUT(wname, wevent)       \
-{       .id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \
+        SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, 0, 0, NULL, 0, wevent, \
-        .shift = 0, .invert = 0, .kcontrol_news = NULL, \
+                            SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD)
-        .num_kcontrols = 0, .event = wevent, \
-        .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD, }
 struct pm860x_det {
        struct snd_soc_jack     *hp_jack;
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index ef2ae32ffc66..ec7351803c24 100644
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -62,13 +62,13 @@ static struct snd_soc_dai_driver ac97_dai = {
 static unsigned int ac97_read(struct snd_soc_codec *codec,
        unsigned int reg)
 {
-        return soc_ac97_ops.read(codec->ac97, reg);
+        return soc_ac97_ops->read(codec->ac97, reg);
 }
 static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
        unsigned int val)
 {
-        soc_ac97_ops.write(codec->ac97, reg, val);
+        soc_ac97_ops->write(codec->ac97, reg, val);
        return 0;
 }
@@ -79,7 +79,8 @@ static int ac97_soc_probe(struct snd_soc_codec *codec)
        int ret;
        /* add codec as bus device for standard ac97 */
-        ret = snd_ac97_bus(codec->card->snd_card, 0, &soc_ac97_ops, NULL, &ac97_bus);
+        ret = snd_ac97_bus(codec->card->snd_card, 0, soc_ac97_ops, NULL,
+                           &ac97_bus);
        if (ret < 0)
                return ret;
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index f385342947d3..89fcf7d6e7b8 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -108,7 +108,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec,
        case AC97_EXTENDED_STATUS:
        case AC97_VENDOR_ID1:
        case AC97_VENDOR_ID2:
-                return soc_ac97_ops.read(codec->ac97, reg);
+                return soc_ac97_ops->read(codec->ac97, reg);
        default:
                reg = reg >> 1;
@@ -124,7 +124,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
 {
        u16 *cache = codec->reg_cache;
-        soc_ac97_ops.write(codec->ac97, reg, val);
+        soc_ac97_ops->write(codec->ac97, reg, val);
        reg = reg >> 1;
        if (reg < ARRAY_SIZE(ad1980_reg))
                cache[reg] = val;
@@ -154,13 +154,13 @@ static int ad1980_reset(struct snd_soc_codec *codec, int try_warm)
        u16 retry_cnt = 0;
 retry:
-        if (try_warm && soc_ac97_ops.warm_reset) {
+        if (try_warm && soc_ac97_ops->warm_reset) {
-                soc_ac97_ops.warm_reset(codec->ac97);
+                soc_ac97_ops->warm_reset(codec->ac97);
                if (ac97_read(codec, AC97_RESET) == 0x0090)
                        return 1;
        }
-        soc_ac97_ops.reset(codec->ac97);
+        soc_ac97_ops->reset(codec->ac97);
        /* Set bit 16slot in register 74h, then every slot will has only 16
         * bits. This command is sent out in 20bit mode, in which case the
         * first nibble of data is eaten by the addr. (Tag is always 16 bit)*/
@@ -186,7 +186,7 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
        printk(KERN_INFO "AD1980 SoC Audio Codec\n");
-        ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
+        ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
        if (ret < 0) {
                printk(KERN_ERR "ad1980: failed to register AC97 codec\n");
                return ret;
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index b6b1a773bd37..0e250f118c0e 100644
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -16,6 +16,7 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/of_device.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -24,16 +25,19 @@
 #include "sigmadsp.h"
 #include "adau1701.h"
-#define ADAU1701_DSPCTRL        0x1c
+#define ADAU1701_DSPCTRL        0x081c
-#define ADAU1701_SEROCTL        0x1e
+#define ADAU1701_SEROCTL        0x081e
-#define ADAU1701_SERICTL        0x1f
+#define ADAU1701_SERICTL        0x081f
-#define ADAU1701_AUXNPOW        0x22
+#define ADAU1701_AUXNPOW        0x0822
+#define ADAU1701_PINCONF_0      0x0820
+#define ADAU1701_PINCONF_1      0x0821
+#define ADAU1701_AUXNPOW        0x0822
-#define ADAU1701_OSCIPOW        0x26
+#define ADAU1701_OSCIPOW        0x0826
-#define ADAU1701_DACSET         0x27
+#define ADAU1701_DACSET         0x0827
-#define ADAU1701_NUM_REGS       0x28
+#define ADAU1701_MAX_REGISTER   0x0828
 #define ADAU1701_DSPCTRL_CR             (1 << 2)
 #define ADAU1701_DSPCTRL_DAM            (1 << 3)
@@ -87,11 +91,18 @@
 #define ADAU1701_OSCIPOW_OPD            0x04
 #define ADAU1701_DACSET_DACINIT         1
+#define ADAU1707_CLKDIV_UNSET           (-1UL)
 #define ADAU1701_FIRMWARE "adau1701.bin"
 struct adau1701 {
        int gpio_nreset;
+        int gpio_pll_mode[2];
        unsigned int dai_fmt;
+        unsigned int pll_clkdiv;
+        unsigned int sysclk;
+        struct regmap *regmap;
+        u8 pin_config[12];
 };
 static const struct snd_kcontrol_new adau1701_controls[] = {
@@ -123,10 +134,13 @@ static const struct snd_soc_dapm_route adau1701_dapm_routes[] = {
        { "ADC", NULL, "IN1" },
 };
-static unsigned int adau1701_register_size(struct snd_soc_codec *codec,
+static unsigned int adau1701_register_size(struct device *dev,
                unsigned int reg)
 {
        switch (reg) {
+        case ADAU1701_PINCONF_0:
+        case ADAU1701_PINCONF_1:
+                return 3;
        case ADAU1701_DSPCTRL:
        case ADAU1701_SEROCTL:
        case ADAU1701_AUXNPOW:
@@ -137,33 +151,42 @@ static unsigned int adau1701_register_size(struct snd_soc_codec *codec,
                return 1;
        }
-        dev_err(codec->dev, "Unsupported register address: %d\n", reg);
+        dev_err(dev, "Unsupported register address: %d\n", reg);
        return 0;
 }
-static int adau1701_write(struct snd_soc_codec *codec, unsigned int reg,
+static bool adau1701_volatile_reg(struct device *dev, unsigned int reg)
-                unsigned int value)
 {
+        switch (reg) {
+        case ADAU1701_DACSET:
+                return true;
+        default:
+                return false;
+        }
+}
+static int adau1701_reg_write(void *context, unsigned int reg,
+                              unsigned int value)
+{
+        struct i2c_client *client = context;
        unsigned int i;
        unsigned int size;
-        uint8_t buf[4];
+        uint8_t buf[5];
        int ret;
-        size = adau1701_register_size(codec, reg);
+        size = adau1701_register_size(&client->dev, reg);
        if (size == 0)
                return -EINVAL;
-        snd_soc_cache_write(codec, reg, value);
+        buf[0] = reg >> 8;
+        buf[1] = reg & 0xff;
-        buf[0] = 0x08;
-        buf[1] = reg;
        for (i = size + 1; i >= 2; --i) {
                buf[i] = value;
                value >>= 8;
        }
-        ret = i2c_master_send(to_i2c_client(codec->dev), buf, size + 2);
+        ret = i2c_master_send(client, buf, size + 2);
        if (ret == size + 2)
                return 0;
        else if (ret < 0)
@@ -172,47 +195,105 @@ static int adau1701_write(struct snd_soc_codec *codec, unsigned int reg,
                return -EIO;
 }
-static unsigned int adau1701_read(struct snd_soc_codec *codec, unsigned int reg)
+static int adau1701_reg_read(void *context, unsigned int reg,
+                             unsigned int *value)
 {
-        unsigned int value;
+        int ret;
-        unsigned int ret;
+        unsigned int i;
+        unsigned int size;
+        uint8_t send_buf[2], recv_buf[3];
+        struct i2c_client *client = context;
+        struct i2c_msg msgs[2];
-        ret = snd_soc_cache_read(codec, reg, &value);
+        size = adau1701_register_size(&client->dev, reg);
-        if (ret)
+        if (size == 0)
-                return ret;
+                return -EINVAL;
-        return value;
+        send_buf[0] = reg >> 8;
-}
+        send_buf[1] = reg & 0xff;
-static void adau1701_reset(struct snd_soc_codec *codec)
+        msgs[0].addr = client->addr;
-{
+        msgs[0].len = sizeof(send_buf);
-        struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
+        msgs[0].buf = send_buf;
+        msgs[0].flags = 0;
-        if (!gpio_is_valid(adau1701->gpio_nreset))
+        msgs[1].addr = client->addr;
-                return;
+        msgs[1].len = size;
+        msgs[1].buf = recv_buf;
+        msgs[1].flags = I2C_M_RD;
-        gpio_set_value(adau1701->gpio_nreset, 0);
+        ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-        /* minimum reset time is 20ns */
+        if (ret < 0)
-        udelay(1);
+                return ret;
-        gpio_set_value(adau1701->gpio_nreset, 1);
+        else if (ret != ARRAY_SIZE(msgs))
-        /* power-up time may be as long as 85ms */
+                return -EIO;
-        mdelay(85);
+        *value = 0;
+        for (i = 0; i < size; i++)
+                *value |= recv_buf[i] << (i * 8);
+        return 0;
 }
-static int adau1701_init(struct snd_soc_codec *codec)
+static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv)
 {
-        int ret;
+        struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
        struct i2c_client *client = to_i2c_client(codec->dev);
+        int ret;
-        adau1701_reset(codec);
+        if (clkdiv != ADAU1707_CLKDIV_UNSET &&
+            gpio_is_valid(adau1701->gpio_pll_mode[0]) &&
+            gpio_is_valid(adau1701->gpio_pll_mode[1])) {
+                switch (clkdiv) {
+                case 64:
+                        gpio_set_value(adau1701->gpio_pll_mode[0], 0);
+                        gpio_set_value(adau1701->gpio_pll_mode[1], 0);
+                        break;
+                case 256:
+                        gpio_set_value(adau1701->gpio_pll_mode[0], 0);
+                        gpio_set_value(adau1701->gpio_pll_mode[1], 1);
+                        break;
+                case 384:
+                        gpio_set_value(adau1701->gpio_pll_mode[0], 1);
+                        gpio_set_value(adau1701->gpio_pll_mode[1], 0);
+                        break;
+                case 0: /* fallback */
+                case 512:
+                        gpio_set_value(adau1701->gpio_pll_mode[0], 1);
+                        gpio_set_value(adau1701->gpio_pll_mode[1], 1);
+                        break;
+                }
+        }
-        ret = process_sigma_firmware(client, ADAU1701_FIRMWARE);
+        adau1701->pll_clkdiv = clkdiv;
-        if (ret) {
-                dev_warn(codec->dev, "Failed to load firmware\n");
+        if (gpio_is_valid(adau1701->gpio_nreset)) {
-                return ret;
+                gpio_set_value(adau1701->gpio_nreset, 0);
+                /* minimum reset time is 20ns */
+                udelay(1);
+                gpio_set_value(adau1701->gpio_nreset, 1);
+                /* power-up time may be as long as 85ms */
+                mdelay(85);
        }
-        snd_soc_write(codec, ADAU1701_DACSET, ADAU1701_DACSET_DACINIT);
+        /*
+         * Postpone the firmware download to a point in time when we
+         * know the correct PLL setup
+         */
+        if (clkdiv != ADAU1707_CLKDIV_UNSET) {
+                ret = process_sigma_firmware(client, ADAU1701_FIRMWARE);
+                if (ret) {
+                        dev_warn(codec->dev, "Failed to load firmware\n");
+                        return ret;
+                }
+        }
+        regmap_write(adau1701->regmap, ADAU1701_DACSET, ADAU1701_DACSET_DACINIT);
+        regmap_write(adau1701->regmap, ADAU1701_DSPCTRL, ADAU1701_DSPCTRL_CR);
+        regcache_mark_dirty(adau1701->regmap);
+        regcache_sync(adau1701->regmap);
        return 0;
 }
@@ -291,8 +372,22 @@ static int adau1701_hw_params(struct snd_pcm_substream *substream,
                struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
        struct snd_soc_codec *codec = dai->codec;
+        struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
+        unsigned int clkdiv = adau1701->sysclk / params_rate(params);
        snd_pcm_format_t format;
        unsigned int val;
+        int ret;
+        /*
+         * If the mclk/lrclk ratio changes, the chip needs updated PLL
+         * mode GPIO settings, and a full reset cycle, including a new
+         * firmware upload.
+         */
+        if (clkdiv != adau1701->pll_clkdiv) {
+                ret = adau1701_reset(codec, clkdiv);
+                if (ret < 0)
+                        return ret;
+        }
        switch (params_rate(params)) {
        case 192000:
@@ -384,8 +479,8 @@ static int adau1701_set_dai_fmt(struct snd_soc_dai *codec_dai,
        adau1701->dai_fmt = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
-        snd_soc_write(codec, ADAU1701_SERICTL, serictl);
+        regmap_write(adau1701->regmap, ADAU1701_SERICTL, serictl);
-        snd_soc_update_bits(codec, ADAU1701_SEROCTL,
+        regmap_update_bits(adau1701->regmap, ADAU1701_SEROCTL,
                ~ADAU1701_SEROCTL_WORD_LEN_MASK, seroctl);
        return 0;
@@ -435,6 +530,7 @@ static int adau1701_set_sysclk(struct snd_soc_codec *codec, int clk_id,
        int source, unsigned int freq, int dir)
 {
        unsigned int val;
+        struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
        switch (clk_id) {
        case ADAU1701_CLK_SRC_OSC:
@@ -448,6 +544,7 @@ static int adau1701_set_sysclk(struct snd_soc_codec *codec, int clk_id,
        }
        snd_soc_update_bits(codec, ADAU1701_OSCIPOW, ADAU1701_OSCIPOW_OPD, val);
+        adau1701->sysclk = freq;
        return 0;
 }
@@ -494,15 +591,37 @@ MODULE_DEVICE_TABLE(of, adau1701_dt_ids);
 static int adau1701_probe(struct snd_soc_codec *codec)
 {
-        int ret;
+        int i, ret;
+        unsigned int val;
+        struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
        codec->control_data = to_i2c_client(codec->dev);
-        ret = adau1701_init(codec);
+        /*
-        if (ret)
+         * Let the pll_clkdiv variable default to something that won't happen
+         * at runtime. That way, we can postpone the firmware download from
+         * adau1701_reset() to a point in time when we know the correct PLL
+         * mode parameters.
+         */
+        adau1701->pll_clkdiv = ADAU1707_CLKDIV_UNSET;
+        /* initalize with pre-configured pll mode settings */
+        ret = adau1701_reset(codec, adau1701->pll_clkdiv);
+        if (ret < 0)
                return ret;
-        snd_soc_write(codec, ADAU1701_DSPCTRL, ADAU1701_DSPCTRL_CR);
+        /* set up pin config */
+        val = 0;
+        for (i = 0; i < 6; i++)
+                val |= adau1701->pin_config[i] << (i * 4);
+        regmap_write(adau1701->regmap, ADAU1701_PINCONF_0, val);
+        val = 0;
+        for (i = 0; i < 6; i++)
+                val |= adau1701->pin_config[i + 6] << (i * 4);
+        regmap_write(adau1701->regmap, ADAU1701_PINCONF_1, val);
        return 0;
 }
@@ -512,9 +631,6 @@ static struct snd_soc_codec_driver adau1701_codec_drv = {
        .set_bias_level         = adau1701_set_bias_level,
        .idle_bias_off          = true,
-        .reg_cache_size         = ADAU1701_NUM_REGS,
-        .reg_word_size          = sizeof(u16),
        .controls               = adau1701_controls,
        .num_controls           = ARRAY_SIZE(adau1701_controls),
        .dapm_widgets           = adau1701_dapm_widgets,
@@ -522,28 +638,58 @@ static struct snd_soc_codec_driver adau1701_codec_drv = {
        .dapm_routes            = adau1701_dapm_routes,
        .num_dapm_routes        = ARRAY_SIZE(adau1701_dapm_routes),
-        .write                  = adau1701_write,
-        .read                   = adau1701_read,
        .set_sysclk             = adau1701_set_sysclk,
 };
+static const struct regmap_config adau1701_regmap = {
+        .reg_bits               = 16,
+        .val_bits               = 32,
+        .max_register           = ADAU1701_MAX_REGISTER,
+        .cache_type             = REGCACHE_RBTREE,
+        .volatile_reg           = adau1701_volatile_reg,
+        .reg_write              = adau1701_reg_write,
+        .reg_read               = adau1701_reg_read,
+};
 static int adau1701_i2c_probe(struct i2c_client *client,
                              const struct i2c_device_id *id)
 {
        struct adau1701 *adau1701;
        struct device *dev = &client->dev;
        int gpio_nreset = -EINVAL;
+        int gpio_pll_mode[2] = { -EINVAL, -EINVAL };
        int ret;
        adau1701 = devm_kzalloc(dev, sizeof(*adau1701), GFP_KERNEL);
        if (!adau1701)
                return -ENOMEM;
+        adau1701->regmap = devm_regmap_init(dev, NULL, client,
+                                            &adau1701_regmap);
+        if (IS_ERR(adau1701->regmap))
+                return PTR_ERR(adau1701->regmap);
        if (dev->of_node) {
                gpio_nreset = of_get_named_gpio(dev->of_node, "reset-gpio", 0);
                if (gpio_nreset < 0 && gpio_nreset != -ENOENT)
                        return gpio_nreset;
+                gpio_pll_mode[0] = of_get_named_gpio(dev->of_node,
+                                                   "adi,pll-mode-gpios", 0);
+                if (gpio_pll_mode[0] < 0 && gpio_pll_mode[0] != -ENOENT)
+                        return gpio_pll_mode[0];
+                gpio_pll_mode[1] = of_get_named_gpio(dev->of_node,
+                                                   "adi,pll-mode-gpios", 1);
+                if (gpio_pll_mode[1] < 0 && gpio_pll_mode[1] != -ENOENT)
+                        return gpio_pll_mode[1];
+                of_property_read_u32(dev->of_node, "adi,pll-clkdiv",
+                                     &adau1701->pll_clkdiv);
+                of_property_read_u8_array(dev->of_node, "adi,pin-config",
+                                          adau1701->pin_config,
+                                          ARRAY_SIZE(adau1701->pin_config));
        }
        if (gpio_is_valid(gpio_nreset)) {
@@ -553,7 +699,24 @@ static int adau1701_i2c_probe(struct i2c_client *client,
                        return ret;
        }
+        if (gpio_is_valid(gpio_pll_mode[0]) &&
+            gpio_is_valid(gpio_pll_mode[1])) {
+                ret = devm_gpio_request_one(dev, gpio_pll_mode[0],
+                                            GPIOF_OUT_INIT_LOW,
+                                            "ADAU1701 PLL mode 0");
+                if (ret < 0)
+                        return ret;
+                ret = devm_gpio_request_one(dev, gpio_pll_mode[1],
+                                            GPIOF_OUT_INIT_LOW,
+                                            "ADAU1701 PLL mode 1");
+                if (ret < 0)
+                        return ret;
+        }
        adau1701->gpio_nreset = gpio_nreset;
+        adau1701->gpio_pll_mode[0] = gpio_pll_mode[0];
+        adau1701->gpio_pll_mode[1] = gpio_pll_mode[1];
        i2c_set_clientdata(client, adau1701);
        ret = snd_soc_register_codec(&client->dev, &adau1701_codec_drv,
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 2eda85ba79ac..a5455c1aea42 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -28,8 +28,6 @@
 #include "stac9766.h"
-#define STAC9766_VERSION "0.10"
 /*
 * STAC9766 register cache
 */
@@ -145,14 +143,14 @@ static int stac9766_ac97_write(struct snd_soc_codec *codec, unsigned int reg,
        if (reg > AC97_STAC_PAGE0) {
                stac9766_ac97_write(codec, AC97_INT_PAGING, 0);
-                soc_ac97_ops.write(codec->ac97, reg, val);
+                soc_ac97_ops->write(codec->ac97, reg, val);
                stac9766_ac97_write(codec, AC97_INT_PAGING, 1);
                return 0;
        }
        if (reg / 2 >= ARRAY_SIZE(stac9766_reg))
                return -EIO;
-        soc_ac97_ops.write(codec->ac97, reg, val);
+        soc_ac97_ops->write(codec->ac97, reg, val);
        cache[reg / 2] = val;
        return 0;
 }
@@ -164,7 +162,7 @@ static unsigned int stac9766_ac97_read(struct snd_soc_codec *codec,
        if (reg > AC97_STAC_PAGE0) {
                stac9766_ac97_write(codec, AC97_INT_PAGING, 0);
-                val = soc_ac97_ops.read(codec->ac97, reg - AC97_STAC_PAGE0);
+                val = soc_ac97_ops->read(codec->ac97, reg - AC97_STAC_PAGE0);
                stac9766_ac97_write(codec, AC97_INT_PAGING, 1);
                return val;
        }
@@ -175,7 +173,7 @@ static unsigned int stac9766_ac97_read(struct snd_soc_codec *codec,
                reg == AC97_INT_PAGING || reg == AC97_VENDOR_ID1 ||
                reg == AC97_VENDOR_ID2) {
-                val = soc_ac97_ops.read(codec->ac97, reg);
+                val = soc_ac97_ops->read(codec->ac97, reg);
                return val;
        }
        return cache[reg / 2];
@@ -242,15 +240,15 @@ static int stac9766_set_bias_level(struct snd_soc_codec *codec,
 static int stac9766_reset(struct snd_soc_codec *codec, int try_warm)
 {
-        if (try_warm && soc_ac97_ops.warm_reset) {
+        if (try_warm && soc_ac97_ops->warm_reset) {
-                soc_ac97_ops.warm_reset(codec->ac97);
+                soc_ac97_ops->warm_reset(codec->ac97);
                if (stac9766_ac97_read(codec, 0) == stac9766_reg[0])
                        return 1;
        }
-        soc_ac97_ops.reset(codec->ac97);
+        soc_ac97_ops->reset(codec->ac97);
-        if (soc_ac97_ops.warm_reset)
+        if (soc_ac97_ops->warm_reset)
-                soc_ac97_ops.warm_reset(codec->ac97);
+                soc_ac97_ops->warm_reset(codec->ac97);
        if (stac9766_ac97_read(codec, 0) != stac9766_reg[0])
                return -EIO;
        return 0;
@@ -274,7 +272,7 @@ reset:
                return -EIO;
        }
        codec->ac97->bus->ops->warm_reset(codec->ac97);
-        id = soc_ac97_ops.read(codec->ac97, AC97_VENDOR_ID2);
+        id = soc_ac97_ops->read(codec->ac97, AC97_VENDOR_ID2);
        if (id != 0x4c13) {
                stac9766_reset(codec, 0);
                reset++;
@@ -338,9 +336,7 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec)
 {
        int ret = 0;
-        printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION);
+        ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
-        ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
        if (ret < 0)
                goto codec_err;
diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index d447c4aa1d5e..6d31d88f7204 100644
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -83,6 +83,14 @@
 #define TAS5086_SPLIT_CAP_CHARGE        0x1a    /* Split cap charge period register */
 #define TAS5086_OSC_TRIM                0x1b    /* Oscillator trim register */
 #define TAS5086_BKNDERR                 0x1c
+#define TAS5086_INPUT_MUX               0x20
+#define TAS5086_PWM_OUTPUT_MUX          0x25
+#define TAS5086_MAX_REGISTER            TAS5086_PWM_OUTPUT_MUX
+#define TAS5086_PWM_START_MIDZ_FOR_START_1      (1 << 7)
+#define TAS5086_PWM_START_MIDZ_FOR_START_2      (1 << 6)
+#define TAS5086_PWM_START_CHANNEL_MASK          (0x3f)
 /*
 * Default TAS5086 power-up configuration
@@ -119,9 +127,30 @@ static const struct reg_default tas5086_reg_defaults[] = {
        { 0x1c, 0x05 },
 };
+static int tas5086_register_size(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case TAS5086_CLOCK_CONTROL ... TAS5086_BKNDERR:
+                return 1;
+        case TAS5086_INPUT_MUX:
+        case TAS5086_PWM_OUTPUT_MUX:
+                return 4;
+        }
+        dev_err(dev, "Unsupported register address: %d\n", reg);
+        return 0;
+}
 static bool tas5086_accessible_reg(struct device *dev, unsigned int reg)
 {
-        return !((reg == 0x0f) || (reg >= 0x11 && reg <= 0x17));
+        switch (reg) {
+        case 0x0f:
+        case 0x11 ... 0x17:
+        case 0x1d ... 0x1f:
+                return false;
+        default:
+                return true;
+        }
 }
 static bool tas5086_volatile_reg(struct device *dev, unsigned int reg)
@@ -140,6 +169,76 @@ static bool tas5086_writeable_reg(struct device *dev, unsigned int reg)
        return tas5086_accessible_reg(dev, reg) && (reg != TAS5086_DEV_ID);
 }
+static int tas5086_reg_write(void *context, unsigned int reg,
+                              unsigned int value)
+{
+        struct i2c_client *client = context;
+        unsigned int i, size;
+        uint8_t buf[5];
+        int ret;
+        size = tas5086_register_size(&client->dev, reg);
+        if (size == 0)
+                return -EINVAL;
+        buf[0] = reg;
+        for (i = size; i >= 1; --i) {
+                buf[i] = value;
+                value >>= 8;
+        }
+        ret = i2c_master_send(client, buf, size + 1);
+        if (ret == size + 1)
+                return 0;
+        else if (ret < 0)
+                return ret;
+        else
+                return -EIO;
+}
+static int tas5086_reg_read(void *context, unsigned int reg,
+                             unsigned int *value)
+{
+        struct i2c_client *client = context;
+        uint8_t send_buf, recv_buf[4];
+        struct i2c_msg msgs[2];
+        unsigned int size;
+        unsigned int i;
+        int ret;
+        size = tas5086_register_size(&client->dev, reg);
+        if (size == 0)
+                return -EINVAL;
+        send_buf = reg;
+        msgs[0].addr = client->addr;
+        msgs[0].len = sizeof(send_buf);
+        msgs[0].buf = &send_buf;
+        msgs[0].flags = 0;
+        msgs[1].addr = client->addr;
+        msgs[1].len = size;
+        msgs[1].buf = recv_buf;
+        msgs[1].flags = I2C_M_RD;
+        ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+        if (ret < 0)
+                return ret;
+        else if (ret != ARRAY_SIZE(msgs))
+                return -EIO;
+        *value = 0;
+        for (i = 0; i < size; i++) {
+                *value <<= 8;
+                *value |= recv_buf[i];
+        }
+        return 0;
+}
 struct tas5086_private {
        struct regmap   *regmap;
        unsigned int    mclk, sclk;
@@ -376,6 +475,202 @@ static const struct snd_kcontrol_new tas5086_controls[] = {
                            tas5086_get_deemph, tas5086_put_deemph),
 };
+/* Input mux controls */
+static const char *tas5086_dapm_sdin_texts[] =
+{
+        "SDIN1-L", "SDIN1-R", "SDIN2-L", "SDIN2-R",
+        "SDIN3-L", "SDIN3-R", "Ground (0)", "nc"
+};
+static const struct soc_enum tas5086_dapm_input_mux_enum[] = {
+        SOC_ENUM_SINGLE(TAS5086_INPUT_MUX, 20, 8, tas5086_dapm_sdin_texts),
+        SOC_ENUM_SINGLE(TAS5086_INPUT_MUX, 16, 8, tas5086_dapm_sdin_texts),
+        SOC_ENUM_SINGLE(TAS5086_INPUT_MUX, 12, 8, tas5086_dapm_sdin_texts),
+        SOC_ENUM_SINGLE(TAS5086_INPUT_MUX, 8,  8, tas5086_dapm_sdin_texts),
+        SOC_ENUM_SINGLE(TAS5086_INPUT_MUX, 4,  8, tas5086_dapm_sdin_texts),
+        SOC_ENUM_SINGLE(TAS5086_INPUT_MUX, 0,  8, tas5086_dapm_sdin_texts),
+};
+static const struct snd_kcontrol_new tas5086_dapm_input_mux_controls[] = {
+        SOC_DAPM_ENUM("Channel 1 input", tas5086_dapm_input_mux_enum[0]),
+        SOC_DAPM_ENUM("Channel 2 input", tas5086_dapm_input_mux_enum[1]),
+        SOC_DAPM_ENUM("Channel 3 input", tas5086_dapm_input_mux_enum[2]),
+        SOC_DAPM_ENUM("Channel 4 input", tas5086_dapm_input_mux_enum[3]),
+        SOC_DAPM_ENUM("Channel 5 input", tas5086_dapm_input_mux_enum[4]),
+        SOC_DAPM_ENUM("Channel 6 input", tas5086_dapm_input_mux_enum[5]),
+};
+/* Output mux controls */
+static const char *tas5086_dapm_channel_texts[] =
+        { "Channel 1 Mux", "Channel 2 Mux", "Channel 3 Mux",
+          "Channel 4 Mux", "Channel 5 Mux", "Channel 6 Mux" };
+static const struct soc_enum tas5086_dapm_output_mux_enum[] = {
+        SOC_ENUM_SINGLE(TAS5086_PWM_OUTPUT_MUX, 20, 6, tas5086_dapm_channel_texts),
+        SOC_ENUM_SINGLE(TAS5086_PWM_OUTPUT_MUX, 16, 6, tas5086_dapm_channel_texts),
+        SOC_ENUM_SINGLE(TAS5086_PWM_OUTPUT_MUX, 12, 6, tas5086_dapm_channel_texts),
+        SOC_ENUM_SINGLE(TAS5086_PWM_OUTPUT_MUX, 8,  6, tas5086_dapm_channel_texts),
+        SOC_ENUM_SINGLE(TAS5086_PWM_OUTPUT_MUX, 4,  6, tas5086_dapm_channel_texts),
+        SOC_ENUM_SINGLE(TAS5086_PWM_OUTPUT_MUX, 0,  6, tas5086_dapm_channel_texts),
+};
+static const struct snd_kcontrol_new tas5086_dapm_output_mux_controls[] = {
+        SOC_DAPM_ENUM("PWM1 Output", tas5086_dapm_output_mux_enum[0]),
+        SOC_DAPM_ENUM("PWM2 Output", tas5086_dapm_output_mux_enum[1]),
+        SOC_DAPM_ENUM("PWM3 Output", tas5086_dapm_output_mux_enum[2]),
+        SOC_DAPM_ENUM("PWM4 Output", tas5086_dapm_output_mux_enum[3]),
+        SOC_DAPM_ENUM("PWM5 Output", tas5086_dapm_output_mux_enum[4]),
+        SOC_DAPM_ENUM("PWM6 Output", tas5086_dapm_output_mux_enum[5]),
+};
+static const struct snd_soc_dapm_widget tas5086_dapm_widgets[] = {
+        SND_SOC_DAPM_INPUT("SDIN1-L"),
+        SND_SOC_DAPM_INPUT("SDIN1-R"),
+        SND_SOC_DAPM_INPUT("SDIN2-L"),
+        SND_SOC_DAPM_INPUT("SDIN2-R"),
+        SND_SOC_DAPM_INPUT("SDIN3-L"),
+        SND_SOC_DAPM_INPUT("SDIN3-R"),
+        SND_SOC_DAPM_INPUT("SDIN4-L"),
+        SND_SOC_DAPM_INPUT("SDIN4-R"),
+        SND_SOC_DAPM_OUTPUT("PWM1"),
+        SND_SOC_DAPM_OUTPUT("PWM2"),
+        SND_SOC_DAPM_OUTPUT("PWM3"),
+        SND_SOC_DAPM_OUTPUT("PWM4"),
+        SND_SOC_DAPM_OUTPUT("PWM5"),
+        SND_SOC_DAPM_OUTPUT("PWM6"),
+        SND_SOC_DAPM_MUX("Channel 1 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_input_mux_controls[0]),
+        SND_SOC_DAPM_MUX("Channel 2 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_input_mux_controls[1]),
+        SND_SOC_DAPM_MUX("Channel 3 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_input_mux_controls[2]),
+        SND_SOC_DAPM_MUX("Channel 4 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_input_mux_controls[3]),
+        SND_SOC_DAPM_MUX("Channel 5 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_input_mux_controls[4]),
+        SND_SOC_DAPM_MUX("Channel 6 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_input_mux_controls[5]),
+        SND_SOC_DAPM_MUX("PWM1 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_output_mux_controls[0]),
+        SND_SOC_DAPM_MUX("PWM2 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_output_mux_controls[1]),
+        SND_SOC_DAPM_MUX("PWM3 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_output_mux_controls[2]),
+        SND_SOC_DAPM_MUX("PWM4 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_output_mux_controls[3]),
+        SND_SOC_DAPM_MUX("PWM5 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_output_mux_controls[4]),
+        SND_SOC_DAPM_MUX("PWM6 Mux", SND_SOC_NOPM, 0, 0,
+                         &tas5086_dapm_output_mux_controls[5]),
+};
+static const struct snd_soc_dapm_route tas5086_dapm_routes[] = {
+        /* SDIN inputs -> channel muxes */
+        { "Channel 1 Mux", "SDIN1-L", "SDIN1-L" },
+        { "Channel 1 Mux", "SDIN1-R", "SDIN1-R" },
+        { "Channel 1 Mux", "SDIN2-L", "SDIN2-L" },
+        { "Channel 1 Mux", "SDIN2-R", "SDIN2-R" },
+        { "Channel 1 Mux", "SDIN3-L", "SDIN3-L" },
+        { "Channel 1 Mux", "SDIN3-R", "SDIN3-R" },
+        { "Channel 2 Mux", "SDIN1-L", "SDIN1-L" },
+        { "Channel 2 Mux", "SDIN1-R", "SDIN1-R" },
+        { "Channel 2 Mux", "SDIN2-L", "SDIN2-L" },
+        { "Channel 2 Mux", "SDIN2-R", "SDIN2-R" },
+        { "Channel 2 Mux", "SDIN3-L", "SDIN3-L" },
+        { "Channel 2 Mux", "SDIN3-R", "SDIN3-R" },
+        { "Channel 2 Mux", "SDIN1-L", "SDIN1-L" },
+        { "Channel 2 Mux", "SDIN1-R", "SDIN1-R" },
+        { "Channel 2 Mux", "SDIN2-L", "SDIN2-L" },
+        { "Channel 2 Mux", "SDIN2-R", "SDIN2-R" },
+        { "Channel 2 Mux", "SDIN3-L", "SDIN3-L" },
+        { "Channel 2 Mux", "SDIN3-R", "SDIN3-R" },
+        { "Channel 3 Mux", "SDIN1-L", "SDIN1-L" },
+        { "Channel 3 Mux", "SDIN1-R", "SDIN1-R" },
+        { "Channel 3 Mux", "SDIN2-L", "SDIN2-L" },
+        { "Channel 3 Mux", "SDIN2-R", "SDIN2-R" },
+        { "Channel 3 Mux", "SDIN3-L", "SDIN3-L" },
+        { "Channel 3 Mux", "SDIN3-R", "SDIN3-R" },
+        { "Channel 4 Mux", "SDIN1-L", "SDIN1-L" },
+        { "Channel 4 Mux", "SDIN1-R", "SDIN1-R" },
+        { "Channel 4 Mux", "SDIN2-L", "SDIN2-L" },
+        { "Channel 4 Mux", "SDIN2-R", "SDIN2-R" },
+        { "Channel 4 Mux", "SDIN3-L", "SDIN3-L" },
+        { "Channel 4 Mux", "SDIN3-R", "SDIN3-R" },
+        { "Channel 5 Mux", "SDIN1-L", "SDIN1-L" },
+        { "Channel 5 Mux", "SDIN1-R", "SDIN1-R" },
+        { "Channel 5 Mux", "SDIN2-L", "SDIN2-L" },
+        { "Channel 5 Mux", "SDIN2-R", "SDIN2-R" },
+        { "Channel 5 Mux", "SDIN3-L", "SDIN3-L" },
+        { "Channel 5 Mux", "SDIN3-R", "SDIN3-R" },
+        { "Channel 6 Mux", "SDIN1-L", "SDIN1-L" },
+        { "Channel 6 Mux", "SDIN1-R", "SDIN1-R" },
+        { "Channel 6 Mux", "SDIN2-L", "SDIN2-L" },
+        { "Channel 6 Mux", "SDIN2-R", "SDIN2-R" },
+        { "Channel 6 Mux", "SDIN3-L", "SDIN3-L" },
+        { "Channel 6 Mux", "SDIN3-R", "SDIN3-R" },
+        /* Channel muxes -> PWM muxes */
+        { "PWM1 Mux", "Channel 1 Mux", "Channel 1 Mux" },
+        { "PWM2 Mux", "Channel 1 Mux", "Channel 1 Mux" },
+        { "PWM3 Mux", "Channel 1 Mux", "Channel 1 Mux" },
+        { "PWM4 Mux", "Channel 1 Mux", "Channel 1 Mux" },
+        { "PWM5 Mux", "Channel 1 Mux", "Channel 1 Mux" },
+        { "PWM6 Mux", "Channel 1 Mux", "Channel 1 Mux" },
+        { "PWM1 Mux", "Channel 2 Mux", "Channel 2 Mux" },
+        { "PWM2 Mux", "Channel 2 Mux", "Channel 2 Mux" },
+        { "PWM3 Mux", "Channel 2 Mux", "Channel 2 Mux" },
+        { "PWM4 Mux", "Channel 2 Mux", "Channel 2 Mux" },
+        { "PWM5 Mux", "Channel 2 Mux", "Channel 2 Mux" },
+        { "PWM6 Mux", "Channel 2 Mux", "Channel 2 Mux" },
+        { "PWM1 Mux", "Channel 3 Mux", "Channel 3 Mux" },
+        { "PWM2 Mux", "Channel 3 Mux", "Channel 3 Mux" },
+        { "PWM3 Mux", "Channel 3 Mux", "Channel 3 Mux" },
+        { "PWM4 Mux", "Channel 3 Mux", "Channel 3 Mux" },
+        { "PWM5 Mux", "Channel 3 Mux", "Channel 3 Mux" },
+        { "PWM6 Mux", "Channel 3 Mux", "Channel 3 Mux" },
+        { "PWM1 Mux", "Channel 4 Mux", "Channel 4 Mux" },
+        { "PWM2 Mux", "Channel 4 Mux", "Channel 4 Mux" },
+        { "PWM3 Mux", "Channel 4 Mux", "Channel 4 Mux" },
+        { "PWM4 Mux", "Channel 4 Mux", "Channel 4 Mux" },
+        { "PWM5 Mux", "Channel 4 Mux", "Channel 4 Mux" },
+        { "PWM6 Mux", "Channel 4 Mux", "Channel 4 Mux" },
+        { "PWM1 Mux", "Channel 5 Mux", "Channel 5 Mux" },
+        { "PWM2 Mux", "Channel 5 Mux", "Channel 5 Mux" },
+        { "PWM3 Mux", "Channel 5 Mux", "Channel 5 Mux" },
+        { "PWM4 Mux", "Channel 5 Mux", "Channel 5 Mux" },
+        { "PWM5 Mux", "Channel 5 Mux", "Channel 5 Mux" },
+        { "PWM6 Mux", "Channel 5 Mux", "Channel 5 Mux" },
+        { "PWM1 Mux", "Channel 6 Mux", "Channel 6 Mux" },
+        { "PWM2 Mux", "Channel 6 Mux", "Channel 6 Mux" },
+        { "PWM3 Mux", "Channel 6 Mux", "Channel 6 Mux" },
+        { "PWM4 Mux", "Channel 6 Mux", "Channel 6 Mux" },
+        { "PWM5 Mux", "Channel 6 Mux", "Channel 6 Mux" },
+        { "PWM6 Mux", "Channel 6 Mux", "Channel 6 Mux" },
+        /* The PWM muxes are directly connected to the PWM outputs */
+        { "PWM1", NULL, "PWM1 Mux" },
+        { "PWM2", NULL, "PWM2 Mux" },
+        { "PWM3", NULL, "PWM3 Mux" },
+        { "PWM4", NULL, "PWM4 Mux" },
+        { "PWM5", NULL, "PWM5 Mux" },
+        { "PWM6", NULL, "PWM6 Mux" },
+};
 static const struct snd_soc_dai_ops tas5086_dai_ops = {
        .hw_params      = tas5086_hw_params,
        .set_sysclk     = tas5086_set_dai_sysclk,
@@ -426,13 +721,34 @@ static int tas5086_probe(struct snd_soc_codec *codec)
 {
        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
        int charge_period = 1300000; /* hardware default is 1300 ms */
+        u8 pwm_start_mid_z = 0;
        int i, ret;
        if (of_match_device(of_match_ptr(tas5086_dt_ids), codec->dev)) {
                struct device_node *of_node = codec->dev->of_node;
                of_property_read_u32(of_node, "ti,charge-period", &charge_period);
+                for (i = 0; i < 6; i++) {
+                        char name[25];
+                        snprintf(name, sizeof(name),
+                                 "ti,mid-z-channel-%d", i + 1);
+                        if (of_get_property(of_node, name, NULL) != NULL)
+                                pwm_start_mid_z |= 1 << i;
+                }
        }
+        /*
+         * If any of the channels is configured to start in Mid-Z mode,
+         * configure 'part 1' of the PWM starts to use Mid-Z, and tell
+         * all configured mid-z channels to start start under 'part 1'.
+         */
+        if (pwm_start_mid_z)
+                regmap_write(priv->regmap, TAS5086_PWM_START,
+                             TAS5086_PWM_START_MIDZ_FOR_START_1 |
+                                pwm_start_mid_z);
        /* lookup and set split-capacitor charge period */
        if (charge_period == 0) {
                regmap_write(priv->regmap, TAS5086_SPLIT_CAP_CHARGE, 0);
@@ -490,6 +806,10 @@ static struct snd_soc_codec_driver soc_codec_dev_tas5086 = {
        .resume                 = tas5086_soc_resume,
        .controls               = tas5086_controls,
        .num_controls           = ARRAY_SIZE(tas5086_controls),
+        .dapm_widgets           = tas5086_dapm_widgets,
+        .num_dapm_widgets       = ARRAY_SIZE(tas5086_dapm_widgets),
+        .dapm_routes            = tas5086_dapm_routes,
+        .num_dapm_routes        = ARRAY_SIZE(tas5086_dapm_routes),
 };
 static const struct i2c_device_id tas5086_i2c_id[] = {
@@ -500,14 +820,16 @@ MODULE_DEVICE_TABLE(i2c, tas5086_i2c_id);
 static const struct regmap_config tas5086_regmap = {
        .reg_bits               = 8,
-        .val_bits               = 8,
+        .val_bits               = 32,
-        .max_register           = ARRAY_SIZE(tas5086_reg_defaults),
+        .max_register           = TAS5086_MAX_REGISTER,
        .reg_defaults           = tas5086_reg_defaults,
        .num_reg_defaults       = ARRAY_SIZE(tas5086_reg_defaults),
        .cache_type             = REGCACHE_RBTREE,
        .volatile_reg           = tas5086_volatile_reg,
        .writeable_reg          = tas5086_writeable_reg,
        .readable_reg           = tas5086_accessible_reg,
+        .reg_read               = tas5086_reg_read,
+        .reg_write              = tas5086_reg_write,
 };
 static int tas5086_i2c_probe(struct i2c_client *i2c,
@@ -522,7 +844,7 @@ static int tas5086_i2c_probe(struct i2c_client *i2c,
        if (!priv)
                return -ENOMEM;
-        priv->regmap = devm_regmap_init_i2c(i2c, &tas5086_regmap);
+        priv->regmap = devm_regmap_init(dev, NULL, i2c, &tas5086_regmap);
        if (IS_ERR(priv->regmap)) {
                ret = PTR_ERR(priv->regmap);
                dev_err(&i2c->dev, "Failed to create regmap: %d\n", ret);
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 1514bf845e4b..e5b926883131 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -128,10 +128,8 @@ static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = {
 };
 #define SOC_DAPM_SINGLE_AIC3X(xname, reg, shift, mask, invert) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        SOC_SINGLE_EXT(xname, reg, shift, mask, invert, \
-        .info = snd_soc_info_volsw, \
+                snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw_aic3x)
-        .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw_aic3x, \
-        .private_value =  SOC_SINGLE_VALUE(reg, shift, mask, invert) }
 /*
 * All input lines are connected when !0xf and disconnected with 0xf bit field,
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 9b9a6e587610..44621ddc332d 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -38,6 +38,14 @@
 #include "twl6040.h"
+enum twl6040_dai_id {
+        TWL6040_DAI_LEGACY = 0,
+        TWL6040_DAI_UL,
+        TWL6040_DAI_DL1,
+        TWL6040_DAI_DL2,
+        TWL6040_DAI_VIB,
+};
 #define TWL6040_RATES           SNDRV_PCM_RATE_8000_96000
 #define TWL6040_FORMATS (SNDRV_PCM_FMTBIT_S32_LE)
@@ -67,6 +75,8 @@ struct twl6040_data {
        int pll_power_mode;
        int hs_power_mode;
        int hs_power_mode_locked;
+        bool dl1_unmuted;
+        bool dl2_unmuted;
        unsigned int clk_in;
        unsigned int sysclk;
        struct twl6040_jack_data hs_jack;
@@ -220,6 +230,25 @@ static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
        return value;
 }
+static bool twl6040_is_path_unmuted(struct snd_soc_codec *codec,
+                                    unsigned int reg)
+{
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+        switch (reg) {
+        case TWL6040_REG_HSLCTL:
+        case TWL6040_REG_HSRCTL:
+        case TWL6040_REG_EARCTL:
+                /* DL1 path */
+                return priv->dl1_unmuted;
+        case TWL6040_REG_HFLCTL:
+        case TWL6040_REG_HFRCTL:
+                return priv->dl2_unmuted;
+        default:
+                return 1;
+        };
+}
 /*
 * write to the twl6040 register space
 */
@@ -232,7 +261,8 @@ static int twl6040_write(struct snd_soc_codec *codec,
                return -EIO;
        twl6040_write_reg_cache(codec, reg, value);
-        if (likely(reg < TWL6040_REG_SW_SHADOW))
+        if (likely(reg < TWL6040_REG_SW_SHADOW) &&
+            twl6040_is_path_unmuted(codec, reg))
                return twl6040_reg_write(twl6040, reg, value);
        else
                return 0;
@@ -1026,16 +1056,84 @@ static int twl6040_set_dai_sysclk(struct snd_soc_dai *codec_dai,
        return 0;
 }
+static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id id,
+                             int mute)
+{
+        struct twl6040 *twl6040 = codec->control_data;
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+        int hslctl, hsrctl, earctl;
+        int hflctl, hfrctl;
+        switch (id) {
+        case TWL6040_DAI_DL1:
+                hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL);
+                hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL);
+                earctl = twl6040_read_reg_cache(codec, TWL6040_REG_EARCTL);
+                if (mute) {
+                        /* Power down drivers and DACs */
+                        earctl &= ~0x01;
+                        hslctl &= ~(TWL6040_HSDRVENA | TWL6040_HSDACENA);
+                        hsrctl &= ~(TWL6040_HSDRVENA | TWL6040_HSDACENA);
+                }
+                twl6040_reg_write(twl6040, TWL6040_REG_EARCTL, earctl);
+                twl6040_reg_write(twl6040, TWL6040_REG_HSLCTL, hslctl);
+                twl6040_reg_write(twl6040, TWL6040_REG_HSRCTL, hsrctl);
+                priv->dl1_unmuted = !mute;
+                break;
+        case TWL6040_DAI_DL2:
+                hflctl = twl6040_read_reg_cache(codec, TWL6040_REG_HFLCTL);
+                hfrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HFRCTL);
+                if (mute) {
+                        /* Power down drivers and DACs */
+                        hflctl &= ~(TWL6040_HFDACENA | TWL6040_HFPGAENA |
+                                    TWL6040_HFDRVENA);
+                        hfrctl &= ~(TWL6040_HFDACENA | TWL6040_HFPGAENA |
+                                    TWL6040_HFDRVENA);
+                }
+                twl6040_reg_write(twl6040, TWL6040_REG_HFLCTL, hflctl);
+                twl6040_reg_write(twl6040, TWL6040_REG_HFRCTL, hfrctl);
+                priv->dl2_unmuted = !mute;
+                break;
+        default:
+                break;
+        };
+}
+static int twl6040_digital_mute(struct snd_soc_dai *dai, int mute)
+{
+        switch (dai->id) {
+        case TWL6040_DAI_LEGACY:
+                twl6040_mute_path(dai->codec, TWL6040_DAI_DL1, mute);
+                twl6040_mute_path(dai->codec, TWL6040_DAI_DL2, mute);
+                break;
+        case TWL6040_DAI_DL1:
+        case TWL6040_DAI_DL2:
+                twl6040_mute_path(dai->codec, dai->id, mute);
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
 static const struct snd_soc_dai_ops twl6040_dai_ops = {
        .startup        = twl6040_startup,
        .hw_params      = twl6040_hw_params,
        .prepare        = twl6040_prepare,
        .set_sysclk     = twl6040_set_dai_sysclk,
+        .digital_mute   = twl6040_digital_mute,
 };
 static struct snd_soc_dai_driver twl6040_dai[] = {
 {
        .name = "twl6040-legacy",
+        .id = TWL6040_DAI_LEGACY,
        .playback = {
                .stream_name = "Legacy Playback",
                .channels_min = 1,
@@ -1054,6 +1152,7 @@ static struct snd_soc_dai_driver twl6040_dai[] = {
 },
 {
        .name = "twl6040-ul",
+        .id = TWL6040_DAI_UL,
        .capture = {
                .stream_name = "Capture",
                .channels_min = 1,
@@ -1065,6 +1164,7 @@ static struct snd_soc_dai_driver twl6040_dai[] = {
 },
 {
        .name = "twl6040-dl1",
+        .id = TWL6040_DAI_DL1,
        .playback = {
                .stream_name = "Headset Playback",
                .channels_min = 1,
@@ -1076,6 +1176,7 @@ static struct snd_soc_dai_driver twl6040_dai[] = {
 },
 {
        .name = "twl6040-dl2",
+        .id = TWL6040_DAI_DL2,
        .playback = {
                .stream_name = "Handsfree Playback",
                .channels_min = 1,
@@ -1087,6 +1188,7 @@ static struct snd_soc_dai_driver twl6040_dai[] = {
 },
 {
        .name = "twl6040-vib",
+        .id = TWL6040_DAI_VIB,
        .playback = {
                .stream_name = "Vibra Playback",
                .channels_min = 1,
@@ -1143,7 +1245,7 @@ static int twl6040_probe(struct snd_soc_codec *codec)
        mutex_init(&priv->mutex);
-        ret = devm_request_threaded_irq(codec->dev, priv->plug_irq, NULL,
+        ret = request_threaded_irq(priv->plug_irq, NULL,
                                        twl6040_audio_handler, IRQF_NO_SUSPEND,
                                        "twl6040_irq_plug", codec);
        if (ret) {
@@ -1159,6 +1261,9 @@ static int twl6040_probe(struct snd_soc_codec *codec)
 static int twl6040_remove(struct snd_soc_codec *codec)
 {
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+        free_irq(priv->plug_irq, codec);
        twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index af6d227e67be..d2a092850283 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -143,13 +143,8 @@ static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
 }
 #define WM8400_OUTPGA_SINGLE_R_TLV(xname, reg, shift, max, invert, tlv_array) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
+        SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, \
-        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
+                snd_soc_get_volsw, wm8400_outpga_put_volsw_vu, tlv_array)
-                SNDRV_CTL_ELEM_ACCESS_READWRITE,\
-        .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw, \
-        .get = snd_soc_get_volsw, .put = wm8400_outpga_put_volsw_vu, \
-        .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) }
 static const char *wm8400_digital_sidetone[] =
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 9d88437cdcd1..fa24cedee687 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -403,10 +403,8 @@ static int wm8903_class_w_put(struct snd_kcontrol *kcontrol,
 }
 #define SOC_DAPM_SINGLE_W(xname, reg, shift, max, invert) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        SOC_SINGLE_EXT(xname, reg, shift, max, invert, \
-        .info = snd_soc_info_volsw, \
+                snd_soc_dapm_get_volsw, wm8903_class_w_put)
-        .get = snd_soc_dapm_get_volsw, .put = wm8903_class_w_put, \
-        .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
 static int wm8903_deemph[] = { 0, 32000, 44100, 48000 };
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 3ff195c541db..4c9fb142cb2d 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -603,13 +603,8 @@ SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0,
 SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0),
 SOC_ENUM("High Pass Filter Mode", hpf_mode),
+SOC_SINGLE_EXT("ADC 128x OSR Switch", WM8904_ANALOGUE_ADC_0, 0, 1, 0,
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        snd_soc_get_volsw, wm8904_adc_osr_put),
-        .name = "ADC 128x OSR Switch",
-        .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,
-        .put = wm8904_adc_osr_put,
-        .private_value = SOC_SINGLE_VALUE(WM8904_ANALOGUE_ADC_0, 0, 1, 0),
-},
 };
 static const char *drc_path_text[] = {
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 837978e16e9d..253c88bb7a4c 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -151,14 +151,9 @@ static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
 }
 #define SOC_WM899X_OUTPGA_SINGLE_R_TLV(xname, reg, shift, max, invert,\
-         tlv_array) {\
+        tlv_array) \
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
+        SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, \
-        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
+                snd_soc_get_volsw, wm899x_outpga_put_volsw_vu, tlv_array)
-                  SNDRV_CTL_ELEM_ACCESS_READWRITE,\
-        .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw, \
-        .get = snd_soc_get_volsw, .put = wm899x_outpga_put_volsw_vu, \
-        .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) }
 static const char *wm8990_digital_sidetone[] =
diff --git a/sound/soc/codecs/wm8991.h b/sound/soc/codecs/wm8991.h
index 8a942efd18a5..07707d8d7e20 100644
--- a/sound/soc/codecs/wm8991.h
+++ b/sound/soc/codecs/wm8991.h
@@ -822,12 +822,7 @@
 #define SOC_WM899X_OUTPGA_SINGLE_R_TLV(xname, reg, shift, max, invert,\
                                         tlv_array) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
+        SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, \
-        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
+                snd_soc_get_volsw, wm899x_outpga_put_volsw_vu, tlv_array)
-                 SNDRV_CTL_ELEM_ACCESS_READWRITE,\
-        .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw, \
-        .get = snd_soc_get_volsw, .put = wm899x_outpga_put_volsw_vu, \
-        .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) }
 #endif /* _WM8991_H */
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 25580b5a853f..1d4b1ec66e36 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -290,10 +290,8 @@ static const DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0);
 static const DECLARE_TLV_DB_SCALE(mixin_boost_tlv, 0, 900, 0);
 #define WM8994_DRC_SWITCH(xname, reg, shift) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        SOC_SINGLE_EXT(xname, reg, shift, 1, 0, \
-        .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
+                snd_soc_get_volsw, wm8994_put_drc_sw)
-        .put = wm8994_put_drc_sw, \
-        .private_value =  SOC_SINGLE_VALUE(reg, shift, 1, 0) }
 static int wm8994_put_drc_sw(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)
@@ -1433,10 +1431,8 @@ SOC_DAPM_SINGLE("AIF1.1 Switch", WM8994_DAC2_RIGHT_MIXER_ROUTING,
 };
 #define WM8994_CLASS_W_SWITCH(xname, reg, shift, max, invert) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        SOC_SINGLE_EXT(xname, reg, shift, max, invert, \
-        .info = snd_soc_info_volsw, \
+                snd_soc_get_volsw, wm8994_put_class_w)
-        .get = snd_soc_dapm_get_volsw, .put = wm8994_put_class_w, \
-        .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
 static int wm8994_put_class_w(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/soc/codecs/wm8995.h b/sound/soc/codecs/wm8995.h
index 5642121c4977..508ad27fe2bb 100644
--- a/sound/soc/codecs/wm8995.h
+++ b/sound/soc/codecs/wm8995.h
@@ -4237,11 +4237,8 @@
 #define WM8995_SPK2_MUTE_SEQ1_WIDTH                  8  /* SPK2_MUTE_SEQ1 - [7:0] */
 #define WM8995_CLASS_W_SWITCH(xname, reg, shift, max, invert) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        SOC_SINGLE_EXT(xname, reg, shift, max, invert, \
-        .info = snd_soc_info_volsw, \
+                snd_soc_dapm_get_volsw, wm8995_put_class_w)
-        .get = snd_soc_dapm_get_volsw, .put = wm8995_put_class_w, \
-        .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) \
-}
 struct wm8995_reg_access {
        u16 read;
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index 05b1f346695b..70ce6793c5bd 100644
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -209,7 +209,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg)
        case AC97_RESET:
        case AC97_VENDOR_ID1:
        case AC97_VENDOR_ID2:
-                return soc_ac97_ops.read(codec->ac97, reg);
+                return soc_ac97_ops->read(codec->ac97, reg);
        default:
                reg = reg >> 1;
@@ -225,7 +225,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
 {
        u16 *cache = codec->reg_cache;
-        soc_ac97_ops.write(codec->ac97, reg, val);
+        soc_ac97_ops->write(codec->ac97, reg, val);
        reg = reg >> 1;
        if (reg < (ARRAY_SIZE(wm9705_reg)))
                cache[reg] = val;
@@ -294,8 +294,8 @@ static struct snd_soc_dai_driver wm9705_dai[] = {
 static int wm9705_reset(struct snd_soc_codec *codec)
 {
-        if (soc_ac97_ops.reset) {
+        if (soc_ac97_ops->reset) {
-                soc_ac97_ops.reset(codec->ac97);
+                soc_ac97_ops->reset(codec->ac97);
                if (ac97_read(codec, 0) == wm9705_reg[0])
                        return 0; /* Success */
        }
@@ -306,7 +306,7 @@ static int wm9705_reset(struct snd_soc_codec *codec)
 #ifdef CONFIG_PM
 static int wm9705_soc_suspend(struct snd_soc_codec *codec)
 {
-        soc_ac97_ops.write(codec->ac97, AC97_POWERDOWN, 0xffff);
+        soc_ac97_ops->write(codec->ac97, AC97_POWERDOWN, 0xffff);
        return 0;
 }
@@ -323,7 +323,7 @@ static int wm9705_soc_resume(struct snd_soc_codec *codec)
        }
        for (i = 2; i < ARRAY_SIZE(wm9705_reg) << 1; i += 2) {
-                soc_ac97_ops.write(codec->ac97, i, cache[i>>1]);
+                soc_ac97_ops->write(codec->ac97, i, cache[i>>1]);
        }
        return 0;
@@ -337,9 +337,7 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec)
 {
        int ret = 0;
-        printk(KERN_INFO "WM9705 SoC Audio Codec\n");
+        ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
-        ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
        if (ret < 0) {
                printk(KERN_ERR "wm9705: failed to register AC97 codec\n");
                return ret;
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 8e9a6a3eeb1a..c5eb746087b4 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -455,7 +455,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec,
        if (reg == AC97_RESET || reg == AC97_GPIO_STATUS ||
                reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 ||
                reg == AC97_REC_GAIN)
-                return soc_ac97_ops.read(codec->ac97, reg);
+                return soc_ac97_ops->read(codec->ac97, reg);
        else {
                reg = reg >> 1;
@@ -472,7 +472,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
        u16 *cache = codec->reg_cache;
        if (reg < 0x7c)
-                soc_ac97_ops.write(codec->ac97, reg, val);
+                soc_ac97_ops->write(codec->ac97, reg, val);
        reg = reg >> 1;
        if (reg < (ARRAY_SIZE(wm9712_reg)))
                cache[reg] = val;
@@ -581,15 +581,15 @@ static int wm9712_set_bias_level(struct snd_soc_codec *codec,
 static int wm9712_reset(struct snd_soc_codec *codec, int try_warm)
 {
-        if (try_warm && soc_ac97_ops.warm_reset) {
+        if (try_warm && soc_ac97_ops->warm_reset) {
-                soc_ac97_ops.warm_reset(codec->ac97);
+                soc_ac97_ops->warm_reset(codec->ac97);
                if (ac97_read(codec, 0) == wm9712_reg[0])
                        return 1;
        }
-        soc_ac97_ops.reset(codec->ac97);
+        soc_ac97_ops->reset(codec->ac97);
-        if (soc_ac97_ops.warm_reset)
+        if (soc_ac97_ops->warm_reset)
-                soc_ac97_ops.warm_reset(codec->ac97);
+                soc_ac97_ops->warm_reset(codec->ac97);
        if (ac97_read(codec, 0) != wm9712_reg[0])
                goto err;
        return 0;
@@ -624,7 +624,7 @@ static int wm9712_soc_resume(struct snd_soc_codec *codec)
                        if (i == AC97_INT_PAGING || i == AC97_POWERDOWN ||
                            (i > 0x58 && i != 0x5c))
                                continue;
-                        soc_ac97_ops.write(codec->ac97, i, cache[i>>1]);
+                        soc_ac97_ops->write(codec->ac97, i, cache[i>>1]);
                }
        }
@@ -635,7 +635,7 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
 {
        int ret = 0;
-        ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
+        ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
        if (ret < 0) {
                printk(KERN_ERR "wm9712: failed to register AC97 codec\n");
                return ret;
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index f7afa68d8c7f..a53e175c015a 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -652,7 +652,7 @@ static unsigned int ac97_read(struct snd_soc_codec *codec,
        if (reg == AC97_RESET || reg == AC97_GPIO_STATUS ||
                reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 ||
                reg == AC97_CD)
-                return soc_ac97_ops.read(codec->ac97, reg);
+                return soc_ac97_ops->read(codec->ac97, reg);
        else {
                reg = reg >> 1;
@@ -668,7 +668,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
 {
        u16 *cache = codec->reg_cache;
        if (reg < 0x7c)
-                soc_ac97_ops.write(codec->ac97, reg, val);
+                soc_ac97_ops->write(codec->ac97, reg, val);
        reg = reg >> 1;
        if (reg < (ARRAY_SIZE(wm9713_reg)))
                cache[reg] = val;
@@ -1095,15 +1095,15 @@ static struct snd_soc_dai_driver wm9713_dai[] = {
 int wm9713_reset(struct snd_soc_codec *codec, int try_warm)
 {
-        if (try_warm && soc_ac97_ops.warm_reset) {
+        if (try_warm && soc_ac97_ops->warm_reset) {
-                soc_ac97_ops.warm_reset(codec->ac97);
+                soc_ac97_ops->warm_reset(codec->ac97);
                if (ac97_read(codec, 0) == wm9713_reg[0])
                        return 1;
        }
-        soc_ac97_ops.reset(codec->ac97);
+        soc_ac97_ops->reset(codec->ac97);
-        if (soc_ac97_ops.warm_reset)
+        if (soc_ac97_ops->warm_reset)
-                soc_ac97_ops.warm_reset(codec->ac97);
+                soc_ac97_ops->warm_reset(codec->ac97);
        if (ac97_read(codec, 0) != wm9713_reg[0])
                return -EIO;
        return 0;
@@ -1180,7 +1180,7 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec)
                        if (i == AC97_POWERDOWN || i == AC97_EXTENDED_MID ||
                                i == AC97_EXTENDED_MSTATUS || i > 0x66)
                                continue;
-                        soc_ac97_ops.write(codec->ac97, i, cache[i>>1]);
+                        soc_ac97_ops->write(codec->ac97, i, cache[i>>1]);
                }
        }
@@ -1197,7 +1197,7 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec)
                return -ENOMEM;
        snd_soc_codec_set_drvdata(codec, wm9713);
-        ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
+        ret = snd_soc_new_ac97_codec(codec, soc_ac97_ops, 0);
        if (ret < 0)
                goto codec_err;
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index 6e890b916592..9f922c82536c 100644
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -61,14 +61,12 @@ struct wm_adsp {
 };
 #define WM_ADSP1(wname, num) \
-        { .id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \
+        SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, num, 0, NULL, 0, \
-        .shift = num, .event = wm_adsp1_event, \
+                wm_adsp1_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)
-        .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
 #define WM_ADSP2(wname, num) \
-{       .id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \
+        SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, num, 0, NULL, 0, \
-        .shift = num, .event = wm_adsp2_event, \
+                wm_adsp2_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)
-        .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
 extern const struct snd_kcontrol_new wm_adsp1_fw_controls[];
 extern const struct snd_kcontrol_new wm_adsp2_fw_controls[];
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index f5d81b948759..2d9e099415a5 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -693,10 +693,8 @@ void wm_hubs_update_class_w(struct snd_soc_codec *codec)
 EXPORT_SYMBOL_GPL(wm_hubs_update_class_w);
 #define WM_HUBS_SINGLE_W(xname, reg, shift, max, invert) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        SOC_SINGLE_EXT(xname, reg, shift, max, invert, \
-        .info = snd_soc_info_volsw, \
+                snd_soc_dapm_get_volsw, class_w_put_volsw)
-        .get = snd_soc_dapm_get_volsw, .put = class_w_put_volsw, \
-        .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
 static int class_w_put_volsw(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index a8362be3cd18..51be3772cba9 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -501,13 +501,12 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
        imx_ssi_ac97_read(ac97, 0);
 }
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops imx_ssi_ac97_ops = {
        .read           = imx_ssi_ac97_read,
        .write          = imx_ssi_ac97_write,
        .reset          = imx_ssi_ac97_reset,
        .warm_reset     = imx_ssi_ac97_warm_reset
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static int imx_ssi_probe(struct platform_device *pdev)
 {
@@ -583,6 +582,12 @@ static int imx_ssi_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, ssi);
+        ret = snd_soc_set_ac97_ops(&imx_ssi_ac97_ops);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
+                goto failed_register;
+        }
        ret = snd_soc_register_component(&pdev->dev, &imx_component,
                                         dai, 1);
        if (ret) {
@@ -608,6 +613,7 @@ failed_register:
        release_mem_region(res->start, resource_size(res));
        clk_disable_unprepare(ssi->clk);
 failed_clk:
+        snd_soc_set_ac97_ops(NULL);
        return ret;
 }
@@ -627,6 +633,7 @@ static int imx_ssi_remove(struct platform_device *pdev)
        release_mem_region(res->start, resource_size(res));
        clk_disable_unprepare(ssi->clk);
+        snd_soc_set_ac97_ops(NULL);
        return 0;
 }
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 4141b35ef0bb..3ef7a0c92efa 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -131,13 +131,12 @@ static void psc_ac97_cold_reset(struct snd_ac97 *ac97)
        psc_ac97_warm_reset(ac97);
 }
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops psc_ac97_ops = {
        .read           = psc_ac97_read,
        .write          = psc_ac97_write,
        .reset          = psc_ac97_cold_reset,
        .warm_reset     = psc_ac97_warm_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static int psc_ac97_hw_analog_params(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params,
@@ -290,6 +289,12 @@ static int psc_ac97_of_probe(struct platform_device *op)
        if (rc != 0)
                return rc;
+        rc = snd_soc_set_ac97_ops(&psc_ac97_ops);
+        if (rc != 0) {
+                dev_err(&op->dev, "Failed to set AC'97 ops: %d\n", ret);
+                return rc;
+        }
        rc = snd_soc_register_component(&op->dev, &psc_ac97_component,
                                        psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai));
        if (rc != 0) {
@@ -318,6 +323,7 @@ static int psc_ac97_of_remove(struct platform_device *op)
 {
        mpc5200_audio_dma_destroy(op);
        snd_soc_unregister_component(&op->dev);
+        snd_soc_set_ac97_ops(NULL);
        return 0;
 }
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index 78d582519891..ee363845759e 100644
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -371,7 +371,7 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)
        /* audio interrupt base of SRAM location where
         * interrupts are stored by System FW */
-        mc_drv_ctx = kzalloc(sizeof(*mc_drv_ctx), GFP_ATOMIC);
+        mc_drv_ctx = devm_kzalloc(&pdev->dev, sizeof(*mc_drv_ctx), GFP_ATOMIC);
        if (!mc_drv_ctx) {
                pr_err("allocation failed\n");
                return -ENOMEM;
@@ -381,50 +381,39 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)
                                pdev, IORESOURCE_MEM, "IRQ_BASE");
        if (!irq_mem) {
                pr_err("no mem resource given\n");
-                ret_val = -ENODEV;
+                return -ENODEV;
-                goto unalloc;
        }
-        mc_drv_ctx->int_base = ioremap_nocache(irq_mem->start,
+        mc_drv_ctx->int_base = devm_ioremap_nocache(&pdev->dev, irq_mem->start,
-                                        resource_size(irq_mem));
+                                                    resource_size(irq_mem));
        if (!mc_drv_ctx->int_base) {
                pr_err("Mapping of cache failed\n");
-                ret_val = -ENOMEM;
+                return -ENOMEM;
-                goto unalloc;
        }
        /* register for interrupt */
-        ret_val = request_threaded_irq(irq, snd_mfld_jack_intr_handler,
+        ret_val = devm_request_threaded_irq(&pdev->dev, irq,
+                        snd_mfld_jack_intr_handler,
                        snd_mfld_jack_detection,
                        IRQF_SHARED, pdev->dev.driver->name, mc_drv_ctx);
        if (ret_val) {
                pr_err("cannot register IRQ\n");
-                goto unalloc;
+                return ret_val;
        }
        /* register the soc card */
        snd_soc_card_mfld.dev = &pdev->dev;
        ret_val = snd_soc_register_card(&snd_soc_card_mfld);
        if (ret_val) {
                pr_debug("snd_soc_register_card failed %d\n", ret_val);
-                goto freeirq;
+                return ret_val;
        }
        platform_set_drvdata(pdev, mc_drv_ctx);
        pr_debug("successfully exited probe\n");
-        return ret_val;
+        return 0;
-freeirq:
-        free_irq(irq, mc_drv_ctx);
-unalloc:
-        kfree(mc_drv_ctx);
-        return ret_val;
 }
 static int snd_mfld_mc_remove(struct platform_device *pdev)
 {
-        struct mfld_mc_private *mc_drv_ctx = platform_get_drvdata(pdev);
        pr_debug("snd_mfld_mc_remove called\n");
-        free_irq(platform_get_irq(pdev, 0), mc_drv_ctx);
        snd_soc_unregister_card(&snd_soc_card_mfld);
-        kfree(mc_drv_ctx);
        return 0;
 }
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index fe3285ceaf5b..f4c2417a8730 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -197,13 +197,12 @@ static void nuc900_ac97_cold_reset(struct snd_ac97 *ac97)
 }
 /* AC97 controller operations */
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops nuc900_ac97_ops = {
        .read           = nuc900_ac97_read,
        .write          = nuc900_ac97_write,
        .reset          = nuc900_ac97_cold_reset,
        .warm_reset     = nuc900_ac97_warm_reset,
-}
+};
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static int nuc900_ac97_trigger(struct snd_pcm_substream *substream,
                                int cmd, struct snd_soc_dai *dai)
@@ -326,64 +325,52 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
        if (nuc900_ac97_data)
                return -EBUSY;
-        nuc900_audio = kzalloc(sizeof(struct nuc900_audio), GFP_KERNEL);
+        nuc900_audio = devm_kzalloc(&pdev->dev, sizeof(struct nuc900_audio),
+                                    GFP_KERNEL);
        if (!nuc900_audio)
                return -ENOMEM;
        spin_lock_init(&nuc900_audio->lock);
        nuc900_audio->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!nuc900_audio->res) {
+        if (!nuc900_audio->res)
-                ret = -ENODEV;
+                return ret;
-                goto out0;
-        }
-        if (!request_mem_region(nuc900_audio->res->start,
-                        resource_size(nuc900_audio->res), pdev->name)) {
-                ret = -EBUSY;
-                goto out0;
-        }
-        nuc900_audio->mmio = ioremap(nuc900_audio->res->start,
+        nuc900_audio->mmio = devm_ioremap_resource(&pdev->dev,
-                                        resource_size(nuc900_audio->res));
+                                                   nuc900_audio->res);
-        if (!nuc900_audio->mmio) {
+        if (IS_ERR(nuc900_audio->mmio))
-                ret = -ENOMEM;
+                return PTR_ERR(nuc900_audio->mmio);
-                goto out1;
-        }
-        nuc900_audio->clk = clk_get(&pdev->dev, NULL);
+        nuc900_audio->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(nuc900_audio->clk)) {
                ret = PTR_ERR(nuc900_audio->clk);
-                goto out2;
+                goto out;
        }
        nuc900_audio->irq_num = platform_get_irq(pdev, 0);
        if (!nuc900_audio->irq_num) {
                ret = -EBUSY;
-                goto out3;
+                goto out;
        }
        nuc900_ac97_data = nuc900_audio;
+        ret = snd_soc_set_ac97_ops(&nuc900_ac97_ops);
+        if (ret)
+                goto out;
        ret = snd_soc_register_component(&pdev->dev, &nuc900_ac97_component,
                                         &nuc900_ac97_dai, 1);
        if (ret)
-                goto out3;
+                goto out;
        /* enbale ac97 multifunction pin */
        mfp_set_groupg(nuc900_audio->dev, NULL);
        return 0;
-out3:
+out:
-        clk_put(nuc900_audio->clk);
+        snd_soc_set_ac97_ops(NULL);
-out2:
-        iounmap(nuc900_audio->mmio);
-out1:
-        release_mem_region(nuc900_audio->res->start,
-                                        resource_size(nuc900_audio->res));
-out0:
-        kfree(nuc900_audio);
        return ret;
 }
@@ -391,13 +378,8 @@ static int nuc900_ac97_drvremove(struct platform_device *pdev)
 {
        snd_soc_unregister_component(&pdev->dev);
-        clk_put(nuc900_ac97_data->clk);
-        iounmap(nuc900_ac97_data->mmio);
-        release_mem_region(nuc900_ac97_data->res->start,
-                                resource_size(nuc900_ac97_data->res));
-        kfree(nuc900_ac97_data);
        nuc900_ac97_data = NULL;
+        snd_soc_set_ac97_ops(NULL);
        return 0;
 }
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 57ea8e6c5488..a3c22ba25f08 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -41,13 +41,12 @@ static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97)
        pxa2xx_ac97_finish_reset(ac97);
 }
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
        .read   = pxa2xx_ac97_read,
        .write  = pxa2xx_ac97_write,
        .warm_reset     = pxa2xx_ac97_warm_reset,
        .reset  = pxa2xx_ac97_cold_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_stereo_out = {
        .name                   = "AC97 PCM Stereo out",
@@ -244,6 +243,10 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
                return -ENXIO;
        }
+        ret = snd_soc_set_ac97_ops(&pxa2xx_ac97_ops);
+        if (ret != 0)
+                return ret;
        /* Punt most of the init to the SoC probe; we may need the machine
         * driver to do interesting things with the clocking to get us up
         * and running.
@@ -255,6 +258,7 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
 static int pxa2xx_ac97_dev_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_component(&pdev->dev);
+        snd_soc_set_ac97_ops(NULL);
        return 0;
 }
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index cb88ead98917..2dd623fa3882 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -214,13 +214,12 @@ static irqreturn_t s3c_ac97_irq(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops s3c_ac97_ops = {
        .read       = s3c_ac97_read,
        .write      = s3c_ac97_write,
        .warm_reset = s3c_ac97_warm_reset,
        .reset      = s3c_ac97_cold_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static int s3c_ac97_hw_params(struct snd_pcm_substream *substream,
                                  struct snd_pcm_hw_params *params,
@@ -417,11 +416,9 @@ static int s3c_ac97_probe(struct platform_device *pdev)
                return -ENXIO;
        }
-        if (!request_mem_region(mem_res->start,
+        s3c_ac97.regs = devm_ioremap_resource(&pdev->dev, mem_res);
-                                resource_size(mem_res), "ac97")) {
+        if (IS_ERR(s3c_ac97.regs))
-                dev_err(&pdev->dev, "Unable to request register region\n");
+                return PTR_ERR(s3c_ac97.regs);
-                return -EBUSY;
-        }
        s3c_ac97_pcm_out.channel = dmatx_res->start;
        s3c_ac97_pcm_out.dma_addr = mem_res->start + S3C_AC97_PCM_DATA;
@@ -433,14 +430,7 @@ static int s3c_ac97_probe(struct platform_device *pdev)
        init_completion(&s3c_ac97.done);
        mutex_init(&s3c_ac97.lock);
-        s3c_ac97.regs = ioremap(mem_res->start, resource_size(mem_res));
+        s3c_ac97.ac97_clk = devm_clk_get(&pdev->dev, "ac97");
-        if (s3c_ac97.regs == NULL) {
-                dev_err(&pdev->dev, "Unable to ioremap register region\n");
-                ret = -ENXIO;
-                goto err1;
-        }
-        s3c_ac97.ac97_clk = clk_get(&pdev->dev, "ac97");
        if (IS_ERR(s3c_ac97.ac97_clk)) {
                dev_err(&pdev->dev, "ac97 failed to get ac97_clock\n");
                ret = -ENODEV;
@@ -461,6 +451,12 @@ static int s3c_ac97_probe(struct platform_device *pdev)
                goto err4;
        }
+        ret = snd_soc_set_ac97_ops(&s3c_ac97_ops);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
+                goto err4;
+        }
        ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
                                         s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));
        if (ret)
@@ -480,18 +476,14 @@ err5:
 err4:
 err3:
        clk_disable_unprepare(s3c_ac97.ac97_clk);
-        clk_put(s3c_ac97.ac97_clk);
 err2:
-        iounmap(s3c_ac97.regs);
+        snd_soc_set_ac97_ops(NULL);
-err1:
-        release_mem_region(mem_res->start, resource_size(mem_res));
        return ret;
 }
 static int s3c_ac97_remove(struct platform_device *pdev)
 {
-        struct resource *mem_res, *irq_res;
+        struct resource *irq_res;
        asoc_dma_platform_unregister(&pdev->dev);
        snd_soc_unregister_component(&pdev->dev);
@@ -501,13 +493,7 @@ static int s3c_ac97_remove(struct platform_device *pdev)
                free_irq(irq_res->start, NULL);
        clk_disable_unprepare(s3c_ac97.ac97_clk);
-        clk_put(s3c_ac97.ac97_clk);
+        snd_soc_set_ac97_ops(NULL);
-        iounmap(s3c_ac97.regs);
-        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (mem_res)
-                release_mem_region(mem_res->start, resource_size(mem_res));
        return 0;
 }
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index af19f77b7bf0..0af2e4dfd139 100644
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -227,13 +227,12 @@ static void hac_ac97_coldrst(struct snd_ac97 *ac97)
        hac_ac97_warmrst(ac97);
 }
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops hac_ac97_ops = {
        .read   = hac_ac97_read,
        .write  = hac_ac97_write,
        .reset  = hac_ac97_coldrst,
        .warm_reset = hac_ac97_warmrst,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static int hac_hw_params(struct snd_pcm_substream *substream,
                         struct snd_pcm_hw_params *params,
@@ -316,6 +315,10 @@ static const struct snd_soc_component_driver sh4_hac_component = {
 static int hac_soc_platform_probe(struct platform_device *pdev)
 {
+        ret = snd_soc_set_ac97_ops(&hac_ac97_ops);
+        if (ret != 0)
+                return ret;
        return snd_soc_register_component(&pdev->dev, &sh4_hac_component,
                                          sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai));
 }
@@ -323,6 +326,7 @@ static int hac_soc_platform_probe(struct platform_device *pdev)
 static int hac_soc_platform_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_component(&pdev->dev);
+        snd_soc_set_ac97_ops(NULL);
        return 0;
 }
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4489c5b7b53a..309e5c91167b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2080,6 +2080,22 @@ int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
 }
 EXPORT_SYMBOL_GPL(snd_soc_new_ac97_codec);
+struct snd_ac97_bus_ops *soc_ac97_ops;
+int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops)
+{
+        if (ops == soc_ac97_ops)
+                return 0;
+        if (soc_ac97_ops && ops)
+                return -EBUSY;
+        soc_ac97_ops = ops;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_set_ac97_ops);
 /**
 * snd_soc_free_ac97_codec - free AC97 codec device
 * @codec: audio codec
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 2f70ea7f6618..f52eab6d2231 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -142,13 +142,12 @@ static void tegra20_ac97_codec_write(struct snd_ac97 *ac97_snd,
        } while (!time_after(jiffies, timeout));
 }
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops tegra20_ac97_ops = {
        .read           = tegra20_ac97_codec_read,
        .write          = tegra20_ac97_codec_write,
        .reset          = tegra20_ac97_codec_reset,
        .warm_reset     = tegra20_ac97_codec_warm_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static inline void tegra20_ac97_start_playback(struct tegra20_ac97 *ac97)
 {
@@ -327,7 +326,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
        }
        dev_set_drvdata(&pdev->dev, ac97);
-        ac97->clk_ac97 = clk_get(&pdev->dev, NULL);
+        ac97->clk_ac97 = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(ac97->clk_ac97)) {
                dev_err(&pdev->dev, "Can't retrieve ac97 clock\n");
                ret = PTR_ERR(ac97->clk_ac97);
@@ -341,18 +340,10 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
                goto err_clk_put;
        }
-        memregion = devm_request_mem_region(&pdev->dev, mem->start,
+        regs = devm_ioremap_resource(&pdev->dev, mem);
-                                            resource_size(mem), DRV_NAME);
+        if (IS_ERR(regs)) {
-        if (!memregion) {
+                ret = PTR_ERR(regs);
-                dev_err(&pdev->dev, "Memory region already claimed\n");
+                dev_err(&pdev->dev, "ioremap failed: %d\n", ret);
-                ret = -EBUSY;
-                goto err_clk_put;
-        }
-        regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
-        if (!regs) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                ret = -ENOMEM;
                goto err_clk_put;
        }
@@ -403,23 +394,9 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
        ac97->capture_dma_data.maxburst = 4;
        ac97->capture_dma_data.slave_id = of_dma[0];
-        ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
-                                         &tegra20_ac97_dai, 1);
-        if (ret) {
-                dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
-                ret = -ENOMEM;
-                goto err_clk_put;
-        }
-        ret = tegra_pcm_platform_register(&pdev->dev);
-        if (ret) {
-                dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_component;
-        }
        ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev);
        if (ret)
-                goto err_unregister_pcm;
+                goto err_clk_put;
        ret = tegra_asoc_utils_set_ac97_rate(&ac97->util_data);
        if (ret)
@@ -431,20 +408,40 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
                goto err_asoc_utils_fini;
        }
+        ret = snd_soc_set_ac97_ops(&tegra20_ac97_ops);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
+                goto err_asoc_utils_fini;
+        }
+        ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
+                                         &tegra20_ac97_dai, 1);
+        if (ret) {
+                dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
+                ret = -ENOMEM;
+                goto err_asoc_utils_fini;
+        }
+        ret = tegra_pcm_platform_register(&pdev->dev);
+        if (ret) {
+                dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
+                goto err_unregister_component;
+        }
        /* XXX: crufty ASoC AC97 API - only one AC97 codec allowed */
        workdata = ac97;
        return 0;
-err_asoc_utils_fini:
-        tegra_asoc_utils_fini(&ac97->util_data);
 err_unregister_pcm:
        tegra_pcm_platform_unregister(&pdev->dev);
 err_unregister_component:
        snd_soc_unregister_component(&pdev->dev);
+err_asoc_utils_fini:
+        tegra_asoc_utils_fini(&ac97->util_data);
 err_clk_put:
-        clk_put(ac97->clk_ac97);
 err:
+        snd_soc_set_ac97_ops(NULL);
        return ret;
 }
@@ -458,7 +455,8 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev)
        tegra_asoc_utils_fini(&ac97->util_data);
        clk_disable_unprepare(ac97->clk_ac97);
-        clk_put(ac97->clk_ac97);
+        snd_soc_set_ac97_ops(NULL);
        return 0;
 }
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c
index 8a2840304d28..4bcce8a3cded 100644
--- a/sound/soc/txx9/txx9aclc-ac97.c
+++ b/sound/soc/txx9/txx9aclc-ac97.c
@@ -119,12 +119,11 @@ static void txx9aclc_ac97_cold_reset(struct snd_ac97 *ac97)
 }
 /* AC97 controller operations */
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops txx9aclc_ac97_ops = {
        .read           = txx9aclc_ac97_read,
        .write          = txx9aclc_ac97_write,
        .reset          = txx9aclc_ac97_cold_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 static irqreturn_t txx9aclc_ac97_irq(int irq, void *dev_id)
 {
@@ -188,9 +187,9 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
        if (!r)
                return -EBUSY;
-        if (!devm_request_mem_region(&pdev->dev, r->start, resource_size(r),
+        drvdata->base = devm_ioremap_resource(&pdev->dev, r);
-                                     dev_name(&pdev->dev)))
+        if (IS_ERR(drvdata->base))
-                return -EBUSY;
+                return PTR_ERR(drvdata->base);
        drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata)
@@ -201,14 +200,15 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
            r->start >= TXX9_DIRECTMAP_BASE &&
            r->start < TXX9_DIRECTMAP_BASE + 0x400000)
                drvdata->physbase |= 0xf00000000ull;
-        drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
-        if (!drvdata->base)
-                return -EBUSY;
        err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq,
                               0, dev_name(&pdev->dev), drvdata);
        if (err < 0)
                return err;
+        err = snd_soc_set_ac97_ops(&txx9aclc_ac97_ops);
+        if (err < 0)
+                return err;
        return snd_soc_register_component(&pdev->dev, &txx9aclc_ac97_component,
                                          &txx9aclc_ac97_dai, 1);
 }
@@ -216,6 +216,7 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
 static int txx9aclc_ac97_dev_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_component(&pdev->dev);
+        snd_soc_set_ac97_ops(NULL);
        return 0;
 }