MLK-17442: ASoC: fsl: fix wrong usage of filter_data

The filter_data should be used for dma_filter_fn function,
but we used the filter_data wrongly for dma channel name.
This patch is to fix the issue.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviwed-by: Daniel Baluta <daniel.baluta@nxp.com>

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 085be9c..1505b1b 100644 (file)
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -1053,8 +1053,8 @@ static int fsl_esai_probe(struct platform_device *pdev)
        else
                esai_priv->fifo_depth = 64;
 
-       esai_priv->dma_params_rx.filter_data = "rx";
-       esai_priv->dma_params_tx.filter_data = "tx";
+       esai_priv->dma_params_rx.chan_name = "rx";
+       esai_priv->dma_params_tx.chan_name = "tx";
        esai_priv->dma_params_tx.maxburst = 16;
        esai_priv->dma_params_rx.maxburst = 16;
        esai_priv->dma_params_tx.addr = res->start + REG_ESAI_ETDR;

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 8b05b20..37d164f 100644 (file)
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -1129,8 +1129,8 @@ static int fsl_sai_probe(struct platform_device *pdev)
                                   MCLK_DIR(index));
        }
 
-       sai->dma_params_rx.filter_data = "rx";
-       sai->dma_params_tx.filter_data = "tx";
+       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;

diff --git a/sound/soc/fsl/imx-pcm-dma-v2.c b/sound/soc/fsl/imx-pcm-dma-v2.c
index 8aa3cd8..7960fec 100644 (file)
--- a/sound/soc/fsl/imx-pcm-dma-v2.c
+++ b/sound/soc/fsl/imx-pcm-dma-v2.c
@@ -113,7 +113,7 @@ static int imx_pcm_open(struct snd_pcm_substream *substream)
                struct dma_chan *chan;
 
                chan = dma_request_slave_channel(rtd->cpu_dai->dev,
-                                                dma_data->filter_data);
+                                                dma_data->chan_name);
                ret = snd_dmaengine_pcm_open(substream, chan);
                if (ret)
                        return ret;