diff options
author | Leonard Crestez <leonard.crestez@nxp.com> | 2019-10-03 20:44:56 +0300 |
---|---|---|
committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:53:29 +0800 |
commit | 1ea30a6341327aef8dd0052108949ceed481beca (patch) | |
tree | cdb5005b9f5c280131a89a06b03393ad3c0c26f9 | |
parent | 219d54332a09e8d8741c1e1982f5eae56099de85 (diff) |
Revert "ASoC: fsl_sai: Fix noise when using EDMA"
This reverts commit e75f4940e8ad0dd76527302a10c06b58bf7eb590.
-rw-r--r-- | sound/soc/fsl/fsl_sai.c | 15 | ||||
-rw-r--r-- | sound/soc/fsl/fsl_sai.h | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index b517e4bc1b87..ef0b74693093 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -628,16 +628,6 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream, FSL_SAI_CR3_TRCE_MASK, FSL_SAI_CR3_TRCE); - /* - * EDMA controller needs period size to be a multiple of - * tx/rx maxburst - */ - if (sai->soc_data->use_edma) - snd_pcm_hw_constraint_step(substream->runtime, 0, - SNDRV_PCM_HW_PARAM_PERIOD_SIZE, - tx ? sai->dma_params_tx.maxburst : - sai->dma_params_rx.maxburst); - ret = snd_pcm_hw_constraint_list(substream->runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &fsl_sai_rate_constraints); @@ -1036,35 +1026,30 @@ static int fsl_sai_remove(struct platform_device *pdev) static const struct fsl_sai_soc_data fsl_sai_vf610_data = { .use_imx_pcm = false, - .use_edma = false, .fifo_depth = 32, .reg_offset = 0, }; static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = { .use_imx_pcm = true, - .use_edma = false, .fifo_depth = 32, .reg_offset = 0, }; static const struct fsl_sai_soc_data fsl_sai_imx7ulp_data = { .use_imx_pcm = true, - .use_edma = false, .fifo_depth = 16, .reg_offset = 8, }; static const struct fsl_sai_soc_data fsl_sai_imx8mq_data = { .use_imx_pcm = true, - .use_edma = false, .fifo_depth = 128, .reg_offset = 8, }; static const struct fsl_sai_soc_data fsl_sai_imx8qm_data = { .use_imx_pcm = true, - .use_edma = true, .fifo_depth = 64, .reg_offset = 0, }; diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 76b15deea80c..b12cb578f6d0 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -157,7 +157,6 @@ struct fsl_sai_soc_data { bool use_imx_pcm; - bool use_edma; unsigned int fifo_depth; unsigned int reg_offset; }; |