From af490c2f518739177a5651bb181ebc556cd2987c Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 28 Apr 2021 15:20:11 +0800 Subject: [PATCH] Revert "ASoC: fsl: add imx-pcm-dma v2 platform driver (part 2)" This reverts commit 035ebd96faf8ed8ed74fd18c61d7e469f5277a3f. imx-pcm-dma v2 is not needed because power enablement flow is changed in dma driver, so switch back to imx-pcm-dma Signed-off-by: Shengjiu Wang Reviewed-by: Robin Gong --- sound/soc/fsl/fsl_sai.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index f90b762fa64e..4303df1788f3 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -1441,8 +1441,6 @@ static int fsl_sai_probe(struct platform_device *pdev) MCLK_DIR(index)); } - sai->dma_params_rx.chan_name = "rx"; - sai->dma_params_tx.chan_name = "tx"; sai->dma_params_rx.addr = res->start + FSL_SAI_RDR0; sai->dma_params_tx.addr = res->start + FSL_SAI_TDR0; sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX; @@ -1494,7 +1492,7 @@ static int fsl_sai_probe(struct platform_device *pdev) goto err_pm_disable; if (sai->soc_data->use_imx_pcm) { - ret = imx_pcm_platform_register(&pdev->dev); + ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE); if (ret) goto err_pm_disable; } else { -- 2.17.1