diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-10-02 00:43:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-02 00:43:43 +0900 |
| commit | e15f6870a2f2a29abcdb910b80f9629bcf7f5566 (patch) | |
| tree | 6b43b8755cc5926692a25c6695d3cbfba360368e /arch/sh/kernel/cpu/sh4a/setup-sh7786.c | |
| parent | 5924ad0d86fbc05bfb0c90afa15e20ccb7155549 (diff) | |
| download | kernel_samsung_smdk4412-e15f6870a2f2a29abcdb910b80f9629bcf7f5566.zip kernel_samsung_smdk4412-e15f6870a2f2a29abcdb910b80f9629bcf7f5566.tar.gz kernel_samsung_smdk4412-e15f6870a2f2a29abcdb910b80f9629bcf7f5566.tar.bz2 | |
sh: Support userimask for all SH-X3 interrupt controllers.
This shuffles some of the shared bits out of the 7786 code and in to a
shared SH-X3 support file. Presently just for userimask, but also a good
place for the IRQ balancing wrappers.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7786.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c index 8797723..bbc0a97 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c @@ -756,8 +756,6 @@ static struct intc_vect vectors[] __initdata = { #define INTDISTCR0 0xfe4100b0 #define INTDISTCR1 0xfe4100b4 -#define INTACK 0xfe4100b8 -#define INTACKCLR 0xfe4100bc #define INT2DISTCR0 0xfe410900 #define INT2DISTCR1 0xfe410904 #define INT2DISTCR2 0xfe410908 @@ -920,19 +918,6 @@ static DECLARE_INTC_DESC(intc_desc_irl4567, "sh7786-irl4567", vectors_irl4567, #define INTC_INTMSK2 INTMSK2 #define INTC_INTMSKCLR1 CnINTMSKCLR1 #define INTC_INTMSKCLR2 INTMSKCLR2 -#define INTC_USERIMASK 0xfe411000 - -#ifdef CONFIG_INTC_BALANCING -unsigned int irq_lookup(unsigned int irq) -{ - return __raw_readl(INTACK) & 1 ? irq : NO_IRQ_IGNORE; -} - -void irq_finish(unsigned int irq) -{ - __raw_writel(irq2evt(irq), INTACKCLR); -} -#endif void __init plat_irq_setup(void) { @@ -947,7 +932,6 @@ void __init plat_irq_setup(void) __raw_writel(__raw_readl(INTC_ICR0) & ~0x00c00000, INTC_ICR0); register_intc_controller(&intc_desc); - register_intc_userimask(INTC_USERIMASK); } void __init plat_irq_setup_pins(int mode) |