clk: rockchip: rename branch_muxgrf to branch_grf_mux
From: Heiko Stuebner <heiko@...> Date: Thu, 8 May 2025 20:07:42 +0200
Commit-Message
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@...>
Patch-Comment
drivers/clk/rockchip/clk.c | 4 ++-- drivers/clk/rockchip/clk.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Statistics
- 4 lines added
- 4 lines removed
Changes
-------------------------- drivers/clk/rockchip/clk.c --------------------------
index 43d7ed5c3418..b140412df65a 100644
@@ -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_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_grf_mux:
clk = rockchip_clk_register_muxgrf(list->name,
list->parent_names, list->num_parents,
flags, grf, list->muxdiv_offset,
-------------------------- drivers/clk/rockchip/clk.h --------------------------
index 10be168f49e3..1e9c3c0d31e3 100644
@@ -664,7 +664,7 @@ struct clk *rockchip_clk_register_gate_grf(const char *name,
enum rockchip_clk_branch_type {
branch_composite,
branch_mux,
+ 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_grf_mux, \
.name = cname, \
.parent_names = pnames, \
.num_parents = ARRAY_SIZE(pnames), \