From: Julien Grall <julien.grall@linaro.org>
To: xen-devel@lists.xen.org
Cc: patches@linaro.org, Julien Grall <julien.grall@linaro.org>,
ian.campbell@citrix.com, andre.przywara@linaro.org,
stefano.stabellini@eu.citrix.com
Subject: [PATCH v4 12/27] xen/dts: dt_find_interrupt_controller: accept multiple compatible strings
Date: Fri, 13 Sep 2013 13:49:19 +0100 [thread overview]
Message-ID: <1379076574-28316-13-git-send-email-julien.grall@linaro.org> (raw)
In-Reply-To: <1379076574-28316-1-git-send-email-julien.grall@linaro.org>
Signed-off-by: Julien Grall <julien.grall@linaro.org>
---
xen/arch/arm/gic.c | 7 ++++++-
xen/common/device_tree.c | 5 +++--
xen/include/asm-arm/gic.h | 2 ++
xen/include/xen/device_tree.h | 3 ++-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 7c24811..aff57b9 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -355,10 +355,15 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize,
/* Set up the GIC */
void __init gic_init(void)
{
+ static const struct dt_device_match gic_ids[] __initconst =
+ {
+ DT_MATCH_GIC,
+ { /* sentinel */ },
+ };
struct dt_device_node *node;
int res;
- node = dt_find_interrupt_controller("arm,cortex-a15-gic");
+ node = dt_find_interrupt_controller(gic_ids);
if ( !node )
panic("Unable to find compatible GIC in the device tree\n");
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index d2262ce..215592e 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -1834,11 +1834,12 @@ static void __init dt_alias_scan(void)
}
}
-struct dt_device_node * __init dt_find_interrupt_controller(const char *compat)
+struct dt_device_node * __init
+dt_find_interrupt_controller(const struct dt_device_match *matches)
{
struct dt_device_node *np = NULL;
- while ( (np = dt_find_compatible_node(np, NULL, compat)) )
+ while ( (np = dt_find_matching_node(np, matches)) )
{
if ( !dt_find_property(np, "interrupt-controller", NULL) )
continue;
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 513c1fc..92a3349 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -135,6 +135,8 @@
#ifndef __ASSEMBLY__
#include <xen/device_tree.h>
+#define DT_MATCH_GIC DT_MATCH_COMPATIBLE("arm,cortex-a15-gic")
+
extern int domain_vgic_init(struct domain *d);
extern void domain_vgic_free(struct domain *d);
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index 5a51ab6..fae9f97 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -240,7 +240,8 @@ extern const struct dt_device_node *dt_interrupt_controller;
*
* If found, return the interrupt controller device node.
*/
-struct dt_device_node * __init dt_find_interrupt_controller(const char *compat);
+struct dt_device_node * __init
+dt_find_interrupt_controller(const struct dt_device_match *matches);
#define dt_prop_cmp(s1, s2) strcmp((s1), (s2))
#define dt_node_cmp(s1, s2) strcasecmp((s1), (s2))
--
1.7.10.4
next prev parent reply other threads:[~2013-09-13 12:49 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-13 12:49 [PATCH v4 00/27] Allow Xen to boot with a raw device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 01/27] xen/dts: Constify device_tree_flattened Julien Grall
2013-09-13 12:49 ` [PATCH v4 02/27] xen/dts: Prefix device tree macro by dt_ Julien Grall
2013-09-13 12:49 ` [PATCH v4 03/27] xen/dts: Don't add a fake property "name" in the device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 04/27] xen/dts: Add new helpers to use " Julien Grall
2013-09-13 12:49 ` [PATCH v4 05/27] xen: Use the right string comparison function in " Julien Grall
2013-09-13 12:49 ` [PATCH v4 06/27] xen/dts: Remove device_get_reg call in process_cpu_node Julien Grall
2013-09-13 12:49 ` [PATCH v4 07/27] xen/dts: Check "reg" property length in process_multiboot_node Julien Grall
2013-09-13 12:49 ` [PATCH v4 08/27] xen/dts: Check the CPU ID is not greater than NR_CPUS Julien Grall
2013-09-13 12:49 ` [PATCH v4 09/27] xen/video: hdlcd: Convert the driver to the new device tree API Julien Grall
2013-09-13 12:49 ` [PATCH v4 10/27] xen/video: hdlcd: Use early_printk instead of printk Julien Grall
2013-09-13 12:49 ` [PATCH v4 11/27] xen/arm: Use dt_device_match to avoid multiple if conditions Julien Grall
2013-09-13 12:49 ` Julien Grall [this message]
2013-09-13 12:49 ` [PATCH v4 13/27] xen/arm: Build DOM0 FDT by browsing the device tree structure Julien Grall
2013-09-13 12:49 ` [PATCH v4 14/27] xen/arm: Don't map disabled device in DOM0 Julien Grall
2013-09-13 12:49 ` [PATCH v4 15/27] xen/arm: Create a fake PSCI node in dom0 device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 16/27] xen/arm: Create a fake cpus " Julien Grall
2013-09-13 12:49 ` [PATCH v4 17/27] xen/arm: Create a fake GIC " Julien Grall
2013-09-13 12:49 ` [PATCH v4 18/27] xen/arm: Create a fake timer " Julien Grall
2013-09-13 12:49 ` [PATCH v4 19/27] xen/arm: Add new platform specific callback device_is_blacklist Julien Grall
2013-09-13 12:49 ` [PATCH v4 20/27] xen/arm: Remove devices used by Xen from dom0 device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 21/27] xen/arm: vexpress: Blacklist a list of board specific devices Julien Grall
2013-09-13 12:49 ` [PATCH v4 22/27] xen/arm: exynos5: Blacklist MCT device Julien Grall
2013-09-13 12:49 ` [PATCH v4 23/27] xen/dts: Clean up the exported API for device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 24/27] xen/dts: device_get_reg: cells are 32-bit big endian value Julien Grall
2013-09-13 12:49 ` [PATCH v4 25/27] xen/dts: replace get_val by dt_next_cell Julien Grall
2013-09-13 12:49 ` [PATCH v4 26/27] xen/arm: Check if the device is available before using it Julien Grall
2013-09-13 12:49 ` [PATCH v4 27/27] ARM: parse separate DT properties for different commandlines Julien Grall
2013-09-17 14:43 ` [PATCH v4 00/27] Allow Xen to boot with a raw device tree Ian Campbell
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=1379076574-28316-13-git-send-email-julien.grall@linaro.org \
--to=julien.grall@linaro.org \
--cc=andre.przywara@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=patches@linaro.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xen.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).