aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/arm
diff options
context:
space:
mode:
authorJulien Grall <julien.grall@linaro.org>2013-09-13 13:49:19 +0100
committerIan Campbell <ian.campbell@citrix.com>2013-09-17 15:28:23 +0100
commite60d11198f7d7fa7cdb4260546d424de14449401 (patch)
tree461b04e9ea77f2aa0c422b063ef726d3708fbd0a /xen/arch/arm
parentd90abf9aa6aea90f2ffe402ca3bad8e6fdb9ef1b (diff)
downloadxen-e60d11198f7d7fa7cdb4260546d424de14449401.tar.gz
xen-e60d11198f7d7fa7cdb4260546d424de14449401.tar.bz2
xen-e60d11198f7d7fa7cdb4260546d424de14449401.zip
xen/dts: dt_find_interrupt_controller: accept multiple compatible strings
Signed-off-by: Julien Grall <julien.grall@linaro.org> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'xen/arch/arm')
-rw-r--r--xen/arch/arm/gic.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 7c24811510..aff57b9338 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");