Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This contains pretty many small commits covering fairly large range of
  files in sound/ directory.  Partly because of additional API support
  and partly because of constantly developed ASoC and ARM stuff.

  Some highlights:

   - Introduced the helper function and documentation for exposing the
     channel map via control API, as discussed in Plumbers; most of PCI
     drivers are covered, will follow more drivers later

   - Most of drivers have been replaced with the new PM callbacks (if
     the bus is supported)

   - HD-audio controller got the support of runtime PM and the support
     of D3 clock-stop.  Also changing the power_save option in sysfs
     kicks off immediately to enable / disable the power-save mode.

   - Another significant code change in HD-audio is the rewrite of
     firmware loading code.  Other than that, most of changes in
     HD-audio are continued cleanups and standardization for the generic
     auto parser and bug fixes (HBR, device-specific fixups), in
     addition to the support of channel-map API.

   - Addition of ASoC bindings for the compressed API, used by the
     mid-x86 drivers.

   - Lots of cleanups and API refreshes for ASoC codec drivers and
     DaVinci.

   - Conversion of OMAP to dmaengine.

   - New machine driver for Wolfson Microelectronics Bells.

   - New CODEC driver for Wolfson Microelectronics WM0010.

   - Enhancements to the ux500 and wm2000 drivers

   - A new driver for DA9055 and the support for regulator bypass mode."

Fix up various arm soc header file reorg conflicts.

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
  ALSA: hda - Add new codec ALC283 ALC290 support
  ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
  ALSA: hda - fix indices on boost volume on Conexant
  ALSA: aloop - add locking to timer access
  ALSA: hda - Fix hang caused by race during suspend.
  sound: Remove unnecessary semicolon
  ALSA: hda/realtek - Fix detection of ALC271X codec
  ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
  ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
  ALSA: hda - make a generic unsol event handler
  ASoC: codecs: Add DA9055 codec driver
  ASoC: eukrea-tlv320: Convert it to platform driver
  ALSA: ASoC: add DT bindings for CS4271
  ASoC: wm_hubs: Ensure volume updates are handled during class W startup
  ASoC: wm5110: Adding missing volume update bits
  ASoC: wm5110: Add OUT3R support
  ASoC: wm5110: Add AEC loopback support
  ASoC: wm5110: Rename EPOUT to HPOUT3
  ASoC: arizona: Add more clock rates
  ASoC: arizona: Add more DSP options for mixer input muxes
  ...

14 files changed, 163 insertions, 170 deletions

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index d70133086ac3..4563b28bd625 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -6,7 +6,7 @@ config SND_SOC_FSL_UTILS
 
 menuconfig SND_POWERPC_SOC
         tristate "SoC Audio for Freescale PowerPC CPUs"
-        depends on FSL_SOC
+        depends on FSL_SOC || PPC_MPC52xx
         help
           Say Y or M if you want to add support for codecs attached to
           the PowerPC CPUs.
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c
index efb9ede01208..267d5b4b63ce 100644
--- a/sound/soc/fsl/eukrea-tlv320.c
+++ b/sound/soc/fsl/eukrea-tlv320.c
@@ -93,9 +93,7 @@ static struct snd_soc_card eukrea_tlv320 = {
         .num_links      = 1,
 };
 
-static struct platform_device *eukrea_tlv320_snd_device;
-
-static int __init eukrea_tlv320_init(void)
+static int __devinit eukrea_tlv320_probe(struct platform_device *pdev)
 {
         int ret;
         int int_port = 0, ext_port;
@@ -136,29 +134,32 @@ static int __init eukrea_tlv320_init(void)
                 return 0;
         }
 
-        eukrea_tlv320_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!eukrea_tlv320_snd_device)
-                return -ENOMEM;
-
-        platform_set_drvdata(eukrea_tlv320_snd_device, &eukrea_tlv320);
-        ret = platform_device_add(eukrea_tlv320_snd_device);
-
-        if (ret) {
-                printk(KERN_ERR "ASoC: Platform device allocation failed\n");
-                platform_device_put(eukrea_tlv320_snd_device);
-        }
+        eukrea_tlv320.dev = &pdev->dev;
+        ret = snd_soc_register_card(&eukrea_tlv320);
+        if (ret)
+                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
 
         return ret;
 }
 
