diff --git a/[refs] b/[refs]
index b8eb9a9f3618..2e923ca79803 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c1c73376b0df5f19dac40cfbaa50f10404ad81b
+refs/heads/master: 77d19b10a45504af3810681d33b9ebfdb3a57a35
diff --git a/trunk/Documentation/devicetree/bindings/sound/ak4104.txt b/trunk/Documentation/devicetree/bindings/sound/ak4104.txt
deleted file mode 100644
index b902ee39cf89..000000000000
--- a/trunk/Documentation/devicetree/bindings/sound/ak4104.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-AK4104 S/PDIF transmitter
-
-This device supports SPI mode only.
-
-Required properties:
-
-  - compatible : "asahi-kasei,ak4104"
-
-  - reg : The chip select number on the SPI bus
-
-Optional properties:
-
-  - reset-gpio : a GPIO spec for the reset pin. If specified, it will be
-		 deasserted before communication to the device starts.
-
-Example:
-
-spdif: ak4104@0 {
-	compatible = "asahi-kasei,ak4104";
-	reg = <0>;
-	spi-max-frequency = <5000000>;
-};
diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig
index f866e18e7876..b92759a39361 100644
--- a/trunk/sound/soc/codecs/Kconfig
+++ b/trunk/sound/soc/codecs/Kconfig
@@ -146,11 +146,6 @@ config SND_SOC_WM_HUBS
 	default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
 	default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m
 
-config SND_SOC_WM_ADSP
-	tristate
-	default y if SND_SOC_WM2200=y
-	default m if SND_SOC_WM2200=m
-
 config SND_SOC_AB8500_CODEC
 	tristate
 
diff --git a/trunk/sound/soc/codecs/Makefile b/trunk/sound/soc/codecs/Makefile
index 61633d5ff3da..9bd4d95aab4f 100644
--- a/trunk/sound/soc/codecs/Makefile
+++ b/trunk/sound/soc/codecs/Makefile
@@ -62,7 +62,6 @@ snd-soc-twl6040-objs := twl6040.o
 snd-soc-uda134x-objs := uda134x.o
 snd-soc-uda1380-objs := uda1380.o
 snd-soc-wl1273-objs := wl1273.o
-snd-soc-wm-adsp-objs := wm_adsp.o
 snd-soc-wm0010-objs := wm0010.o
 snd-soc-wm1250-ev1-objs := wm1250-ev1.o
 snd-soc-wm2000-objs := wm2000.o
@@ -230,7 +229,6 @@ obj-$(CONFIG_SND_SOC_WM9090)	+= snd-soc-wm9090.o
 obj-$(CONFIG_SND_SOC_WM9705)	+= snd-soc-wm9705.o
 obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-wm9712.o
 obj-$(CONFIG_SND_SOC_WM9713)	+= snd-soc-wm9713.o
-obj-$(CONFIG_SND_SOC_WM_ADSP)	+= snd-soc-wm-adsp.o
 obj-$(CONFIG_SND_SOC_WM_HUBS)	+= snd-soc-wm-hubs.o
 
 # Amp
diff --git a/trunk/sound/soc/codecs/ab8500-codec.c b/trunk/sound/soc/codecs/ab8500-codec.c
index 4d96090db662..af547490b4f7 100644
--- a/trunk/sound/soc/codecs/ab8500-codec.c
+++ b/trunk/sound/soc/codecs/ab8500-codec.c
@@ -2356,7 +2356,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
 	return 0;
 }
 
