diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2012-11-12 14:40:44 +0000 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2013-01-31 15:51:05 +0000 |
| commit | ef201de430b0deb62a9afd2c4e67f04525cec43c (patch) | |
| tree | dfb5efcd5f9eaa3f98e6ec41c9758bb5dfb6f256 /arch/arm/kernel/arch_timer.c | |
| parent | 2b55d10c46815d9660c0f1bc6044f7019ff384aa (diff) | |
arm: arch_timer: remove redundant available check
This check is a holdover from the pre-devicetree days. As the timer
is not probed except by platforms which register it via devicetree,
it's not strictly necessary.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kernel/arch_timer.c')
| -rw-r--r-- | arch/arm/kernel/arch_timer.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c index 6dd73c67d86..1bb3b582043 100644 --- a/arch/arm/kernel/arch_timer.c +++ b/arch/arm/kernel/arch_timer.c @@ -20,11 +20,9 @@ #include <linux/of_irq.h> #include <linux/io.h> -#include <asm/cputype.h> #include <asm/delay.h> #include <asm/localtimer.h> #include <asm/arch_timer.h> -#include <asm/system_info.h> #include <asm/sched_clock.h> static unsigned long arch_timer_rate; @@ -259,20 +257,10 @@ static int __cpuinit arch_timer_setup(struct clock_event_device *clk) return 0; } -/* Is the optional system timer available? */ -static int local_timer_is_architected(void) -{ - return (cpu_architecture() >= CPU_ARCH_ARMv7) && - ((read_cpuid_ext(CPUID_EXT_PFR1) >> 16) & 0xf) == 1; -} - static int arch_timer_available(void) { unsigned long freq; - if (!local_timer_is_architected()) - return -ENXIO; - if (arch_timer_rate == 0) { freq = arch_timer_reg_read(ARCH_TIMER_PHYS_ACCESS, ARCH_TIMER_REG_FREQ); |