Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc3ee18a authored Apr 14, 2014 by Chanho Min Committed by Catalin Marinas Apr 25, 2014

arm64: init: Move of_clk_init to time_init



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 <will.deacon@arm.com>
Signed-off-by: Chanho Min <chanho.min@lge.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

parent 8f071203

arch/arm64/kernel/setup.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

arch/arm64/kernel/time.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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();