-static struct snd_soc_dai_driver ab8500_codec_dai[] = {
+struct snd_soc_dai_driver ab8500_codec_dai[] = {
 	{
 		.name = "ab8500-codec-dai.0",
 		.id = 0,
diff --git a/trunk/sound/soc/codecs/ak4104.c b/trunk/sound/soc/codecs/ak4104.c
index 4b11b82b2273..31d4483245d0 100644
--- a/trunk/sound/soc/codecs/ak4104.c
+++ b/trunk/sound/soc/codecs/ak4104.c
@@ -15,8 +15,6 @@
 #include <sound/soc.h>
 #include <sound/initval.h>
 #include <linux/spi/spi.h>
-#include <linux/of_device.h>
-#include <linux/of_gpio.h>
 #include <sound/asoundef.h>
 
 /* AK4104 registers addresses */
@@ -100,32 +98,14 @@ static int ak4104_hw_params(struct snd_pcm_substream *substream,
 	val = 0;
 
 	switch (params_rate(params)) {
-	case 22050:
-		val |= IEC958_AES3_CON_FS_22050;
-		break;
-	case 24000:
-		val |= IEC958_AES3_CON_FS_24000;
-		break;
-	case 32000:
-		val |= IEC958_AES3_CON_FS_32000;
-		break;
 	case 44100:
 		val |= IEC958_AES3_CON_FS_44100;
 		break;
 	case 48000:
 		val |= IEC958_AES3_CON_FS_48000;
 		break;
-	case 88200:
-		val |= IEC958_AES3_CON_FS_88200;
-		break;
-	case 96000:
-		val |= IEC958_AES3_CON_FS_96000;
-		break;
-	case 176400:
-		val |= IEC958_AES3_CON_FS_176400;
-		break;
-	case 192000:
-		val |= IEC958_AES3_CON_FS_192000;
+	case 32000:
+		val |= IEC958_AES3_CON_FS_32000;
 		break;
 	default:
 		dev_err(codec->dev, "unsupported sampling rate\n");
@@ -206,7 +186,6 @@ static const struct regmap_config ak4104_regmap = {
 
 static int ak4104_spi_probe(struct spi_device *spi)
 {
-	struct device_node *np = spi->dev.of_node;
 	struct ak4104_private *ak4104;
 	unsigned int val;
 	int ret;
@@ -222,59 +201,49 @@ static int ak4104_spi_probe(struct spi_device *spi)
 	if (ak4104 == NULL)
 		return -ENOMEM;
 
-	ak4104->regmap = devm_regmap_init_spi(spi, &ak4104_regmap);
+	ak4104->regmap = regmap_init_spi(spi, &ak4104_regmap);
 	if (IS_ERR(ak4104->regmap)) {
 		ret = PTR_ERR(ak4104->regmap);
 		return ret;
 	}
 
-	if (np) {
-		enum of_gpio_flags flags;
-		int gpio = of_get_named_gpio_flags(np, "reset-gpio", 0, &flags);
-
-		if (gpio_is_valid(gpio)) {
-			ret = devm_gpio_request_one(&spi->dev, gpio,
-				     flags & OF_GPIO_ACTIVE_LOW ?
-					GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH,
-				     "ak4104 reset");
-			if (ret < 0)
-				return ret;
-		}
-	}
-
 	/* read the 'reserved' register - according to the datasheet, it
 	 * should contain 0x5b. Not a good way to verify the presence of
 	 * the device, but there is no hardware ID register. */
 	ret = regmap_read(ak4104->regmap, AK4104_REG_RESERVED, &val);
 	if (ret != 0)
-		return ret;
-	if (val != AK4104_RESERVED_VAL)
-		return -ENODEV;
+		goto err;
+	if (val != AK4104_RESERVED_VAL) {
+		ret = -ENODEV;
+		goto err;
+	}
 
 	spi_set_drvdata(spi, ak4104);
 
 	ret = snd_soc_register_codec(&spi->dev,
 			&soc_codec_device_ak4104, &ak4104_dai, 1);
+	if (ret != 0)
+		goto err;
+
+	return 0;
+
+err:
+	regmap_exit(ak4104->regmap);
 	return ret;
 }
 
 static int __devexit ak4104_spi_remove(struct spi_device *spi)
 {
+	struct ak4104_private *ak4101 = spi_get_drvdata(spi);
+	regmap_exit(ak4101->regmap);
 	snd_soc_unregister_codec(&spi->dev);
 	return 0;
 }
 
-static const struct of_device_id ak4104_of_match[] = {
-	{ .compatible = "asahi-kasei,ak4104", },
-	{ }
-};
-MODULE_DEVICE_TABLE(of, ak4104_of_match);
-
 static struct spi_driver ak4104_spi_driver = {
 	.driver  = {
 		.name   = DRV_NAME,
 		.owner  = THIS_MODULE,
-		.of_match_table = ak4104_of_match,
 	},
 	.probe  = ak4104_spi_probe,
 	.remove = __devexit_p(ak4104_spi_remove),
diff --git a/trunk/sound/soc/codecs/ak4535.c b/trunk/sound/soc/codecs/ak4535.c
index 618fdc30f73e..fc5581063b2d 100644
--- a/trunk/sound/soc/codecs/ak4535.c
+++ b/trunk/sound/soc/codecs/ak4535.c
@@ -447,7 +447,7 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,
 	if (ak4535 == NULL)
 		return -ENOMEM;
 
-	ak4535->regmap = regmap_init_i2c(i2c, &ak4535_regmap);
+	ak4535->regmap = devm_regmap_init_i2c(i2c, &ak4535_regmap);
 	if (IS_ERR(ak4535->regmap)) {
 		ret = PTR_ERR(ak4535->regmap);
 		dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret);
@@ -458,18 +458,13 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,
 
 	ret = snd_soc_register_codec(&i2c->dev,
 			&soc_codec_dev_ak4535, &ak4535_dai, 1);
-	if (ret != 0)
-		regmap_exit(ak4535->regmap);
 
 	return ret;
 }
 
 static __devexit int ak4535_i2c_remove(struct i2c_client *client)
 {
-	struct ak4535_priv *ak4535 = i2c_get_clientdata(client);
-
 	snd_soc_unregister_codec(&client->dev);
-	regmap_exit(ak4535->regmap);
 	return 0;
 }
 
diff --git a/trunk/sound/soc/codecs/wm2200.c b/trunk/sound/soc/codecs/wm2200.c
index 06d4e612a164..eab64a193989 100644
--- a/trunk/sound/soc/codecs/wm2200.c
+++ b/trunk/sound/soc/codecs/wm2200.c
@@ -15,7 +15,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/firmware.h>
 #include <linux/gcd.h>
 #include <linux/gpio.h>
 #include <linux/i2c.h>
@@ -33,39 +32,6 @@
 #include <sound/wm2200.h>
 
 #include "wm2200.h"
-#include "wmfw.h"
-
-#define WM2200_DSP_CONTROL_1                   0x00
-#define WM2200_DSP_CONTROL_2                   0x02
-#define WM2200_DSP_CONTROL_3                   0x03
-#define WM2200_DSP_CONTROL_4                   0x04
-#define WM2200_DSP_CONTROL_5                   0x06
-#define WM2200_DSP_CONTROL_6                   0x07
-#define WM2200_DSP_CONTROL_7                   0x08
-#define WM2200_DSP_CONTROL_8                   0x09
-#define WM2200_DSP_CONTROL_9                   0x0A
-#define WM2200_DSP_CONTROL_10                  0x0B
-#define WM2200_DSP_CONTROL_11                  0x0C
-#define WM2200_DSP_CONTROL_12                  0x0D
-#define WM2200_DSP_CONTROL_13                  0x0F
-#define WM2200_DSP_CONTROL_14                  0x10
-#define WM2200_DSP_CONTROL_15                  0x11
-#define WM2200_DSP_CONTROL_16                  0x12
-#define WM2200_DSP_CONTROL_17                  0x13
-#define WM2200_DSP_CONTROL_18                  0x14
-#define WM2200_DSP_CONTROL_19                  0x16
-#define WM2200_DSP_CONTROL_20                  0x17
-#define WM2200_DSP_CONTROL_21                  0x18
-#define WM2200_DSP_CONTROL_22                  0x1A
-#define WM2200_DSP_CONTROL_23                  0x1B
-#define WM2200_DSP_CONTROL_24                  0x1C
-#define WM2200_DSP_CONTROL_25                  0x1E
-#define WM2200_DSP_CONTROL_26                  0x20
-#define WM2200_DSP_CONTROL_27                  0x21
-#define WM2200_DSP_CONTROL_28                  0x22
-#define WM2200_DSP_CONTROL_29                  0x23
-#define WM2200_DSP_CONTROL_30                  0x24
-#define WM2200_DSP_CONTROL_31                  0x26
 
 /* The code assumes DCVDD is generated internally */
 #define WM2200_NUM_CORE_SUPPLIES 2
@@ -98,66 +64,6 @@ struct wm2200_priv {
 	int sysclk;
 };
 
-#define WM2200_DSP_RANGE_BASE (WM2200_MAX_REGISTER + 1)
-#define WM2200_DSP_SPACING 12288
-
-#define WM2200_DSP1_DM_BASE (WM2200_DSP_RANGE_BASE + (0 * WM2200_DSP_SPACING))
-#define WM2200_DSP1_PM_BASE (WM2200_DSP_RANGE_BASE + (1 * WM2200_DSP_SPACING))
-#define WM2200_DSP1_ZM_BASE (WM2200_DSP_RANGE_BASE + (2 * WM2200_DSP_SPACING))
-#define WM2200_DSP2_DM_BASE (WM2200_DSP_RANGE_BASE + (3 * WM2200_DSP_SPACING))
-#define WM2200_DSP2_PM_BASE (WM2200_DSP_RANGE_BASE + (4 * WM2200_DSP_SPACING))
-#define WM2200_DSP2_ZM_BASE (WM2200_DSP_RANGE_BASE + (5 * WM2200_DSP_SPACING))
-
-static const struct regmap_range_cfg wm2200_ranges[] = {
-	/* DSP1 DM */
-	{ .range_min = WM2200_DSP1_DM_BASE,
-	  .range_max = WM2200_DSP1_DM_BASE + 12287,
-	  .selector_reg = WM2200_DSP1_CONTROL_3,
-	  .selector_mask = WM2200_DSP1_PAGE_BASE_DM_0_MASK,
-	  .selector_shift = WM2200_DSP1_PAGE_BASE_DM_0_SHIFT,
-	  .window_start = WM2200_DSP1_DM_0, .window_len = 2048, },
-
-	/* DSP1 PM */
-	{ .range_min = WM2200_DSP1_PM_BASE,
-	  .range_max = WM2200_DSP1_PM_BASE + 12287,
-	  .selector_reg = WM2200_DSP1_CONTROL_2,
-	  .selector_mask = WM2200_DSP1_PAGE_BASE_PM_0_MASK,
-	  .selector_shift = WM2200_DSP1_PAGE_BASE_PM_0_SHIFT,
-	  .window_start = WM2200_DSP1_PM_0, .window_len = 768, },
-
-	/* DSP1 ZM */
-	{ .range_min = WM2200_DSP1_ZM_BASE,
-	  .range_max = WM2200_DSP1_ZM_BASE + 2047,
-	  .selector_reg = WM2200_DSP1_CONTROL_4,
-	  .selector_mask = WM2200_DSP1_PAGE_BASE_ZM_0_MASK,
-	  .selector_shift = WM2200_DSP1_PAGE_BASE_ZM_0_SHIFT,
-	  .window_start = WM2200_DSP1_ZM_0, .window_len = 1024, },
-
-	/* DSP2 DM */
-	{ .range_min = WM2200_DSP2_DM_BASE,
-	  .range_max = WM2200_DSP2_DM_BASE + 4095,
-	  .selector_reg = WM2200_DSP2_CONTROL_3,
-	  .selector_mask = WM2200_DSP2_PAGE_BASE_DM_0_MASK,
-	  .selector_shift = WM2200_DSP2_PAGE_BASE_DM_0_SHIFT,
-	  .window_start = WM2200_DSP2_DM_0, .window_len = 2048, },
-
-	/* DSP2 PM */
-	{ .range_min = WM2200_DSP2_PM_BASE,
-	  .range_max = WM2200_DSP2_PM_BASE + 11287,
-	  .selector_reg = WM2200_DSP2_CONTROL_2,
-	  .selector_mask = WM2200_DSP2_PAGE_BASE_PM_0_MASK,
-	  .selector_shift = WM2200_DSP2_PAGE_BASE_PM_0_SHIFT,
-	  .window_start = WM2200_DSP2_PM_0, .window_len = 768, },
-
-	/* DSP2 ZM */
-	{ .range_min = WM2200_DSP2_ZM_BASE,
-	  .range_max = WM2200_DSP2_ZM_BASE + 2047,
-	  .selector_reg = WM2200_DSP2_CONTROL_4,
-	  .selector_mask = WM2200_DSP2_PAGE_BASE_ZM_0_MASK,
-	  .selector_shift = WM2200_DSP2_PAGE_BASE_ZM_0_SHIFT,
-	  .window_start = WM2200_DSP2_ZM_0, .window_len = 1024, },
-};
-
 static struct reg_default wm2200_reg_defaults[] = {
 	{ 0x000B, 0x0000 },   /* R11    - Tone Generator 1 */
 	{ 0x0102, 0x0000 },   /* R258   - Clocking 3 */
@@ -501,16 +407,6 @@ static struct reg_default wm2200_reg_defaults[] = {
 
 static bool wm2200_volatile_register(struct device *dev, unsigned int reg)
 {
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(wm2200_ranges); i++)
-		if ((reg >= wm2200_ranges[i].window_start &&
-		     reg <= wm2200_ranges[i].window_start +
-		     wm2200_ranges[i].window_len) ||
-		    (reg >= wm2200_ranges[i].range_min &&
-		     reg <= wm2200_ranges[i].range_max))
-			return true;
-
 	switch (reg) {
 	case WM2200_SOFTWARE_RESET:
 	case WM2200_DEVICE_REVISION:
@@ -527,16 +423,6 @@ static bool wm2200_volatile_register(struct device *dev, unsigned int reg)
 
 static bool wm2200_readable_register(struct device *dev, unsigned int reg)
 {
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(wm2200_ranges); i++)
-		if ((reg >= wm2200_ranges[i].window_start &&
-		     reg <= wm2200_ranges[i].window_start +
-		     wm2200_ranges[i].window_len) ||
-		    (reg >= wm2200_ranges[i].range_min &&
-		     reg <= wm2200_ranges[i].range_max))
-			return true;
-
 	switch (reg) {
 	case WM2200_SOFTWARE_RESET:
 	case WM2200_DEVICE_REVISION:
@@ -987,400 +873,6 @@ static int wm2200_reset(struct wm2200_priv *wm2200)
 	}
 }
 
-static int wm2200_dsp_load(struct snd_soc_codec *codec, int base)
-{
-	const struct firmware *firmware;
-	struct regmap *regmap = codec->control_data;
-	unsigned int pos = 0;
-	const struct wmfw_header *header;
-	const struct wmfw_adsp1_sizes *adsp1_sizes;
-	const struct wmfw_footer *footer;
-	const struct wmfw_region *region;
-	const char *file, *region_name;
-	char *text;
-	unsigned int dm, pm, zm, reg;
-	int regions = 0;
-	int ret, offset, type;
-
-	switch (base) {
-	case WM2200_DSP1_CONTROL_1:
-		file = "wm2200-dsp1.wmfw";
-		dm = WM2200_DSP1_DM_BASE;
-		pm = WM2200_DSP1_PM_BASE;
-		zm = WM2200_DSP1_ZM_BASE;
-		break;
-	case WM2200_DSP2_CONTROL_1:
-		file = "wm2200-dsp2.wmfw";
-		dm = WM2200_DSP2_DM_BASE;
-		pm = WM2200_DSP2_PM_BASE;
-		zm = WM2200_DSP2_ZM_BASE;
-		break;
-	default:
-		dev_err(codec->dev, "BASE %x\n", base);
-		BUG_ON(1);
-		return -EINVAL;
-	}
-
-	ret = request_firmware(&firmware, file, codec->dev);
-	if (ret != 0) {
-		dev_err(codec->dev, "Failed to request '%s'\n", file);
-		return ret;
-	}
-
-	pos = sizeof(*header) + sizeof(*adsp1_sizes) + sizeof(*footer);
-	if (pos >= firmware->size) {
-		dev_err(codec->dev, "%s: file too short, %d bytes\n",
-			file, firmware->size);
-		return -EINVAL;
-	}
-
-	header = (void*)&firmware->data[0];
-
-	if (memcmp(&header->magic[0], "WMFW", 4) != 0) {
-		dev_err(codec->dev, "%s: invalid magic\n", file);
-		return -EINVAL;
-	}
-
-	if (header->ver != 0) {
-		dev_err(codec->dev, "%s: unknown file format %d\n",
-			file, header->ver);
-		return -EINVAL;
-	}
-
-	if (le32_to_cpu(header->len) != sizeof(*header) +
-	    sizeof(*adsp1_sizes) + sizeof(*footer)) {
-		dev_err(codec->dev, "%s: unexpected header length %d\n",
-			file, le32_to_cpu(header->len));
-		return -EINVAL;
-	}
-
-	if (header->core != WMFW_ADSP1) {
-		dev_err(codec->dev, "%s: invalid core %d\n",
-			file, header->core);
-		return -EINVAL;
-	}
-
-	adsp1_sizes = (void *)&(header[1]);
-	footer = (void *)&(adsp1_sizes[1]);
-
-	dev_dbg(codec->dev, "%s: %d DM, %d PM, %d ZM\n",
-		file, le32_to_cpu(adsp1_sizes->dm),
-		le32_to_cpu(adsp1_sizes->pm), le32_to_cpu(adsp1_sizes->zm));
-
-	dev_dbg(codec->dev, "%s: timestamp %llu\n", file,
-		le64_to_cpu(footer->timestamp));
-
-	while (pos < firmware->size &&
-	       pos - firmware->size > sizeof(*region)) {
-		region = (void *)&(firmware->data[pos]);
-		region_name = "Unknown";
-		reg = 0;
-		text = NULL;
-		offset = le32_to_cpu(region->offset) & 0xffffff;
-		type = be32_to_cpu(region->type) & 0xff;
-		
-		switch (type) {
-		case WMFW_NAME_TEXT:
-			region_name = "Firmware name";
-			text = kzalloc(le32_to_cpu(region->len) + 1,
-				       GFP_KERNEL);
-			break;
-		case WMFW_INFO_TEXT:
-			region_name = "Information";
-			text = kzalloc(le32_to_cpu(region->len) + 1,
-				       GFP_KERNEL);
-			break;
-		case WMFW_ABSOLUTE:
-			region_name = "Absolute";
-			reg = offset;
-			break;
-		case WMFW_ADSP1_PM:
-			region_name = "PM";
-			reg = pm + (offset * 3);
-			break;
-		case WMFW_ADSP1_DM:
-			region_name = "DM";
-			reg = dm + (offset * 2);
-			break;
-		case WMFW_ADSP1_ZM:
-			region_name = "ZM";
-			reg = zm + (offset * 2);
-			break;
-		default:
-			dev_warn(codec->dev,
-				 "%s.%d: Unknown region type %x at %d(%x)\n",
-				 file, regions, type, pos, pos);
-			break;
-		}
-
-		dev_dbg(codec->dev, "%s.%d: %d bytes at %d in %s\n", file,
-			regions, le32_to_cpu(region->len), offset,
-			region_name);
-
-		if (text) {
-			memcpy(text, region->data, le32_to_cpu(region->len));
-			dev_info(codec->dev, "%s: %s\n", file, text);
-			kfree(text);
-		}
-
-		if (reg) {
-			ret = regmap_raw_write(regmap, reg, region->data,
-					       le32_to_cpu(region->len));
-			if (ret != 0) {
-				dev_err(codec->dev,
-					"%s.%d: Failed to write %d bytes at %d in %s: %d\n",
-					file, regions,
-					le32_to_cpu(region->len), offset,
-					region_name, ret);
-				goto out;
-			}
-		}
-
-		pos += le32_to_cpu(region->len) + sizeof(*region);
-		regions++;
-	}
-
-	if (pos > firmware->size)
-		dev_warn(codec->dev, "%s.%d: %d bytes at end of file\n",
-			 file, regions, pos - firmware->size);
-
-out:
-	release_firmware(firmware);
-	
-	return ret;
-}
-
-static int wm2200_setup_algs(struct snd_soc_codec *codec, int base)
-{
-	struct regmap *regmap = codec->control_data;
-	struct wmfw_adsp1_id_hdr id;
-	struct wmfw_adsp1_alg_hdr *alg;
-	size_t algs;
-	int zm, dm, pm, ret, i;
-	__be32 val;
-
-	switch (base) {
-	case WM2200_DSP1_CONTROL_1:
-		dm = WM2200_DSP1_DM_BASE;
-		pm = WM2200_DSP1_PM_BASE;
-		zm = WM2200_DSP1_ZM_BASE;
-		break;
-	case WM2200_DSP2_CONTROL_1:
-		dm = WM2200_DSP2_DM_BASE;
-		pm = WM2200_DSP2_PM_BASE;
-		zm = WM2200_DSP2_ZM_BASE;
-		break;
-	default:
-		dev_err(codec->dev, "BASE %x\n", base);
-		BUG_ON(1);
-		return -EINVAL;
-	}
-
-	ret = regmap_raw_read(regmap, dm, &id, sizeof(id));
-	if (ret != 0) {
-		dev_err(codec->dev, "Failed to read algorithm info: %d\n",
-			ret);
-		return ret;
-	}
-
-	algs = be32_to_cpu(id.algs);
-	dev_info(codec->dev, "Firmware: %x v%d.%d.%d, %d algorithms\n",
-		 be32_to_cpu(id.fw.id),
-		 (be32_to_cpu(id.fw.ver) & 0xff000) >> 16,
-		 (be32_to_cpu(id.fw.ver) & 0xff00) >> 8,
-		 be32_to_cpu(id.fw.ver) & 0xff,
-		 algs);
-
-	/* Read the terminator first to validate the length */
-	ret = regmap_raw_read(regmap, dm +
-			      (sizeof(id) + (algs * sizeof(*alg))) / 2,
-			      &val, sizeof(val));
-	if (ret != 0) {
-		dev_err(codec->dev, "Failed to read algorithm list end: %d\n",
-			ret);
-		return ret;
-	}
-
-	if (be32_to_cpu(val) != 0xbedead)
-		dev_warn(codec->dev, "Algorithm list end %x 0x%x != 0xbeadead\n",
-			 (sizeof(id) + (algs * sizeof(*alg))) / 2,
-			 be32_to_cpu(val));
-
-	alg = kzalloc(sizeof(*alg) * algs, GFP_KERNEL);
-	if (!alg)
-		return -ENOMEM;
-
-	ret = regmap_raw_read(regmap, dm + (sizeof(id) / 2),
-			      alg, algs * sizeof(*alg));
-	if (ret != 0) {
-		dev_err(codec->dev, "Failed to read algorithm list: %d\n",
-			ret);
-		goto out;
-	}
-
-	for (i = 0; i < algs; i++) {
-		dev_info(codec->dev, "%d: ID %x v%d.%d.%d\n",
-			 i, be32_to_cpu(alg[i].alg.id),
-			 (be32_to_cpu(alg[i].alg.ver) & 0xff000) >> 16,
-			 (be32_to_cpu(alg[i].alg.ver) & 0xff00) >> 8,
-			 be32_to_cpu(alg[i].alg.ver) & 0xff);
-	}
-
-out:
-	kfree(alg);
-	return ret;
-}
-
-static int wm2200_load_coeff(struct snd_soc_codec *codec, int base)
-{
-	struct regmap *regmap = codec->control_data;
-	struct wmfw_coeff_hdr *hdr;
-	struct wmfw_coeff_item *blk;
-	const struct firmware *firmware;
-	const char *file, *region_name;
-	int ret, dm, pm, zm, pos, blocks, type, offset, reg;
-
-	switch (base) {
-	case WM2200_DSP1_CONTROL_1:
-		file = "wm2200-dsp1.bin";
-		dm = WM2200_DSP1_DM_BASE;
-		pm = WM2200_DSP1_PM_BASE;
-		zm = WM2200_DSP1_ZM_BASE;
-		break;
-	case WM2200_DSP2_CONTROL_1:
-		file = "wm2200-dsp2.bin";
-		dm = WM2200_DSP2_DM_BASE;
-		pm = WM2200_DSP2_PM_BASE;
-		zm = WM2200_DSP2_ZM_BASE;
-		break;
-	default:
-		dev_err(codec->dev, "BASE %x\n", base);
-		BUG_ON(1);
-		return -EINVAL;
-	}
-
-	ret = request_firmware(&firmware, file, codec->dev);
-	if (ret != 0) {
-		dev_err(codec->dev, "Failed to request '%s'\n", file);
-		return ret;
-	}
-
-	if (sizeof(*hdr) >= firmware->size) {
-		dev_err(codec->dev, "%s: file too short, %d bytes\n",
-			file, firmware->size);
-		return -EINVAL;
-	}
-
-	hdr = (void*)&firmware->data[0];
-	if (memcmp(hdr->magic, "WMDR", 4) != 0) {
-		dev_err(codec->dev, "%s: invalid magic\n", file);
-		return -EINVAL;
-	}
-
-	dev_dbg(codec->dev, "%s: v%d.%d.%d\n", file,
-		(le32_to_cpu(hdr->ver) >> 16) & 0xff,
-		(le32_to_cpu(hdr->ver) >>  8) & 0xff,
-		le32_to_cpu(hdr->ver) & 0xff);
-
-	pos = le32_to_cpu(hdr->len);
-
-	blocks = 0;
-	while (pos < firmware->size &&
-	       pos - firmware->size > sizeof(*blk)) {
-		blk = (void*)(&firmware->data[pos]);
-
-		type = be32_to_cpu(blk->type) & 0xff;
-		offset = le32_to_cpu(blk->offset) & 0xffffff;
-
-		dev_dbg(codec->dev, "%s.%d: %x v%d.%d.%d\n",
-			file, blocks, le32_to_cpu(blk->id),
-			(le32_to_cpu(blk->ver) >> 16) & 0xff,
-			(le32_to_cpu(blk->ver) >>  8) & 0xff,
-			le32_to_cpu(blk->ver) & 0xff);
-		dev_dbg(codec->dev, "%s.%d: %d bytes at 0x%x in %x\n",
-			file, blocks, le32_to_cpu(blk->len), offset, type);
-
-		reg = 0;
-		region_name = "Unknown";
-		switch (type) {
-		case WMFW_NAME_TEXT:
-		case WMFW_INFO_TEXT:
-			break;
-		case WMFW_ABSOLUTE:
-			region_name = "register";
-			reg = offset;
-			break;
-		default:
-			dev_err(codec->dev, "Unknown region type %x\n", type);
-			break;
-		}
-
-		if (reg) {
-			ret = regmap_raw_write(regmap, reg, blk->data,
-					       le32_to_cpu(blk->len));
-			if (ret != 0) {
-				dev_err(codec->dev,
-					"%s.%d: Failed to write to %x in %s\n",
-					file, blocks, reg, region_name);
-			}
-		}
-
-		pos += le32_to_cpu(blk->len) + sizeof(*blk);
-		blocks++;
-	}
-
-	if (pos > firmware->size)
-		dev_warn(codec->dev, "%s.%d: %d bytes at end of file\n",
-			 file, blocks, pos - firmware->size);
-
-	return 0;
-}
-
-static int wm2200_dsp_ev(struct snd_soc_dapm_widget *w,
-			 struct snd_kcontrol *kcontrol,
-			 int event)
-{
-	struct snd_soc_codec *codec = w->codec;
-	int base = w->reg - WM2200_DSP_CONTROL_30;
-	int ret;
-
-	switch (event) {
-	case SND_SOC_DAPM_POST_PMU:
-		ret = wm2200_dsp_load(codec, base);
-		if (ret != 0)
-			return ret;
-
-		ret = wm2200_setup_algs(codec, base);
-		if (ret != 0)
-			return ret;
-
-		ret = wm2200_load_coeff(codec, base);
-		if (ret != 0)
-			return ret;
-
-		/* Start the core running */
-		snd_soc_update_bits(codec, w->reg,
-				    WM2200_DSP1_CORE_ENA | WM2200_DSP1_START,
-				    WM2200_DSP1_CORE_ENA | WM2200_DSP1_START);
-		break;
-
-	case SND_SOC_DAPM_PRE_PMD:
-		/* Halt the core */
-		snd_soc_update_bits(codec, w->reg,
-				    WM2200_DSP1_CORE_ENA | WM2200_DSP1_START,
-				    0);
-
-		snd_soc_update_bits(codec, base + WM2200_DSP_CONTROL_19,
-				    WM2200_DSP1_WDMA_BUFFER_LENGTH_MASK, 0);
-		break;
-
-	default:
-		break;
-	}
-
-	return 0;
-}
-
 static DECLARE_TLV_DB_SCALE(in_tlv, -6300, 100, 0);
 static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);
 static DECLARE_TLV_DB_SCALE(out_tlv, -6400, 100, 0);
@@ -1388,7 +880,7 @@ static DECLARE_TLV_DB_SCALE(out_tlv, -6400, 100, 0);
 static const char *wm2200_mixer_texts[] = {
 	"None",
 	"Tone Generator",
-	"AEC Loopback",
+	"AEC loopback",
 	"IN1L",
 	"IN1R",
 	"IN2L",
@@ -1484,20 +976,6 @@ static int wm2200_mixer_values[] = {
 	static WM2200_MUX_CTL_DECL(name##_in3); \
 	static WM2200_MUX_CTL_DECL(name##_in4)
 
-#define WM2200_DSP_ENUMS(name, base_reg) \
-	static WM2200_MUX_ENUM_DECL(name##_aux1_enum, base_reg);     \
-	static WM2200_MUX_ENUM_DECL(name##_aux2_enum, base_reg + 1); \
-	static WM2200_MUX_ENUM_DECL(name##_aux3_enum, base_reg + 2); \
-	static WM2200_MUX_ENUM_DECL(name##_aux4_enum, base_reg + 3); \
-	static WM2200_MUX_ENUM_DECL(name##_aux5_enum, base_reg + 4); \
-	static WM2200_MUX_ENUM_DECL(name##_aux6_enum, base_reg + 5); \
-	static WM2200_MUX_CTL_DECL(name##_aux1); \
-	static WM2200_MUX_CTL_DECL(name##_aux2); \
-	static WM2200_MUX_CTL_DECL(name##_aux3); \
-	static WM2200_MUX_CTL_DECL(name##_aux4); \
-	static WM2200_MUX_CTL_DECL(name##_aux5); \
-	static WM2200_MUX_CTL_DECL(name##_aux6);
-
 static const struct snd_kcontrol_new wm2200_snd_controls[] = {
 SOC_SINGLE("IN1 High Performance Switch", WM2200_IN1L_CONTROL,
 	   WM2200_IN1_OSR_SHIFT, 1, 0),
@@ -1573,9 +1051,6 @@ WM2200_MIXER_ENUMS(DSP1R, WM2200_DSP1RMIX_INPUT_1_SOURCE);
 WM2200_MIXER_ENUMS(DSP2L, WM2200_DSP2LMIX_INPUT_1_SOURCE);
 WM2200_MIXER_ENUMS(DSP2R, WM2200_DSP2RMIX_INPUT_1_SOURCE);
 
-WM2200_DSP_ENUMS(DSP1, WM2200_DSP1AUX1MIX_INPUT_1_SOURCE);
-WM2200_DSP_ENUMS(DSP2, WM2200_DSP2AUX1MIX_INPUT_1_SOURCE);
-
 WM2200_MIXER_ENUMS(LHPF1, WM2200_LHPF1MIX_INPUT_1_SOURCE);
 WM2200_MIXER_ENUMS(LHPF2, WM2200_LHPF2MIX_INPUT_1_SOURCE);
 
@@ -1589,19 +1064,8 @@ WM2200_MIXER_ENUMS(LHPF2, WM2200_LHPF2MIX_INPUT_1_SOURCE);
 	WM2200_MUX(name_str " Input 4", &name##_in4_mux), \
 	SND_SOC_DAPM_MIXER(name_str " Mixer", SND_SOC_NOPM, 0, 0, NULL, 0)
 
-#define WM2200_DSP_WIDGETS(name, name_str) \
-	WM2200_MIXER_WIDGETS(name##L, name_str "L"), \
-	WM2200_MIXER_WIDGETS(name##R, name_str "R"), \
-	WM2200_MUX(name_str " Aux 1", &name##_aux1_mux), \
-	WM2200_MUX(name_str " Aux 2", &name##_aux2_mux), \
-	WM2200_MUX(name_str " Aux 3", &name##_aux3_mux), \
-	WM2200_MUX(name_str " Aux 4", &name##_aux4_mux), \
-	WM2200_MUX(name_str " Aux 5", &name##_aux5_mux), \
-	WM2200_MUX(name_str " Aux 6", &name##_aux6_mux)
-
 #define WM2200_MIXER_INPUT_ROUTES(name)	\
 	{ name, "Tone Generator", "Tone Generator" }, \
-	{ name, "AEC Loopback", "AEC Loopback" }, \
         { name, "IN1L", "IN1L PGA" }, \
         { name, "IN1R", "IN1R PGA" }, \
         { name, "IN2L", "IN2L PGA" }, \
@@ -1642,33 +1106,6 @@ WM2200_MIXER_ENUMS(LHPF2, WM2200_LHPF2MIX_INPUT_1_SOURCE);
 	WM2200_MIXER_INPUT_ROUTES(name " Input 3"), \
 	WM2200_MIXER_INPUT_ROUTES(name " Input 4")
 
-#define WM2200_DSP_AUX_ROUTES(name) \
-	{ name, NULL, name " Aux 1" }, \
-	{ name, NULL, name " Aux 2" }, \
-	{ name, NULL, name " Aux 3" }, \
-	{ name, NULL, name " Aux 4" }, \
-	{ name, NULL, name " Aux 5" }, \
-	{ name, NULL, name " Aux 6" }, \
-	WM2200_MIXER_INPUT_ROUTES(name " Aux 1"), \
-	WM2200_MIXER_INPUT_ROUTES(name " Aux 2"), \
-	WM2200_MIXER_INPUT_ROUTES(name " Aux 3"), \
-	WM2200_MIXER_INPUT_ROUTES(name " Aux 4"), \
-	WM2200_MIXER_INPUT_ROUTES(name " Aux 5"), \
-	WM2200_MIXER_INPUT_ROUTES(name " Aux 6")
-
-static const char *wm2200_aec_loopback_texts[] = {
-	"OUT1L", "OUT1R", "OUT2L", "OUT2R",
-};
-
-static const struct soc_enum wm2200_aec_loopback =
-	SOC_ENUM_SINGLE(WM2200_DAC_AEC_CONTROL_1,
-			WM2200_AEC_LOOPBACK_SRC_SHIFT,
-			ARRAY_SIZE(wm2200_aec_loopback_texts),
-			wm2200_aec_loopback_texts);
-
-static const struct snd_kcontrol_new wm2200_aec_loopback_mux =
-	SOC_DAPM_ENUM("AEC Loopback", wm2200_aec_loopback);
-
 static const struct snd_soc_dapm_widget wm2200_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", WM2200_CLOCKING_3, WM2200_SYSCLK_ENA_SHIFT, 0,
 		    NULL, 0),
@@ -1728,12 +1165,8 @@ SND_SOC_DAPM_PGA("LHPF1", WM2200_HPLPF1_1, WM2200_LHPF1_ENA_SHIFT, 0,
 SND_SOC_DAPM_PGA("LHPF2", WM2200_HPLPF2_1, WM2200_LHPF2_ENA_SHIFT, 0,
 		 NULL, 0),
 
-SND_SOC_DAPM_PGA_E("DSP1", WM2200_DSP1_CONTROL_30, WM2200_DSP1_SYS_ENA_SHIFT,
-		   0, NULL, 0, wm2200_dsp_ev,
-		   SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
-SND_SOC_DAPM_PGA_E("DSP2", WM2200_DSP2_CONTROL_30, WM2200_DSP2_SYS_ENA_SHIFT,
-		   0, NULL, 0, wm2200_dsp_ev,
-		   SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+SND_SOC_DAPM_PGA_E("DSP1", SND_SOC_NOPM, 0, 0, NULL, 0, NULL, 0),
+SND_SOC_DAPM_PGA_E("DSP2", SND_SOC_NOPM, 1, 0, NULL, 0, NULL, 0),
 
 SND_SOC_DAPM_AIF_OUT("AIF1TX1", "Capture", 0,
 		    WM2200_AUDIO_IF_1_22, WM2200_AIF1TX1_ENA_SHIFT, 0),
@@ -1748,9 +1181,6 @@ SND_SOC_DAPM_AIF_OUT("AIF1TX5", "Capture", 4,
 SND_SOC_DAPM_AIF_OUT("AIF1TX6", "Capture", 5,
 		    WM2200_AUDIO_IF_1_22, WM2200_AIF1TX6_ENA_SHIFT, 0),
 
-SND_SOC_DAPM_MUX("AEC Loopback", WM2200_DAC_AEC_CONTROL_1,
-		 WM2200_AEC_LOOPBACK_ENA_SHIFT, 0, &wm2200_aec_loopback_mux),
-
 SND_SOC_DAPM_PGA_S("OUT1L", 0, WM2200_OUTPUT_ENABLES,
 		   WM2200_OUT1L_ENA_SHIFT, 0, NULL, 0),
 SND_SOC_DAPM_PGA_S("OUT1R", 0, WM2200_OUTPUT_ENABLES,
@@ -1801,8 +1231,10 @@ WM2200_MIXER_WIDGETS(EQR, "EQR"),
 WM2200_MIXER_WIDGETS(LHPF1, "LHPF1"),
 WM2200_MIXER_WIDGETS(LHPF2, "LHPF2"),
 
-WM2200_DSP_WIDGETS(DSP1, "DSP1"),
-WM2200_DSP_WIDGETS(DSP2, "DSP2"),
+WM2200_MIXER_WIDGETS(DSP1L, "DSP1L"),
+WM2200_MIXER_WIDGETS(DSP1R, "DSP1R"),
+WM2200_MIXER_WIDGETS(DSP2L, "DSP2L"),
+WM2200_MIXER_WIDGETS(DSP2R, "DSP2R"),
 
 WM2200_MIXER_WIDGETS(AIF1TX1, "AIF1TX1"),
 WM2200_MIXER_WIDGETS(AIF1TX2, "AIF1TX2"),
@@ -1894,19 +1326,11 @@ static const struct snd_soc_dapm_route wm2200_dapm_routes[] = {
 	{ "SPK", NULL, "OUT2L" },
 	{ "SPK", NULL, "OUT2R" },
 
-	{ "AEC Loopback", "OUT1L", "OUT1L" },
-	{ "AEC Loopback", "OUT1R", "OUT1R" },
-	{ "AEC Loopback", "OUT2L", "OUT2L" },
-	{ "AEC Loopback", "OUT2R", "OUT2R" },
-
 	WM2200_MIXER_ROUTES("DSP1", "DSP1L"),
 	WM2200_MIXER_ROUTES("DSP1", "DSP1R"),
 	WM2200_MIXER_ROUTES("DSP2", "DSP2L"),
 	WM2200_MIXER_ROUTES("DSP2", "DSP2R"),
 
-	WM2200_DSP_AUX_ROUTES("DSP1"),
-	WM2200_DSP_AUX_ROUTES("DSP2"),
-
 	WM2200_MIXER_ROUTES("OUT1L", "OUT1L"),
 	WM2200_MIXER_ROUTES("OUT1R", "OUT1R"),
 	WM2200_MIXER_ROUTES("OUT2L", "OUT2L"),
@@ -2544,15 +1968,12 @@ static const struct regmap_config wm2200_regmap = {
 	.reg_bits = 16,
 	.val_bits = 16,
 
-	.max_register = WM2200_MAX_REGISTER + (ARRAY_SIZE(wm2200_ranges) *
-					       WM2200_DSP_SPACING),
+	.max_register = WM2200_MAX_REGISTER,
 	.reg_defaults = wm2200_reg_defaults,
 	.num_reg_defaults = ARRAY_SIZE(wm2200_reg_defaults),
 	.volatile_reg = wm2200_volatile_register,
 	.readable_reg = wm2200_readable_register,
 	.cache_type = REGCACHE_RBTREE,
-	.ranges = wm2200_ranges,
-	.num_ranges = ARRAY_SIZE(wm2200_ranges),
 };
 
 static const unsigned int wm2200_dig_vu[] = {
@@ -2590,7 +2011,7 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c,
 	wm2200->dev = &i2c->dev;
 	init_completion(&wm2200->fll_lock);
 
-	wm2200->regmap = devm_regmap_init_i2c(i2c, &wm2200_regmap);
+	wm2200->regmap = regmap_init_i2c(i2c, &wm2200_regmap);
 	if (IS_ERR(wm2200->regmap)) {
 		ret = PTR_ERR(wm2200->regmap);
 		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@@ -2606,9 +2027,8 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c,
 	for (i = 0; i < ARRAY_SIZE(wm2200->core_supplies); i++)
 		wm2200->core_supplies[i].supply = wm2200_core_supply_names[i];
 
-	ret = devm_regulator_bulk_get(&i2c->dev,
-				      ARRAY_SIZE(wm2200->core_supplies),
-				      wm2200->core_supplies);
+	ret = regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm2200->core_supplies),
+				 wm2200->core_supplies);
 	if (ret != 0) {
 		dev_err(&i2c->dev, "Failed to request core supplies: %d\n",
 			ret);
@@ -2624,9 +2044,8 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c,
 	}
 
 	if (wm2200->pdata.ldo_ena) {
-		ret = devm_gpio_request_one(&i2c->dev, wm2200->pdata.ldo_ena,
-					    GPIOF_OUT_INIT_HIGH,
-					    "WM2200 LDOENA");
+		ret = gpio_request_one(wm2200->pdata.ldo_ena,
+				       GPIOF_OUT_INIT_HIGH, "WM2200 LDOENA");
 		if (ret < 0) {
 			dev_err(&i2c->dev, "Failed to request LDOENA %d: %d\n",
 				wm2200->pdata.ldo_ena, ret);
@@ -2636,9 +2055,8 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c,
 	}
 
 	if (wm2200->pdata.reset) {
-		ret = devm_gpio_request_one(&i2c->dev, wm2200->pdata.reset,
-					    GPIOF_OUT_INIT_HIGH,
-					    "WM2200 /RESET");
+		ret = gpio_request_one(wm2200->pdata.reset,
+				       GPIOF_OUT_INIT_HIGH, "WM2200 /RESET");
 		if (ret < 0) {
 			dev_err(&i2c->dev, "Failed to request /RESET %d: %d\n",
 				wm2200->pdata.reset, ret);
@@ -2748,16 +2166,23 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c,
 err_pm_runtime:
 	pm_runtime_disable(&i2c->dev);
 err_reset:
-	if (wm2200->pdata.reset)
+	if (wm2200->pdata.reset) {
 		gpio_set_value_cansleep(wm2200->pdata.reset, 0);
+		gpio_free(wm2200->pdata.reset);
+	}
 err_ldo:
-	if (wm2200->pdata.ldo_ena)
+	if (wm2200->pdata.ldo_ena) {
 		gpio_set_value_cansleep(wm2200->pdata.ldo_ena, 0);
+		gpio_free(wm2200->pdata.ldo_ena);
+	}
 err_enable:
 	regulator_bulk_disable(ARRAY_SIZE(wm2200->core_supplies),
 			       wm2200->core_supplies);
 err_core:
+	regulator_bulk_free(ARRAY_SIZE(wm2200->core_supplies),
+			    wm2200->core_supplies);
 err_regmap:
+	regmap_exit(wm2200->regmap);
 err:
 	return ret;
 }
@@ -2769,10 +2194,17 @@ static __devexit int wm2200_i2c_remove(struct i2c_client *i2c)
 	snd_soc_unregister_codec(&i2c->dev);
 	if (i2c->irq)
 		free_irq(i2c->irq, wm2200);
-	if (wm2200->pdata.reset)
+	if (wm2200->pdata.reset) {
 		gpio_set_value_cansleep(wm2200->pdata.reset, 0);
-	if (wm2200->pdata.ldo_ena)
+		gpio_free(wm2200->pdata.reset);
+	}
+	if (wm2200->pdata.ldo_ena) {
 		gpio_set_value_cansleep(wm2200->pdata.ldo_ena, 0);
+		gpio_free(wm2200->pdata.ldo_ena);
+	}
+	regulator_bulk_free(ARRAY_SIZE(wm2200->core_supplies),
+			    wm2200->core_supplies);
+	regmap_exit(wm2200->regmap);
 
 	return 0;
 }
diff --git a/trunk/sound/soc/codecs/wm_adsp.c b/trunk/sound/soc/codecs/wm_adsp.c
deleted file mode 100644
index 7fdb68ef384e..000000000000
--- a/trunk/sound/soc/codecs/wm_adsp.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
- * wm_adsp.c  --  Wolfson ADSP support
- *
- * Copyright 2012 Wolfson Microelectronics plc
- *
- * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/firmware.h>
-#include <linux/pm.h>
-#include <linux/pm_runtime.h>
-#include <linux/regmap.h>
-#include <linux/regulator/consumer.h>
-#include <linux/slab.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/soc.h>
-#include <sound/jack.h>
-#include <sound/initval.h>
-#include <sound/tlv.h>
-
-#include <linux/mfd/arizona/registers.h>
-
-#include "wm_adsp.h"
-
-#define adsp_crit(_dsp, fmt, ...) \
-	dev_crit(_dsp->dev, "DSP%d: " fmt, _dsp->num, ##__VA_ARGS__)
-#define adsp_err(_dsp, fmt, ...) \
-	dev_err(_dsp->dev, "DSP%d: " fmt, _dsp->num, ##__VA_ARGS__)
-#define adsp_warn(_dsp, fmt, ...) \
-	dev_warn(_dsp->dev, "DSP%d: " fmt, _dsp->num, ##__VA_ARGS__)
-#define adsp_info(_dsp, fmt, ...) \
-	dev_info(_dsp->dev, "DSP%d: " fmt, _dsp->num, ##__VA_ARGS__)
-#define adsp_dbg(_dsp, fmt, ...) \
-	dev_dbg(_dsp->dev, "DSP%d: " fmt, _dsp->num, ##__VA_ARGS__)
-
-#define ADSP1_CONTROL_1                   0x00
-#define ADSP1_CONTROL_2                   0x02
-#define ADSP1_CONTROL_3                   0x03
-#define ADSP1_CONTROL_4                   0x04
-#define ADSP1_CONTROL_5                   0x06
-#define ADSP1_CONTROL_6                   0x07
-#define ADSP1_CONTROL_7                   0x08
-#define ADSP1_CONTROL_8                   0x09
-#define ADSP1_CONTROL_9                   0x0A
-#define ADSP1_CONTROL_10                  0x0B
-#define ADSP1_CONTROL_11                  0x0C
-#define ADSP1_CONTROL_12                  0x0D
-#define ADSP1_CONTROL_13                  0x0F
-#define ADSP1_CONTROL_14                  0x10
-#define ADSP1_CONTROL_15                  0x11
-#define ADSP1_CONTROL_16                  0x12
-#define ADSP1_CONTROL_17                  0x13
-#define ADSP1_CONTROL_18                  0x14
-#define ADSP1_CONTROL_19                  0x16
-#define ADSP1_CONTROL_20                  0x17
-#define ADSP1_CONTROL_21                  0x18
-#define ADSP1_CONTROL_22                  0x1A
-#define ADSP1_CONTROL_23                  0x1B
-#define ADSP1_CONTROL_24                  0x1C
-#define ADSP1_CONTROL_25                  0x1E
-#define ADSP1_CONTROL_26                  0x20
-#define ADSP1_CONTROL_27                  0x21
-#define ADSP1_CONTROL_28                  0x22
-#define ADSP1_CONTROL_29                  0x23
-#define ADSP1_CONTROL_30                  0x24
-#define ADSP1_CONTROL_31                  0x26
-
-/*
- * ADSP1 Control 19
- */
-#define ADSP1_WDMA_BUFFER_LENGTH_MASK     0x00FF  /* DSP1_WDMA_BUFFER_LENGTH - [7:0] */
-#define ADSP1_WDMA_BUFFER_LENGTH_SHIFT         0  /* DSP1_WDMA_BUFFER_LENGTH - [7:0] */
-#define ADSP1_WDMA_BUFFER_LENGTH_WIDTH         8  /* DSP1_WDMA_BUFFER_LENGTH - [7:0] */
-
-
-/*
- * ADSP1 Control 30
- */
-#define ADSP1_DBG_CLK_ENA                 0x0008  /* DSP1_DBG_CLK_ENA */
-#define ADSP1_DBG_CLK_ENA_MASK            0x0008  /* DSP1_DBG_CLK_ENA */
-#define ADSP1_DBG_CLK_ENA_SHIFT                3  /* DSP1_DBG_CLK_ENA */
-#define ADSP1_DBG_CLK_ENA_WIDTH                1  /* DSP1_DBG_CLK_ENA */
-#define ADSP1_SYS_ENA                     0x0004  /* DSP1_SYS_ENA */
-#define ADSP1_SYS_ENA_MASK                0x0004  /* DSP1_SYS_ENA */
-#define ADSP1_SYS_ENA_SHIFT                    2  /* DSP1_SYS_ENA */
-#define ADSP1_SYS_ENA_WIDTH                    1  /* DSP1_SYS_ENA */
-#define ADSP1_CORE_ENA                    0x0002  /* DSP1_CORE_ENA */
-#define ADSP1_CORE_ENA_MASK               0x0002  /* DSP1_CORE_ENA */
-#define ADSP1_CORE_ENA_SHIFT                   1  /* DSP1_CORE_ENA */
-#define ADSP1_CORE_ENA_WIDTH                   1  /* DSP1_CORE_ENA */
-#define ADSP1_START                       0x0001  /* DSP1_START */
-#define ADSP1_START_MASK                  0x0001  /* DSP1_START */
-#define ADSP1_START_SHIFT                      0  /* DSP1_START */
-#define ADSP1_START_WIDTH                      1  /* DSP1_START */
-
-#define ADSP2_CONTROL  0
-#define ADSP2_CLOCKING 1
-#define ADSP2_STATUS1  4
-
-/*
- * ADSP2 Control
- */
-
-#define ADSP2_MEM_ENA                     0x0010  /* DSP1_MEM_ENA */
-#define ADSP2_MEM_ENA_MASK                0x0010  /* DSP1_MEM_ENA */
-#define ADSP2_MEM_ENA_SHIFT                    4  /* DSP1_MEM_ENA */
-#define ADSP2_MEM_ENA_WIDTH                    1  /* DSP1_MEM_ENA */
-#define ADSP2_SYS_ENA                     0x0004  /* DSP1_SYS_ENA */
-#define ADSP2_SYS_ENA_MASK                0x0004  /* DSP1_SYS_ENA */
-#define ADSP2_SYS_ENA_SHIFT                    2  /* DSP1_SYS_ENA */
-#define ADSP2_SYS_ENA_WIDTH                    1  /* DSP1_SYS_ENA */
-#define ADSP2_CORE_ENA                    0x0002  /* DSP1_CORE_ENA */
-#define ADSP2_CORE_ENA_MASK               0x0002  /* DSP1_CORE_ENA */
-#define ADSP2_CORE_ENA_SHIFT                   1  /* DSP1_CORE_ENA */
-#define ADSP2_CORE_ENA_WIDTH                   1  /* DSP1_CORE_ENA */
-#define ADSP2_START                       0x0001  /* DSP1_START */
-#define ADSP2_START_MASK                  0x0001  /* DSP1_START */
-#define ADSP2_START_SHIFT                      0  /* DSP1_START */
-#define ADSP2_START_WIDTH                      1  /* DSP1_START */
-
-/*
- * ADSP2 clocking
- */
-#define ADSP2_CLK_SEL_MASK                0x0007  /* CLK_SEL_ENA */
-#define ADSP2_CLK_SEL_SHIFT                    0  /* CLK_SEL_ENA */
-#define ADSP2_CLK_SEL_WIDTH                    3  /* CLK_SEL_ENA */
-
-/*
- * ADSP2 Status 1
- */
-#define ADSP2_RAM_RDY                     0x0001
-#define ADSP2_RAM_RDY_MASK                0x0001
-#define ADSP2_RAM_RDY_SHIFT                    0
-#define ADSP2_RAM_RDY_WIDTH                    1
-
-
-static struct wm_adsp_region const *wm_adsp_find_region(struct wm_adsp *dsp,
-							int type)
-{
-	int i;
-
-	for (i = 0; i < dsp->num_mems; i++)
-		if (dsp->mem[i].type == type)
-			return &dsp->mem[i];
-
-	return NULL;
-}
-
-static int wm_adsp_load(struct wm_adsp *dsp)
-{
-	const struct firmware *firmware;
-	struct regmap *regmap = dsp->regmap;
-	unsigned int pos = 0;
-	const struct wmfw_header *header;
-	const struct wmfw_adsp1_sizes *adsp1_sizes;
-	const struct wmfw_adsp2_sizes *adsp2_sizes;
-	const struct wmfw_footer *footer;
-	const struct wmfw_region *region;
-	const struct wm_adsp_region *mem;
-	const char *region_name;
-	char *file, *text;
-	unsigned int reg;
-	int regions = 0;
-	int ret, offset, type, sizes;
-
-	file = kzalloc(PAGE_SIZE, GFP_KERNEL);
-	if (file == NULL)
-		return -ENOMEM;
-
-	snprintf(file, PAGE_SIZE, "%s-dsp%d.wmfw", dsp->part, dsp->num);
-	file[PAGE_SIZE - 1] = '\0';
-
-	ret = request_firmware(&firmware, file, dsp->dev);
-	if (ret != 0) {
-		adsp_err(dsp, "Failed to request '%s'\n", file);
-		goto out;
-	}
-	ret = -EINVAL;
-
-	pos = sizeof(*header) + sizeof(*adsp1_sizes) + sizeof(*footer);
-	if (pos >= firmware->size) {
-		adsp_err(dsp, "%s: file too short, %zu bytes\n",
-			 file, firmware->size);
-		goto out_fw;
-	}
-
-	header = (void*)&firmware->data[0];
-
-	if (memcmp(&header->magic[0], "WMFW", 4) != 0) {
-		adsp_err(dsp, "%s: invalid magic\n", file);
-		goto out_fw;
-	}
-
-	if (header->ver != 0) {
-		adsp_err(dsp, "%s: unknown file format %d\n",
-			 file, header->ver);
-		goto out_fw;
-	}
-
-	if (header->core != dsp->type) {
-		adsp_err(dsp, "%s: invalid core %d != %d\n",
-			 file, header->core, dsp->type);
-		goto out_fw;
-	}
-
-	switch (dsp->type) {
-	case WMFW_ADSP1:
-		pos = sizeof(*header) + sizeof(*adsp1_sizes) + sizeof(*footer);
-		adsp1_sizes = (void *)&(header[1]);
-		footer = (void *)&(adsp1_sizes[1]);
-		sizes = sizeof(*adsp1_sizes);
-
-		adsp_dbg(dsp, "%s: %d DM, %d PM, %d ZM\n",
-			 file, le32_to_cpu(adsp1_sizes->dm),
-			 le32_to_cpu(adsp1_sizes->pm),
-			 le32_to_cpu(adsp1_sizes->zm));
-		break;
-
-	case WMFW_ADSP2:
-		pos = sizeof(*header) + sizeof(*adsp2_sizes) + sizeof(*footer);
-		adsp2_sizes = (void *)&(header[1]);
-		footer = (void *)&(adsp2_sizes[1]);
-		sizes = sizeof(*adsp2_sizes);
-
-		adsp_dbg(dsp, "%s: %d XM, %d YM %d PM, %d ZM\n",
-			 file, le32_to_cpu(adsp2_sizes->xm),
-			 le32_to_cpu(adsp2_sizes->ym),
-			 le32_to_cpu(adsp2_sizes->pm),
-			 le32_to_cpu(adsp2_sizes->zm));
-		break;
-
-	default:
-		BUG_ON(NULL == "Unknown DSP type");
-		goto out_fw;
-	}
-
-	if (le32_to_cpu(header->len) != sizeof(*header) +
-	    sizes + sizeof(*footer)) {
-		adsp_err(dsp, "%s: unexpected header length %d\n",
-			 file, le32_to_cpu(header->len));
-		goto out_fw;
-	}
-
-	adsp_dbg(dsp, "%s: timestamp %llu\n", file,
-		 le64_to_cpu(footer->timestamp));
-
-	while (pos < firmware->size &&
-	       pos - firmware->size > sizeof(*region)) {
-		region = (void *)&(firmware->data[pos]);
-		region_name = "Unknown";
-		reg = 0;
-		text = NULL;
-		offset = le32_to_cpu(region->offset) & 0xffffff;
-		type = be32_to_cpu(region->type) & 0xff;
-		mem = wm_adsp_find_region(dsp, type);
-		
-		switch (type) {
-		case WMFW_NAME_TEXT:
-			region_name = "Firmware name";
-			text = kzalloc(le32_to_cpu(region->len) + 1,
-				       GFP_KERNEL);
-			break;
-		case WMFW_INFO_TEXT:
-			region_name = "Information";
-			text = kzalloc(le32_to_cpu(region->len) + 1,
-				       GFP_KERNEL);
-			break;
-		case WMFW_ABSOLUTE:
-			region_name = "Absolute";
-			reg = offset;
-			break;
-		case WMFW_ADSP1_PM:
-			BUG_ON(!mem);
-			region_name = "PM";
-			reg = mem->base + (offset * 3);
-			break;
-		case WMFW_ADSP1_DM:
-			BUG_ON(!mem);
-			region_name = "DM";
-			reg = mem->base + (offset * 2);
-			break;
-		case WMFW_ADSP2_XM:
-			BUG_ON(!mem);
-			region_name = "XM";
-			reg = mem->base + (offset * 2);
-			break;
-		case WMFW_ADSP2_YM:
-			BUG_ON(!mem);
-			region_name = "YM";
-			reg = mem->base + (offset * 2);
-			break;
-		case WMFW_ADSP1_ZM:
-			BUG_ON(!mem);
-			region_name = "ZM";
-			reg = mem->base + (offset * 2);
-			break;
-		default:
-			adsp_warn(dsp,
-				  "%s.%d: Unknown region type %x at %d(%x)\n",
-				  file, regions, type, pos, pos);
-			break;
-		}
-
-		adsp_dbg(dsp, "%s.%d: %d bytes at %d in %s\n", file,
-			 regions, le32_to_cpu(region->len), offset,
-			 region_name);
-
-		if (text) {
-			memcpy(text, region->data, le32_to_cpu(region->len));
-			adsp_info(dsp, "%s: %s\n", file, text);
-			kfree(text);
-		}
-
-		if (reg) {
-			ret = regmap_raw_write(regmap, reg, region->data,
-					       le32_to_cpu(region->len));
-			if (ret != 0) {
-				adsp_err(dsp,
-					"%s.%d: Failed to write %d bytes at %d in %s: %d\n",
-					file, regions,
-					le32_to_cpu(region->len), offset,
-					region_name, ret);
-				goto out_fw;
-			}
-		}
-
-		pos += le32_to_cpu(region->len) + sizeof(*region);
-		regions++;
-	}
-	
-	if (pos > firmware->size)
-		adsp_warn(dsp, "%s.%d: %zu bytes at end of file\n",
-			  file, regions, pos - firmware->size);
-
-out_fw:
-	release_firmware(firmware);
-out:
-	kfree(file);
-
-	return ret;
-}
-
-static int wm_adsp_load_coeff(struct wm_adsp *dsp)
-{
-	struct regmap *regmap = dsp->regmap;
-	struct wmfw_coeff_hdr *hdr;
-	struct wmfw_coeff_item *blk;
-	const struct firmware *firmware;
-	const char *region_name;
-	int ret, pos, blocks, type, offset, reg;
-	char *file;
-
-	file = kzalloc(PAGE_SIZE, GFP_KERNEL);
-	if (file == NULL)
-		return -ENOMEM;
-
-	snprintf(file, PAGE_SIZE, "%s-dsp%d.bin", dsp->part, dsp->num);
-	file[PAGE_SIZE - 1] = '\0';
-
-	ret = request_firmware(&firmware, file, dsp->dev);
-	if (ret != 0) {
-		adsp_warn(dsp, "Failed to request '%s'\n", file);
-		ret = 0;
-		goto out;
-	}
-	ret = -EINVAL;
-
-	if (sizeof(*hdr) >= firmware->size) {
-		adsp_err(dsp, "%s: file too short, %zu bytes\n",
-			file, firmware->size);
-		goto out_fw;
-	}
-
-	hdr = (void*)&firmware->data[0];
-	if (memcmp(hdr->magic, "WMDR", 4) != 0) {
-		adsp_err(dsp, "%s: invalid magic\n", file);
-		return -EINVAL;
-	}
-
-	adsp_dbg(dsp, "%s: v%d.%d.%d\n", file,
-		(le32_to_cpu(hdr->ver) >> 16) & 0xff,
-		(le32_to_cpu(hdr->ver) >>  8) & 0xff,
-		le32_to_cpu(hdr->ver) & 0xff);
-
-	pos = le32_to_cpu(hdr->len);
-
-	blocks = 0;
-	while (pos < firmware->size &&
-	       pos - firmware->size > sizeof(*blk)) {
-		blk = (void*)(&firmware->data[pos]);
-
-		type = be32_to_cpu(blk->type) & 0xff;
-		offset = le32_to_cpu(blk->offset) & 0xffffff;
-
-		adsp_dbg(dsp, "%s.%d: %x v%d.%d.%d\n",
-			 file, blocks, le32_to_cpu(blk->id),
-			 (le32_to_cpu(blk->ver) >> 16) & 0xff,
-			 (le32_to_cpu(blk->ver) >>  8) & 0xff,
-			 le32_to_cpu(blk->ver) & 0xff);
-		adsp_dbg(dsp, "%s.%d: %d bytes at 0x%x in %x\n",
-			 file, blocks, le32_to_cpu(blk->len), offset, type);
-
-		reg = 0;
-		region_name = "Unknown";
-		switch (type) {
-		case WMFW_NAME_TEXT:
-		case WMFW_INFO_TEXT:
-			break;
-		case WMFW_ABSOLUTE:
-			region_name = "register";
-			reg = offset;
-			break;
-		default:
-			adsp_err(dsp, "Unknown region type %x\n", type);
-			break;
-		}
-
-		if (reg) {
-			ret = regmap_raw_write(regmap, reg, blk->data,
-					       le32_to_cpu(blk->len));
-			if (ret != 0) {
-				adsp_err(dsp,
-					"%s.%d: Failed to write to %x in %s\n",
-					file, blocks, reg, region_name);
-			}
-		}
-
-		pos += le32_to_cpu(blk->len) + sizeof(*blk);
-		blocks++;
-	}
-
-	if (pos > firmware->size)
-		adsp_warn(dsp, "%s.%d: %zu bytes at end of file\n",
-			  file, blocks, pos - firmware->size);
-
-out_fw:
-	release_firmware(firmware);
-out:
-	kfree(file);
-	return 0;
-}
-
-int wm_adsp1_event(struct snd_soc_dapm_widget *w,
-		   struct snd_kcontrol *kcontrol,
-		   int event)
-{
-	struct snd_soc_codec *codec = w->codec;
-	struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
-	struct wm_adsp *dsp = &dsps[w->shift];
-	int ret;
-
-	switch (event) {
-	case SND_SOC_DAPM_POST_PMU:
-		regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
-				   ADSP1_SYS_ENA, ADSP1_SYS_ENA);
-
-		ret = wm_adsp_load(dsp);
-		if (ret != 0)
-			goto err;
-
-		ret = wm_adsp_load_coeff(dsp);
-		if (ret != 0)
-			goto err;
-
-		/* Start the core running */
-		regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
-				   ADSP1_CORE_ENA | ADSP1_START,
-				   ADSP1_CORE_ENA | ADSP1_START);
-		break;
-
-	case SND_SOC_DAPM_PRE_PMD:
-		/* Halt the core */
-		regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
-				   ADSP1_CORE_ENA | ADSP1_START, 0);
-
-		regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_19,
-				   ADSP1_WDMA_BUFFER_LENGTH_MASK, 0);
-
-		regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
-				   ADSP1_SYS_ENA, 0);
-		break;
-
-	default:
-		break;
-	}
-
-	return 0;
-
-err:
-	regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30,
-			   ADSP1_SYS_ENA, 0);
-	return ret;
-}
-EXPORT_SYMBOL_GPL(wm_adsp1_event);
-
-static int wm_adsp2_ena(struct wm_adsp *dsp)
-{
-	unsigned int val;
-	int ret, count;
-
-	ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
-				 ADSP2_SYS_ENA, ADSP2_SYS_ENA);
-	if (ret != 0)
-		return ret;
-
-	/* Wait for the RAM to start, should be near instantaneous */
-	count = 0;
-	do {
-		ret = regmap_read(dsp->regmap, dsp->base + ADSP2_STATUS1,
-				  &val);
-		if (ret != 0)
-			return ret;
-	} while (!(val & ADSP2_RAM_RDY) && ++count < 10);
-
-	if (!(val & ADSP2_RAM_RDY)) {
-		adsp_err(dsp, "Failed to start DSP RAM\n");
-		return -EBUSY;
-	}
-
-	adsp_dbg(dsp, "RAM ready after %d polls\n", count);
-	adsp_info(dsp, "RAM ready after %d polls\n", count);
-
-	return 0;
-}
-
-int wm_adsp2_event(struct snd_soc_dapm_widget *w,
-		   struct snd_kcontrol *kcontrol, int event)
-{
-	struct snd_soc_codec *codec = w->codec;
-	struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
-	struct wm_adsp *dsp = &dsps[w->shift];
-	unsigned int val;
-	int ret;
-
-	switch (event) {
-	case SND_SOC_DAPM_POST_PMU:
-		if (dsp->dvfs) {
-			ret = regmap_read(dsp->regmap,
-					  dsp->base + ADSP2_CLOCKING, &val);
-			if (ret != 0) {
-				dev_err(dsp->dev,
-					"Failed to read clocking: %d\n", ret);
-				return ret;
-			}
-
-			if ((val & ADSP2_CLK_SEL_MASK) >= 3) {
-				ret = regulator_enable(dsp->dvfs);
-				if (ret != 0) {
-					dev_err(dsp->dev,
-						"Failed to enable supply: %d\n",
-						ret);
-					return ret;
-				}
-
-				ret = regulator_set_voltage(dsp->dvfs,
-							    1800000,
-							    1800000);
-				if (ret != 0) {
-					dev_err(dsp->dev,
-						"Failed to raise supply: %d\n",
-						ret);
-					return ret;
-				}
-			}
-		}
-
-		ret = wm_adsp2_ena(dsp);
-		if (ret != 0)
-			return ret;
-
-		ret = wm_adsp_load(dsp);
-		if (ret != 0)
-			goto err;
-
-		ret = wm_adsp_load_coeff(dsp);
-		if (ret != 0)
-			goto err;
-
-		ret = regmap_update_bits(dsp->regmap,
-					 dsp->base + ADSP2_CONTROL,
-					 ADSP2_CORE_ENA | ADSP2_START,
-					 ADSP2_CORE_ENA | ADSP2_START);
-		if (ret != 0)
-			goto err;
-		break;
-
-	case SND_SOC_DAPM_PRE_PMD:
-		regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
-				   ADSP2_SYS_ENA | ADSP2_CORE_ENA |
-				   ADSP2_START, 0);
-
-		if (dsp->dvfs) {
-			ret = regulator_set_voltage(dsp->dvfs, 1200000,
-						    1800000);
-			if (ret != 0)
-				dev_warn(dsp->dev,
-					 "Failed to lower supply: %d\n",
-					 ret);
-
-			ret = regulator_disable(dsp->dvfs);
-			if (ret != 0)
-				dev_err(dsp->dev,
-					"Failed to enable supply: %d\n",
-					ret);
-		}
-		break;
-
-	default:
-		break;
-	}
-
-	return 0;
-err:
-	regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
-			   ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);
-	return ret;
-}
-EXPORT_SYMBOL_GPL(wm_adsp2_event);
-
-int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs)
-{
-	int ret;
-
-	if (dvfs) {
-		adsp->dvfs = devm_regulator_get(adsp->dev, "DCVDD");
-		if (IS_ERR(adsp->dvfs)) {
-			ret = PTR_ERR(adsp->dvfs);
-			dev_err(adsp->dev, "Failed to get DCVDD: %d\n", ret);
-			return ret;
-		}
-
-		ret = regulator_enable(adsp->dvfs);
-		if (ret != 0) {
-			dev_err(adsp->dev, "Failed to enable DCVDD: %d\n",
-				ret);
-			return ret;
-		}
-
-		ret = regulator_set_voltage(adsp->dvfs, 1200000, 1800000);
-		if (ret != 0) {
-			dev_err(adsp->dev, "Failed to initialise DVFS: %d\n",
-				ret);
-			return ret;
-		}
-
-		ret = regulator_disable(adsp->dvfs);
-		if (ret != 0) {
-			dev_err(adsp->dev, "Failed to disable DCVDD: %d\n",
-				ret);
-			return ret;
-		}
-	}
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(wm_adsp2_init);
diff --git a/trunk/sound/soc/codecs/wm_adsp.h b/trunk/sound/soc/codecs/wm_adsp.h
deleted file mode 100644
index ffd29a4609e2..000000000000
--- a/trunk/sound/soc/codecs/wm_adsp.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * wm_adsp.h  --  Wolfson ADSP support
- *
- * Copyright 2012 Wolfson Microelectronics plc
- *
- * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __WM_ADSP_H
-#define __WM_ADSP_H
-
-#include <sound/soc.h>
-#include <sound/soc-dapm.h>
-
-#include "wmfw.h"
-
-struct regulator;
-
-struct wm_adsp_region {
-	int type;
-	unsigned int base;
-};
-
-struct wm_adsp {
-	const char *part;
-	int num;
-	int type;
-	struct device *dev;
-	struct regmap *regmap;
-
-	int base;
-
-	const struct wm_adsp_region *mem;
-	int num_mems;
-
-	struct regulator *dvfs;
-};
-
-#define WM_ADSP1(wname, num) \
-	{ .id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \
-	.shift = num, .event = wm_adsp1_event, \
-	.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, \
-	.shift = num, .event = wm_adsp2_event, \
-	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
-
-int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs);
-int wm_adsp1_event(struct snd_soc_dapm_widget *w,
-		   struct snd_kcontrol *kcontrol, int event);
-int wm_adsp2_event(struct snd_soc_dapm_widget *w,
-		   struct snd_kcontrol *kcontrol, int event);
-
-#endif
diff --git a/trunk/sound/soc/codecs/wmfw.h b/trunk/sound/soc/codecs/wmfw.h
deleted file mode 100644
index 5632ded67fdd..000000000000
--- a/trunk/sound/soc/codecs/wmfw.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * wmfw.h - Wolfson firmware format information
- *
- * Copyright 2012 Wolfson Microelectronics plc
- *
- * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __WMFW_H
-#define __WMFW_H
-
-#include <linux/types.h>
-
-struct wmfw_header {
-	char magic[4];
-	__le32 len;
-	__le16 rev;
-	u8 core;
-	u8 ver;
-} __packed;
-
-struct wmfw_footer {
-	__le64 timestamp;
-	__le32 checksum;
-} __packed;
-
-struct wmfw_adsp1_sizes {
-	__le32 dm;
-	__le32 pm;
-	__le32 zm;
-} __packed;
-
-struct wmfw_adsp2_sizes {
-	__le32 xm;
-	__le32 ym;
-	__le32 pm;
-	__le32 zm;
-} __packed;
-
-struct wmfw_region {
-	union {
-		__be32 type;
-		__le32 offset;
-	};
-	__le32 len;
-	u8 data[];
-} __packed;
-
-struct wmfw_id_hdr {
-	__be32 core_id;
-	__be32 core_rev;
-	__be32 id;
-	__be32 ver;
-} __packed;
-
-struct wmfw_adsp1_id_hdr {
-	struct wmfw_id_hdr fw;
-	__be32 zm;
-	__be32 dm;
-	__be32 algs;
-} __packed;
-
-struct wmfw_adsp2_id_hdr {
-	struct wmfw_id_hdr fw;
-	__be32 zm;
-	__be32 xm;
-	__be32 ym;
-	__be32 algs;
-} __packed;
-
-struct wmfw_alg_hdr {
-	__be32 id;
-	__be32 ver;
-} __packed;
-
-struct wmfw_adsp1_alg_hdr {
-	struct wmfw_alg_hdr alg;
-	__be32 zm;
-	__be32 dm;
-} __packed;
-
-struct wmfw_adsp2_alg_hdr {
-	struct wmfw_alg_hdr alg;
-	__be32 zm;
-	__be32 xm;
-	__be32 ym;
-} __packed;
-
-struct wmfw_coeff_hdr {
-	u8 magic[4];
-	__le32 len;
-	__le32 ver;
-	u8 data[];
-} __packed;
-
-struct wmfw_coeff_item {
-	union {
-		__be32 type;
-		__le32 offset;
-	};
-	__le32 id;
-	__le32 ver;
-	__le32 sr;
-	__le32 len;
-	u8 data[];
-} __packed;
-
-#define WMFW_ADSP1 1
-#define WMFW_ADSP2 2
-
-#define WMFW_ABSOLUTE  0xf0
-#define WMFW_NAME_TEXT 0xfe
-#define WMFW_INFO_TEXT 0xff
-
-#define WMFW_ADSP1_PM 2
-#define WMFW_ADSP1_DM 3
-#define WMFW_ADSP1_ZM 4
-
-#define WMFW_ADSP2_PM 2
-#define WMFW_ADSP2_ZM 4
-#define WMFW_ADSP2_XM 5
-#define WMFW_ADSP2_YM 6
-
-#endif
diff --git a/trunk/sound/soc/fsl/Kconfig b/trunk/sound/soc/fsl/Kconfig
index aa73efa64cb4..4563b28bd625 100644
--- a/trunk/sound/soc/fsl/Kconfig
+++ b/trunk/sound/soc/fsl/Kconfig
@@ -98,12 +98,12 @@ config SND_SOC_IMX_PCM
 	tristate
 
 config SND_SOC_IMX_PCM_FIQ
-	bool
+	tristate
 	select FIQ
 	select SND_SOC_IMX_PCM
 
 config SND_SOC_IMX_PCM_DMA
-	bool
+	tristate
 	select SND_SOC_DMAENGINE_PCM
 	select SND_SOC_IMX_PCM
 
diff --git a/trunk/sound/soc/fsl/Makefile b/trunk/sound/soc/fsl/Makefile
index c3deee897b5a..5f3cf3f52ea0 100644
--- a/trunk/sound/soc/fsl/Makefile
+++ b/trunk/sound/soc/fsl/Makefile
@@ -26,18 +26,14 @@ obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o
 # i.MX Platform Support
 snd-soc-imx-ssi-objs := imx-ssi.o
 snd-soc-imx-audmux-objs := imx-audmux.o
-snd-soc-imx-pcm-objs := imx-pcm.o
-ifneq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),)
-	snd-soc-imx-pcm-objs += imx-pcm-fiq.o
-endif
-ifneq ($(CONFIG_SND_SOC_IMX_PCM_DMA),)
-	snd-soc-imx-pcm-objs += imx-pcm-dma.o
-endif
 
 obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o
 obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
 
 obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o
+snd-soc-imx-pcm-y := imx-pcm.o
+snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += imx-pcm-fiq.o
+snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o
 
 # i.MX Machine Support
 snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
diff --git a/trunk/sound/soc/mxs/mxs-saif.c b/trunk/sound/soc/mxs/mxs-saif.c
index b304e375568a..c294fbb523fc 100644
--- a/trunk/sound/soc/mxs/mxs-saif.c
+++ b/trunk/sound/soc/mxs/mxs-saif.c
@@ -229,7 +229,6 @@ int mxs_saif_put_mclk(unsigned int saif_id)
 	saif->mclk_in_use = 0;
 	return 0;
 }
-EXPORT_SYMBOL_GPL(mxs_saif_put_mclk);
 
 /*
  * Get MCLK and set clock rate, then enable it
@@ -283,7 +282,6 @@ int mxs_saif_get_mclk(unsigned int saif_id, unsigned int mclk,
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(mxs_saif_get_mclk);
 
 /*
  * SAIF DAI format configuration.