Commit 3d0316c9 authored by Alex Bee's avatar Alex Bee Committed by Heiko Stuebner

clk: rockchip: rk3128: 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 avatarAlex Bee <knaerzche@gmail.com>
Link: https://lore.kernel.org/r/20240606143401.32454-3-knaerzche@gmail.comSigned-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent e7456982
...@@ -569,18 +569,22 @@ static const char *const rk3128_critical_clocks[] __initconst = { ...@@ -569,18 +569,22 @@ static const char *const rk3128_critical_clocks[] __initconst = {
"sclk_timer5", "sclk_timer5",
}; };
static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device_node *np) static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device_node *np,
unsigned long soc_nr_clks)
{ {
struct rockchip_clk_provider *ctx; struct rockchip_clk_provider *ctx;
unsigned long common_nr_clks;
void __iomem *reg_base; void __iomem *reg_base;
common_nr_clks = rockchip_clk_find_max_clk_id(common_clk_branches,
ARRAY_SIZE(common_clk_branches)) + 1;
reg_base = of_iomap(np, 0); reg_base = of_iomap(np, 0);
if (!reg_base) { if (!reg_base) {
pr_err("%s: could not map cru region\n", __func__); pr_err("%s: could not map cru region\n", __func__);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS); ctx = rockchip_clk_init(np, reg_base, max(common_nr_clks, soc_nr_clks));
if (IS_ERR(ctx)) { if (IS_ERR(ctx)) {
pr_err("%s: rockchip clk init failed\n", __func__); pr_err("%s: rockchip clk init failed\n", __func__);
iounmap(reg_base); iounmap(reg_base);
...@@ -609,8 +613,12 @@ static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device ...@@ -609,8 +613,12 @@ static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device
static void __init rk3126_clk_init(struct device_node *np) static void __init rk3126_clk_init(struct device_node *np)
{ {
struct rockchip_clk_provider *ctx; struct rockchip_clk_provider *ctx;
unsigned long soc_nr_clks;
ctx = rk3128_common_clk_init(np); soc_nr_clks = rockchip_clk_find_max_clk_id(rk3126_clk_branches,
ARRAY_SIZE(rk3126_clk_branches)) + 1;
ctx = rk3128_common_clk_init(np, soc_nr_clks);
if (IS_ERR(ctx)) if (IS_ERR(ctx))
return; return;
...@@ -627,8 +635,12 @@ CLK_OF_DECLARE(rk3126_cru, "rockchip,rk3126-cru", rk3126_clk_init); ...@@ -627,8 +635,12 @@ CLK_OF_DECLARE(rk3126_cru, "rockchip,rk3126-cru", rk3126_clk_init);
static void __init rk3128_clk_init(struct device_node *np) static void __init rk3128_clk_init(struct device_node *np)
{ {
struct rockchip_clk_provider *ctx; struct rockchip_clk_provider *ctx;
unsigned long soc_nr_clks;
soc_nr_clks = rockchip_clk_find_max_clk_id(rk3128_clk_branches,
ARRAY_SIZE(rk3128_clk_branches)) + 1;
ctx = rk3128_common_clk_init(np); ctx = rk3128_common_clk_init(np, soc_nr_clks);
if (IS_ERR(ctx)) if (IS_ERR(ctx))
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment