aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch b/target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch
new file mode 100644
index 0000000000..e116389031
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/801-audio-0006-Revert-ASoC-fsl_sai-Update-Tx-Rx-channel-enable-mask.patch
@@ -0,0 +1,43 @@
+From 480565647b43c25ae86c635f88ae99f036f4e63a Mon Sep 17 00:00:00 2001
+From: Dong Aisheng <aisheng.dong@nxp.com>
+Date: Fri, 16 Aug 2019 18:01:33 +0800
+Subject: [PATCH] Revert "ASoC: fsl_sai: Update Tx/Rx channel enable mask"
+
+This reverts commit b84f50b0fcb497a62068926fca793d2d213c7dbd.
+---
+ sound/soc/fsl/fsl_sai.c | 6 ++----
+ sound/soc/fsl/fsl_sai.h | 1 -
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+--- a/sound/soc/fsl/fsl_sai.c
++++ b/sound/soc/fsl/fsl_sai.c
+@@ -599,8 +599,7 @@ static int fsl_sai_startup(struct snd_pc
+ bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+ int ret;
+
+- regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx),
+- FSL_SAI_CR3_TRCE_MASK,
++ regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE,
+ FSL_SAI_CR3_TRCE);
+
+ ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
+@@ -615,8 +614,7 @@ static void fsl_sai_shutdown(struct snd_
+ struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
+ bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+
+- regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx),
+- FSL_SAI_CR3_TRCE_MASK, 0);
++ regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0);
+ }
+
+ static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {
+--- a/sound/soc/fsl/fsl_sai.h
++++ b/sound/soc/fsl/fsl_sai.h
+@@ -110,7 +110,6 @@
+
+ /* SAI Transmit and Receive Configuration 3 Register */
+ #define FSL_SAI_CR3_TRCE BIT(16)
+-#define FSL_SAI_CR3_TRCE_MASK GENMASK(23, 16)
+ #define FSL_SAI_CR3_WDFL(x) (x)
+ #define FSL_SAI_CR3_WDFL_MASK 0x1f
+