-static void __exit eukrea_tlv320_exit(void)
+static int __devexit eukrea_tlv320_remove(struct platform_device *pdev)
 {
-        platform_device_unregister(eukrea_tlv320_snd_device);
+        snd_soc_unregister_card(&eukrea_tlv320);
+
+        return 0;
 }
 
-module_init(eukrea_tlv320_init);
-module_exit(eukrea_tlv320_exit);
+static struct platform_driver eukrea_tlv320_driver = {
+        .driver = {
+                .name = "eukrea_tlv320",
+                .owner = THIS_MODULE,
+        },
+        .probe = eukrea_tlv320_probe,
+        .remove = __devexit_p(eukrea_tlv320_remove),};
+
+module_platform_driver(eukrea_tlv320_driver);
 
 MODULE_AUTHOR("Eric Bénard <eric@eukrea.com>");
 MODULE_DESCRIPTION("CPUIMX ALSA SoC driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:eukrea_tlv320");
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 96bb92dd174c..6feb26500580 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -823,12 +823,6 @@ static int fsl_dma_close(struct snd_pcm_substream *substream)
                 if (dma_private->irq)
                         free_irq(dma_private->irq, dma_private);
 
-                if (dma_private->ld_buf_phys) {
-                        dma_unmap_single(dev, dma_private->ld_buf_phys,
-                                         sizeof(dma_private->link),
-                                         DMA_TO_DEVICE);
-                }
-
                 /* Deallocate the fsl_dma_private structure */
                 dma_free_coherent(dev, sizeof(struct fsl_dma_private),
                                   dma_private, dma_private->ld_buf_phys);
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index e7c800ebbd75..524ce6210cee 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -74,9 +74,6 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
         if (!buf)
                 return -ENOMEM;
 
-        if (!audmux_base)
-                return -ENOSYS;
-
         if (audmux_clk)
                 clk_prepare_enable(audmux_clk);
 
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index 89a7755b6f56..d85929b79c35 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -109,6 +109,9 @@ static int snd_imx_open(struct snd_pcm_substream *substream)
         dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
         dma_data = kzalloc(sizeof(*dma_data), GFP_KERNEL);
+        if (!dma_data)
+                return -ENOMEM;
+
         dma_data->peripheral_type = dma_params->shared_peripheral ?
                                         IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI;
         dma_data->priority = DMA_PRIO_HIGH;
@@ -117,7 +120,7 @@ static int snd_imx_open(struct snd_pcm_substream *substream)
         ret = snd_dmaengine_pcm_open(substream, filter, dma_data);
         if (ret) {
                 kfree(dma_data);
-                return 0;
+                return ret;
         }
 
         snd_dmaengine_pcm_set_data(substream, dma_data);
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index e6a17baca1ee..006f7d465ed2 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -380,14 +380,13 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai)
 static struct snd_soc_dai_driver imx_ssi_dai = {
         .probe = imx_ssi_dai_probe,
         .playback = {
-                /* The SSI does not support monaural audio. */
-                .channels_min = 2,
+                .channels_min = 1,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_96000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
         },
         .capture = {
-                .channels_min = 2,
+                .channels_min = 1,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_96000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -524,7 +523,7 @@ static int imx_ssi_probe(struct platform_device *pdev)
         int ret = 0;
         struct snd_soc_dai_driver *dai;
 
-        ssi = kzalloc(sizeof(*ssi), GFP_KERNEL);
+        ssi = devm_kzalloc(&pdev->dev, sizeof(*ssi), GFP_KERNEL);
         if (!ssi)
                 return -ENOMEM;
         dev_set_drvdata(&pdev->dev, ssi);
@@ -537,7 +536,7 @@ static int imx_ssi_probe(struct platform_device *pdev)
 
         ssi->irq = platform_get_irq(pdev, 0);
 
-        ssi->clk = clk_get(&pdev->dev, NULL);
+        ssi->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(ssi->clk)) {
                 ret = PTR_ERR(ssi->clk);
                 dev_err(&pdev->dev, "Cannot get the clock: %d\n",
@@ -552,23 +551,18 @@ static int imx_ssi_probe(struct platform_device *pdev)
                 goto failed_get_resource;
         }
 
-        if (!request_mem_region(res->start, resource_size(res), DRV_NAME)) {
-                dev_err(&pdev->dev, "request_mem_region failed\n");
-                ret = -EBUSY;
-                goto failed_get_resource;
-        }
-
-        ssi->base = ioremap(res->start, resource_size(res));
+        ssi->base = devm_request_and_ioremap(&pdev->dev, res);
         if (!ssi->base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENODEV;
-                goto failed_ioremap;
+                goto failed_register;
         }
 
         if (ssi->flags & IMX_SSI_USE_AC97) {
                 if (ac97_ssi) {
+                        dev_err(&pdev->dev, "AC'97 SSI already registered\n");
                         ret = -EBUSY;
-                        goto failed_ac97;
+                        goto failed_register;
                 }
                 ac97_ssi = ssi;
                 setup_channel_to_ac97(ssi);
@@ -637,15 +631,10 @@ failed_pdev_fiq_add:
 failed_pdev_fiq_alloc:
         snd_soc_unregister_dai(&pdev->dev);
 failed_register:
-failed_ac97:
-        iounmap(ssi->base);
-failed_ioremap:
         release_mem_region(res->start, resource_size(res));
 failed_get_resource:
         clk_disable_unprepare(ssi->clk);
-        clk_put(ssi->clk);
 failed_clk:
-        kfree(ssi);
 
         return ret;
 }
@@ -663,11 +652,8 @@ static int __devexit imx_ssi_remove(struct platform_device *pdev)
         if (ssi->flags & IMX_SSI_USE_AC97)
                 ac97_ssi = NULL;
 
-        iounmap(ssi->base);
         release_mem_region(res->start, resource_size(res));
         clk_disable_unprepare(ssi->clk);
-        clk_put(ssi->clk);
-        kfree(ssi);
 
         return 0;
 }
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 9a3f7c5ab687..9997c039bb24 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -370,7 +370,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
         .pcm_free       = &psc_dma_free,
 };
 
