| Message ID | 20200506090452.1290-1-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | ce61b490965e6d4068641cf33b8ecf6864c3e105 |
| Headers | show |
| Series | MIPS: ingenic: Replace <linux/clk-provider.h> by <linux/of_clk.h> | expand |
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 >
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.
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
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.
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>
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(-)