aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/801-audio-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.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-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.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-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/801-audio-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch135
1 files changed, 0 insertions, 135 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch b/target/linux/layerscape/patches-5.4/801-audio-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch
deleted file mode 100644
index 31033000c8..0000000000
--- a/target/linux/layerscape/patches-5.4/801-audio-0051-MLK-18534-1-ASoC-fsl-sai-introduce-1-1-bclk-mclk-rat.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 2e891d3d62f5fd51e33ae6e614198ce0b3b48e95 Mon Sep 17 00:00:00 2001
-From: Viorel Suman <viorel.suman@nxp.com>
-Date: Wed, 6 Jun 2018 13:36:20 +0300
-Subject: [PATCH] MLK-18534-1: ASoC: fsl: sai: introduce 1:1 bclk:mclk ratio
- support
-
-Since IP version 3.01 (845s) SAI has support for 1:1
-bclk:mclk ratio.
-
-Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
----
- sound/soc/fsl/fsl_sai.c | 69 +++++++++++++++++++++++++------------------------
- sound/soc/fsl/fsl_sai.h | 2 +-
- 2 files changed, 36 insertions(+), 35 deletions(-)
-
---- a/sound/soc/fsl/fsl_sai.c
-+++ b/sound/soc/fsl/fsl_sai.c
-@@ -471,7 +471,8 @@ static int fsl_sai_set_bclk(struct snd_s
- struct fsl_sai *sai = snd_soc_dai_get_drvdata(dai);
- unsigned char offset = sai->soc->reg_offset;
- unsigned long clk_rate;
-- u32 savediv = 0, ratio, savesub = freq;
-+ unsigned int reg = 0;
-+ u32 ratio, savesub = freq, saveratio = 0, savediv = 0;
- u32 id;
- int ret = 0;
-
-@@ -479,6 +480,8 @@ static int fsl_sai_set_bclk(struct snd_s
- if (sai->slave_mode[tx])
- return 0;
-
-+ fsl_sai_check_ver(dai);
-+
- for (id = 0; id < FSL_SAI_MCLK_MAX; id++) {
- clk_rate = clk_get_rate(sai->mclk_clk[id]);
- if (!clk_rate)
-@@ -499,22 +502,21 @@ static int fsl_sai_set_bclk(struct snd_s
- "ratio %d for freq %dHz based on clock %ldHz\n",
- ratio, freq, clk_rate);
-
-- if (ratio % 2 == 0 && ratio >= 2 && ratio <= 512)
-- ratio /= 2;
-- else
-- continue;
-+ if ((ratio % 2 == 0 && ratio >= 2 && ratio <= 512) ||
-+ (ratio == 1 && sai->verid.id >= FSL_SAI_VERID_0301)) {
-
-- if (ret < savesub) {
-- savediv = ratio;
-- sai->mclk_id[tx] = id;
-- savesub = ret;
-- }
-+ if (ret < savesub) {
-+ saveratio = ratio;
-+ sai->mclk_id[tx] = id;
-+ savesub = ret;
-+ }
-
-- if (ret == 0)
-- break;
-+ if (ret == 0)
-+ break;
-+ }
- }
-
-- if (savediv == 0) {
-+ if (saveratio == 0) {
- dev_err(dai->dev, "failed to derive required %cx rate: %d\n",
- tx ? 'T' : 'R', freq);
- return -EINVAL;
-@@ -530,33 +532,32 @@ static int fsl_sai_set_bclk(struct snd_s
- * 4) For Tx and Rx are both Synchronous with another SAI, we just
- * ignore it.
- */
-- if ((sai->synchronous[TX] && !sai->synchronous[RX]) ||
-- (!tx && !sai->synchronous[RX])) {
-- regmap_update_bits(sai->regmap, FSL_SAI_RCR2(offset),
-- FSL_SAI_CR2_MSEL_MASK,
-- FSL_SAI_CR2_MSEL(sai->mclk_id[tx]));
-- regmap_update_bits(sai->regmap, FSL_SAI_RCR2(offset),
-- FSL_SAI_CR2_DIV_MASK, savediv - 1);
-- } else if ((sai->synchronous[RX] && !sai->synchronous[TX]) ||
-- (tx && !sai->synchronous[TX])) {
-- regmap_update_bits(sai->regmap, FSL_SAI_TCR2(offset),
-- FSL_SAI_CR2_MSEL_MASK,
-- FSL_SAI_CR2_MSEL(sai->mclk_id[tx]));
-- regmap_update_bits(sai->regmap, FSL_SAI_TCR2(offset),
-- FSL_SAI_CR2_DIV_MASK, savediv - 1);
-+ if ((!tx || sai->synchronous[TX]) && !sai->synchronous[RX])
-+ reg = FSL_SAI_RCR2(offset);
-+ else if ((tx || sai->synchronous[RX]) && !sai->synchronous[TX])
-+ reg = FSL_SAI_TCR2(offset);
-+
-+ if (reg) {
-+ regmap_update_bits(sai->regmap, reg, FSL_SAI_CR2_MSEL_MASK,
-+ FSL_SAI_CR2_MSEL(sai->mclk_id[tx]));
-+
-+ savediv = (saveratio == 1 ? 0 : (saveratio >> 1) - 1);
-+ regmap_update_bits(sai->regmap, reg, FSL_SAI_CR2_DIV_MASK, savediv);
-+
-+ if (sai->verid.id >= FSL_SAI_VERID_0301) {
-+ regmap_update_bits(sai->regmap, reg, FSL_SAI_CR2_BYP,
-+ (saveratio == 1 ? FSL_SAI_CR2_BYP : 0));
-+ }
- }
-
-- fsl_sai_check_ver(dai);
-- switch (sai->verid.id) {
-- case FSL_SAI_VERID_0301:
-+ if (sai->verid.id >= FSL_SAI_VERID_0301) {
- /* SAI is in master mode at this point, so enable MCLK */
- regmap_update_bits(sai->regmap, FSL_SAI_MCTL,
-- FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN);
-- break;
-+ FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN);
- }
-
-- dev_dbg(dai->dev, "best fit: clock id=%d, div=%d, deviation =%d\n",
-- sai->mclk_id[tx], savediv, savesub);
-+ dev_dbg(dai->dev, "best fit: clock id=%d, ratio=%d, deviation=%d\n",
-+ sai->mclk_id[tx], saveratio, savesub);
-
- return 0;
- }
---- a/sound/soc/fsl/fsl_sai.h
-+++ b/sound/soc/fsl/fsl_sai.h
-@@ -122,7 +122,7 @@
- #define FSL_SAI_CR2_MSEL(ID) ((ID) << 26)
- #define FSL_SAI_CR2_BCP BIT(25)
- #define FSL_SAI_CR2_BCD_MSTR BIT(24)
--#define FSL_SAI_CR2_BCBP BIT(23) /* BCLK bypass */
-+#define FSL_SAI_CR2_BYP BIT(23) /* BCLK bypass */
- #define FSL_SAI_CR2_DIV_MASK 0xff
-
- /* SAI Transmit and Receive Configuration 3 Register */