-static int mpc5200_hpcd_probe(struct platform_device *op)
+int mpc5200_audio_dma_create(struct platform_device *op)
 {
         phys_addr_t fifo;
         struct psc_dma *psc_dma;
@@ -487,8 +487,9 @@ out_unmap:
         iounmap(regs);
         return ret;
 }
+EXPORT_SYMBOL_GPL(mpc5200_audio_dma_create);
 
-static int mpc5200_hpcd_remove(struct platform_device *op)
+int mpc5200_audio_dma_destroy(struct platform_device *op)
 {
         struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);
 
@@ -510,24 +511,7 @@ static int mpc5200_hpcd_remove(struct platform_device *op)
 
         return 0;
 }
-
-static struct of_device_id mpc5200_hpcd_match[] = {
-        { .compatible = "fsl,mpc5200-pcm", },
-        {}
-};
-MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
-
-static struct platform_driver mpc5200_hpcd_of_driver = {
-        .probe          = mpc5200_hpcd_probe,
-        .remove         = mpc5200_hpcd_remove,
-        .driver = {
-                .owner          = THIS_MODULE,
-                .name           = "mpc5200-pcm-audio",
-                .of_match_table    = mpc5200_hpcd_match,
-        }
-};
-
-module_platform_driver(mpc5200_hpcd_of_driver);
+EXPORT_SYMBOL_GPL(mpc5200_audio_dma_destroy);
 
 MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
 MODULE_DESCRIPTION("Freescale MPC5200 PSC in DMA mode ASoC Driver");
diff --git a/sound/soc/fsl/mpc5200_dma.h b/sound/soc/fsl/mpc5200_dma.h
index a3c0cd5382fb..dff253fde29a 100644
--- a/sound/soc/fsl/mpc5200_dma.h
+++ b/sound/soc/fsl/mpc5200_dma.h
@@ -81,4 +81,7 @@ to_psc_dma_stream(struct snd_pcm_substream *substream, struct psc_dma *psc_dma)
         return &psc_dma->playback;
 }
 
