lkml.org 
[lkml]   [2015]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCHv2 5/6] clk: sunxi: make use of of_clk_parent_fill helper function
From
Hi Dinh,

On 21 July 2015 at 08:22, Dinh Nguyen <dinguyen@opensource.altera.com> wrote:
> On Tue, 21 Jul 2015, Tyler Baker wrote:
>
>> Hi,
>>
>> On 17 July 2015 at 17:53, Stephen Boyd <sboyd@codeaurora.org> wrote:
>> > On 07/06, dinguyen@opensource.altera.com wrote:
>> >> From: Dinh Nguyen <dinguyen@opensource.altera.com>
>> >>
>> >> Use of_clk_parent_fill to fill in the parent clock names' array.
>> >>
>> >> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
>> >> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
>> >> Cc: "Emilio López" <emilio@elopez.com.ar>
>> >> ---
>> >
>> > 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?

I've tested the patch below on top of next-20150721 and can confirm it
fixes the sunxi a20 issues I've reported.

> -->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,

Thanks,

Tyler


\
 
 \ /
  Last update: 2015-07-21 18:41    [W:0.055 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site