diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 12:12:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 12:12:41 +0900 |
| commit | d978006a54ddf73cdeb3c59d1862a17f4445751c (patch) | |
| tree | 407e4e37402936ef2c06bee64d8575390c3339f6 /arch/sh/include/mach-se | |
| parent | f21efd45362d555b3b93960a5736ad7c6fc1f367 (diff) | |
| parent | 123df01e8e046d6065089e1bff29aa3fc48d4420 (diff) | |
| download | lwn-d978006a54ddf73cdeb3c59d1862a17f4445751c.tar.gz lwn-d978006a54ddf73cdeb3c59d1862a17f4445751c.zip | |
Merge branch 'sh/dynamic-irq-cleanup' into sh-latest
Conflicts:
drivers/sh/intc/dynamic.c
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/se7343.h | 7 | ||||
| -rw-r--r-- | arch/sh/include/mach-se/mach/se7722.h | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/arch/sh/include/mach-se/mach/se7343.h b/arch/sh/include/mach-se/mach/se7343.h index 50b5d575dff0..542521c970c6 100644 --- a/arch/sh/include/mach-se/mach/se7343.h +++ b/arch/sh/include/mach-se/mach/se7343.h @@ -50,9 +50,6 @@ #define PA_LED 0xb0C00000 /* LED */ #define LED_SHIFT 0 #define PA_DIPSW 0xb0900000 /* Dip switch 31 */ -#define PA_CPLD_MODESET 0xb1400004 /* CPLD Mode set register */ -#define PA_CPLD_ST 0xb1400008 /* CPLD Interrupt status register */ -#define PA_CPLD_IMSK 0xb140000a /* CPLD Interrupt mask register */ /* Area 5 */ #define PA_EXT5 0x14000000 #define PA_EXT5_SIZE 0x04000000 @@ -135,8 +132,10 @@ #define SE7343_FPGA_IRQ_NR 12 +struct irq_domain; + /* arch/sh/boards/se/7343/irq.c */ -extern unsigned int se7343_fpga_irq[]; +extern struct irq_domain *se7343_irq_domain; void init_7343se_IRQ(void); diff --git a/arch/sh/include/mach-se/mach/se7722.h b/arch/sh/include/mach-se/mach/se7722.h index 201081ebdbce..637e7ac753f8 100644 --- a/arch/sh/include/mach-se/mach/se7722.h +++ b/arch/sh/include/mach-se/mach/se7722.h @@ -81,12 +81,6 @@ #define IRQ0_IRQ evt2irq(0x600) #define IRQ1_IRQ evt2irq(0x620) -#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 */ @@ -95,8 +89,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); |