aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/time.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-04-10 19:27:51 -0400
committerRob Herring <rob.herring@calxeda.com>2013-04-11 16:11:15 -0400
commit0583fe478a7d93be2c814b7e50d6e81c287edfe8 (patch)
tree1fedae32e915a0caf60fa20be32824a67262cf99 /arch/arm64/kernel/time.c
parentf414f13f2fd0d8bb12a87268a55827cda771d42b (diff)
ARM: convert arm/arm64 arch timer to use CLKSRC_OF init
This converts arm and arm64 to use CLKSRC_OF DT based initialization for the arch timer. A new function arch_timer_arch_init is added to allow for arch specific setup. This has a side effect of enabling sched_clock on omap5 and exynos5. There should not be any reason not to use the arch timers for sched_clock. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Simon Horman <horms@verge.net.au> Cc: Magnus Damm <magnus.damm@gmail.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-samsung-soc@vger.kernel.org Cc: linux-omap@vger.kernel.org Cc: linux-sh@vger.kernel.org Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm64/kernel/time.c')
-rw-r--r--arch/arm64/kernel/time.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index b0ef18d14c3b..a551f88ae2c1 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -32,6 +32,7 @@
32#include <linux/timer.h> 32#include <linux/timer.h>
33#include <linux/irq.h> 33#include <linux/irq.h>
34#include <linux/delay.h> 34#include <linux/delay.h>
35#include <linux/clocksource.h>
35 36
36#include <clocksource/arm_arch_timer.h> 37#include <clocksource/arm_arch_timer.h>
37 38
@@ -77,10 +78,11 @@ void __init time_init(void)
77{ 78{
78 u32 arch_timer_rate; 79 u32 arch_timer_rate;
79 80
80 if (arch_timer_init()) 81 clocksource_of_init();
81 panic("Unable to initialise architected timer.\n");
82 82
83 arch_timer_rate = arch_timer_get_rate(); 83 arch_timer_rate = arch_timer_get_rate();
84 if (!arch_timer_rate)
85 panic("Unable to initialise architected timer.\n");
84 86
85 /* Cache the sched_clock multiplier to save a divide in the hot path. */ 87 /* Cache the sched_clock multiplier to save a divide in the hot path. */
86 sched_clock_mult = NSEC_PER_SEC / arch_timer_rate; 88 sched_clock_mult = NSEC_PER_SEC / arch_timer_rate;