From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 7/7] ARM: architected timers: remove support for non DT platforms
Date: Fri, 27 Apr 2012 13:55:59 +0100 [thread overview]
Message-ID: <1335531359-32128-8-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1335531359-32128-1-git-send-email-marc.zyngier@arm.com>
All mainline platforms using the ARM architected timers are DT
only. As such, remove the ad-hoc support that is not longer needed
anymore.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/include/asm/arch_timer.h | 14 +-------------
arch/arm/kernel/arch_timer.c | 19 ++-----------------
2 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index 935897f..ed2e95d 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -1,22 +1,10 @@
#ifndef __ASMARM_ARCH_TIMER_H
#define __ASMARM_ARCH_TIMER_H
-#include <linux/ioport.h>
-
-struct arch_timer {
- struct resource res[2];
-};
-
#ifdef CONFIG_ARM_ARCH_TIMER
-int arch_timer_register(struct arch_timer *);
-int arch_timer_sched_clock_init(void);
int arch_timer_of_register(void);
+int arch_timer_sched_clock_init(void);
#else
-static inline int arch_timer_register(struct arch_timer *at)
-{
- return -ENXIO;
-}
-
static inline int arch_timer_of_register(void)
{
return -ENXIO;
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
index 154f0a1..dd58035 100644
--- a/arch/arm/kernel/arch_timer.c
+++ b/arch/arm/kernel/arch_timer.c
@@ -248,7 +248,7 @@ static struct local_timer_ops arch_timer_ops __cpuinitdata = {
static struct clock_event_device arch_timer_global_evt;
-static int __init arch_timer_common_register(void)
+static int __init arch_timer_register(void)
{
int err;
@@ -309,20 +309,6 @@ out_free:
return err;
}
-int __init arch_timer_register(struct arch_timer *at)
-{
- if (at->res[0].start <= 0 || !(at->res[0].flags & IORESOURCE_IRQ))
- return -EINVAL;
-
- arch_timer_ppi = at->res[0].start;
-
- if (at->res[1].start > 0 || (at->res[1].flags & IORESOURCE_IRQ))
- arch_timer_ppi2 = at->res[1].start;
-
- return arch_timer_common_register();
-}
-
-#ifdef CONFIG_OF
static const struct of_device_id arch_timer_of_match[] __initconst = {
{ .compatible = "arm,armv7-timer", },
{},
@@ -348,9 +334,8 @@ int __init arch_timer_of_register(void)
pr_info("arch_timer: found %s irqs %d %d\n",
np->name, arch_timer_ppi, arch_timer_ppi2);
- return arch_timer_common_register();
+ return arch_timer_register();
}
-#endif
int __init arch_timer_sched_clock_init(void)
{
--
1.7.7.1
prev parent reply other threads:[~2012-04-27 12:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 12:55 [GIT PULL][PATCH v4 0/7] A7/A15 architected timer support Marc Zyngier
2012-04-27 12:55 ` [PATCH v4 1/7] ARM: local timers: reserve local_timer_register() to SMP Marc Zyngier
2012-04-27 12:55 ` [PATCH v4 2/7] ARM: local timers: Add A15 architected timer support Marc Zyngier
2012-04-27 12:55 ` [PATCH v4 3/7] ARM: architected timers: Add A15 specific sched_clock implementation Marc Zyngier
2012-04-27 12:55 ` [PATCH v4 4/7] ARM: architected timers: add DT support Marc Zyngier
2012-04-27 12:55 ` [PATCH v4 5/7] ARM: architected timers: add support for UP timer Marc Zyngier
2012-04-27 12:55 ` [PATCH v4 6/7] ARM: vexpress: plug local timers into the DT code Marc Zyngier
2012-04-27 12:55 ` Marc Zyngier [this message]
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=1335531359-32128-8-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@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).