linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/10] arm: arch_timer: remove redundant available check
Date: Fri, 30 Nov 2012 17:45:59 +0000	[thread overview]
Message-ID: <1354297568-26366-2-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1354297568-26366-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 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
index c8ef207..a4d3b5c 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.7.0.4

  reply	other threads:[~2012-11-30 17:45 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-30 17:45 [PATCH 00/10] Unify arm_generic and arch_timer drivers Mark Rutland
2012-11-30 17:45 ` Mark Rutland [this message]
2012-11-30 17:46 ` [PATCH 02/10] arm: arch_timer: use u64/u32 for register data Mark Rutland
2012-11-30 17:46 ` [PATCH 03/10] arm: arch_timer: standardise counter reading Mark Rutland
2012-11-30 17:46 ` [PATCH 04/10] arm: arch_timer: split cntfrq accessor Mark Rutland
2012-11-30 17:46 ` [PATCH 05/10] arm: arch_timer: factor out register accessors Mark Rutland
2012-11-30 17:46 ` [PATCH 06/10] arm: arch_timer: divorce from local_timer api Mark Rutland
2012-12-07 22:16   ` Stephen Boyd
2012-12-10 11:09     ` Mark Rutland
2012-12-18 12:20       ` Mark Rutland
2012-11-30 17:46 ` [PATCH 07/10] arm: arch_timer: add arch_counter_enable_user_access Mark Rutland
2012-11-30 19:32   ` Will Deacon
2012-12-03 10:24     ` Mark Rutland
2012-11-30 17:46 ` [PATCH 08/10] arm: arch_timer: move core to drivers/clocksource Mark Rutland
2012-11-30 17:46 ` [PATCH 09/10] arm64: move from arm_generic to arm_arch_timer Mark Rutland
2012-11-30 19:36   ` Will Deacon
2012-11-30 17:46 ` [PATCH 10/10] Documentation: Add ARMv8 to arch_timer devicetree Mark Rutland

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=1354297568-26366-2-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).