diff mbox series

MIPS: loongson32: Update the clock initialization

Message ID 20230210111141.1379645-1-keguang.zhang@gmail.com (mailing list archive)
State Handled Elsewhere
Headers show
Series MIPS: loongson32: Update the clock initialization | expand

Commit Message

Keguang Zhang Feb. 10, 2023, 11:11 a.m. UTC 
The Loongson-1 clock driver is under re-implementation
to add DT support. As a result, ls1x_clk_init() will be dropped soon.
Therefore, call of_clk_init() for clock initialization instead.

Link: https://lore.kernel.org/all/20230209132614.1079198-3-keguang.zhang@gmail.com
Link: https://lore.kernel.org/all/20230209132614.1079198-4-keguang.zhang@gmail.com
Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
---
 arch/mips/include/asm/mach-loongson32/platform.h | 1 -
 arch/mips/loongson32/common/time.c               | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)


base-commit: 159c610af8cdf2b3c915e59162fc867b557cbe7e
prerequisite-patch-id: 6a8c8d604fca8bce5d9e35cac080b87a33be2b5c

Comments

Stephen Boyd Feb. 10, 2023, 11:31 p.m. UTC | #1 
Quoting Keguang Zhang (2023-02-10 03:11:41)
> The Loongson-1 clock driver is under re-implementation
> to add DT support. As a result, ls1x_clk_init() will be dropped soon.
> Therefore, call of_clk_init() for clock initialization instead.
> 
> Link: https://lore.kernel.org/all/20230209132614.1079198-3-keguang.zhang@gmail.com
> Link: https://lore.kernel.org/all/20230209132614.1079198-4-keguang.zhang@gmail.com
> Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
> ---

Acked-by: Stephen Boyd <sboyd@kernel.org>
Keguang Zhang March 15, 2023, 3:07 a.m. UTC | #2 
On Sat, Feb 11, 2023 at 7:31 AM Stephen Boyd <sboyd@kernel.org> wrote:
>
> Quoting Keguang Zhang (2023-02-10 03:11:41)
> > The Loongson-1 clock driver is under re-implementation
> > to add DT support. As a result, ls1x_clk_init() will be dropped soon.
> > Therefore, call of_clk_init() for clock initialization instead.
> >
> > Link: https://lore.kernel.org/all/20230209132614.1079198-3-keguang.zhang@gmail.com
> > Link: https://lore.kernel.org/all/20230209132614.1079198-4-keguang.zhang@gmail.com

Hi Thomas,
Sorry to bother you.
For fear of raising build error, is it possible to merge this patch
before the above two patches getting applied?
Or is there anything to improve?
Thanks very much!


> > Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com>
> > ---
>
> Acked-by: Stephen Boyd <sboyd@kernel.org>



--
Best regards,

Kelvin Cheung
Thomas Bogendoerfer March 15, 2023, 9:29 a.m. UTC | #3 
On Wed, Mar 15, 2023 at 11:07:23AM +0800, Keguang Zhang wrote:
> On Sat, Feb 11, 2023 at 7:31 AM Stephen Boyd <sboyd@kernel.org> wrote:
> >
> > Quoting Keguang Zhang (2023-02-10 03:11:41)
> > > The Loongson-1 clock driver is under re-implementation
> > > to add DT support. As a result, ls1x_clk_init() will be dropped soon.
> > > Therefore, call of_clk_init() for clock initialization instead.
> > >
> > > Link: https://lore.kernel.org/all/20230209132614.1079198-3-keguang.zhang@gmail.com
> > > Link: https://lore.kernel.org/all/20230209132614.1079198-4-keguang.zhang@gmail.com
> 
> Hi Thomas,
> Sorry to bother you.
> For fear of raising build error, is it possible to merge this patch
> before the above two patches getting applied?
> Or is there anything to improve?
> Thanks very much!

