openwrt/target/linux/layerscape/patches-5.4/801-audio-0010-Revert-ASoC-fsl_sai-derive-TX-FIFO-watermark-from-FI.patch

47 lines
1.3 KiB
Diff
Raw Normal View History

From 33c1f03b9eca0c192708c9df295d2a30073cd121 Mon Sep 17 00:00:00 2001
From: Dong Aisheng <aisheng.dong@nxp.com>
Date: Wed, 31 Jul 2019 17:11:32 +0800
Subject: [PATCH] Revert "ASoC: fsl_sai: derive TX FIFO watermark from FIFO
depth"
This reverts commit bd517707d85f19a7339ea8b882fcbf0fd9976bd6.
---
sound/soc/fsl/fsl_sai.c | 4 +---
sound/soc/fsl/fsl_sai.h | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
--- 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_
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);
@@ -928,12 +928,10 @@ static int fsl_sai_remove(struct platfor
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[] = {
--- 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 {