From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Date: Thu, 28 Nov 2013 07:26:12 +0000 (-0800)
Subject: of: irq: Ignore disabled intc's when searching map
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ca56e7dcadd865ae2c235789cbdbfebae719ffb;p=linux-beck.git

of: irq: Ignore disabled intc's when searching map

When searching the interrupt map, if a matched parent is disabled, just
ignore it and move on with the search.

This allows for specifying connection of a single device IRQ to
multiple interrupt controllers via the interrupt map schema. This change
allows for selection of the active interrupt controller via the already
existing status = "disabled" mechanism.

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>
---

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 9876963ed7b3..bf8026895c5e 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -217,6 +217,9 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
 				goto fail;
 			}
 
+			if (!of_device_is_available(newpar))
+				match = 0;
+
 			/* Get #interrupt-cells and #address-cells of new
 			 * parent
 			 */