Commit 0573a2bb authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Arnd Bergmann

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: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 9b747fea
...@@ -66,12 +66,6 @@ static void int1_mask(struct irq_data *d) ...@@ -66,12 +66,6 @@ static void int1_mask(struct irq_data *d)
static void int1_ack(struct irq_data *d) static void int1_ack(struct irq_data *d)
{ {
u32 intmr1;
intmr1 = clps_readl(INTMR1);
intmr1 &= ~(1 << d->irq);
clps_writel(intmr1, INTMR1);
switch (d->irq) { switch (d->irq) {
case IRQ_CSINT: clps_writel(0, COEOI); break; case IRQ_CSINT: clps_writel(0, COEOI); break;
case IRQ_TC1OI: clps_writel(0, TC1EOI); break; case IRQ_TC1OI: clps_writel(0, TC1EOI); break;
...@@ -108,12 +102,6 @@ static void int2_mask(struct irq_data *d) ...@@ -108,12 +102,6 @@ static void int2_mask(struct irq_data *d)
static void int2_ack(struct irq_data *d) static void int2_ack(struct irq_data *d)
{ {
u32 intmr2;
intmr2 = clps_readl(INTMR2);
intmr2 &= ~(1 << (d->irq - 16));
clps_writel(intmr2, INTMR2);
switch (d->irq) { switch (d->irq) {
case IRQ_KBDINT: clps_writel(0, KBDEOI); break; case IRQ_KBDINT: clps_writel(0, KBDEOI); break;
} }
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#define IRQ_SSEOTI 15 #define IRQ_SSEOTI 15
#define INT1_IRQS (0x0000fff0) #define INT1_IRQS (0x0000fff0)
#define INT1_ACK_IRQS (0x00004f10)
/* /*
* Interrupts from INTSR2 * Interrupts from INTSR2
...@@ -47,7 +46,5 @@ ...@@ -47,7 +46,5 @@
#define IRQ_URXINT2 (16+13) /* bit 13 */ #define IRQ_URXINT2 (16+13) /* bit 13 */
#define INT2_IRQS (0x30070000) #define INT2_IRQS (0x30070000)
#define INT2_ACK_IRQS (0x00010000)
#define NR_IRQS 30 #define NR_IRQS 30
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment