diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-05-24 09:24:32 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-24 09:24:32 (GMT) |
commit | 5df38b9b7676e4e46c5c13e75f023ffb82542980 (patch) | |
tree | c7a21ff99ec07365dcc3f55de6f09b6261cfdcde /arch/sh/include/mach-se | |
parent | b98b35815f40f01337e25e3f0d10d57b7cec5126 (diff) | |
download | linux-fsl-qoriq-5df38b9b7676e4e46c5c13e75f023ffb82542980.tar.xz |
sh: se722: Move FPGA IRQs to irqdomain and generic irq chip.
This implements a total rewrite of the rather buggy SE7722 FPGA IRQ code,
utilizing a linear irq domain as well as the generic irq chip type.
While the interaction between the two APIs is a bit clunky (ie, revmap
lookup for gc irq_base), they work well enough together that it's easy
enough to work with going forward.
While we're at it, deal with irq_mask_ack/unmask of the chained IRQ in
the demux handler to prevent smc91x screaming about spurious interrupts.
There's also some more improvement that can be made to the irqdomain code
to create backing irqdescs for the entire linear range in one bang
instead of iterating over the number of hwirqs and doing it
irq-at-a-time. This is easily dealt with at a later point, though.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/mach-se')
-rw-r--r-- | arch/sh/include/mach-se/mach/se7722.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/sh/include/mach-se/mach/se7722.h b/arch/sh/include/mach-se/mach/se7722.h index 16505bf..5508dc4 100644 --- a/arch/sh/include/mach-se/mach/se7722.h +++ b/arch/sh/include/mach-se/mach/se7722.h @@ -80,12 +80,6 @@ #define IRQ0_IRQ 32 #define IRQ1_IRQ 33 -#define IRQ01_MODE 0xb1800000 -#define IRQ01_STS 0xb1800004 -#define IRQ01_MASK 0xb1800008 - -/* Bits in IRQ01_* registers */ - #define SE7722_FPGA_IRQ_USB 0 /* IRQ0 */ #define SE7722_FPGA_IRQ_SMC 1 /* IRQ0 */ #define SE7722_FPGA_IRQ_MRSHPC0 2 /* IRQ1 */ @@ -94,8 +88,10 @@ #define SE7722_FPGA_IRQ_MRSHPC3 5 /* IRQ1 */ #define SE7722_FPGA_IRQ_NR 6 +struct irq_domain; + /* arch/sh/boards/se/7722/irq.c */ -extern unsigned int se7722_fpga_irq[]; +extern struct irq_domain *se7722_irq_domain; void init_se7722_IRQ(void); |