ASoC: fsl: remove use of imx-fiq-pcm-audio from imx-ssi

Commit 2bf9d4bbd0fa97ff6f214484f62fc8aca64d1d00 upstream.

Rather than instantiating imx-fiq-pcm-audio to call imx_pcm_fiq_init(),
imx-ssi can just directly call it to save the use of imx-fiq-pcm-audio.
With this change, imx-ssi becomes not only a cpu DAI but also a platform
device, so updates platform device setup in eukrea-tlv320, phycore-ac97
and wm1133-ev1 accordingly.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

1 files changed, 6 insertions, 17 deletions

diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 034dd9b4a1a0..a8362be3cd18 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -590,18 +590,9 @@ static int imx_ssi_probe(struct platform_device *pdev)
                 goto failed_register;
         }
 
-        ssi->soc_platform_pdev_fiq = platform_device_alloc("imx-fiq-pcm-audio", pdev->id);
-        if (!ssi->soc_platform_pdev_fiq) {
-                ret = -ENOMEM;
-                goto failed_pdev_fiq_alloc;
-        }
-
-        platform_set_drvdata(ssi->soc_platform_pdev_fiq, ssi);
-        ret = platform_device_add(ssi->soc_platform_pdev_fiq);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to add platform device\n");
-                goto failed_pdev_fiq_add;
-        }
+        ret = imx_pcm_fiq_init(pdev);
+        if (ret)
+                goto failed_pcm_fiq;
 
         ret = imx_pcm_dma_init(pdev);
         if (ret)
@@ -610,10 +601,8 @@ static int imx_ssi_probe(struct platform_device *pdev)
         return 0;
 
 failed_pcm_dma:
-        platform_device_del(ssi->soc_platform_pdev_fiq);
-failed_pdev_fiq_add:
-        platform_device_put(ssi->soc_platform_pdev_fiq);
-failed_pdev_fiq_alloc:
+        imx_pcm_fiq_exit(pdev);
+failed_pcm_fiq:
         snd_soc_unregister_component(&pdev->dev);
 failed_register:
         release_mem_region(res->start, resource_size(res));
@@ -629,7 +618,7 @@ static int imx_ssi_remove(struct platform_device *pdev)
         struct imx_ssi *ssi = platform_get_drvdata(pdev);
 
         imx_pcm_dma_exit(pdev);
-        platform_device_unregister(ssi->soc_platform_pdev_fiq);
+        imx_pcm_fiq_exit(pdev);
 
         snd_soc_unregister_component(&pdev->dev);