clk: sunxi: Fix gate indexing for sun6i-a31-apb0-gates

sun6i-a31-apb0-gates supports using clock-indices for holes between
individual gates. However, the driver passes the number of gates
registered in clk_data->clk_num, which of_clk_src_onecell_get uses
to recognize the range of valid indices a consumer can use.

This patch makes the driver pass the maximum gate index + 1, so
of_clk_src_onecell_get does not complain about indices greater
than gates registered.

This was tested on the A23 SoC, which has a similar APB0 clock,
but has holes for gates to removed IP blocks.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
index 44cd27c5c40110f4f19457d1eaa7a404c2aff275..b342f2a2d4a72b9000474edc2b2734eef6534f27 100644 (file)
--- a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
+++ b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c
@@ -25,6 +25,7 @@ static int sun6i_a31_apb0_gates_clk_probe(struct platform_device *pdev)
        void __iomem *reg;
        int gate_id;
        int ngates;
+       int gate_max = 0;
        int i;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -72,9 +73,12 @@ static int sun6i_a31_apb0_gates_clk_probe(struct platform_device *pdev)
                                                            reg, gate_id,
                                                            0, NULL);
                WARN_ON(IS_ERR(clk_data->clks[gate_id]));
+
+               if (gate_id > gate_max)
+                       gate_max = gate_id;
        }
 
-       clk_data->clk_num = ngates;
+       clk_data->clk_num = gate_max + 1;
 
        return of_clk_add_provider(np, of_clk_src_onecell_get, clk_data);
 }