diff options
author | Chen-Yu Tsai <wens@csie.org> | 2014-07-03 10:55:42 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-07-07 04:53:52 -0400 |
commit | cd6eb534fbb8c9c52e6900f6b086d8c95f966449 (patch) | |
tree | c562594be8c193d6a37feb14e72aa195e563fb60 /drivers/clk | |
parent | 57a1fbf28424561a080b34fbdd04661282aea40e (diff) |
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>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/clk/sunxi/clk-sun6i-apb0-gates.c b/drivers/clk/sunxi/clk-sun6i-apb0-gates.c index 44cd27c5c401..b342f2a2d4a7 100644 --- 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) | |||
25 | void __iomem *reg; | 25 | void __iomem *reg; |
26 | int gate_id; | 26 | int gate_id; |
27 | int ngates; | 27 | int ngates; |
28 | int gate_max = 0; | ||
28 | int i; | 29 | int i; |
29 | 30 | ||
30 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 31 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
@@ -72,9 +73,12 @@ static int sun6i_a31_apb0_gates_clk_probe(struct platform_device *pdev) | |||
72 | reg, gate_id, | 73 | reg, gate_id, |
73 | 0, NULL); | 74 | 0, NULL); |
74 | WARN_ON(IS_ERR(clk_data->clks[gate_id])); | 75 | WARN_ON(IS_ERR(clk_data->clks[gate_id])); |
76 | |||
77 | if (gate_id > gate_max) | ||
78 | gate_max = gate_id; | ||
75 | } | 79 | } |
76 | 80 | ||
77 | clk_data->clk_num = ngates; | 81 | clk_data->clk_num = gate_max + 1; |
78 | 82 | ||
79 | return of_clk_add_provider(np, of_clk_src_onecell_get, clk_data); | 83 | return of_clk_add_provider(np, of_clk_src_onecell_get, clk_data); |
80 | } | 84 | } |