summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/arm_arch_timer.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-10 06:25:23 +0200
committerIngo Molnar <mingo@kernel.org>2013-10-10 06:25:23 +0200
commit8a749de5e32d2b72def93f7bd7a2745580d75872 (patch)
treee46d9059d0328bcb2faea1c084d17f749338cfe4 /drivers/clocksource/arm_arch_timer.c
parenta44eb870f815356dac56adf3a380ee9b94787424 (diff)
parentb4042ceaabbd913bc5b397ddd1e396eeb312d72f (diff)
downloadop-kernel-dev-8a749de5e32d2b72def93f7bd7a2745580d75872.zip
op-kernel-dev-8a749de5e32d2b72def93f7bd7a2745580d75872.tar.gz
Merge branch 'fortglx/3.13/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Pull more timekeeping items for v3.13 from John Stultz: * Small cleanup in the clocksource code. * Fix for rtc-pl031 to let it work with alarmtimers. * Move arm64 to using the generic sched_clock framework & resulting cleanup in the generic sched_clock code. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
-rw-r--r--drivers/clocksource/arm_arch_timer.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index b94b0d4..f655036 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -20,6 +20,7 @@
#include <linux/of_address.h>
#include <linux/io.h>
#include <linux/slab.h>
+#include <linux/sched_clock.h>
#include <asm/arch_timer.h>
#include <asm/virt.h>
@@ -514,6 +515,15 @@ static int __init arch_timer_register(void)
goto out;
}
+ clocksource_register_hz(&clocksource_counter, arch_timer_rate);
+ cyclecounter.mult = clocksource_counter.mult;
+ cyclecounter.shift = clocksource_counter.shift;
+ timecounter_init(&timecounter, &cyclecounter,
+ arch_counter_get_cntvct());
+
+ /* 56 bits minimum, so we assume worst case rollover */
+ sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate);
+
if (arch_timer_use_virtual) {
ppi = arch_timer_ppi[VIRT_PPI];
err = request_percpu_irq(ppi, arch_timer_handler_virt,
OpenPOWER on IntegriCloud