Commit ec4f4261 authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner
Browse files

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: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/c8e73847-f472-4473-ac55-068cb28b98f6@gmail.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 2496910c
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ static const char *const rk3036_critical_clocks[] __initconst = {
static void __init rk3036_clk_init(struct device_node *np)
{
	struct rockchip_clk_provider *ctx;
	unsigned long clk_nr_clks;
	void __iomem *reg_base;
	struct clk *clk;

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

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