Stephen,

On Thu, 15 Oct 2015 11:09:03 -0700, Stephen Boyd wrote:

> Good catch! Except we don't need to do all that complicated
> stuff, right? We can use of_clk_get_from_provider() instead.
> 
> ---8<----
> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index 16b86a551bcb..648fb2c8904d 100644
> --- a/drivers/clk/clk.c
> +++ b/drivers/clk/clk.c
> @@ -3088,7 +3088,7 @@ const char *of_clk_get_parent_name(struct device_node 
> *np, int index)
>                * registered, we return the node name as the name of
>                * the clock as long as #clock-cells = 0.
>                */
> -             clk = of_clk_get(np, index);
> +             clk = of_clk_get_from_provider(clkspec);
>               if (IS_ERR(clk)) {
>                       if (clkspec.args_count == 0)
>                               clk_name = clkspec.np->name;

I'll re-test this solution tomorrow, just to make sure.

> > So, what is the plan now ?
> > 
> >  - Have the minimal fix in drivers/clk/mvebu/clk-cpu.c for 4.3.
> 
> Yep.

I see in your other e-mail that you already applied the fix, so good.

> >  - Have the patch improving the of_clk_get_parent_name() logic merged
> >    in 4.4 + a revert of the fix done for 4.3 in clk-cpu.c. Unless maybe
> >    you don't want to clutter the core of the clock framework to handle
> >    this specific case?
> 
> Assuming that the patch doesn't cause problems for other
> platforms, then I think we'll go with this approach.

Ok. Can you send the patch "properly" so that I can give a formal
Tested-by ?

> >  - Add the clock-output-names to the Marvell EBU Device Tree files, so
> >    that in a couple of kernel releases we can remove the hacks and rely
> >    on the generic logic of of_clk_get_parent_name().
> > 
> 
> Naw, let's not change any DT files for this.

ACK.

Thanks for your help!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to