diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2012-05-15 13:55:01 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 15:20:59 -0400 |
commit | 0573a2bb885848af67127b77dbebb900d0ae19b9 (patch) | |
tree | 16fcf43f9add78c9be10c159970e275965778768 | |
parent | 9b747fea71501e970425cd479cf5058ec3917e0b (diff) |
ARM: clps711x: Cleanup IRQ handling
This patch contains two changes:
- Removed unused definitions from mach/irqs.h
- Do not mask interrupts in ack procedure, because we have separate
intX_mask procedure for do it and actually these 2 functions are
called sequentially
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-clps711x/common.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/irqs.h | 5 |
2 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c index b6dfd2f22cd4..c965fd8eb31a 100644 --- a/arch/arm/mach-clps711x/common.c +++ b/arch/arm/mach-clps711x/common.c | |||
@@ -66,12 +66,6 @@ static void int1_mask(struct irq_data *d) | |||
66 | 66 | ||
67 | static void int1_ack(struct irq_data *d) | 67 | static void int1_ack(struct irq_data *d) |
68 | { | 68 | { |
69 | u32 intmr1; | ||
70 | |||
71 | intmr1 = clps_readl(INTMR1); | ||
72 | intmr1 &= ~(1 << d->irq); | ||
73 | clps_writel(intmr1, INTMR1); | ||
74 | |||
75 | switch (d->irq) { | 69 | switch (d->irq) { |
76 | case IRQ_CSINT: clps_writel(0, COEOI); break; | 70 | case IRQ_CSINT: clps_writel(0, COEOI); break; |
77 | case IRQ_TC1OI: clps_writel(0, TC1EOI); break; | 71 | case IRQ_TC1OI: clps_writel(0, TC1EOI); break; |
@@ -108,12 +102,6 @@ static void int2_mask(struct irq_data *d) | |||
108 | 102 | ||
109 | static void int2_ack(struct irq_data *d) | 103 | static void int2_ack(struct irq_data *d) |
110 | { | 104 | { |
111 | u32 intmr2; | ||
112 | |||
113 | intmr2 = clps_readl(INTMR2); | ||
114 | intmr2 &= ~(1 << (d->irq - 16)); | ||
115 | clps_writel(intmr2, INTMR2); | ||
116 | |||
117 | switch (d->irq) { | 105 | switch (d->irq) { |
118 | case IRQ_KBDINT: clps_writel(0, KBDEOI); break; | 106 | case IRQ_KBDINT: clps_writel(0, KBDEOI); break; |
119 | } | 107 | } |
diff --git a/arch/arm/mach-clps711x/include/mach/irqs.h b/arch/arm/mach-clps711x/include/mach/irqs.h index 30b7e97285a4..14d215f8ca81 100644 --- a/arch/arm/mach-clps711x/include/mach/irqs.h +++ b/arch/arm/mach-clps711x/include/mach/irqs.h | |||
@@ -35,7 +35,6 @@ | |||
35 | #define IRQ_SSEOTI 15 | 35 | #define IRQ_SSEOTI 15 |
36 | 36 | ||
37 | #define INT1_IRQS (0x0000fff0) | 37 | #define INT1_IRQS (0x0000fff0) |
38 | #define INT1_ACK_IRQS (0x00004f10) | ||
39 | 38 | ||
40 | /* | 39 | /* |
41 | * Interrupts from INTSR2 | 40 | * Interrupts from INTSR2 |
@@ -47,7 +46,5 @@ | |||
47 | #define IRQ_URXINT2 (16+13) /* bit 13 */ | 46 | #define IRQ_URXINT2 (16+13) /* bit 13 */ |
48 | 47 | ||
49 | #define INT2_IRQS (0x30070000) | 48 | #define INT2_IRQS (0x30070000) |
50 | #define INT2_ACK_IRQS (0x00010000) | ||
51 | |||
52 | #define NR_IRQS 30 | ||
53 | 49 | ||
50 | #define NR_IRQS 30 | ||