clk: rockchip: rk3188: Drop CLK_NR_CLKS usage
Subsystems (2)
PATCH 1/1 clk: rockchip: rk3188: 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]>
--- drivers/clk/rockchip/clk-rk3188.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/clk/rockchip/clk-rk3188.c +14 -4
@@ -757,9 +757,11 @@ static const char *const rk3188_critical_clocks[] __initconst = { "sclk_mac_lbtest", }; -static struct rockchip_clk_provider *__init rk3188_common_clk_init (struct device_node *np) +static struct rockchip_clk_provider *__init rk3188_common_clk_init (struct device_node *np, +unsigned long soc_nr_clks) {struct rockchip_clk_provider *ctx; +unsigned long common_nr_clks;void __iomem *reg_base; reg_base =of_iomap (np,0 );
@@ -768,7 +770,9 @@ static struct rockchip_clk_provider *__init rk3188_common_clk_init(struct devicereturn ERR_PTR (-ENOMEM ); } - ctx =rockchip_clk_init (np, reg_base,CLK_NR_CLKS ); + common_nr_clks =rockchip_clk_find_max_clk_id (common_clk_branches, +ARRAY_SIZE (common_clk_branches)) +1 ; + ctx =rockchip_clk_init (np, reg_base,max (common_nr_clks, soc_nr_clks));if (IS_ERR (ctx)) {pr_err ("%s: rockchip clk init failed\n" , __func__);iounmap (reg_base);
@@ -789,8 +793,11 @@ static struct rockchip_clk_provider *__init rk3188_common_clk_init(struct devicestatic void __init rk3066a_clk_init (struct device_node *np) {struct rockchip_clk_provider *ctx; +unsigned long soc_nr_clks; - ctx =rk3188_common_clk_init (np); + soc_nr_clks =rockchip_clk_find_max_clk_id (rk3066a_clk_branches, +ARRAY_SIZE (rk3066a_clk_branches)) +1 ; + ctx =rk3188_common_clk_init (np, soc_nr_clks);if (IS_ERR (ctx))return ;
@@ -812,11 +819,14 @@ CLK_OF_DECLARE(rk3066a_cru, "rockchip,rk3066a-cru", rk3066a_clk_init);static void __init rk3188a_clk_init (struct device_node *np) {struct rockchip_clk_provider *ctx; +unsigned long soc_nr_clks;struct clk *clk1, *clk2;unsigned long rate;int ret; - ctx =rk3188_common_clk_init (np); + soc_nr_clks =rockchip_clk_find_max_clk_id (rk3188_clk_branches, +ARRAY_SIZE (rk3188_clk_branches)) +1 ; + ctx =rk3188_common_clk_init (np, soc_nr_clks);if (IS_ERR (ctx))return ;
--
2.39.2
Quoted 5 lines · Johan Jonker
In order to get rid of
CLK_NR_CLKSand be able to drop it from the bindings, userockchip_clk_find_max_clk_idhelper to find the highest clock id.
Applied, thanks!
[1/1] clk: rockchip: rk3188: Drop CLK_NR_CLKS usage
commit: ec2265dc91307622e43a7d602c3ea425da6f5de1
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>