linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / mach-s3c2410 / irq.c

diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index cd6139b..66d8c06 100644 (file)
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -86,7 +86,7 @@ unsigned long s3c_irqwake_intmask     = 0xffffffffL;
 unsigned long s3c_irqwake_eintallow    = 0x0000fff0L;
 unsigned long s3c_irqwake_eintmask     = 0xffffffffL;
 
-int
+static int
 s3c_irq_wake(unsigned int irqno, unsigned int state)
 {
        unsigned long irqbit = 1 << (irqno - IRQ_EINT0);
@@ -191,9 +191,13 @@ static struct irqchip s3c_irq_chip = {
        .ack       = s3c_irq_ack,
        .mask      = s3c_irq_mask,
        .unmask    = s3c_irq_unmask,
-       .set_wake  = s3c_irq_wake
+       .set_wake          = s3c_irq_wake
 };
 
+/* S3C2410_EINTMASK
+ * S3C2410_EINTPEND
+ */
+
 static void
 s3c_irqext_mask(unsigned int irqno)
 {
@@ -201,9 +205,9 @@ s3c_irqext_mask(unsigned int irqno)
 
        irqno -= EXTINT_OFF;
 
-       mask = __raw_readl(S3C24XX_EINTMASK);
+       mask = __raw_readl(S3C2410_EINTMASK);
        mask |= ( 1UL << irqno);
-       __raw_writel(mask, S3C24XX_EINTMASK);
+       __raw_writel(mask, S3C2410_EINTMASK);
 
        if (irqno <= (IRQ_EINT7 - EXTINT_OFF)) {
                /* check to see if all need masking */
@@ -228,11 +232,11 @@ s3c_irqext_ack(unsigned int irqno)
        bit = 1UL << (irqno - EXTINT_OFF);
 
 
-       mask = __raw_readl(S3C24XX_EINTMASK);
+       mask = __raw_readl(S3C2410_EINTMASK);
 
-       __raw_writel(bit, S3C24XX_EINTPEND);
+       __raw_writel(bit, S3C2410_EINTPEND);
 
-       req = __raw_readl(S3C24XX_EINTPEND);
+       req = __raw_readl(S3C2410_EINTPEND);
        req &= ~mask;
 
        /* not sure if we should be acking the parent irq... */
@@ -253,14 +257,14 @@ s3c_irqext_unmask(unsigned int irqno)
 
        irqno -= EXTINT_OFF;
 
-       mask = __raw_readl(S3C24XX_EINTMASK);
+       mask = __raw_readl(S3C2410_EINTMASK);
        mask &= ~( 1UL << irqno);
-       __raw_writel(mask, S3C24XX_EINTMASK);
+       __raw_writel(mask, S3C2410_EINTMASK);
 
        s3c_irq_unmask((irqno <= (IRQ_EINT7 - EXTINT_OFF)) ? IRQ_EINT4t7 : IRQ_EINT8t23);
 }
 
-int
+static int
 s3c_irqext_type(unsigned int irq, unsigned int type)
 {
        void __iomem *extint_reg;
@@ -271,28 +275,28 @@ s3c_irqext_type(unsigned int irq, unsigned int type)
        if ((irq >= IRQ_EINT0) && (irq <= IRQ_EINT3))
        {
                gpcon_reg = S3C2410_GPFCON;
-               extint_reg = S3C24XX_EXTINT0;
+               extint_reg = S3C2410_EXTINT0;
                gpcon_offset = (irq - IRQ_EINT0) * 2;
                extint_offset = (irq - IRQ_EINT0) * 4;
        }
        else if ((irq >= IRQ_EINT4) && (irq <= IRQ_EINT7))
        {
                gpcon_reg = S3C2410_GPFCON;
-               extint_reg = S3C24XX_EXTINT0;
+               extint_reg = S3C2410_EXTINT0;
                gpcon_offset = (irq - (EXTINT_OFF)) * 2;
                extint_offset = (irq - (EXTINT_OFF)) * 4;
        }
        else if ((irq >= IRQ_EINT8) && (irq <= IRQ_EINT15))
        {
                gpcon_reg = S3C2410_GPGCON;
-               extint_reg = S3C24XX_EXTINT1;
+               extint_reg = S3C2410_EXTINT1;
                gpcon_offset = (irq - IRQ_EINT8) * 2;
                extint_offset = (irq - IRQ_EINT8) * 4;
        }
        else if ((irq >= IRQ_EINT16) && (irq <= IRQ_EINT23))
        {
                gpcon_reg = S3C2410_GPGCON;
-               extint_reg = S3C24XX_EXTINT2;
+               extint_reg = S3C2410_EXTINT2;
                gpcon_offset = (irq - IRQ_EINT8) * 2;
                extint_offset = (irq - IRQ_EINT16) * 4;
        } else
@@ -568,23 +572,6 @@ s3c_irq_demux_uart2(unsigned int irq,
        s3c_irq_demux_uart(IRQ_S3CUART_RX2, regs);
 }
 
-static void
-s3c_irq_demux_extint(unsigned int irq,
-                    struct irqdesc *desc,
-                    struct pt_regs *regs)
-{
-       unsigned long eintpnd = __raw_readl(S3C24XX_EINTPEND);
-       unsigned long eintmsk = __raw_readl(S3C24XX_EINTMASK);
-
-       eintpnd &= ~eintmsk;
-
-       if (eintpnd) {
-               irq = fls(eintpnd);
-               irq += (IRQ_EINT4 - (4 + 1));
-
-               desc_handle_irq(irq, irq_desc + irq, regs);
-       }
-}
 
 /* s3c24xx_init_irq
  *
@@ -604,12 +591,12 @@ void __init s3c24xx_init_irq(void)
 
        last = 0;
        for (i = 0; i < 4; i++) {
-               pend = __raw_readl(S3C24XX_EINTPEND);
+               pend = __raw_readl(S3C2410_EINTPEND);
 
                if (pend == 0 || pend == last)
                        break;
 
-               __raw_writel(pend, S3C24XX_EINTPEND);
+               __raw_writel(pend, S3C2410_EINTPEND);
                printk("irq: clearing pending ext status %08x\n", (int)pend);
                last = pend;
        }
@@ -643,14 +630,12 @@ void __init s3c24xx_init_irq(void)
 
        irqdbf("s3c2410_init_irq: registering s3c2410 interrupt handlers\n");
 
-       for (irqno = IRQ_EINT4t7; irqno <= IRQ_ADCPARENT; irqno++) {
+       for (irqno = IRQ_BATT_FLT; irqno <= IRQ_ADCPARENT; irqno++) {
                /* set all the s3c2410 internal irqs */
 
                switch (irqno) {
                        /* deal with the special IRQs (cascaded) */
 
-               case IRQ_EINT4t7:
-               case IRQ_EINT8t23:
                case IRQ_UART0:
                case IRQ_UART1:
                case IRQ_UART2:
@@ -674,14 +659,12 @@ void __init s3c24xx_init_irq(void)
 
        /* setup the cascade irq handlers */
 
-       set_irq_chained_handler(IRQ_EINT4t7, s3c_irq_demux_extint);
-       set_irq_chained_handler(IRQ_EINT8t23, s3c_irq_demux_extint);
-
        set_irq_chained_handler(IRQ_UART0, s3c_irq_demux_uart0);
        set_irq_chained_handler(IRQ_UART1, s3c_irq_demux_uart1);
        set_irq_chained_handler(IRQ_UART2, s3c_irq_demux_uart2);
        set_irq_chained_handler(IRQ_ADCPARENT, s3c_irq_demux_adc);
 
+
        /* external interrupts */
 
        for (irqno = IRQ_EINT0; irqno <= IRQ_EINT3; irqno++) {