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

Commit 3b7d46380beae3de4a0f03ba4dcbd509c97ab503 upstream.

Rather than instantiating imx-pcm-audio to call imx_pcm_dma_init(),
imx-ssi can just directly call it to save the use of imx-pcm-audio.
With this change, imx-ssi becomes not only a cpu DAI but also a
platform device, so updates platform device setup in imx-mc13783 and
mx27vis-aic32x4 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, 5 insertions, 16 deletions

diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index c6fa03e2114a..034dd9b4a1a0 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -603,24 +603,13 @@ static int imx_ssi_probe(struct platform_device *pdev)
                 goto failed_pdev_fiq_add;
         }
 
-        ssi->soc_platform_pdev = platform_device_alloc("imx-pcm-audio", pdev->id);
-        if (!ssi->soc_platform_pdev) {
-                ret = -ENOMEM;
-                goto failed_pdev_alloc;
-        }
-
-        platform_set_drvdata(ssi->soc_platform_pdev, ssi);
-        ret = platform_device_add(ssi->soc_platform_pdev);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to add platform device\n");
-                goto failed_pdev_add;
-        }
+        ret = imx_pcm_dma_init(pdev);
+        if (ret)
+                goto failed_pcm_dma;
 
         return 0;
 
-failed_pdev_add:
-        platform_device_put(ssi->soc_platform_pdev);
-failed_pdev_alloc:
+failed_pcm_dma:
         platform_device_del(ssi->soc_platform_pdev_fiq);
 failed_pdev_fiq_add:
         platform_device_put(ssi->soc_platform_pdev_fiq);
@@ -639,7 +628,7 @@ static int imx_ssi_remove(struct platform_device *pdev)
         struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         struct imx_ssi *ssi = platform_get_drvdata(pdev);
 
-        platform_device_unregister(ssi->soc_platform_pdev);
+        imx_pcm_dma_exit(pdev);
         platform_device_unregister(ssi->soc_platform_pdev_fiq);
 
         snd_soc_unregister_component(&pdev->dev);