From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv5 02/16] arm: arch_timer: remove redundant available check
Date: Thu, 31 Jan 2013 12:15:25 +0000 [thread overview]
Message-ID: <1359634539-9580-3-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1359634539-9580-1-git-send-email-mark.rutland@arm.com>
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>
---
arch/arm/kernel/arch_timer.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
index 6dd73c6..1bb3b582 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);
--
1.8.1.1
next prev parent reply other threads:[~2013-01-31 12:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-31 12:15 [PATCHv5 00/16] Unify arm_generic and arch_timer drivers Mark Rutland
2013-01-31 12:15 ` [PATCHv5 01/16] arm: arch_timer: balance device_node refcounting Mark Rutland
2013-01-31 15:33 ` Catalin Marinas
2013-01-31 12:15 ` Mark Rutland [this message]
2013-01-31 12:15 ` [PATCHv5 03/16] arm: arch_timer: use u64/u32 for register data Mark Rutland
2013-01-31 12:15 ` [PATCHv5 04/16] arm: arch_timer: standardise counter reading Mark Rutland
2013-01-31 15:34 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 05/16] arm: arch_timer: split cntfrq accessor Mark Rutland
2013-01-31 12:15 ` [PATCHv5 06/16] arm: arch_timer: factor out register accessors Mark Rutland
2013-01-31 12:15 ` [PATCHv5 07/16] arm: arch_timer: add isbs to " Mark Rutland
2013-01-31 15:35 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 08/16] arm: arch_timer: divorce from local_timer api Mark Rutland
2013-01-31 12:15 ` [PATCHv5 09/16] arm: arch_timer: add arch_counter_set_user_access Mark Rutland
2013-01-31 15:36 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 10/16] arm: arch_timer: move core to drivers/clocksource Mark Rutland
2013-01-31 12:15 ` [PATCHv5 11/16] arm64: arm_generic: prevent reading stale time Mark Rutland
2013-01-31 15:36 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 12/16] arm64: move from arm_generic to arm_arch_timer Mark Rutland
2013-01-31 12:15 ` [PATCHv5 13/16] Documentation: Add ARMv8 to arch_timer devicetree Mark Rutland
2013-01-31 12:15 ` [PATCHv5 14/16] ARM: arch_timers: switch to physical timers if HYP mode is available Mark Rutland
2013-01-31 15:37 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 15/16] ARM: hyp: initialize CNTVOFF to zero Mark Rutland
2013-02-01 11:13 ` Dave Martin
2013-02-01 11:43 ` Marc Zyngier
2013-02-01 11:46 ` Mark Rutland
2013-02-01 18:07 ` Dave Martin
2013-02-04 9:29 ` Mark Rutland
2013-01-31 12:15 ` [PATCHv5 16/16] clocksource: arch_timer: use virtual counters Mark Rutland
2013-01-31 15:38 ` Catalin Marinas
2013-01-31 17:39 ` [PATCHv5 00/16] Unify arm_generic and arch_timer drivers Stephen Warren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359634539-9580-3-git-send-email-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).