aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-01-19 13:53:50 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2012-04-27 13:35:34 +0100
commit0075242b3a2f78901172aaadf73beed762a1f02f (patch)
tree18a33963355c7dcbba0d6420c2fbefe430ef7907 /arch/arm/include/asm
parentARM: architected timers: Add A15 specific sched_clock implementation (diff)
downloadlinux-dev-0075242b3a2f78901172aaadf73beed762a1f02f.tar.xz
linux-dev-0075242b3a2f78901172aaadf73beed762a1f02f.zip
ARM: architected timers: add DT support
Add runtime DT support and documentation for the Cortex A7/A15 architected timers. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch_timer.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index dc008c696b5a..935897f120b6 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -10,12 +10,18 @@ struct arch_timer {
#ifdef CONFIG_ARM_ARCH_TIMER
int arch_timer_register(struct arch_timer *);
int arch_timer_sched_clock_init(void);
+int arch_timer_of_register(void);
#else
static inline int arch_timer_register(struct arch_timer *at)
{
return -ENXIO;
}
+static inline int arch_timer_of_register(void)
+{
+ return -ENXIO;
+}
+
static inline int arch_timer_sched_clock_init(void)
{
return -ENXIO;