aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-xilinx-intc.c
diff options
context:
space:
mode:
authorZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>2016-11-14 12:13:50 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2016-11-29 09:14:49 +0000
commit8a11da598e2ff96050a99e24772e1568e3e31c4d (patch)
treecc619ba71a615915fff1fccb130baa4669387398 /drivers/irqchip/irq-xilinx-intc.c
parentirqchip/xilinx: Add support for parent intc (diff)
downloadlinux-dev-8a11da598e2ff96050a99e24772e1568e3e31c4d.tar.xz
linux-dev-8a11da598e2ff96050a99e24772e1568e3e31c4d.zip
irqchip/xilinx: Try to fall back if xlnx,kind-of-intr not provided
The powerpc dts file does not have the xlnx,kind-of-intr property. Instead of erroring out, give a warning instead. And attempt to continue to probe the interrupt controller while assuming kind-of-intr is 0x0 as a fall back. Acked-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/irqchip/irq-xilinx-intc.c')
-rw-r--r--drivers/irqchip/irq-xilinx-intc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-xilinx-intc.c b/drivers/irqchip/irq-xilinx-intc.c
index 971c141d575d..d330917840a4 100644
--- a/drivers/irqchip/irq-xilinx-intc.c
+++ b/drivers/irqchip/irq-xilinx-intc.c
@@ -179,8 +179,8 @@ static int __init xilinx_intc_of_init(struct device_node *intc,
ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &irqc->intr_mask);
if (ret < 0) {
- pr_err("irq-xilinx: unable to read xlnx,kind-of-intr\n");
- goto err_alloc;
+ pr_warn("irq-xilinx: unable to read xlnx,kind-of-intr\n");
+ irqc->intr_mask = 0;
}
if (irqc->intr_mask >> nr_irq)