arm64: init: Move of_clk_init to time_init

Chanho Min · ctmarinas · commit bc3ee18a7a57 · 2014-04-25T18:15:56.000+01:00
Clock providers should be initialized before clocksource_of_init.
If not, Clock source initialization can be fail to get the clock.

Acked-by: Will Deacon &lt;will.deacon@arm.com&gt;
Signed-off-by: Chanho Min &lt;chanho.min@lge.com&gt;
Signed-off-by: Will Deacon &lt;will.deacon@arm.com&gt;
Signed-off-by: Catalin Marinas &lt;catalin.marinas@arm.com&gt;
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
@@ -393,7 +393,6 @@ void __init setup_arch(char **cmdline_p)
 
 static int __init arm64_device_init(void)
 {
-	of_clk_init(NULL);
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 	return 0;
 }
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
@@ -33,6 +33,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/clocksource.h>
+#include <linux/clk-provider.h>
 
 #include <clocksource/arm_arch_timer.h>
 
@@ -65,6 +66,7 @@ void __init time_init(void)
 {
 	u32 arch_timer_rate;
 
+	of_clk_init(NULL);
 	clocksource_of_init();
 
 	arch_timer_rate = arch_timer_get_rate();

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,6 @@ void __init setup_arch(char **cmdline_p)`
`393`	`393`
`394`	`394`	`static int __init arm64_device_init(void)`
`395`	`395`	`{`
`396`		`- of_clk_init(NULL);`
`397`	`396`	`of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);`
`398`	`397`	`return 0;`
`399`	`398`	`}`