diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-06 10:41:31 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-06 10:41:31 -0500 |
commit | f60be0d5c1f2dd0188205f04a4a7b8778234fd9c (patch) | |
tree | 517a2b01eec7703d049bc712030a62f6681ec636 /include/linux | |
parent | 3b19119b95a52200c8ae3df3aa89c21c9a1a8894 (diff) | |
parent | 2389d5014342e9535aad212d0c68d439aaf534ba (diff) |
Merge tag 'integrator-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
From Linus Walleij:
This provides the following Integrator refactorings:
- Switch the FPGA IRQ controller to use the simple IRQ domain
- Get rid of preallocated IRQ descriptors on the Integrator
- Move the FPGA IRQ driver to drivers/irqchip
* tag 'integrator-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: plat-versatile: move FPGA irq driver to drivers/irqchip
ARM: integrator: get rid of preallocated irq descriptors
ARM: plat-versatile: use simple irqdomain for FPGA IRQ
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/irqchip/versatile-fpga.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/irqchip/versatile-fpga.h b/include/linux/irqchip/versatile-fpga.h new file mode 100644 index 000000000000..1fac9651d3ca --- /dev/null +++ b/include/linux/irqchip/versatile-fpga.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef PLAT_FPGA_IRQ_H | ||
2 | #define PLAT_FPGA_IRQ_H | ||
3 | |||
4 | struct device_node; | ||
5 | struct pt_regs; | ||
6 | |||
7 | void fpga_handle_irq(struct pt_regs *regs); | ||
8 | void fpga_irq_init(void __iomem *, const char *, int, int, u32, | ||
9 | struct device_node *node); | ||
10 | int fpga_irq_of_init(struct device_node *node, | ||
11 | struct device_node *parent); | ||
12 | |||
13 | #endif | ||