Skip to content

Commit ec4f426

Browse files
Johan Jonkermmind
authored andcommitted
clk: rockchip: rk3036: Drop CLK_NR_CLKS usage
In order to get rid of CLK_NR_CLKS and be able to drop it from the bindings, use rockchip_clk_find_max_clk_id helper to find the highest clock id. Signed-off-by: Johan Jonker <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 2496910 commit ec4f426

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/clk/rockchip/clk-rk3036.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ static const char *const rk3036_critical_clocks[] __initconst = {
436436
static void __init rk3036_clk_init(struct device_node *np)
437437
{
438438
struct rockchip_clk_provider *ctx;
439+
unsigned long clk_nr_clks;
439440
void __iomem *reg_base;
440441
struct clk *clk;
441442

@@ -452,7 +453,9 @@ static void __init rk3036_clk_init(struct device_node *np)
452453
writel_relaxed(HIWORD_UPDATE(0x2, 0x3, 10),
453454
reg_base + RK2928_CLKSEL_CON(13));
454455

455-
ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
456+
clk_nr_clks = rockchip_clk_find_max_clk_id(rk3036_clk_branches,
457+
ARRAY_SIZE(rk3036_clk_branches)) + 1;
458+
ctx = rockchip_clk_init(np, reg_base, clk_nr_clks);
456459
if (IS_ERR(ctx)) {
457460
pr_err("%s: rockchip clk init failed\n", __func__);
458461
iounmap(reg_base);

0 commit comments

Comments
 (0)