diff --git a/target/linux/rockchip/patches-6.1/111-03-clk-rockchip-rk3588-fix-CLK_NR_CLKS-usage.patch b/target/linux/rockchip/patches-6.1/030-12-v6.9-clk-rockchip-rk3588-fix-CLK_NR_CLKS-usage.patch similarity index 90% rename from target/linux/rockchip/patches-6.1/111-03-clk-rockchip-rk3588-fix-CLK_NR_CLKS-usage.patch rename to target/linux/rockchip/patches-6.1/030-12-v6.9-clk-rockchip-rk3588-fix-CLK_NR_CLKS-usage.patch index 94b2cf7780..b7dc0936c0 100644 --- a/target/linux/rockchip/patches-6.1/111-03-clk-rockchip-rk3588-fix-CLK_NR_CLKS-usage.patch +++ b/target/linux/rockchip/patches-6.1/030-12-v6.9-clk-rockchip-rk3588-fix-CLK_NR_CLKS-usage.patch @@ -1,6 +1,6 @@ -From a5946bf5ce48ed73fffb1542be606e7b8659b017 Mon Sep 17 00:00:00 2001 +From 2dc66a5ab2c6fb532fbb16107ee7efcb0effbfa5 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel -Date: Wed, 13 Dec 2023 18:58:43 +0100 +Date: Fri, 26 Jan 2024 19:18:22 +0100 Subject: [PATCH] clk: rockchip: rk3588: fix CLK_NR_CLKS usage CLK_NR_CLKS is not part of the DT bindings and needs to be removed @@ -9,6 +9,8 @@ takes care of it by introducing a new function identifying the maximum used clock ID at runtime. Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20240126182919.48402-2-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner --- drivers/clk/rockchip/clk-rk3588.c | 5 ++++- drivers/clk/rockchip/clk.c | 17 +++++++++++++++++ @@ -46,8 +48,8 @@ Signed-off-by: Sebastian Reichel +unsigned long rockchip_clk_find_max_clk_id(struct rockchip_clk_branch *list, + unsigned int nr_clk) +{ ++ unsigned long max = 0; + unsigned int idx; -+ unsigned long max; + + for (idx = 0; idx < nr_clk; idx++, list++) { + if (list->id > max) diff --git a/target/linux/rockchip/patches-6.1/030-13-v6.9-dt-bindings-clock-rk3588-drop-CLK_NR_CLKS.patch b/target/linux/rockchip/patches-6.1/030-13-v6.9-dt-bindings-clock-rk3588-drop-CLK_NR_CLKS.patch new file mode 100644 index 0000000000..c8117f08c5 --- /dev/null +++ b/target/linux/rockchip/patches-6.1/030-13-v6.9-dt-bindings-clock-rk3588-drop-CLK_NR_CLKS.patch @@ -0,0 +1,27 @@ +From 11a29dc2e41ead2be78cfa9d532edf924b461acc Mon Sep 17 00:00:00 2001 +From: Sebastian Reichel +Date: Fri, 26 Jan 2024 19:18:23 +0100 +Subject: [PATCH] dt-bindings: clock: rk3588: drop CLK_NR_CLKS + +CLK_NR_CLKS should not be part of the binding. Let's drop it, since +the kernel code no longer uses it either. + +Reviewed-by: Krzysztof Kozlowski +Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20240126182919.48402-3-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner +--- + include/dt-bindings/clock/rockchip,rk3588-cru.h | 2 -- + 1 file changed, 2 deletions(-) + +--- a/include/dt-bindings/clock/rockchip,rk3588-cru.h ++++ b/include/dt-bindings/clock/rockchip,rk3588-cru.h +@@ -734,8 +734,6 @@ + #define PCLK_AV1_PRE 719 + #define HCLK_SDIO_PRE 720 + +-#define CLK_NR_CLKS (HCLK_SDIO_PRE + 1) +- + /* scmi-clocks indices */ + + #define SCMI_CLK_CPUL 0 diff --git a/target/linux/rockchip/patches-6.1/111-04-dt-bindings-clock-rk3588-add-missing-PCLK_VO1GRF.patch b/target/linux/rockchip/patches-6.1/030-14-v6.9-dt-bindings-clock-rk3588-add-missing-PCLK_VO1GRF.patch similarity index 65% rename from target/linux/rockchip/patches-6.1/111-04-dt-bindings-clock-rk3588-add-missing-PCLK_VO1GRF.patch rename to target/linux/rockchip/patches-6.1/030-14-v6.9-dt-bindings-clock-rk3588-add-missing-PCLK_VO1GRF.patch index b29a700cd5..b960bc6197 100644 --- a/target/linux/rockchip/patches-6.1/111-04-dt-bindings-clock-rk3588-add-missing-PCLK_VO1GRF.patch +++ b/target/linux/rockchip/patches-6.1/030-14-v6.9-dt-bindings-clock-rk3588-add-missing-PCLK_VO1GRF.patch @@ -1,12 +1,15 @@ -From fb7ba4ede6ab6c37bc1146f7fa1f07a7810439ab Mon Sep 17 00:00:00 2001 +From c81798cf9dd2f324934585b2b52a0398caefb88e Mon Sep 17 00:00:00 2001 From: Sebastian Reichel -Date: Wed, 13 Dec 2023 19:02:57 +0100 +Date: Fri, 26 Jan 2024 19:18:24 +0100 Subject: [PATCH] dt-bindings: clock: rk3588: add missing PCLK_VO1GRF Add PCLK_VO1GRF to complement PCLK_VO0GRF. This will be needed for HDMI support. +Acked-by: Krzysztof Kozlowski Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20240126182919.48402-4-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner --- include/dt-bindings/clock/rockchip,rk3588-cru.h | 1 + 1 file changed, 1 insertion(+) @@ -19,5 +22,5 @@ Signed-off-by: Sebastian Reichel #define HCLK_SDIO_PRE 720 +#define PCLK_VO1GRF 721 - #define CLK_NR_CLKS (HCLK_SDIO_PRE + 1) + /* scmi-clocks indices */ diff --git a/target/linux/rockchip/patches-6.1/111-05-clk-rockchip-rk3588-fix-pclk_vo0grf-and-pclk_vo1grf.patch b/target/linux/rockchip/patches-6.1/030-15-v6.9-clk-rockchip-rk3588-fix-pclk_vo0grf-and-pclk_vo1grf.patch similarity index 93% rename from target/linux/rockchip/patches-6.1/111-05-clk-rockchip-rk3588-fix-pclk_vo0grf-and-pclk_vo1grf.patch rename to target/linux/rockchip/patches-6.1/030-15-v6.9-clk-rockchip-rk3588-fix-pclk_vo0grf-and-pclk_vo1grf.patch index e1b9922cb3..e12b73fb30 100644 --- a/target/linux/rockchip/patches-6.1/111-05-clk-rockchip-rk3588-fix-pclk_vo0grf-and-pclk_vo1grf.patch +++ b/target/linux/rockchip/patches-6.1/030-15-v6.9-clk-rockchip-rk3588-fix-pclk_vo0grf-and-pclk_vo1grf.patch @@ -1,6 +1,6 @@ -From 8824bba8426bab1a05b2f285283bc0e99de678d1 Mon Sep 17 00:00:00 2001 +From 326be62eaf2e89767b7b9223f88eaf3c041b98d2 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel -Date: Wed, 13 Dec 2023 19:06:30 +0100 +Date: Fri, 26 Jan 2024 19:18:25 +0100 Subject: [PATCH] clk: rockchip: rk3588: fix pclk_vo0grf and pclk_vo1grf Currently pclk_vo1grf is not exposed, but it should be referenced @@ -14,6 +14,8 @@ No Fixes tag has been added, since the logic requiring these clocks is not yet upstream anyways. Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20240126182919.48402-5-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner --- drivers/clk/rockchip/clk-rk3588.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/target/linux/rockchip/patches-6.1/111-06-clk-rockchip-rk3588-fix-indent.patch b/target/linux/rockchip/patches-6.1/030-16-v6.9-clk-rockchip-rk3588-fix-indent.patch similarity index 80% rename from target/linux/rockchip/patches-6.1/111-06-clk-rockchip-rk3588-fix-indent.patch rename to target/linux/rockchip/patches-6.1/030-16-v6.9-clk-rockchip-rk3588-fix-indent.patch index f46bb47f42..27aa28edd5 100644 --- a/target/linux/rockchip/patches-6.1/111-06-clk-rockchip-rk3588-fix-indent.patch +++ b/target/linux/rockchip/patches-6.1/030-16-v6.9-clk-rockchip-rk3588-fix-indent.patch @@ -1,12 +1,14 @@ -From 1d45059214265717c8bc1fd32b966896e91ec51d Mon Sep 17 00:00:00 2001 +From 2a6e4710672242281347103b64e01693aa823a29 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel -Date: Tue, 21 Nov 2023 17:52:54 +0100 +Date: Fri, 26 Jan 2024 19:18:26 +0100 Subject: [PATCH] clk: rockchip: rk3588: fix indent pclk_mailbox2 is the only RK3588 clock indented with one tab instead of two tabs. Let's fix this. Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20240126182919.48402-6-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner --- drivers/clk/rockchip/clk-rk3588.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/rockchip/patches-6.1/111-07-clk-rockchip-rk3588-use-linked-clock-ID-for-GATE_LINK.patch b/target/linux/rockchip/patches-6.1/030-17-v6.9-clk-rockchip-rk3588-use-linked-clock-ID-for-GATE_LINK.patch similarity index 96% rename from target/linux/rockchip/patches-6.1/111-07-clk-rockchip-rk3588-use-linked-clock-ID-for-GATE_LINK.patch rename to target/linux/rockchip/patches-6.1/030-17-v6.9-clk-rockchip-rk3588-use-linked-clock-ID-for-GATE_LINK.patch index 1b48d85412..949041fb9f 100644 --- a/target/linux/rockchip/patches-6.1/111-07-clk-rockchip-rk3588-use-linked-clock-ID-for-GATE_LINK.patch +++ b/target/linux/rockchip/patches-6.1/030-17-v6.9-clk-rockchip-rk3588-use-linked-clock-ID-for-GATE_LINK.patch @@ -1,6 +1,6 @@ -From 923c6fa62da49b895fc110e2bad8d6e812b37d1a Mon Sep 17 00:00:00 2001 +From dae3e57000fb2d6f491e3ee2956f5918326d6b72 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel -Date: Wed, 22 Nov 2023 19:23:13 +0100 +Date: Fri, 26 Jan 2024 19:18:27 +0100 Subject: [PATCH] clk: rockchip: rk3588: use linked clock ID for GATE_LINK In preparation for properly supporting GATE_LINK switch the unused @@ -8,6 +8,8 @@ linked clock argument from the clock's name to its ID. This allows easy and fast lookup of the 'struct clk'. Signed-off-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20240126182919.48402-7-sebastian.reichel@collabora.com +Signed-off-by: Heiko Stuebner --- drivers/clk/rockchip/clk-rk3588.c | 46 +++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/target/linux/rockchip/patches-6.1/111-08-clk-rockchip-implement-proper-GATE_LINK-support.patch b/target/linux/rockchip/patches-6.1/111-08-clk-rockchip-implement-proper-GATE_LINK-support.patch index a2adea4c8f..711dce959b 100644 --- a/target/linux/rockchip/patches-6.1/111-08-clk-rockchip-implement-proper-GATE_LINK-support.patch +++ b/target/linux/rockchip/patches-6.1/111-08-clk-rockchip-implement-proper-GATE_LINK-support.patch @@ -1,7 +1,21 @@ -From 42987730c377951c90e9cfe55652e812db4a9ac9 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel -Date: Thu, 23 Nov 2023 17:58:21 +0100 -Subject: [PATCH] clk: rockchip: implement proper GATE_LINK support +To: Michael Turquette , + Stephen Boyd , + linux-clk@vger.kernel.org +Cc: Elaine Zhang , + Kever Yang , + Heiko Stuebner , + Rob Herring , + Krzysztof Kozlowski , + Conor Dooley , + huangtao@rock-chips.com, andy.yan@rock-chips.com, + devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, + Sebastian Reichel , + kernel@collabora.com +Subject: [PATCH v8 7/7] clk: rockchip: implement proper GATE_LINK support +Date: Fri, 26 Jan 2024 19:18:28 +0100 [thread overview] +Message-ID: <20240126182919.48402-8-sebastian.reichel@collabora.com> (raw) +In-Reply-To: <20240126182919.48402-1-sebastian.reichel@collabora.com> Recent Rockchip SoCs have a new hardware block called Native Interface Unit (NIU), which gates clocks to devices behind them. These effectively