1 files changed, 73 insertions, 27 deletions

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>");