From 3698e46b6e5bcd43d7b2faad9e77a015a3495011 Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Mon, 26 May 2014 16:31:57 +0800 Subject: Revert "arm64: init: Move of_clk_init to time_init" This reverts commit 638b6642b041f83802ea5d7ca68b45ce508bbc5c. Since time is close to 14.05 release, we revert this commit for a quick fix to clock missing bug on armv8: [ 0.000000] Hierarchical RCU implementation. [ 0.000000] NR_IRQS:64 nr_irqs:64 0 [ 0.000000] vexpress-osc: Failed to obtain config func for node '/smb/motherboard/mcc/osc@1'! Signed-off-by: Alex Shi --- arch/arm64/kernel/setup.c | 1 + arch/arm64/kernel/time.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 1e05fc993331..5fdfc0255953 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -299,6 +299,7 @@ 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 index dbe1c8d8e90f..03dc3718eb13 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -33,7 +33,6 @@ #include #include #include -#include #include @@ -73,7 +72,6 @@ void __init time_init(void) { u32 arch_timer_rate; - of_clk_init(NULL); clocksource_of_init(); arch_timer_rate = arch_timer_get_rate(); -- cgit v1.2.3