From 9a96d4da3a5354b357e4a10dac91b8cbeeab17b7 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 4 Mar 2020 16:35:25 +0800 Subject: [PATCH] LF-601-1: ASoC: fsl_esai: Switch to imx-pcm-dma-v2 With the imx-pcm-dma, the dma channel will be allocated in probe, with EDMA, the channel allocation is fixed for each peripheral. In ASRC->ESAI->CODEC case, we have two sound card device, hw:x,0 and hw:x,1, with imx-pcm-dma, the channel for esai will be ocuppied by hw:x,0 in boot up. when asrc platform driver want to request the dma channnel for esai, it will fail. So we switch to imx-pcm-dma-v2, with imx-pcm-dma-v2, the dma channel is allocated when running, not in probe. Signed-off-by: Shengjiu Wang Reviewed-by: Viorel Suman --- sound/soc/fsl/fsl_esai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 54a03744031c..e2e33b352ef6 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -1132,7 +1132,7 @@ static int fsl_esai_probe(struct platform_device *pdev) regcache_cache_only(esai_priv->regmap, true); - ret = imx_pcm_dma_init(pdev, IMX_ESAI_DMABUF_SIZE); + ret = imx_pcm_platform_register(&pdev->dev); if (ret) dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret); -- 2.17.1