ASoC: fsl: imx-audmix: cleanup platform which is using Generic DMA
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 21 Apr 2023 00:11:21 +0000 (00:11 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 21 Apr 2023 12:45:06 +0000 (13:45 +0100)
If CPU is using soc-generic-dmaengine-pcm, Platform Component will be
same as CPU Component. In this case, we can use CPU dlc for Platform dlc.
This patch shares CPU dlc with Platform, and add comment.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>
Tested-by: Shengjiu Wang <shengjiu.wang@gmail.com>
Link: https://lore.kernel.org/r/878remf61j.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/imx-audmix.c

index 1292a84..cabef0d 100644 (file)
@@ -207,8 +207,8 @@ static int imx_audmix_probe(struct platform_device *pdev)
        for (i = 0; i < num_dai; i++) {
                struct snd_soc_dai_link_component *dlc;
 
-               /* for CPU/Codec/Platform x 2 */
-               dlc = devm_kcalloc(&pdev->dev, 6, sizeof(*dlc), GFP_KERNEL);
+               /* for CPU/Codec x 2 + Platform */
+               dlc = devm_kcalloc(&pdev->dev, 5, sizeof(*dlc), GFP_KERNEL);
                if (!dlc)
                        return -ENOMEM;
 
@@ -238,9 +238,13 @@ static int imx_audmix_probe(struct platform_device *pdev)
                                               dai_name, "CPU-Capture");
                }
 
-               priv->dai[i].cpus = &dlc[0];
-               priv->dai[i].codecs = &dlc[1];
-               priv->dai[i].platforms = &dlc[2];
+               /*
+                * CPU == Platform
+                * platform is using soc-generic-dmaengine-pcm
+                */
+               priv->dai[i].cpus       =
+               priv->dai[i].platforms  = &dlc[0];
+               priv->dai[i].codecs     = &dlc[1];
 
                priv->dai[i].num_cpus = 1;
                priv->dai[i].num_codecs = 1;
@@ -252,7 +256,6 @@ static int imx_audmix_probe(struct platform_device *pdev)
                priv->dai[i].codecs->name = "snd-soc-dummy";
                priv->dai[i].cpus->of_node = args.np;
                priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev);
-               priv->dai[i].platforms->of_node = args.np;
                priv->dai[i].dynamic = 1;
                priv->dai[i].dpcm_playback = 1;
                priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0);
@@ -267,9 +270,9 @@ static int imx_audmix_probe(struct platform_device *pdev)
                be_cp = devm_kasprintf(&pdev->dev, GFP_KERNEL,
                                       "AUDMIX-Capture-%d", i);
 
-               priv->dai[num_dai + i].cpus = &dlc[3];
-               priv->dai[num_dai + i].codecs = &dlc[4];
-               priv->dai[num_dai + i].platforms = &dlc[5];
+               priv->dai[num_dai + i].cpus     = &dlc[2];
+               priv->dai[num_dai + i].codecs   = &dlc[3];
+               priv->dai[num_dai + i].platforms = &dlc[4];
 
                priv->dai[num_dai + i].num_cpus = 1;
                priv->dai[num_dai + i].num_codecs = 1;