Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4f3e084 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked 



Do not bother masking/unmasking the parent IRQ
for the mulitplexed EINT irqs, as masking the
leaf seems to be fine.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 32d2deea

arch/arm/mach-s3c2410/irq.c

+0 −15
Original line number Diff line number Diff line
@@ -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
@@ -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);
@@ -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