diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-29 16:39:43 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-06-24 14:15:58 -0500 |
| commit | 2920bc9abedf87451e9ba2695a4c418c567046b6 (patch) | |
| tree | c5115b0a519cf52a2ae42f5c317095549b65df3e /drivers/irqchip/irq-versatile-fpga.c | |
| parent | 0ba6c5d26a31789fc89ebadccd8d3604e0994a51 (diff) | |
| download | linux-stable-2920bc9abedf87451e9ba2695a4c418c567046b6.tar.gz linux-stable-2920bc9abedf87451e9ba2695a4c418c567046b6.tar.bz2 linux-stable-2920bc9abedf87451e9ba2695a4c418c567046b6.zip | |
irqchip: versatile-fpga: Add IRQCHIP_DECLARE support
Add support for initialization using IRQCHIP_DECLARE. This also requires
that the controller initialization set the handle_irq function pointer
itself when it is a primary controller.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/irqchip/irq-versatile-fpga.c')
| -rw-r--r-- | drivers/irqchip/irq-versatile-fpga.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c index 3ae2bb8d9cf2..8e0bb566bfaa 100644 --- a/drivers/irqchip/irq-versatile-fpga.c +++ b/drivers/irqchip/irq-versatile-fpga.c @@ -14,6 +14,8 @@ #include <asm/exception.h> #include <asm/mach/irq.h> +#include "irqchip.h" + #define IRQ_STATUS 0x00 #define IRQ_RAW_STATUS 0x04 #define IRQ_ENABLE_SET 0x08 @@ -201,8 +203,10 @@ int __init fpga_irq_of_init(struct device_node *node, /* Some chips are cascaded from a parent IRQ */ parent_irq = irq_of_parse_and_map(node, 0); - if (!parent_irq) + if (!parent_irq) { + set_handle_irq(fpga_handle_irq); parent_irq = -1; + } fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node); @@ -211,4 +215,5 @@ int __init fpga_irq_of_init(struct device_node *node, return 0; } +IRQCHIP_DECLARE(arm_fpga, "arm,versatile-fpga-irq", fpga_irq_of_init); #endif |