diff options
author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2013-11-28 02:26:13 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-12-04 14:12:49 -0500 |
commit | bf49be02d6f92b95c2462e5027fc90b98f62e324 (patch) | |
tree | 582ddf7d938788aeb9b35ca9b08e1162703f2570 /drivers/of | |
parent | 105353145eafb3ea919f5cdeb652a9d8f270228e (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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 786b0b47fae4..9876963ed7b3 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) | |||
438 | INIT_LIST_HEAD(&intc_parent_list); | 438 | INIT_LIST_HEAD(&intc_parent_list); |
439 | 439 | ||
440 | for_each_matching_node(np, matches) { | 440 | for_each_matching_node(np, matches) { |
441 | if (!of_find_property(np, "interrupt-controller", NULL)) | 441 | if (!of_find_property(np, "interrupt-controller", NULL) || |
442 | !of_device_is_available(np)) | ||
442 | continue; | 443 | continue; |
443 | /* | 444 | /* |
444 | * Here, we allocate and populate an intc_desc with the node | 445 | * Here, we allocate and populate an intc_desc with the node |