From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 6/6] ARM: vexpress: plug local timers into the DT code
Date: Mon, 16 Apr 2012 17:13:30 +0100 [thread overview]
Message-ID: <1334592810-4382-7-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1334592810-4382-1-git-send-email-marc.zyngier@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/mach-vexpress/v2m.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 47cdcca..fd62bfe 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -19,8 +19,10 @@
#include <linux/clkdev.h>
#include <linux/mtd/physmap.h>
+#include <asm/arch_timer.h>
#include <asm/mach-types.h>
#include <asm/sizes.h>
+#include <asm/smp_twd.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
@@ -616,7 +618,6 @@ void __init v2m_dt_init_early(void)
}
clkdev_add_table(v2m_dt_lookups, ARRAY_SIZE(v2m_dt_lookups));
- versatile_sched_clock_init(v2m_sysreg_base + V2M_SYS_24MHZ, 24000000);
}
static struct of_device_id vexpress_irq_match[] __initdata = {
@@ -643,6 +644,11 @@ static void __init v2m_dt_timer_init(void)
return;
node = of_find_node_by_path(path);
v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0));
+ if (arch_timer_of_register())
+ twd_local_timer_of_register();
+
+ if (arch_timer_sched_clock_init())
+ versatile_sched_clock_init(v2m_sysreg_base + V2M_SYS_24MHZ, 24000000);
}
static struct sys_timer v2m_dt_timer = {
--
1.7.7.1
next prev parent reply other threads:[~2012-04-16 16:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-16 16:13 [PATCH v3 0/6] A7/A15 architected timer support Marc Zyngier
2012-04-16 16:13 ` [PATCH v3 1/6] ARM: local timers: reserve local_timer_register() to SMP Marc Zyngier
2012-04-16 16:13 ` [PATCH v3 2/6] ARM: local timers: Add A15 architected timer support Marc Zyngier
2012-04-16 17:45 ` Stephen Boyd
2012-04-17 9:21 ` Marc Zyngier
2012-04-16 16:13 ` [PATCH v3 3/6] ARM: architected timers: Add A15 specific sched_clock implementation Marc Zyngier
2012-04-16 16:13 ` [PATCH v3 4/6] ARM: architected timers: add DT support Marc Zyngier
2012-04-19 12:55 ` Arnd Bergmann
2012-04-19 13:07 ` Marc Zyngier
2012-04-16 16:13 ` [PATCH v3 5/6] ARM: architected timers: add support for UP timer Marc Zyngier
2012-04-16 16:13 ` Marc Zyngier [this message]
2012-04-17 9:22 ` [PATCH v3 6/6] ARM: vexpress: plug local timers into the DT code Pawel Moll
2012-04-17 9:41 ` Marc Zyngier
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=1334592810-4382-7-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).