diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-05-26 16:31:57 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-05-26 17:18:05 +0800 |
| commit | 3698e46b6e5bcd43d7b2faad9e77a015a3495011 (patch) | |
| tree | 271f7db3d051298d309c9848e54710db3346132e | |
| parent | 8b343c860c2eb637c24ca77dec244d1f1a7560a6 (diff) | |
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 <alex.shi@linaro.org>
| -rw-r--r-- | arch/arm64/kernel/setup.c | 1 | ||||
| -rw-r--r-- | arch/arm64/kernel/time.c | 2 |
2 files changed, 1 insertions, 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 <linux/irq.h> #include <linux/delay.h> #include <linux/clocksource.h> -#include <linux/clk-provider.h> #include <clocksource/arm_arch_timer.h> @@ -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(); |