ASoC: fsl: pcm030-audio-fabric use snd_soc_register_card

Convert pcm030-audio-fabric to use the new snd_soc_register_card api
instead of the older method of registering a separate platform device.
Create the dai_link to the mpc5200_psc_ac97 platform using the device tree.
Convert the pcm030-audio-fabric driver to a platform-driver and add a
remove function.

Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c
index 1353e8f..893e240 100644 (file)
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
@@ -28,7 +28,6 @@ static struct snd_soc_dai_link pcm030_fabric_dai[] = {
        .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",
 },
 {
@@ -36,44 +35,74 @@ 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;
+       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");
+       card->dev = &op->dev;
+       platform_set_drvdata(op, card);
+
+       platform_np = of_parse_phandle(np, "asoc-platform", 0);
+       if (!platform_np) {
+               dev_err(&op->dev, "ac97 not registered\n");
                return -ENODEV;
        }
 
-       platform_set_drvdata(pdev, &card);
+       for (i = 0; i < card->num_links; i++)
+               card->dai_link[i].platform_of_node = platform_np;
 
-       rc = platform_device_add(pdev);
-       if (rc) {
-               pr_err("pcm030_fabric_init: platform_device_add() failed\n");
-               platform_device_put(pdev);
-               return -ENODEV;
-       }
-       return 0;
+       ret = snd_soc_register_card(card);
+       if (ret)
+               dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret);
+
+       return ret;
 }
 
-module_init(pcm030_fabric_init);
+static int __devexit pcm030_fabric_remove(struct platform_device *op)
+{
+       struct snd_soc_card *card = platform_get_drvdata(op);
+       int ret;
+
+       ret = snd_soc_unregister_card(card);
+
+       return ret;
+}
+
+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>");