+int mpc5200_audio_dma_create(struct platform_device *op);
+int mpc5200_audio_dma_destroy(struct platform_device *op);
+
 #endif /* __SOUND_SOC_FSL_MPC5200_DMA_H__ */
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index ffa00a2eb770..a313c0ae36db 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -237,15 +237,18 @@ static const struct snd_soc_dai_ops psc_ac97_digital_ops = {
 
 static struct snd_soc_dai_driver psc_ac97_dai[] = {
 {
+        .name = "mpc5200-psc-ac97.0",
         .ac97_control = 1,
         .probe  = psc_ac97_probe,
         .playback = {
+                .stream_name    = "AC97 Playback",
                 .channels_min   = 1,
                 .channels_max   = 6,
                 .rates          = SNDRV_PCM_RATE_8000_48000,
                 .formats = SNDRV_PCM_FMTBIT_S32_BE,
         },
         .capture = {
+                .stream_name    = "AC97 Capture",
                 .channels_min   = 1,
                 .channels_max   = 2,
                 .rates          = SNDRV_PCM_RATE_8000_48000,
@@ -254,8 +257,10 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
         .ops = &psc_ac97_analog_ops,
 },
 {
+        .name = "mpc5200-psc-ac97.1",
         .ac97_control = 1,
         .playback = {
+                .stream_name    = "AC97 SPDIF",
                 .channels_min   = 1,
                 .channels_max   = 2,
                 .rates          = SNDRV_PCM_RATE_32000 | \
@@ -278,6 +283,10 @@ static int __devinit psc_ac97_of_probe(struct platform_device *op)
         struct snd_ac97 ac97;
         struct mpc52xx_psc __iomem *regs;
 
+        rc = mpc5200_audio_dma_create(op);
+        if (rc != 0)
+                return rc;
+
         rc = snd_soc_register_dais(&op->dev, psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai));
         if (rc != 0) {
                 dev_err(&op->dev, "Failed to register DAI\n");
@@ -303,6 +312,7 @@ static int __devinit psc_ac97_of_probe(struct platform_device *op)
 
 static int __devexit psc_ac97_of_remove(struct platform_device *op)
 {
+        mpc5200_audio_dma_destroy(op);
         snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai));
         return 0;
 }
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 7b530327553a..ba1f0a66358f 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -130,13 +130,16 @@ static const struct snd_soc_dai_ops psc_i2s_dai_ops = {
 };
 
 static struct snd_soc_dai_driver psc_i2s_dai[] = {{
+        .name = "mpc5200-psc-i2s.0",
         .playback = {
+                .stream_name = "I2S Playback",
                 .channels_min = 2,
                 .channels_max = 2,
                 .rates = PSC_I2S_RATES,
                 .formats = PSC_I2S_FORMATS,
         },
         .capture = {
+                .stream_name = "I2S Capture",
                 .channels_min = 2,
                 .channels_max = 2,
                 .rates = PSC_I2S_RATES,
@@ -156,6 +159,10 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op)
         struct psc_dma *psc_dma;
         struct mpc52xx_psc __iomem *regs;
 
+        rc = mpc5200_audio_dma_create(op);
+        if (rc != 0)
+                return rc;
+
         rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));
         if (rc != 0) {
                 pr_err("Failed to register DAI\n");
@@ -200,6 +207,7 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op)
 
 static int __devexit psc_i2s_of_remove(struct platform_device *op)
 {
+        mpc5200_audio_dma_destroy(op);
         snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai));
         return 0;
 }
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 60bcba1bc30e..9ff9318c52b9 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -192,7 +192,6 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
                 container_of(dev, struct platform_device, dev);
         struct device_node *np = ssi_pdev->dev.of_node;
         struct device_node *codec_np = NULL;
-        struct platform_device *sound_device = NULL;
         struct mpc8610_hpcd_data *machine_data;
         int ret = -ENODEV;
         const char *sprop;
@@ -341,34 +340,22 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
         machine_data->card.probe = mpc8610_hpcd_machine_probe;
         machine_data->card.remove = mpc8610_hpcd_machine_remove;
         machine_data->card.name = pdev->name; /* The platform driver name */
+        machine_data->card.owner = THIS_MODULE;
+        machine_data->card.dev = &pdev->dev;
         machine_data->card.num_links = 2;
         machine_data->card.dai_link = machine_data->dai;
 
-        /* Allocate a new audio platform device structure */
-        sound_device = platform_device_alloc("soc-audio", -1);
-        if (!sound_device) {
-                dev_err(&pdev->dev, "platform device alloc failed\n");
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        /* Associate the card data with the sound device */
-        platform_set_drvdata(sound_device, &machine_data->card);
-
         /* Register with ASoC */
-        ret = platform_device_add(sound_device);
+        ret = snd_soc_register_card(&machine_data->card);
         if (ret) {
-                dev_err(&pdev->dev, "platform device add failed\n");
-                goto error_sound;
+                dev_err(&pdev->dev, "could not register card\n");
+                goto error;
         }
-        dev_set_drvdata(&pdev->dev, sound_device);
 
         of_node_put(codec_np);
 
         return 0;
 
-error_sound:
-        platform_device_put(sound_device);
 error:
         kfree(machine_data);
 error_alloc:
@@ -383,17 +370,12 @@ error_alloc:
  */
 static int __devexit mpc8610_hpcd_remove(struct platform_device *pdev)
 {
-        struct platform_device *sound_device = dev_get_drvdata(&pdev->dev);
-        struct snd_soc_card *card = platform_get_drvdata(sound_device);
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
         struct mpc8610_hpcd_data *machine_data =
                 container_of(card, struct mpc8610_hpcd_data, card);
 
-        platform_device_unregister(sound_device);
-
+        snd_soc_unregister_card(card);
         kfree(machine_data);
-        sound_device->dev.platform_data = NULL;
-
-        dev_set_drvdata(&pdev->dev, NULL);
 
         return 0;
 }
diff --git a/sound/soc/fsl/mx27vis-aic32x4.c b/sound/soc/fsl/mx27vis-aic32x4.c
index f6d04ad4bb39..2b76877b1789 100644
--- a/sound/soc/fsl/mx27vis-aic32x4.c
+++ b/sound/soc/fsl/mx27vis-aic32x4.c
@@ -26,13 +26,13 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
+#include <linux/platform_data/asoc-mx27vis.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <asm/mach-types.h>
-#include <mach/iomux-mx27.h>
 
 #include "../codecs/tlv320aic32x4.h"
 #include "imx-ssi.h"
@@ -41,20 +41,12 @@
 #define MX27VIS_AMP_GAIN        0
 #define MX27VIS_AMP_MUTE        1
 
-#define MX27VIS_PIN_G0          (GPIO_PORTF + 9)
-#define MX27VIS_PIN_G1          (GPIO_PORTF + 8)
-#define MX27VIS_PIN_SDL         (GPIO_PORTE + 5)
-#define MX27VIS_PIN_SDR         (GPIO_PORTF + 7)
-
 static int mx27vis_amp_gain;
 static int mx27vis_amp_mute;
-
-static const int mx27vis_amp_pins[] = {
-        MX27VIS_PIN_G0 | GPIO_GPIO | GPIO_OUT,
-        MX27VIS_PIN_G1 | GPIO_GPIO | GPIO_OUT,
-        MX27VIS_PIN_SDL | GPIO_GPIO | GPIO_OUT,
-        MX27VIS_PIN_SDR | GPIO_GPIO | GPIO_OUT,
-};
+static int mx27vis_amp_gain0_gpio;
+static int mx27vis_amp_gain1_gpio;
+static int mx27vis_amp_mutel_gpio;
+static int mx27vis_amp_muter_gpio;
 
 static int mx27vis_aic32x4_hw_params(struct snd_pcm_substream *substream,
                             struct snd_pcm_hw_params *params)
@@ -109,13 +101,13 @@ static int mx27vis_amp_set(struct snd_kcontrol *kcontrol,
 
         switch (reg) {
         case MX27VIS_AMP_GAIN:
-                gpio_set_value(MX27VIS_PIN_G0, value & 1);
-                gpio_set_value(MX27VIS_PIN_G1, value >> 1);
+                gpio_set_value(mx27vis_amp_gain0_gpio, value & 1);
+                gpio_set_value(mx27vis_amp_gain1_gpio, value >> 1);
                 mx27vis_amp_gain = value;
                 break;
         case MX27VIS_AMP_MUTE:
-                gpio_set_value(MX27VIS_PIN_SDL, value & 1);
-                gpio_set_value(MX27VIS_PIN_SDR, value >> 1);
+                gpio_set_value(mx27vis_amp_mutel_gpio, value & 1);
+                gpio_set_value(mx27vis_amp_muter_gpio, value >> 1);
                 mx27vis_amp_mute = value;
                 break;
         }
@@ -190,8 +182,19 @@ static struct snd_soc_card mx27vis_aic32x4 = {
 
 static int __devinit mx27vis_aic32x4_probe(struct platform_device *pdev)
 {
+        struct snd_mx27vis_platform_data *pdata = pdev->dev.platform_data;
         int ret;
 
+        if (!pdata) {
+                dev_err(&pdev->dev, "No platform data supplied\n");
+                return -EINVAL;
+        }
+
+        mx27vis_amp_gain0_gpio = pdata->amp_gain0_gpio;
+        mx27vis_amp_gain1_gpio = pdata->amp_gain1_gpio;
+        mx27vis_amp_mutel_gpio = pdata->amp_mutel_gpio;
+        mx27vis_amp_muter_gpio = pdata->amp_muter_gpio;
+
         mx27vis_aic32x4.dev = &pdev->dev;
         ret = snd_soc_register_card(&mx27vis_aic32x4);
         if (ret) {
@@ -213,11 +216,6 @@ static int __devinit mx27vis_aic32x4_probe(struct platform_device *pdev)
                         IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0)
         );
 
-        ret = mxc_gpio_setup_multiple_pins(mx27vis_amp_pins,
-                        ARRAY_SIZE(mx27vis_amp_pins), "MX27VIS_AMP");
-        if (ret)
-                printk(KERN_ERR "ASoC: unable to setup gpios\n");
-
         return ret;
 }
 
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 50adf4032bcc..144d49603637 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -202,7 +202,6 @@ static int p1022_ds_probe(struct platform_device *pdev)
                 container_of(dev, struct platform_device, dev);
         struct device_node *np = ssi_pdev->dev.of_node;
         struct device_node *codec_np = NULL;
-        struct platform_device *sound_device = NULL;
         struct machine_data *mdata;
         int ret = -ENODEV;
         const char *sprop;
@@ -349,36 +348,23 @@ static int p1022_ds_probe(struct platform_device *pdev)
         mdata->card.probe = p1022_ds_machine_probe;
         mdata->card.remove = p1022_ds_machine_remove;
         mdata->card.name = pdev->name; /* The platform driver name */
+        mdata->card.owner = THIS_MODULE;
+        mdata->card.dev = &pdev->dev;
         mdata->card.num_links = 2;
         mdata->card.dai_link = mdata->dai;
 
-        /* Allocate a new audio platform device structure */
-        sound_device = platform_device_alloc("soc-audio", -1);
-        if (!sound_device) {
-                dev_err(&pdev->dev, "platform device alloc failed\n");
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        /* Associate the card data with the sound device */
-        platform_set_drvdata(sound_device, &mdata->card);
-
         /* Register with ASoC */
-        ret = platform_device_add(sound_device);
+        ret = snd_soc_register_card(&mdata->card);
         if (ret) {
-                dev_err(&pdev->dev, "platform device add failed\n");
+                dev_err(&pdev->dev, "could not register card\n");
                 goto error;
         }
-        dev_set_drvdata(&pdev->dev, sound_device);
 
         of_node_put(codec_np);
 
         return 0;
 
 error:
-        if (sound_device)
-                platform_device_put(sound_device);
-
         kfree(mdata);
 error_put:
         of_node_put(codec_np);
@@ -392,17 +378,12 @@ error_put:
  */
 static int __devexit p1022_ds_remove(struct platform_device *pdev)
 {
-        struct platform_device *sound_device = dev_get_drvdata(&pdev->dev);
-        struct snd_soc_card *card = platform_get_drvdata(sound_device);
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
         struct machine_data *mdata =
                 container_of(card, struct machine_data, card);
 
-        platform_device_unregister(sound_device);
-
+        snd_soc_unregister_card(card);
         kfree(mdata);
-        sound_device->dev.platform_data = NULL;
-
-        dev_set_drvdata(&pdev->dev, NULL);
 
         return 0;
 }
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c
index b3af55dcde9d..4b63ec8eb372 100644
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
@@ -12,32 +12,27 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/interrupt.h>
 #include <linux/device.h>
-#include <linux/delay.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
-#include <linux/dma-mapping.h>
 
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/initval.h>
 #include <sound/soc.h>
 
 #include "mpc5200_dma.h"
-#include "mpc5200_psc_ac97.h"
-#include "../codecs/wm9712.h"
 
 #define DRV_NAME "pcm030-audio-fabric"
 
+struct pcm030_audio_data {
+        struct snd_soc_card *card;
+        struct platform_device *codec_device;
+};
+
 static struct snd_soc_dai_link pcm030_fabric_dai[] = {
 {
         .name = "AC97",
         .stream_name = "AC97 Analog",
         .codec_dai_name = "wm9712-hifi",
         .cpu_dai_name = "mpc5200-psc-ac97.0",
-        .platform_name = "mpc5200-pcm-audio",
         .codec_name = "wm9712-codec",
 },
 {
@@ -45,44 +40,95 @@ static struct snd_soc_dai_link pcm030_fabric_dai[] = {
         .stream_name = "AC97 IEC958",
         .codec_dai_name = "wm9712-aux",
         .cpu_dai_name = "mpc5200-psc-ac97.1",
-        .platform_name = "mpc5200-pcm-audio",
         .codec_name = "wm9712-codec",
 },
 };
 
-static struct snd_soc_card card = {
+static struct snd_soc_card pcm030_card = {
         .name = "pcm030",
         .owner = THIS_MODULE,
         .dai_link = pcm030_fabric_dai,
         .num_links = ARRAY_SIZE(pcm030_fabric_dai),
 };
 
-static __init int pcm030_fabric_init(void)
+static int __init pcm030_fabric_probe(struct platform_device *op)
 {
-        struct platform_device *pdev;
-        int rc;
+        struct device_node *np = op->dev.of_node;
+        struct device_node *platform_np;
+        struct snd_soc_card *card = &pcm030_card;
+        struct pcm030_audio_data *pdata;
+        int ret;
+        int i;
 
         if (!of_machine_is_compatible("phytec,pcm030"))
                 return -ENODEV;
 
-        pdev = platform_device_alloc("soc-audio", 1);
-        if (!pdev) {
-                pr_err("pcm030_fabric_init: platform_device_alloc() failed\n");
-                return -ENODEV;
-        }
+        pdata = devm_kzalloc(&op->dev, sizeof(struct pcm030_audio_data),
+                             GFP_KERNEL);
+        if (!pdata)
+                return -ENOMEM;
+
+        card->dev = &op->dev;
+        platform_set_drvdata(op, pdata);
 
-        platform_set_drvdata(pdev, &card);
+        pdata->card = card;
 
-        rc = platform_device_add(pdev);
-        if (rc) {
-                pr_err("pcm030_fabric_init: platform_device_add() failed\n");
-                platform_device_put(pdev);
+        platform_np = of_parse_phandle(np, "asoc-platform", 0);
+        if (!platform_np) {
+                dev_err(&op->dev, "ac97 not registered\n");
                 return -ENODEV;
         }
-        return 0;
+
+        for (i = 0; i < card->num_links; i++)
+                card->dai_link[i].platform_of_node = platform_np;
+
+        ret = request_module("snd-soc-wm9712");
+        if (ret)
+                dev_err(&op->dev, "request_module returned: %d\n", ret);
+
+        pdata->codec_device = platform_device_alloc("wm9712-codec", -1);
+        if (!pdata->codec_device)
+                dev_err(&op->dev, "platform_device_alloc() failed\n");
+
+        ret = platform_device_add(pdata->codec_device);
+        if (ret)
+                dev_err(&op->dev, "platform_device_add() failed: %d\n", ret);
+
+        ret = snd_soc_register_card(card);
+        if (ret)
+                dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret);
+
+        return ret;
+}
+
+static int __devexit pcm030_fabric_remove(struct platform_device *op)
+{
+        struct pcm030_audio_data *pdata = platform_get_drvdata(op);
+        int ret;
+
+        ret = snd_soc_unregister_card(pdata->card);
+        platform_device_unregister(pdata->codec_device);
+
+        return ret;
 }
 
-module_init(pcm030_fabric_init);
+static struct of_device_id pcm030_audio_match[] = {
+        { .compatible = "phytec,pcm030-audio-fabric", },
+        {}
+};
+MODULE_DEVICE_TABLE(of, pcm030_audio_match);
+
+static struct platform_driver pcm030_fabric_driver = {
+        .probe          = pcm030_fabric_probe,
+        .remove         = __devexit_p(pcm030_fabric_remove),
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+                .of_match_table    = pcm030_audio_match,
+        },
+};
+
+module_platform_driver(pcm030_fabric_driver);
 
 
 MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>");