aboutsummaryrefslogtreecommitdiffstats
path: root/xen/include
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/include
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/include')
-rw-r--r--xen/include/asm-arm/gic.h2
-rw-r--r--xen/include/xen/device_tree.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 513c1fca6c..92a3349c68 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 5a51ab679d..fae9f97215 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))