2020-02-12 10:18:09

by Geert Uytterhoeven

[permalink] [raw]
Subject: [PATCH] nds32: Replace <linux/clk-provider.h> by <linux/of_clk.h>

The Andes platform code is not a clock provider, and just needs to call
of_clk_init().

Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/nds32/kernel/time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/nds32/kernel/time.c b/arch/nds32/kernel/time.c
index ac9d78ce3a818926..574a3d0a853980a9 100644
--- a/arch/nds32/kernel/time.c
+++ b/arch/nds32/kernel/time.c
@@ -2,7 +2,7 @@
// Copyright (C) 2005-2017 Andes Technology Corporation

#include <linux/clocksource.h>
-#include <linux/clk-provider.h>
+#include <linux/of_clk.h>

void __init time_init(void)
{
--
2.17.1


2020-02-12 10:52:30

by Greentime Hu

[permalink] [raw]
Subject: Re: [PATCH] nds32: Replace <linux/clk-provider.h> by <linux/of_clk.h>

Geert Uytterhoeven <[email protected]> 於 2020年2月12日 週三 下午6:16寫道:
>
> The Andes platform code is not a clock provider, and just needs to call
> of_clk_init().
>
> Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> arch/nds32/kernel/time.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/nds32/kernel/time.c b/arch/nds32/kernel/time.c
> index ac9d78ce3a818926..574a3d0a853980a9 100644
> --- a/arch/nds32/kernel/time.c
> +++ b/arch/nds32/kernel/time.c
> @@ -2,7 +2,7 @@
> // Copyright (C) 2005-2017 Andes Technology Corporation
>
> #include <linux/clocksource.h>
> -#include <linux/clk-provider.h>
> +#include <linux/of_clk.h>
>
> void __init time_init(void)
> {

Thank you, Geert.

Let me know if you like to put in your tree or nds32's.
Acked-by: Greentime Hu <[email protected]>

2020-02-12 12:26:50

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] nds32: Replace <linux/clk-provider.h> by <linux/of_clk.h>

Hi Greentime,

On Wed, Feb 12, 2020 at 11:52 AM Greentime Hu <[email protected]> wrote:
> Geert Uytterhoeven <[email protected]> 於 2020年2月12日 週三 下午6:16寫道:
> > The Andes platform code is not a clock provider, and just needs to call
> > of_clk_init().
> >
> > Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.
> >
> > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > ---
> > arch/nds32/kernel/time.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/nds32/kernel/time.c b/arch/nds32/kernel/time.c
> > index ac9d78ce3a818926..574a3d0a853980a9 100644
> > --- a/arch/nds32/kernel/time.c
> > +++ b/arch/nds32/kernel/time.c
> > @@ -2,7 +2,7 @@
> > // Copyright (C) 2005-2017 Andes Technology Corporation
> >
> > #include <linux/clocksource.h>
> > -#include <linux/clk-provider.h>
> > +#include <linux/of_clk.h>
> >
> > void __init time_init(void)
> > {
>
> Thank you, Geert.
>
> Let me know if you like to put in your tree or nds32's.
> Acked-by: Greentime Hu <[email protected]>

Please take it in the nds32 tree.
Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2020-02-12 17:09:16

by Stephen Boyd

[permalink] [raw]
Subject: Re: [PATCH] nds32: Replace <linux/clk-provider.h> by <linux/of_clk.h>

Quoting Geert Uytterhoeven (2020-02-12 02:16:51)
> The Andes platform code is not a clock provider, and just needs to call
> of_clk_init().
>
> Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---

Reviewed-by: Stephen Boyd <[email protected]>

2020-06-23 08:52:36

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] nds32: Replace <linux/clk-provider.h> by <linux/of_clk.h>

Hi Greentime,

On Wed, Feb 12, 2020 at 1:25 PM Geert Uytterhoeven <[email protected]> wrote:
> On Wed, Feb 12, 2020 at 11:52 AM Greentime Hu <[email protected]> wrote:
> > Geert Uytterhoeven <[email protected]> 於 2020年2月12日 週三 下午6:16寫道:
> > > The Andes platform code is not a clock provider, and just needs to call
> > > of_clk_init().
> > >
> > > Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.
> > >
> > > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > > ---
> > > arch/nds32/kernel/time.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/arch/nds32/kernel/time.c b/arch/nds32/kernel/time.c
> > > index ac9d78ce3a818926..574a3d0a853980a9 100644
> > > --- a/arch/nds32/kernel/time.c
> > > +++ b/arch/nds32/kernel/time.c
> > > @@ -2,7 +2,7 @@
> > > // Copyright (C) 2005-2017 Andes Technology Corporation
> > >
> > > #include <linux/clocksource.h>
> > > -#include <linux/clk-provider.h>
> > > +#include <linux/of_clk.h>
> > >
> > > void __init time_init(void)
> > > {
> >
> > Thank you, Geert.
> >
> > Let me know if you like to put in your tree or nds32's.
> > Acked-by: Greentime Hu <[email protected]>
>
> Please take it in the nds32 tree.
> Thanks!

And so you did. But it disappeared after June 12, when the nds32 tree
was reset to v5.7, losing the following 2 commits:

de9a5650b611014c52b1ad994f63253593d8eddf nds32: Replace
<linux/clk-provider.h> by <linux/of_clk.h>
d785c5a324cd8812720a409dc85050558281a567 nds32: configs: Cleanup
CONFIG_CROSS_COMPILE

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2020-06-23 12:32:36

by Greentime Hu

[permalink] [raw]
Subject: Re: [PATCH] nds32: Replace <linux/clk-provider.h> by <linux/of_clk.h>

Geert Uytterhoeven <[email protected]> 於 2020年6月23日 週二 下午4:49寫道:
>
> Hi Greentime,
>
> On Wed, Feb 12, 2020 at 1:25 PM Geert Uytterhoeven <[email protected]> wrote:
> > On Wed, Feb 12, 2020 at 11:52 AM Greentime Hu <[email protected]> wrote:
> > > Geert Uytterhoeven <[email protected]> 於 2020年2月12日 週三 下午6:16寫道:
> > > > The Andes platform code is not a clock provider, and just needs to call
> > > > of_clk_init().
> > > >
> > > > Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.
> > > >
> > > > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > > > ---
> > > > arch/nds32/kernel/time.c | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/arch/nds32/kernel/time.c b/arch/nds32/kernel/time.c
> > > > index ac9d78ce3a818926..574a3d0a853980a9 100644
> > > > --- a/arch/nds32/kernel/time.c
> > > > +++ b/arch/nds32/kernel/time.c
> > > > @@ -2,7 +2,7 @@
> > > > // Copyright (C) 2005-2017 Andes Technology Corporation
> > > >
> > > > #include <linux/clocksource.h>
> > > > -#include <linux/clk-provider.h>
> > > > +#include <linux/of_clk.h>
> > > >
> > > > void __init time_init(void)
> > > > {
> > >
> > > Thank you, Geert.
> > >
> > > Let me know if you like to put in your tree or nds32's.
> > > Acked-by: Greentime Hu <[email protected]>
> >
> > Please take it in the nds32 tree.
> > Thanks!
>
> And so you did. But it disappeared after June 12, when the nds32 tree
> was reset to v5.7, losing the following 2 commits:
>
> de9a5650b611014c52b1ad994f63253593d8eddf nds32: Replace
> <linux/clk-provider.h> by <linux/of_clk.h>
> d785c5a324cd8812720a409dc85050558281a567 nds32: configs: Cleanup
> CONFIG_CROSS_COMPILE
>

Thank you, Geert. It must be my mistake when I try to clean the next branch.
I just put these 2 commits back.