diff options
Diffstat (limited to 'arch/arm/mach-lh7a40x/irq-lh7a404.c')
-rw-r--r-- | arch/arm/mach-lh7a40x/irq-lh7a404.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/arm/mach-lh7a40x/irq-lh7a404.c b/arch/arm/mach-lh7a40x/irq-lh7a404.c index e902e3d87da4..2685a81454d2 100644 --- a/arch/arm/mach-lh7a40x/irq-lh7a404.c +++ b/arch/arm/mach-lh7a40x/irq-lh7a404.c | |||
@@ -28,13 +28,17 @@ | |||
28 | 28 | ||
29 | static unsigned char irq_pri_vic1[] = { | 29 | static unsigned char irq_pri_vic1[] = { |
30 | #if defined (USE_PRIORITIES) | 30 | #if defined (USE_PRIORITIES) |
31 | IRQ_GPIO3INTR, | 31 | IRQ_GPIO3INTR, /* CPLD */ |
32 | IRQ_DMAM2P4, IRQ_DMAM2P5, /* AC97 */ | ||
32 | #endif | 33 | #endif |
33 | }; | 34 | }; |
34 | static unsigned char irq_pri_vic2[] = { | 35 | static unsigned char irq_pri_vic2[] = { |
35 | #if defined (USE_PRIORITIES) | 36 | #if defined (USE_PRIORITIES) |
36 | IRQ_T3UI, IRQ_GPIO7INTR, | 37 | IRQ_T3UI, /* Timer */ |
38 | IRQ_GPIO7INTR, /* CPLD */ | ||
37 | IRQ_UART1INTR, IRQ_UART2INTR, IRQ_UART3INTR, | 39 | IRQ_UART1INTR, IRQ_UART2INTR, IRQ_UART3INTR, |
40 | IRQ_LCDINTR, /* LCD */ | ||
41 | IRQ_TSCINTR, /* ADC/Touchscreen */ | ||
38 | #endif | 42 | #endif |
39 | }; | 43 | }; |
40 | 44 | ||
@@ -98,10 +102,19 @@ static struct irqchip lh7a404_gpio_vic2_chip = { | |||
98 | 102 | ||
99 | /* IRQ initialization */ | 103 | /* IRQ initialization */ |
100 | 104 | ||
105 | #if defined (CONFIG_ARCH_LH7A400) && defined (CONFIG_ARCH_LH7A404) | ||
106 | extern void* branch_irq_lh7a400; | ||
107 | #endif | ||
108 | |||
101 | void __init lh7a404_init_irq (void) | 109 | void __init lh7a404_init_irq (void) |
102 | { | 110 | { |
103 | int irq; | 111 | int irq; |
104 | 112 | ||
113 | #if defined (CONFIG_ARCH_LH7A400) && defined (CONFIG_ARCH_LH7A404) | ||
114 | #define NOP 0xe1a00000 /* mov r0, r0 */ | ||
115 | branch_irq_lh7a400 = NOP; | ||
116 | #endif | ||
117 | |||
105 | VIC1_INTENCLR = 0xffffffff; | 118 | VIC1_INTENCLR = 0xffffffff; |
106 | VIC2_INTENCLR = 0xffffffff; | 119 | VIC2_INTENCLR = 0xffffffff; |
107 | VIC1_INTSEL = 0; /* All IRQs */ | 120 | VIC1_INTSEL = 0; /* All IRQs */ |