diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-07-31 17:11:32 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:53:34 +0800 |
| commit | 252b2a0d9ece09f654f0f9ec071f1916901c63e4 (patch) | |
| tree | db02e22d51f5a7c9eb4f2b7f8ac1d171f32e8a56 /sound | |
| parent | 0df4d8e7c78963cccf0ab3a28150aea0251c6212 (diff) | |
Revert "ASoC: fsl_sai: derive TX FIFO watermark from FIFO depth"
This reverts commit bd517707d85f19a7339ea8b882fcbf0fd9976bd6.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_sai.c | 4 | ||||
| -rw-r--r-- | sound/soc/fsl/fsl_sai.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 1d1a447163e3..ed0432e7327a 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -640,7 +640,7 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) regmap_write(sai->regmap, FSL_SAI_RCSR, 0); regmap_update_bits(sai->regmap, FSL_SAI_TCR1, FSL_SAI_CR1_RFW_MASK, - sai->soc_data->fifo_depth - FSL_SAI_MAXBURST_TX); + FSL_SAI_MAXBURST_TX * 2); regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK, FSL_SAI_MAXBURST_RX - 1); @@ -913,12 +913,10 @@ static int fsl_sai_remove(struct platform_device *pdev) static const struct fsl_sai_soc_data fsl_sai_vf610_data = { .use_imx_pcm = false, - .fifo_depth = 32, }; static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = { .use_imx_pcm = true, - .fifo_depth = 32, }; static const struct of_device_id fsl_sai_ids[] = { diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 7c1ef671da28..83e2bfe05b1b 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -128,7 +128,6 @@ struct fsl_sai_soc_data { bool use_imx_pcm; - unsigned int fifo_depth; }; struct fsl_sai { |