From 54ade918089e33f14287817d08b2eca64524f065 Mon Sep 17 00:00:00 2001 From: retro98boy Date: Sat, 28 Feb 2026 21:04:28 +0800 Subject: [PATCH] rockchip64: Drop upstreamed i2s-tdm patch --- .../rk3308-i2s-default-rate.patch | 36 ------------------- .../rk3308-i2s-default-rate.patch | 36 ------------------- 2 files changed, 72 deletions(-) delete mode 100644 patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch delete mode 100644 patch/kernel/archive/rockchip64-6.19/rk3308-i2s-default-rate.patch diff --git a/patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch deleted file mode 100644 index 47b5edd437..0000000000 --- a/patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Brent Roman -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 ---- - 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 - diff --git a/patch/kernel/archive/rockchip64-6.19/rk3308-i2s-default-rate.patch b/patch/kernel/archive/rockchip64-6.19/rk3308-i2s-default-rate.patch deleted file mode 100644 index 47b5edd437..0000000000 --- a/patch/kernel/archive/rockchip64-6.19/rk3308-i2s-default-rate.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Brent Roman -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 ---- - 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 -