aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch_timer.h19
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index 729f6d98df86..7ade91d8cc6f 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -4,22 +4,14 @@
4#include <asm/barrier.h> 4#include <asm/barrier.h>
5#include <asm/errno.h> 5#include <asm/errno.h>
6#include <linux/clocksource.h> 6#include <linux/clocksource.h>
7#include <linux/init.h>
7#include <linux/types.h> 8#include <linux/types.h>
8 9
10#include <clocksource/arm_arch_timer.h>
11
9#ifdef CONFIG_ARM_ARCH_TIMER 12#ifdef CONFIG_ARM_ARCH_TIMER
10int arch_timer_of_register(void); 13int arch_timer_of_register(void);
11int arch_timer_sched_clock_init(void); 14int arch_timer_sched_clock_init(void);
12struct timecounter *arch_timer_get_timecounter(void);
13
14#define ARCH_TIMER_CTRL_ENABLE (1 << 0)
15#define ARCH_TIMER_CTRL_IT_MASK (1 << 1)
16#define ARCH_TIMER_CTRL_IT_STAT (1 << 2)
17
18#define ARCH_TIMER_REG_CTRL 0
19#define ARCH_TIMER_REG_TVAL 1
20
21#define ARCH_TIMER_PHYS_ACCESS 0
22#define ARCH_TIMER_VIRT_ACCESS 1
23 15
24/* 16/*
25 * These register accessors are marked inline so the compiler can 17 * These register accessors are marked inline so the compiler can
@@ -128,11 +120,6 @@ static inline int arch_timer_sched_clock_init(void)
128{ 120{
129 return -ENXIO; 121 return -ENXIO;
130} 122}
131
132static inline struct timecounter *arch_timer_get_timecounter(void)
133{
134 return NULL;
135}
136#endif 123#endif
137 124
138#endif 125#endif