kernel: delete Linux 5.4 config and patches

[openwrt/staging/chunkeey.git] / target / linux / layerscape / patches-5.4 / 801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch

diff --git a/target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch b/target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch
deleted file mode 100644 (file)
index 2fb5789..0000000
--- a/target/linux/layerscape/patches-5.4/801-audio-0021-ASoC-fsl_sai-handle-slave-mode-per-TX-RX-direction.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 06d8069b308a1655e0c248b6bd556e63d9b38099 Mon Sep 17 00:00:00 2001
-From: Viorel Suman <viorel.suman@nxp.com>
-Date: Wed, 3 May 2017 10:16:02 +0300
-Subject: [PATCH] ASoC: fsl_sai: handle slave mode per TX/RX direction
-
-The SAI interface can be a clock supplier or consummer
-as function of stream direction, ie when interacting
-with I2S XTOR. Removed FSL_SAI_RFR define as it is now
-referred as FSL_SAI_RFR0.
-
-Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
----
- sound/soc/fsl/fsl_sai.c | 18 +++++++++---------
- sound/soc/fsl/fsl_sai.h |  3 +--
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
---- a/sound/soc/fsl/fsl_sai.c
-+++ b/sound/soc/fsl/fsl_sai.c
-@@ -300,7 +300,7 @@ static int fsl_sai_set_dai_fmt_tr(struct
-               return -EINVAL;
-       }
- 
--      sai->is_slave_mode = false;
-+      sai->slave_mode[tx] = false;
- 
-       /* DAI clock master masks */
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-@@ -310,7 +310,7 @@ static int fsl_sai_set_dai_fmt_tr(struct
-               sai->is_slave_mode = false;
-               break;
-       case SND_SOC_DAIFMT_CBM_CFM:
--              sai->is_slave_mode = true;
-+              sai->slave_mode[tx] = true;
-               break;
-       case SND_SOC_DAIFMT_CBS_CFM:
-               val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
-@@ -318,7 +318,7 @@ static int fsl_sai_set_dai_fmt_tr(struct
-               break;
-       case SND_SOC_DAIFMT_CBM_CFS:
-               val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
--              sai->is_slave_mode = true;
-+              sai->slave_mode[tx] = true;
-               break;
-       default:
-               return -EINVAL;
-@@ -359,7 +359,7 @@ static int fsl_sai_set_bclk(struct snd_s
-       int ret = 0;
- 
-       /* Don't apply to slave mode */
--      if (sai->is_slave_mode)
-+      if (sai->slave_mode[tx])
-               return 0;
- 
-       for (id = 0; id < FSL_SAI_MCLK_MAX; id++) {
-@@ -454,7 +454,7 @@ static int fsl_sai_hw_params(struct snd_
-       if (sai->slot_width)
-               slot_width = sai->slot_width;
- 
--      if (!sai->is_slave_mode) {
-+      if (!sai->slave_mode[tx]) {
-               ret = fsl_sai_set_bclk(cpu_dai, tx,
-                               slots * slot_width * params_rate(params));
-               if (ret)
-@@ -490,7 +490,7 @@ static int fsl_sai_hw_params(struct snd_
-        * error.
-        */
- 
--      if (!sai->is_slave_mode) {
-+      if (!sai->slave_mode[tx]) {
-               if (!sai->synchronous[TX] && sai->synchronous[RX] && !tx) {
-                       regmap_update_bits(sai->regmap, FSL_SAI_TCR4,
-                               FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK,
-@@ -519,7 +519,7 @@ static int fsl_sai_hw_params(struct snd_
-        * error.
-        */
- 
--      if (!sai->is_slave_mode) {
-+      if (!sai->slave_mode[tx]) {
-               if (!sai->synchronous[TX] && sai->synchronous[RX] && !tx) {
-                       regmap_update_bits(sai->regmap, FSL_SAI_TCR4,
-                               FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK,
-@@ -577,7 +577,7 @@ static int fsl_sai_hw_free(struct snd_pc
-       struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
-       bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
- 
--      if (!sai->is_slave_mode &&
-+      if (!sai->slave_mode[tx] &&
-                       sai->mclk_streams & BIT(substream->stream)) {
-               clk_disable_unprepare(sai->mclk_clk[sai->mclk_id[tx]]);
-               sai->mclk_streams &= ~BIT(substream->stream);
-@@ -672,7 +672,7 @@ static int fsl_sai_trigger(struct snd_pc
-                        * This is a hardware bug, and will be fix in the
-                        * next sai version.
-                        */
--                      if (!sai->is_slave_mode) {
-+                      if (!sai->slave_mode[tx]) {
-                               /* Software Reset for both Tx and Rx */
-                               regmap_write(sai->regmap,
-                                            FSL_SAI_TCSR, FSL_SAI_CSR_SR);
---- a/sound/soc/fsl/fsl_sai.h
-+++ b/sound/soc/fsl/fsl_sai.h
-@@ -37,7 +37,6 @@
- #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_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)
-@@ -158,7 +157,7 @@ struct fsl_sai {
-       struct clk *bus_clk;
-       struct clk *mclk_clk[FSL_SAI_MCLK_MAX];
- 
--      bool is_slave_mode;
-+      bool slave_mode[2];
-       bool is_lsb_first;
-       bool is_dsp_mode;
-       bool sai_on_imx;