[PATCH 0/2] Some minor cleanup in the Rockchip clock driver

[PATCH 0/2] Some minor cleanup in the Rockchip clock driver

[Heiko Stuebner]

One fixup for the new grf-gate and bringing the grf-mux branch naming
in line with the oher newly added grf clock-types.

Heiko Stuebner (2):
  clk: rockchip: rename branch_muxgrf to branch_grf_mux
  clk: rockchip: rename gate-grf clk file

 drivers/clk/rockchip/Makefile                       | 2 +-
 drivers/clk/rockchip/{gate-grf.c => clk-gate-grf.c} | 0
 drivers/clk/rockchip/clk.c                          | 4 ++--
 drivers/clk/rockchip/clk.h                          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename drivers/clk/rockchip/{gate-grf.c => clk-gate-grf.c} (100%)

-- 
2.47.2

[PATCH 1/2] clk: rockchip: rename branch_muxgrf to branch_grf_mux

[Heiko Stuebner]

We now have a number of new branch-types coming from the "General Register
Files" (gates and mmc phase clocks). Their naming as branch_grf_foo is
way nicer, so rename the old branch_muxgrf to a similar scheme.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 drivers/clk/rockchip/clk.c | 4 ++--
 drivers/clk/rockchip/clk.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index 43d7ed5c3418..b140412df65a 100644
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -509,7 +509,7 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx,
 		clk = NULL;
 
 		/* for GRF-dependent branches, choose the right grf first */
-		if ((list->branch_type == branch_muxgrf ||
+		if ((list->branch_type == branch_grf_mux ||
 		     list->branch_type == branch_grf_gate ||
 		     list->branch_type == branch_grf_mmc) &&
 		    list->grf_type != grf_type_sys) {
@@ -540,7 +540,7 @@ void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx,
 					list->mux_shift, list->mux_width,
 					list->mux_flags, &ctx->lock);
 			break;
-		case branch_muxgrf:
+		case branch_grf_mux:
 			clk = rockchip_clk_register_muxgrf(list->name,
 				list->parent_names, list->num_parents,
 				flags, grf, list->muxdiv_offset,
diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
index 10be168f49e3..1e9c3c0d31e3 100644
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@ -664,7 +664,7 @@ struct clk *rockchip_clk_register_gate_grf(const char *name,
 enum rockchip_clk_branch_type {
 	branch_composite,
 	branch_mux,
-	branch_muxgrf,
+	branch_grf_mux,
 	branch_divider,
 	branch_fraction_divider,
 	branch_gate,
@@ -943,7 +943,7 @@ struct rockchip_clk_branch {
 #define MUXGRF(_id, cname, pnames, f, o, s, w, mf, gt)		\
 	{							\
 		.id		= _id,				\
-		.branch_type	= branch_muxgrf,		\
+		.branch_type	= branch_grf_mux,		\
 		.name		= cname,			\
 		.parent_names	= pnames,			\
 		.num_parents	= ARRAY_SIZE(pnames),		\
-- 
2.47.2

[PATCH 2/2] clk: rockchip: rename gate-grf clk file

[Heiko Stuebner]

All Rockchip clock types live in files starting with clk-foo, so rename
the newly added gate-grf-clock to follow that scheme.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 drivers/clk/rockchip/Makefile                       | 2 +-
 drivers/clk/rockchip/{gate-grf.c => clk-gate-grf.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename drivers/clk/rockchip/{gate-grf.c => clk-gate-grf.c} (100%)

diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile
index f0e0b2c6e876..c281a9738d9f 100644
--- a/drivers/clk/rockchip/Makefile
+++ b/drivers/clk/rockchip/Makefile
@@ -8,13 +8,13 @@ obj-$(CONFIG_COMMON_CLK_ROCKCHIP) += clk-rockchip.o
 clk-rockchip-y += clk.o
 clk-rockchip-y += clk-pll.o
 clk-rockchip-y += clk-cpu.o
+clk-rockchip-y += clk-gate-grf.o
 clk-rockchip-y += clk-half-divider.o
 clk-rockchip-y += clk-inverter.o
 clk-rockchip-y += clk-mmc-phase.o
 clk-rockchip-y += clk-muxgrf.o
 clk-rockchip-y += clk-ddr.o
 clk-rockchip-y += gate-link.o
-clk-rockchip-y += gate-grf.o
 clk-rockchip-$(CONFIG_RESET_CONTROLLER) += softrst.o
 
 obj-$(CONFIG_CLK_PX30)          += clk-px30.o
diff --git a/drivers/clk/rockchip/gate-grf.c b/drivers/clk/rockchip/clk-gate-grf.c
similarity index 100%
rename from drivers/clk/rockchip/gate-grf.c
rename to drivers/clk/rockchip/clk-gate-grf.c
-- 
2.47.2

Re: [PATCH 0/2] Some minor cleanup in the Rockchip clock driver

[Heiko Stuebner]

On Thu, 08 May 2025 20:27:50 +0200, Heiko Stuebner wrote:
> One fixup for the new grf-gate and bringing the grf-mux branch naming
> in line with the oher newly added grf clock-types.
> 
> Heiko Stuebner (2):
>   clk: rockchip: rename branch_muxgrf to branch_grf_mux
>   clk: rockchip: rename gate-grf clk file
> 
> [...]

Applied, thanks!

[1/2] clk: rockchip: rename branch_muxgrf to branch_grf_mux
      commit: e37fe0b9bf762dca9f16e0461d14038ec3898f8d
[2/2] clk: rockchip: rename gate-grf clk file
      commit: 553f648dbd9472ea55a6835446fe57f48491b355

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>