From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: <arnd@arndb.de>
Cc: <linux@arm.linux.org.uk>, <catalin.marinas@arm.com>,
<linaro-dev@lists.linaro.org>,
<linux-arm-kernel@lists.infradead.org>, <tim@xen.org>,
<Ian.Campbell@citrix.com>, <konrad.wilk@oracle.com>,
<Stefano.Stabellini@eu.citrix.com>,
<xen-devel@lists.xensource.com>, <linux-kernel@vger.kernel.org>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Pawel Moll <pawel.moll@arm.com>,
Marc Zyngier <marc.zyngier@arm.com>
Subject: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present
Date: Fri, 14 Sep 2012 12:13:23 +0100 [thread overview]
Message-ID: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1209141145150.29232@kaball.uk.xensource.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Russell King <linux@arm.linux.org.uk>
CC: Pawel Moll <pawel.moll@arm.com>
CC: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/mach-vexpress/v2m.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 37608f2..4e567f7 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -621,16 +621,17 @@ static void __init v2m_dt_timer_init(void)
v2m_clk_init();
- err = of_property_read_string(of_aliases, "arm,v2m_timer", &path);
- if (WARN_ON(err))
- 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() != 0)
twd_local_timer_of_register();
if (arch_timer_sched_clock_init() != 0)
versatile_sched_clock_init(v2m_sysreg_base + V2M_SYS_24MHZ, 24000000);
+
+ err = of_property_read_string(of_aliases, "arm,v2m_timer", &path);
+ if (WARN_ON(err))
+ return;
+ node = of_find_node_by_path(path);
+ v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0));
}
static struct sys_timer v2m_dt_timer = {
--
1.7.2.5
next prev parent reply other threads:[~2012-09-14 11:41 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 11:12 [PATCH v4 00/24] Introduce Xen support on ARM (based on 3.6-rc5) Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 01/24] arm: initial Xen support Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 02/24] xen/arm: hypercalls Stefano Stabellini
2012-09-14 12:57 ` Konrad Rzeszutek Wilk
2012-09-14 13:45 ` Marc Zyngier
2012-09-14 14:02 ` Stefano Stabellini
2012-09-14 14:05 ` Marc Zyngier
2012-09-14 11:13 ` [PATCH v4 03/24] xen/arm: page.h definitions Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 04/24] xen/arm: sync_bitops Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 05/24] xen/arm: empty implementation of grant_table arch specific functions Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 06/24] docs: Xen ARM DT bindings Stefano Stabellini
2012-09-14 13:01 ` Konrad Rzeszutek Wilk
2012-09-14 14:26 ` Stefano Stabellini
2012-09-17 13:33 ` Rob Herring
2012-09-17 14:12 ` Stefano Stabellini
2012-09-18 14:50 ` Dave Martin
2012-09-14 11:13 ` [PATCH v4 07/24] xen/arm: Xen detection and shared_info page mapping Stefano Stabellini
2012-09-14 13:08 ` Konrad Rzeszutek Wilk
2012-09-14 14:44 ` Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 08/24] xen/arm: Introduce xen_pfn_t for pfn and mfn types Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 09/24] xen/arm: Introduce xen_ulong_t for unsigned long Stefano Stabellini
2012-09-14 13:04 ` Konrad Rzeszutek Wilk
2012-09-14 11:13 ` [PATCH v4 10/24] xen/arm: compile and run xenbus Stefano Stabellini
2012-09-14 13:03 ` Konrad Rzeszutek Wilk
2012-09-17 11:05 ` Stefano Stabellini
2012-09-17 13:56 ` Konrad Rzeszutek Wilk
2012-09-17 13:29 ` Konrad Rzeszutek Wilk
2012-09-17 13:45 ` Stefano Stabellini
2012-09-17 14:06 ` Konrad Rzeszutek Wilk
2012-09-14 11:13 ` [PATCH v4 11/24] xen: do not compile manage, balloon, pci, acpi, pcpu and cpu_hotplug on ARM Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 12/24] xen/arm: introduce CONFIG_XEN " Stefano Stabellini
2012-09-14 18:18 ` Sergei Shtylyov
2012-09-17 10:57 ` Stefano Stabellini
2012-09-17 12:07 ` Sergei Shtylyov
2012-09-17 14:02 ` Konrad Rzeszutek Wilk
2012-09-17 14:16 ` Stefano Stabellini
2012-09-17 14:05 ` Stefano Stabellini
2012-09-17 14:30 ` Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 13/24] xen/arm: get privilege status Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 14/24] xen/arm: initialize grant_table on ARM Stefano Stabellini
2012-09-14 13:10 ` Konrad Rzeszutek Wilk
2012-09-14 14:56 ` Stefano Stabellini
2012-09-14 15:08 ` Ian Campbell
2012-09-14 15:29 ` Stefano Stabellini
2012-09-14 15:34 ` Ian Campbell
2012-09-14 11:13 ` [PATCH v4 15/24] xen/arm: receive Xen events " Stefano Stabellini
2012-09-14 13:14 ` Konrad Rzeszutek Wilk
2012-09-14 11:13 ` [PATCH v4 16/24] xen: clear IRQ_NOAUTOEN and IRQ_NOREQUEST Stefano Stabellini
2012-09-14 14:02 ` Marc Zyngier
2012-09-14 14:13 ` Stefano Stabellini
2012-09-14 14:20 ` Marc Zyngier
2012-09-14 14:28 ` Stefano Stabellini
2012-09-14 14:31 ` Marc Zyngier
2012-09-14 11:13 ` [PATCH v4 17/24] xen/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 18/24] xen: allow privcmd for HVM guests Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 19/24] xen/arm: compile blkfront and blkback Stefano Stabellini
2012-09-14 13:12 ` Konrad Rzeszutek Wilk
2012-09-14 11:13 ` [PATCH v4 20/24] xen/arm: compile netback Stefano Stabellini
2012-09-14 11:13 ` Stefano Stabellini [this message]
2012-09-14 12:27 ` [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present Pawel Moll
2012-09-14 12:48 ` Stefano Stabellini
2012-09-14 13:03 ` Pawel Moll
2013-01-07 17:21 ` Stefano Stabellini
2013-01-07 17:32 ` Marc Zyngier
2013-01-07 19:21 ` Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 22/24] xen: missing includes Stefano Stabellini
2012-09-14 11:13 ` [PATCH v4 23/24] xen: update xen_add_to_physmap interface Stefano Stabellini
2012-09-14 13:13 ` Konrad Rzeszutek Wilk
2012-09-14 11:13 ` [PATCH v4 24/24] MAINTAINERS: add myself as Xen ARM maintainer Stefano Stabellini
2012-09-14 13:09 ` Konrad Rzeszutek Wilk
2012-09-14 13:21 ` [PATCH v4 00/24] Introduce Xen support on ARM (based on 3.6-rc5) Konrad Rzeszutek Wilk
2012-09-14 13:56 ` Stefano Stabellini
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=1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=konrad.wilk@oracle.com \
--cc=linaro-dev@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=marc.zyngier@arm.com \
--cc=pawel.moll@arm.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xensource.com \
/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).