aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/timex.h
diff options
context:
space:
mode:
authorJonathan Austin <Jonathan.Austin@arm.com>2012-09-21 18:51:44 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-09-26 22:57:52 +0100
commit56942fec06efa0e17df0f4c3b438332c923b9014 (patch)
tree89b604c987b7f6a0eaaa16af7a9d8f45711349a7 /arch/arm/include/asm/timex.h
parenta1b2dde70419ae947fd7c9c8fcad7da005dc600e (diff)
downloadlinux-linaro-stable-56942fec06efa0e17df0f4c3b438332c923b9014.tar.gz
ARM: 7538/1: delay: add registration mechanism for delay timer sources
The current timer-based delay loop relies on the architected timer to initiate the switch away from the polling-based implementation. This is unfortunate for platforms without the architected timers but with a suitable delay source (that is, constant frequency, always powered-up and ticking as long as the CPUs are online). This patch introduces a registration mechanism for the delay timer (which provides an unconditional read_current_timer implementation) and updates the architected timer code to use the new interface. Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Jonathan Austin <jonathan.austin@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/timex.h')
-rw-r--r--arch/arm/include/asm/timex.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h
index ce119442277c..9acc135dad94 100644
--- a/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@ -12,15 +12,9 @@
#ifndef _ASMARM_TIMEX_H
#define _ASMARM_TIMEX_H
-#include <asm/arch_timer.h>
#include <mach/timex.h>
typedef unsigned long cycles_t;
-
-#ifdef ARCH_HAS_READ_CURRENT_TIMER
#define get_cycles() ({ cycles_t c; read_current_timer(&c) ? 0 : c; })
-#else
-#define get_cycles() (0)
-#endif
#endif