aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-03-21 01:16:48 +0000
committerDaniel Golle <daniel@makrotopia.org>2022-03-21 13:11:56 +0000
commit786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch)
tree926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch
parent9470160c350d15f765c33d6c1db15d6c4709a64c (diff)
downloadupstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz
upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2
upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all kernel configuration as well as patches for Linux 5.4. There were no targets still actively using Linux 5.4. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch108
1 files changed, 0 insertions, 108 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch b/target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch
deleted file mode 100644
index c353ba4ae4..0000000000
--- a/target/linux/layerscape/patches-5.4/801-audio-0033-MLK-13946-3-ASoC-fsl_sai-fix-the-xMR-setting.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 9d00118e0ac420d3bf6e266a0fbfd28135cbadb8 Mon Sep 17 00:00:00 2001
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-Date: Thu, 12 Oct 2017 14:01:19 +0800
-Subject: [PATCH] MLK-13946-3: ASoC: fsl_sai: fix the xMR setting
-
-When there is multi data line enabled, the xMR setting is
-wrong if according to the channel number. which should
-according to the slot number
-
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
----
- sound/soc/fsl/fsl_sai.c | 28 ++++++++++++++++++++++++++--
- sound/soc/fsl/fsl_sai.h | 12 ++++++++++++
- 2 files changed, 38 insertions(+), 2 deletions(-)
-
---- a/sound/soc/fsl/fsl_sai.c
-+++ b/sound/soc/fsl/fsl_sai.c
-@@ -80,7 +80,7 @@ static struct fsl_sai_soc_data fsl_sai_i
-
- static struct fsl_sai_soc_data fsl_sai_imx8qm = {
- .imx = true,
-- .dataline = 0x3,
-+ .dataline = 0xf,
- .fifos = 1,
- .fifo_depth = 64,
- .flags = 0,
-@@ -571,7 +571,7 @@ static int fsl_sai_hw_params(struct snd_
- regmap_update_bits(sai->regmap, FSL_SAI_xCR5(tx, offset),
- FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK |
- FSL_SAI_CR5_FBT_MASK, val_cr5);
-- regmap_write(sai->regmap, FSL_SAI_xMR(tx), ~0UL - ((1 << channels) - 1));
-+ regmap_write(sai->regmap, FSL_SAI_xMR(tx), ~0UL - ((1 << slots) - 1));
-
- return 0;
- }
-@@ -858,11 +858,23 @@ static bool fsl_sai_readable_reg(struct
- switch (reg) {
- case FSL_SAI_TFR0:
- case FSL_SAI_TFR1:
-+ case FSL_SAI_TFR2:
-+ case FSL_SAI_TFR3:
-+ case FSL_SAI_TFR4:
-+ case FSL_SAI_TFR5:
-+ case FSL_SAI_TFR6:
-+ case FSL_SAI_TFR7:
- case FSL_SAI_TMR:
- case FSL_SAI_RDR0:
- case FSL_SAI_RDR1:
- case FSL_SAI_RFR0:
- case FSL_SAI_RFR1:
-+ case FSL_SAI_RFR2:
-+ case FSL_SAI_RFR3:
-+ case FSL_SAI_RFR4:
-+ case FSL_SAI_RFR5:
-+ case FSL_SAI_RFR6:
-+ case FSL_SAI_RFR7:
- case FSL_SAI_RMR:
- return true;
- default:
-@@ -881,8 +893,20 @@ static bool fsl_sai_volatile_reg(struct
- switch (reg) {
- case FSL_SAI_TFR0:
- case FSL_SAI_TFR1:
-+ case FSL_SAI_TFR2:
-+ case FSL_SAI_TFR3:
-+ case FSL_SAI_TFR4:
-+ case FSL_SAI_TFR5:
-+ case FSL_SAI_TFR6:
-+ case FSL_SAI_TFR7:
- case FSL_SAI_RFR0:
- case FSL_SAI_RFR1:
-+ case FSL_SAI_RFR2:
-+ case FSL_SAI_RFR3:
-+ case FSL_SAI_RFR4:
-+ case FSL_SAI_RFR5:
-+ case FSL_SAI_RFR6:
-+ case FSL_SAI_RFR7:
- case FSL_SAI_RDR0:
- case FSL_SAI_RDR1:
- return true;
---- a/sound/soc/fsl/fsl_sai.h
-+++ b/sound/soc/fsl/fsl_sai.h
-@@ -24,6 +24,12 @@
- #define FSL_SAI_TDR1 0x24 /* SAI Transmit Data */
- #define FSL_SAI_TFR0 0x40 /* SAI Transmit FIFO */
- #define FSL_SAI_TFR1 0x44 /* SAI Transmit FIFO */
-+#define FSL_SAI_TFR2 0x48 /* SAI Transmit FIFO */
-+#define FSL_SAI_TFR3 0x4C /* SAI Transmit FIFO */
-+#define FSL_SAI_TFR4 0x50 /* SAI Transmit FIFO */
-+#define FSL_SAI_TFR5 0x54 /* SAI Transmit FIFO */
-+#define FSL_SAI_TFR6 0x58 /* SAI Transmit FIFO */
-+#define FSL_SAI_TFR7 0x5C /* SAI Transmit FIFO */
- #define FSL_SAI_TFR 0x40 /* SAI Transmit FIFO */
- #define FSL_SAI_TMR 0x60 /* SAI Transmit Mask */
- #define FSL_SAI_RCSR(offset) (0x80 + offset) /* SAI Receive Control */
-@@ -36,6 +42,12 @@
- #define FSL_SAI_RDR1 0xa4 /* SAI Receive Data */
- #define FSL_SAI_RFR0 0xc0 /* SAI Receive FIFO */
- #define FSL_SAI_RFR1 0xc4 /* SAI Receive FIFO */
-+#define FSL_SAI_RFR2 0xc8 /* SAI Receive FIFO */
-+#define FSL_SAI_RFR3 0xcc /* SAI Receive FIFO */
-+#define FSL_SAI_RFR4 0xd0 /* SAI Receive FIFO */
-+#define FSL_SAI_RFR5 0xd4 /* SAI Receive FIFO */
-+#define FSL_SAI_RFR6 0xd8 /* SAI Receive FIFO */
-+#define FSL_SAI_RFR7 0xdc /* SAI Receive FIFO */
- #define FSL_SAI_RMR 0xe0 /* SAI Receive Mask */
-
- #define FSL_SAI_xCSR(tx, off) (tx ? FSL_SAI_TCSR(off) : FSL_SAI_RCSR(off))