aboutsummaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>2013-11-27 23:26:13 -0800
committerRob Herring <rob.herring@calxeda.com>2013-12-04 13:12:49 -0600
commitbf49be02d6f92b95c2462e5027fc90b98f62e324 (patch)
tree582ddf7d938788aeb9b35ca9b08e1162703f2570 /drivers/of
parent105353145eafb3ea919f5cdeb652a9d8f270228e (diff)
of: irq: Ignore disabled interrupt controllers
When searching the system for interrupt controllers, skip over any that are explicitly disabled. This makes interrupt controllers consistent with regular devices, which can be marked as do-not-probe via the status = "disabled" dts property. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Acked-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/irq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 786b0b47fae..9876963ed7b 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -438,7 +438,8 @@ void __init of_irq_init(const struct of_device_id *matches)
INIT_LIST_HEAD(&intc_parent_list);
for_each_matching_node(np, matches) {
- if (!of_find_property(np, "interrupt-controller", NULL))
+ if (!of_find_property(np, "interrupt-controller", NULL) ||
+ !of_device_is_available(np))
continue;
/*
* Here, we allocate and populate an intc_desc with the node