On Tue, 21 Jul 2015, Tyler Baker wrote:
> Hi,
>
> On 17 July 2015 at 17:53, Stephen Boyd <[email protected]> wrote:
> > On 07/06, [email protected] wrote:
> >> From: Dinh Nguyen <[email protected]>
> >>
> >> Use of_clk_parent_fill to fill in the parent clock names' array.
> >>
> >> Signed-off-by: Dinh Nguyen <[email protected]>
> >> Cc: Maxime Ripard <[email protected]>
> >> Cc: "Emilio López" <[email protected]>
> >> ---
> >
> > Applied to clk-next with that fix I posted.
>
> The kernelci.org bot reported sunxi a20 boot failures[1][2] in
> next-20150720 and next-20150721. I have bisected[3] these failures to
> this commit. However, I have not investigated any further but
> reverting this commit on top of next-20150721 gets the boards booting
> again.
>
Can you please try this patch?
-->8-
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index e8c5185..958655f 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -204,7 +204,7 @@ static void __init sun6i_ahb1_clk_setup(struct device_node
*node)
return;
/* we have a mux, we will have >1 parents */
- of_clk_parent_fill(node, parents, SUN6I_AHB1_MAX_PARENTS);
+ i = of_clk_parent_fill(node, parents, SUN6I_AHB1_MAX_PARENTS);
of_property_read_string(node, "clock-output-names", &clk_name);
ahb1 = kzalloc(sizeof(struct sun6i_ahb1_clk), GFP_KERNEL);
@@ -789,7 +789,7 @@ static void __init sunxi_mux_clk_setup(struct device_node
*node,
reg = of_iomap(node, 0);
- of_clk_parent_fill(node, parents, SUNXI_MAX_PARENTS);
+ i = of_clk_parent_fill(node, parents, SUNXI_MAX_PARENTS);
of_property_read_string(node, "clock-output-names", &clk_name);
clk = clk_register_mux(NULL, clk_name, parents, i,
