Skip to content

Commit 3ce08f8

Browse files
morimotobroonie
authored andcommitted
ASoC: fsl: imx-audmix: cleanup platform which is using Generic DMA
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>
1 parent 2324bc1 commit 3ce08f8

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

sound/soc/fsl/imx-audmix.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ static int imx_audmix_probe(struct platform_device *pdev)
207207
for (i = 0; i < num_dai; i++) {
208208
struct snd_soc_dai_link_component *dlc;
209209

210-
/* for CPU/Codec/Platform x 2 */
211-
dlc = devm_kcalloc(&pdev->dev, 6, sizeof(*dlc), GFP_KERNEL);
210+
/* for CPU/Codec x 2 + Platform */
211+
dlc = devm_kcalloc(&pdev->dev, 5, sizeof(*dlc), GFP_KERNEL);
212212
if (!dlc)
213213
return -ENOMEM;
214214

@@ -238,9 +238,13 @@ static int imx_audmix_probe(struct platform_device *pdev)
238238
dai_name, "CPU-Capture");
239239
}
240240

241-
priv->dai[i].cpus = &dlc[0];
242-
priv->dai[i].codecs = &dlc[1];
243-
priv->dai[i].platforms = &dlc[2];
241+
/*
242+
* CPU == Platform
243+
* platform is using soc-generic-dmaengine-pcm
244+
*/
245+
priv->dai[i].cpus =
246+
priv->dai[i].platforms = &dlc[0];
247+
priv->dai[i].codecs = &dlc[1];
244248

245249
priv->dai[i].num_cpus = 1;
246250
priv->dai[i].num_codecs = 1;
@@ -252,7 +256,6 @@ static int imx_audmix_probe(struct platform_device *pdev)
252256
priv->dai[i].codecs->name = "snd-soc-dummy";
253257
priv->dai[i].cpus->of_node = args.np;
254258
priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev);
255-
priv->dai[i].platforms->of_node = args.np;
256259
priv->dai[i].dynamic = 1;
257260
priv->dai[i].dpcm_playback = 1;
258261
priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0);
@@ -267,9 +270,9 @@ static int imx_audmix_probe(struct platform_device *pdev)
267270
be_cp = devm_kasprintf(&pdev->dev, GFP_KERNEL,
268271
"AUDMIX-Capture-%d", i);
269272

270-
priv->dai[num_dai + i].cpus = &dlc[3];
271-
priv->dai[num_dai + i].codecs = &dlc[4];
272-
priv->dai[num_dai + i].platforms = &dlc[5];
273+
priv->dai[num_dai + i].cpus = &dlc[2];
274+
priv->dai[num_dai + i].codecs = &dlc[3];
275+
priv->dai[num_dai + i].platforms = &dlc[4];
273276

274277
priv->dai[num_dai + i].num_cpus = 1;
275278
priv->dai[num_dai + i].num_codecs = 1;

0 commit comments

Comments
 (0)