aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch184
1 files changed, 184 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch b/target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch
new file mode 100644
index 0000000000..0cca97f4f6
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/801-audio-0007-Revert-ASoC-fsl_sai-Add-registers-definition-for-mul.patch
@@ -0,0 +1,184 @@
+From 56d254c9b7abf3e5632dd1b257927e23b4449019 Mon Sep 17 00:00:00 2001
+From: Dong Aisheng <aisheng.dong@nxp.com>
+Date: Fri, 16 Aug 2019 18:01:43 +0800
+Subject: [PATCH] Revert "ASoC: fsl_sai: Add registers definition for multiple
+ datalines"
+
+This reverts commit 5f0ac20ed6db1d6da2eea8b862cf3d54fdfb5830.
+---
+ sound/soc/fsl/fsl_sai.c | 76 +++++++------------------------------------------
+ sound/soc/fsl/fsl_sai.h | 36 +++--------------------
+ 2 files changed, 14 insertions(+), 98 deletions(-)
+
+--- a/sound/soc/fsl/fsl_sai.c
++++ b/sound/soc/fsl/fsl_sai.c
+@@ -685,14 +685,7 @@ static struct reg_default fsl_sai_reg_de
+ {FSL_SAI_TCR3, 0},
+ {FSL_SAI_TCR4, 0},
+ {FSL_SAI_TCR5, 0},
+- {FSL_SAI_TDR0, 0},
+- {FSL_SAI_TDR1, 0},
+- {FSL_SAI_TDR2, 0},
+- {FSL_SAI_TDR3, 0},
+- {FSL_SAI_TDR4, 0},
+- {FSL_SAI_TDR5, 0},
+- {FSL_SAI_TDR6, 0},
+- {FSL_SAI_TDR7, 0},
++ {FSL_SAI_TDR, 0},
+ {FSL_SAI_TMR, 0},
+ {FSL_SAI_RCR1, 0},
+ {FSL_SAI_RCR2, 0},
+@@ -711,14 +704,7 @@ static bool fsl_sai_readable_reg(struct
+ case FSL_SAI_TCR3:
+ case FSL_SAI_TCR4:
+ case FSL_SAI_TCR5:
+- 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_TFR:
+ case FSL_SAI_TMR:
+ case FSL_SAI_RCSR:
+ case FSL_SAI_RCR1:
+@@ -726,22 +712,8 @@ static bool fsl_sai_readable_reg(struct
+ case FSL_SAI_RCR3:
+ case FSL_SAI_RCR4:
+ case FSL_SAI_RCR5:
+- case FSL_SAI_RDR0:
+- case FSL_SAI_RDR1:
+- case FSL_SAI_RDR2:
+- case FSL_SAI_RDR3:
+- case FSL_SAI_RDR4:
+- case FSL_SAI_RDR5:
+- case FSL_SAI_RDR6:
+- case FSL_SAI_RDR7:
+- 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_RDR:
++ case FSL_SAI_RFR:
+ case FSL_SAI_RMR:
+ return true;
+ default:
+@@ -754,30 +726,9 @@ static bool fsl_sai_volatile_reg(struct
+ switch (reg) {
+ case FSL_SAI_TCSR:
+ case FSL_SAI_RCSR:
+- 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:
+- case FSL_SAI_RDR2:
+- case FSL_SAI_RDR3:
+- case FSL_SAI_RDR4:
+- case FSL_SAI_RDR5:
+- case FSL_SAI_RDR6:
+- case FSL_SAI_RDR7:
++ case FSL_SAI_TFR:
++ case FSL_SAI_RFR:
++ case FSL_SAI_RDR:
+ return true;
+ default:
+ return false;
+@@ -793,14 +744,7 @@ static bool fsl_sai_writeable_reg(struct
+ case FSL_SAI_TCR3:
+ case FSL_SAI_TCR4:
+ case FSL_SAI_TCR5:
+- case FSL_SAI_TDR0:
+- case FSL_SAI_TDR1:
+- case FSL_SAI_TDR2:
+- case FSL_SAI_TDR3:
+- case FSL_SAI_TDR4:
+- case FSL_SAI_TDR5:
+- case FSL_SAI_TDR6:
+- case FSL_SAI_TDR7:
++ case FSL_SAI_TDR:
+ case FSL_SAI_TMR:
+ case FSL_SAI_RCSR:
+ case FSL_SAI_RCR1:
+@@ -939,8 +883,8 @@ static int fsl_sai_probe(struct platform
+ MCLK_DIR(index));
+ }
+
+- sai->dma_params_rx.addr = res->start + FSL_SAI_RDR0;
+- sai->dma_params_tx.addr = res->start + FSL_SAI_TDR0;
++ sai->dma_params_rx.addr = res->start + FSL_SAI_RDR;
++ sai->dma_params_tx.addr = res->start + FSL_SAI_TDR;
+ sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
+ sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX;
+
+--- a/sound/soc/fsl/fsl_sai.h
++++ b/sound/soc/fsl/fsl_sai.h
+@@ -20,22 +20,8 @@
+ #define FSL_SAI_TCR3 0x0c /* SAI Transmit Configuration 3 */
+ #define FSL_SAI_TCR4 0x10 /* SAI Transmit Configuration 4 */
+ #define FSL_SAI_TCR5 0x14 /* SAI Transmit Configuration 5 */
+-#define FSL_SAI_TDR0 0x20 /* SAI Transmit Data 0 */
+-#define FSL_SAI_TDR1 0x24 /* SAI Transmit Data 1 */
+-#define FSL_SAI_TDR2 0x28 /* SAI Transmit Data 2 */
+-#define FSL_SAI_TDR3 0x2C /* SAI Transmit Data 3 */
+-#define FSL_SAI_TDR4 0x30 /* SAI Transmit Data 4 */
+-#define FSL_SAI_TDR5 0x34 /* SAI Transmit Data 5 */
+-#define FSL_SAI_TDR6 0x38 /* SAI Transmit Data 6 */
+-#define FSL_SAI_TDR7 0x3C /* SAI Transmit Data 7 */
+-#define FSL_SAI_TFR0 0x40 /* SAI Transmit FIFO 0 */
+-#define FSL_SAI_TFR1 0x44 /* SAI Transmit FIFO 1 */
+-#define FSL_SAI_TFR2 0x48 /* SAI Transmit FIFO 2 */
+-#define FSL_SAI_TFR3 0x4C /* SAI Transmit FIFO 3 */
+-#define FSL_SAI_TFR4 0x50 /* SAI Transmit FIFO 4 */
+-#define FSL_SAI_TFR5 0x54 /* SAI Transmit FIFO 5 */
+-#define FSL_SAI_TFR6 0x58 /* SAI Transmit FIFO 6 */
+-#define FSL_SAI_TFR7 0x5C /* SAI Transmit FIFO 7 */
++#define FSL_SAI_TDR 0x20 /* SAI Transmit Data */
++#define FSL_SAI_TFR 0x40 /* SAI Transmit FIFO */
+ #define FSL_SAI_TMR 0x60 /* SAI Transmit Mask */
+ #define FSL_SAI_RCSR 0x80 /* SAI Receive Control */
+ #define FSL_SAI_RCR1 0x84 /* SAI Receive Configuration 1 */
+@@ -43,22 +29,8 @@
+ #define FSL_SAI_RCR3 0x8c /* SAI Receive Configuration 3 */
+ #define FSL_SAI_RCR4 0x90 /* SAI Receive Configuration 4 */
+ #define FSL_SAI_RCR5 0x94 /* SAI Receive Configuration 5 */
+-#define FSL_SAI_RDR0 0xa0 /* SAI Receive Data 0 */
+-#define FSL_SAI_RDR1 0xa4 /* SAI Receive Data 1 */
+-#define FSL_SAI_RDR2 0xa8 /* SAI Receive Data 2 */
+-#define FSL_SAI_RDR3 0xac /* SAI Receive Data 3 */
+-#define FSL_SAI_RDR4 0xb0 /* SAI Receive Data 4 */
+-#define FSL_SAI_RDR5 0xb4 /* SAI Receive Data 5 */
+-#define FSL_SAI_RDR6 0xb8 /* SAI Receive Data 6 */
+-#define FSL_SAI_RDR7 0xbc /* SAI Receive Data 7 */
+-#define FSL_SAI_RFR0 0xc0 /* SAI Receive FIFO 0 */
+-#define FSL_SAI_RFR1 0xc4 /* SAI Receive FIFO 1 */
+-#define FSL_SAI_RFR2 0xc8 /* SAI Receive FIFO 2 */
+-#define FSL_SAI_RFR3 0xcc /* SAI Receive FIFO 3 */
+-#define FSL_SAI_RFR4 0xd0 /* SAI Receive FIFO 4 */
+-#define FSL_SAI_RFR5 0xd4 /* SAI Receive FIFO 5 */
+-#define FSL_SAI_RFR6 0xd8 /* SAI Receive FIFO 6 */
+-#define FSL_SAI_RFR7 0xdc /* SAI Receive FIFO 7 */
++#define FSL_SAI_RDR 0xa0 /* SAI Receive Data */
++#define FSL_SAI_RFR 0xc0 /* SAI Receive FIFO */
+ #define FSL_SAI_RMR 0xe0 /* SAI Receive Mask */
+
+ #define FSL_SAI_xCSR(tx) (tx ? FSL_SAI_TCSR : FSL_SAI_RCSR)