Skip to content

Commit

Permalink
[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
Browse files Browse the repository at this point in the history
Do not bother masking/unmasking the parent IRQ
for the mulitplexed EINT irqs, as masking the
leaf seems to be fine.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ben Dooks authored and Russell King committed Dec 7, 2006
1 parent 32d2dee commit d4f3e08
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions arch/arm/mach-s3c2410/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,18 +206,6 @@ s3c_irqext_mask(unsigned int irqno)
mask = __raw_readl(S3C24XX_EINTMASK);
mask |= ( 1UL << irqno);
__raw_writel(mask, S3C24XX_EINTMASK);

if (irqno <= (IRQ_EINT7 - EXTINT_OFF)) {
/* check to see if all need masking */

if ((mask & (0xf << 4)) == (0xf << 4)) {
/* all masked, mask the parent */
s3c_irq_mask(IRQ_EINT4t7);
}
} else {
/* todo: the same check as above for the rest of the irq regs...*/

}
}

static void
Expand All @@ -229,7 +217,6 @@ s3c_irqext_ack(unsigned int irqno)

bit = 1UL << (irqno - EXTINT_OFF);


mask = __raw_readl(S3C24XX_EINTMASK);

__raw_writel(bit, S3C24XX_EINTPEND);
Expand Down Expand Up @@ -258,8 +245,6 @@ s3c_irqext_unmask(unsigned int irqno)
mask = __raw_readl(S3C24XX_EINTMASK);
mask &= ~( 1UL << irqno);
__raw_writel(mask, S3C24XX_EINTMASK);

s3c_irq_unmask((irqno <= (IRQ_EINT7 - EXTINT_OFF)) ? IRQ_EINT4t7 : IRQ_EINT8t23);
}

int
Expand Down

0 comments on commit d4f3e08

Please sign in to comment.