diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:59:23 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:59:23 +0200 |
commit | cfb6d656d569510ac9239583ce09e4c92ad54719 (patch) | |
tree | f80d4526a5a293d69a0262b04890ba296c8874ab /include | |
parent | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (diff) | |
parent | 220069945b298d3998c6598b081c466dca259929 (diff) | |
download | kernel_goldelico_gta04-cfb6d656d569510ac9239583ce09e4c92ad54719.zip kernel_goldelico_gta04-cfb6d656d569510ac9239583ce09e4c92ad54719.tar.gz kernel_goldelico_gta04-cfb6d656d569510ac9239583ce09e4c92ad54719.tar.bz2 |
Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core
* Support for memory mapped arch_timers
* Trivial fixes to the moxart timer code
* Documentation updates
Trivial conflicts in drivers/clocksource/arm_arch_timer.c. Fixed up
the newly added __cpuinit annotations as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/clocksource/arm_arch_timer.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index c463ce9..93b7f96 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -23,16 +23,20 @@ #define ARCH_TIMER_CTRL_IT_MASK (1 << 1) #define ARCH_TIMER_CTRL_IT_STAT (1 << 2) -#define ARCH_TIMER_REG_CTRL 0 -#define ARCH_TIMER_REG_TVAL 1 +enum arch_timer_reg { + ARCH_TIMER_REG_CTRL, + ARCH_TIMER_REG_TVAL, +}; #define ARCH_TIMER_PHYS_ACCESS 0 #define ARCH_TIMER_VIRT_ACCESS 1 +#define ARCH_TIMER_MEM_PHYS_ACCESS 2 +#define ARCH_TIMER_MEM_VIRT_ACCESS 3 #ifdef CONFIG_ARM_ARCH_TIMER extern u32 arch_timer_get_rate(void); -extern u64 arch_timer_read_counter(void); +extern u64 (*arch_timer_read_counter)(void); extern struct timecounter *arch_timer_get_timecounter(void); #else |