aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorNathan Lynch <nathan_lynch@mentor.com>2014-09-28 19:50:06 -0400
committerDaniel Lezcano <daniel.lezcano@linaro.org>2014-09-28 19:59:26 -0400
commite1ce5c7adc735ce96a35806ca32ceb78e607a283 (patch)
treef64460684e1eb8139a65e108f7ebc49b1163d521 /arch/arm/include
parent8b8dde00347ef409b29abd97e5833ffdb4ed7508 (diff)
clocksource: arm_arch_timer: Consolidate arch_timer_evtstrm_enable
The arch_timer_evtstrm_enable hooks in arm and arm64 are substantially similar, the only difference being a CONFIG_COMPAT-conditional section which is relevant only for arm64. Copy the arm64 version to the driver, removing the arch-specific hooks. Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/arch_timer.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index b7ae44464231..92793ba69c40 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -99,17 +99,6 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
99 asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl)); 99 asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
100} 100}
101 101
102static inline void arch_timer_evtstrm_enable(int divider)
103{
104 u32 cntkctl = arch_timer_get_cntkctl();
105 cntkctl &= ~ARCH_TIMER_EVT_TRIGGER_MASK;
106 /* Set the divider and enable virtual event stream */
107 cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)
108 | ARCH_TIMER_VIRT_EVT_EN;
109 arch_timer_set_cntkctl(cntkctl);
110 elf_hwcap |= HWCAP_EVTSTRM;
111}
112
113#endif 102#endif
114 103
115#endif 104#endif