diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 01:16:48 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 13:11:56 +0000 |
| commit | 786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch) | |
| tree | 926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/801-audio-0024-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch | |
| parent | 9470160c350d15f765c33d6c1db15d6c4709a64c (diff) | |
| download | upstream-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-0024-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/801-audio-0024-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0024-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch b/target/linux/layerscape/patches-5.4/801-audio-0024-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch deleted file mode 100644 index 1edd4a35ea..0000000000 --- a/target/linux/layerscape/patches-5.4/801-audio-0024-MLK-14847-Revert-ASoC-fsl-sai-set-xCR4-xCR5-xMR-for-.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 060265cd3cec354804c0c944e42de83cec9f2f2a Mon Sep 17 00:00:00 2001 -From: Mihai Serban <mihai.serban@nxp.com> -Date: Fri, 21 Apr 2017 15:57:58 +0300 -Subject: [PATCH] MLK-14847: Revert "ASoC: fsl-sai: set xCR4/xCR5/xMR for SAI - master mode" - -This reverts commit c768ed336bba ("ASoC: fsl-sai: set xCR4/xCR5/xMR for -SAI master mode") - -This change was already introduced by commit 51659ca069ce ("ASoC: fsl-sai: -set xCR4/xCR5/xMR for SAI master mode") from upstream. - -Manually adjust the code to match the changes introduced by subsequent -commit b2936555bb38 ("MLK-13609: ASoC: fsl_sai: fix for synchronize mode") -by removing updates to FSL_SAI_TMR/FSL_SAI_RMR registers. - -Signed-off-by: Mihai Serban <mihai.serban@nxp.com> ---- - sound/soc/fsl/fsl_sai.c | 29 ----------------------------- - 1 file changed, 29 deletions(-) - ---- a/sound/soc/fsl/fsl_sai.c -+++ b/sound/soc/fsl/fsl_sai.c -@@ -507,35 +507,6 @@ static int fsl_sai_hw_params(struct snd_ - regmap_update_bits(sai->regmap, FSL_SAI_TCR5, - FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK | - FSL_SAI_CR5_FBT_MASK, val_cr5); -- regmap_write(sai->regmap, FSL_SAI_TMR, -- ~0UL - ((1 << channels) - 1)); -- } else if (!sai->synchronous[RX] && sai->synchronous[TX] && tx) { -- regmap_update_bits(sai->regmap, FSL_SAI_RCR4, -- FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK, -- val_cr4); -- regmap_update_bits(sai->regmap, FSL_SAI_RCR5, -- FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK | -- FSL_SAI_CR5_FBT_MASK, val_cr5); -- regmap_write(sai->regmap, FSL_SAI_RMR, -- ~0UL - ((1 << channels) - 1)); -- } -- } -- -- /* -- * For SAI master mode, when Tx(Rx) sync with Rx(Tx) clock, Rx(Tx) will -- * generate bclk and frame clock for Tx(Rx), we should set RCR4(TCR4), -- * RCR5(TCR5) and RMR(TMR) for playback(capture), or there will be sync -- * error. -- */ -- -- 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, -- val_cr4); -- regmap_update_bits(sai->regmap, FSL_SAI_TCR5, -- FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK | -- FSL_SAI_CR5_FBT_MASK, val_cr5); - } else if (!sai->synchronous[RX] && sai->synchronous[TX] && tx) { - regmap_update_bits(sai->regmap, FSL_SAI_RCR4, - FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK, |