summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeguang Zhang <keguang.zhang@gmail.com>2023-03-21 19:18:17 +0800
committerStephen Boyd <sboyd@kernel.org>2023-03-21 16:34:23 -0700
commitb927c76c805432cc66e1cee67e1209514868c873 (patch)
tree02b4a4d1fc97d3c9f88eb04e2b32c6fd8d0cc056
parentfbdb1873656be002df069b7a235c202aefcfdf2e (diff)
downloadlinux-b927c76c805432cc66e1cee67e1209514868c873.tar.gz
linux-b927c76c805432cc66e1cee67e1209514868c873.tar.bz2
linux-b927c76c805432cc66e1cee67e1209514868c873.zip
MIPS: loongson32: Update the clock initialization
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. Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> Acked-by: Stephen Boyd <sboyd@kernel.org> Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Link: https://lore.kernel.org/r/20230321111817.71756-5-keguang.zhang@gmail.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--arch/mips/include/asm/mach-loongson32/platform.h1
-rw-r--r--arch/mips/loongson32/common/time.c3
2 files changed, 2 insertions, 2 deletions
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 */