the IMHO best way would be to let this patch go the same way as
the other patch set. So Stephen could you take this into your
tree, too ?

Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Keguang Zhang March 15, 2023, 9:43 a.m. UTC | #4 
On Wed, Mar 15, 2023 at 5:29 PM Thomas Bogendoerfer
<tsbogend@alpha.franken.de> wrote:
>
> On Wed, Mar 15, 2023 at 11:07:23AM +0800, Keguang Zhang wrote:
> > On Sat, Feb 11, 2023 at 7:31 AM Stephen Boyd <sboyd@kernel.org> wrote:
> > >
> > > Quoting Keguang Zhang (2023-02-10 03:11:41)
> > > > The Loongson-1 clock driver is under re-implementation
> > > > to add DT support. As a result, ls1x_clk_init() will be dropped soon.
> > > > Therefore, call of_clk_init() for clock initialization instead.
> > > >
> > > > Link: https://lore.kernel.org/all/20230209132614.1079198-3-keguang.zhang@gmail.com
> > > > Link: https://lore.kernel.org/all/20230209132614.1079198-4-keguang.zhang@gmail.com
> >
> > Hi Thomas,
> > Sorry to bother you.
> > For fear of raising build error, is it possible to merge this patch
> > before the above two patches getting applied?
> > Or is there anything to improve?
> > Thanks very much!
>
> the IMHO best way would be to let this patch go the same way as
> the other patch set. So Stephen could you take this into your
> tree, too ?
>
Sure. Will do.

> Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
>
> --
> Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
> good idea.                                                [ RFC1925, 2.3 ]
Stephen Boyd March 15, 2023, 7:04 p.m. UTC | #5 
Quoting Keguang Zhang (2023-03-15 02:43:02)
> On Wed, Mar 15, 2023 at 5:29 PM Thomas Bogendoerfer
> <tsbogend@alpha.franken.de> wrote:
> >
> > On Wed, Mar 15, 2023 at 11:07:23AM +0800, Keguang Zhang wrote:
> > > On Sat, Feb 11, 2023 at 7:31 AM Stephen Boyd <sboyd@kernel.org> wrote:
> > > >
> > > > Quoting Keguang Zhang (2023-02-10 03:11:41)
> > > > > The Loongson-1 clock driver is under re-implementation
> > > > > to add DT support. As a result, ls1x_clk_init() will be dropped soon.
> > > > > Therefore, call of_clk_init() for clock initialization instead.
> > > > >
> > > > > Link: https://lore.kernel.org/all/20230209132614.1079198-3-keguang.zhang@gmail.com
> > > > > Link: https://lore.kernel.org/all/20230209132614.1079198-4-keguang.zhang@gmail.com
> > >
> > > Hi Thomas,
> > > Sorry to bother you.
> > > For fear of raising build error, is it possible to merge this patch
> > > before the above two patches getting applied?
> > > Or is there anything to improve?
> > > Thanks very much!
> >
> > the IMHO best way would be to let this patch go the same way as
> > the other patch set. So Stephen could you take this into your
> > tree, too ?
> >
> Sure. Will do.
> 

Please resend this patch along with the loongson patches that it goes
with.
diff mbox series

Patch

diff --git a/arch/mips/include/asm/mach-loongson32/platform.h b/arch/mips/include/asm/mach-loongson32/platform.h
index 86e1a6aab4e5..2cdcfb5f6012 100644
--- a/arch/mips/include/asm/mach-loongson32/platform.h
+++ b/arch/mips/include/asm/mach-loongson32/platform.h
@@ -20,7 +20,6 @@  extern struct platform_device ls1x_gpio1_pdev;
 extern struct platform_device ls1x_rtc_pdev;
 extern struct platform_device ls1x_wdt_pdev;
 
-void __init ls1x_clk_init(void);
 void __init ls1x_rtc_set_extclk(struct platform_device *pdev);
 void __init ls1x_serial_set_uartclk(struct platform_device *pdev);
 
diff --git a/arch/mips/loongson32/common/time.c b/arch/mips/loongson32/common/time.c
index 459b15c96d3b..965c04aa56fd 100644
--- a/arch/mips/loongson32/common/time.c
+++ b/arch/mips/loongson32/common/time.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <linux/clk.h>
+#include <linux/of_clk.h>
 #include <linux/interrupt.h>
 #include <linux/sizes.h>
 #include <asm/time.h>
@@ -211,7 +212,7 @@  void __init plat_time_init(void)
 	struct clk *clk = NULL;
 
 	/* initialize LS1X clocks */
-	ls1x_clk_init();
+	of_clk_init(NULL);
 
 #ifdef CONFIG_CEVT_CSRC_LS1X
 	/* setup LS1X PWM timer */