* [PATCH] MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h>
@ 2020-05-06 9:04 Geert Uytterhoeven
2020-05-06 10:39 ` Paul Cercueil
2020-05-07 8:40 ` Thomas Bogendoerfer
0 siblings, 2 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2020-05-06 9:04 UTC (permalink / raw)
To: Paul Cercueil, Thomas Bogendoerfer
Cc: linux-mips, linux-clk, Geert Uytterhoeven
The JZ4740 setup 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>.
Fixes: f932449c11dabb4b ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/mips/jz4740/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
index 81428ddcaa9736f9..142cf127bf9e1c9f 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -5,13 +5,13 @@
* JZ4740 setup code
*/
-#include <linux/clk-provider.h>
#include <linux/clocksource.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/irqchip.h>
#include <linux/kernel.h>
#include <linux/libfdt.h>
+#include <linux/of_clk.h>
#include <linux/of_fdt.h>
#include <linux/pm.h>
#include <linux/suspend.h>
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h>
2020-05-06 9:04 [PATCH] MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h> Geert Uytterhoeven
@ 2020-05-06 10:39 ` Paul Cercueil
2020-05-07 8:40 ` Thomas Bogendoerfer
1 sibling, 0 replies; 5+ messages in thread
From: Paul Cercueil @ 2020-05-06 10:39 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Thomas Bogendoerfer, linux-mips, linux-clk
Hi,
Le mer. 6 mai 2020 à 11:04, Geert Uytterhoeven
<geert+renesas@glider.be> a écrit :
> The JZ4740 setup 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>.
>
> Fixes: f932449c11dabb4b ("MIPS: ingenic: Drop obsolete code, merge
> the rest in setup.c")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Looks good to me. Thanks for your patch.
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Cheers,
-Paul
> ---
> arch/mips/jz4740/setup.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
> index 81428ddcaa9736f9..142cf127bf9e1c9f 100644
> --- a/arch/mips/jz4740/setup.c
> +++ b/arch/mips/jz4740/setup.c
> @@ -5,13 +5,13 @@
> * JZ4740 setup code
> */
>
> -#include <linux/clk-provider.h>
> #include <linux/clocksource.h>
> #include <linux/init.h>
> #include <linux/io.h>
> #include <linux/irqchip.h>
> #include <linux/kernel.h>
> #include <linux/libfdt.h>
> +#include <linux/of_clk.h>
> #include <linux/of_fdt.h>
> #include <linux/pm.h>
> #include <linux/suspend.h>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h>
2020-05-06 9:04 [PATCH] MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h> Geert Uytterhoeven
2020-05-06 10:39 ` Paul Cercueil
@ 2020-05-07 8:40 ` Thomas Bogendoerfer
2020-05-07 9:11 ` Geert Uytterhoeven
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Bogendoerfer @ 2020-05-07 8:40 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Paul Cercueil, linux-mips, linux-clk
On Wed, May 06, 2020 at 11:04:52AM +0200, Geert Uytterhoeven wrote:
> The JZ4740 setup 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>.
>
> Fixes: f932449c11dabb4b ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> arch/mips/jz4740/setup.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Does this need to go via mips-fixes ? Or is mips-next good enough ?
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h>
2020-05-07 8:40 ` Thomas Bogendoerfer
@ 2020-05-07 9:11 ` Geert Uytterhoeven
2020-05-07 10:00 ` Thomas Bogendoerfer
0 siblings, 1 reply; 5+ messages in thread
From: Geert Uytterhoeven @ 2020-05-07 9:11 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Paul Cercueil, open list:BROADCOM NVRAM DRIVER, linux-clk
Hi Thomas,
On Thu, May 7, 2020 at 11:05 AM Thomas Bogendoerfer
<tsbogend@alpha.franken.de> wrote:
> On Wed, May 06, 2020 at 11:04:52AM +0200, Geert Uytterhoeven wrote:
> > The JZ4740 setup 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>.
> >
> > Fixes: f932449c11dabb4b ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> > arch/mips/jz4740/setup.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Does this need to go via mips-fixes ? Or is mips-next good enough ?
The commit fixed is not yet upstream, only in next, and the fix is
non-critical. It could even be merged into the original commit,
depending on your rebase policy.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h>
2020-05-07 9:11 ` Geert Uytterhoeven
@ 2020-05-07 10:00 ` Thomas Bogendoerfer
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Bogendoerfer @ 2020-05-07 10:00 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Paul Cercueil, open list:BROADCOM NVRAM DRIVER, linux-clk
On Thu, May 07, 2020 at 11:11:10AM +0200, Geert Uytterhoeven wrote:
> Hi Thomas,
>
> On Thu, May 7, 2020 at 11:05 AM Thomas Bogendoerfer
> <tsbogend@alpha.franken.de> wrote:
> > On Wed, May 06, 2020 at 11:04:52AM +0200, Geert Uytterhoeven wrote:
> > > The JZ4740 setup 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>.
> > >
> > > Fixes: f932449c11dabb4b ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > > ---
> > > arch/mips/jz4740/setup.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Does this need to go via mips-fixes ? Or is mips-next good enough ?
>
> The commit fixed is not yet upstream, only in next, and the fix is
> non-critical. It could even be merged into the original commit,
> depending on your rebase policy.
no rebase on mips-next. I've applied your patch to mips-next.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-07 10:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-06 9:04 [PATCH] MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h> Geert Uytterhoeven
2020-05-06 10:39 ` Paul Cercueil
2020-05-07 8:40 ` Thomas Bogendoerfer
2020-05-07 9:11 ` Geert Uytterhoeven
2020-05-07 10:00 ` Thomas Bogendoerfer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.