enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip64: Drop upstreamed i2s-tdm patch

Browse Source
This commit is contained in:
retro98boy 2026-02-28 21:04:28 +08:00 committed by Igor
parent 12f4e9f91b
commit 54ade91808
2 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch
View File

@ -1,36 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brent Roman <genosenosor@gmail.com>
Date: Sat, 5 Jul 2025 00:35:09 -0700
Subject: Restore rockchip_i2s_tdm default clk rates
sound/soc/rockchip/rockchip_i2s_tdm.c
Signed-off-by: Brent Roman <genosenosor@gmail.com>
---
sound/soc/rockchip/rockchip_i2s_tdm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
index 111111111111..222222222222 100644
--- a/sound/soc/rockchip/rockchip_i2s_tdm.c
+++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
@@ -22,6 +22,7 @@
#define DRV_NAME "rockchip-i2s-tdm"
+#define DEFAULT_MCLK_FS 256
#define CH_GRP_MAX 4 /* The max channel 8 / 2 */
#define MULTIPLEX_CH_MAX 10
@@ -665,6 +666,9 @@ static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream,
mclk_rate = i2s_tdm->mclk_rx_freq;
}
+ /* set to default rate if set_sysclk was never called */
+ if (!mclk_rate)
+ mclk_rate = DEFAULT_MCLK_FS * params_rate(params);
err = clk_set_rate(mclk, mclk_rate);
if (err)
return err;
--
Armbian

36
patch/kernel/archive/rockchip64-6.19/rk3308-i2s-default-rate.patch
View File

@ -1,36 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brent Roman <genosenosor@gmail.com>
Date: Sat, 5 Jul 2025 00:35:09 -0700
Subject: Restore rockchip_i2s_tdm default clk rates
sound/soc/rockchip/rockchip_i2s_tdm.c
Signed-off-by: Brent Roman <genosenosor@gmail.com>
---
sound/soc/rockchip/rockchip_i2s_tdm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
index 111111111111..222222222222 100644
--- a/sound/soc/rockchip/rockchip_i2s_tdm.c
+++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
@@ -22,6 +22,7 @@
#define DRV_NAME "rockchip-i2s-tdm"
+#define DEFAULT_MCLK_FS 256
#define CH_GRP_MAX 4 /* The max channel 8 / 2 */
#define MULTIPLEX_CH_MAX 10
@@ -665,6 +666,9 @@ static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream,
mclk_rate = i2s_tdm->mclk_rx_freq;
}
+ /* set to default rate if set_sysclk was never called */
+ if (!mclk_rate)
+ mclk_rate = DEFAULT_MCLK_FS * params_rate(params);
err = clk_set_rate(mclk, mclk_rate);
if (err)
return err;
--
Armbian