clk: rockchip: rename branch_muxgrf to branch_grf_mux

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>
Link: https://lore.kernel.org/r/20250508182752.1925313-2-heiko@sntech.de

diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index 805ab4a..19caf26 100644 (file)
--- 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 10be168..1e9c3c0 100644 (file)
--- 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),           \