linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / mach-integrator / integrator_cp.c

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 678b6ba..a0724f2 100644 (file)
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -156,8 +156,7 @@ static void cic_unmask_irq(unsigned int irq)
        cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET);
 }
 
-static struct irq_chip cic_chip = {
-       .name   = "CIC",
+static struct irqchip cic_chip = {
        .ack    = cic_mask_irq,
        .mask   = cic_mask_irq,
        .unmask = cic_unmask_irq,
@@ -175,8 +174,7 @@ static void pic_unmask_irq(unsigned int irq)
        pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET);
 }
 
-static struct irq_chip pic_chip = {
-       .name   = "PIC",
+static struct irqchip pic_chip = {
        .ack    = pic_mask_irq,
        .mask   = pic_mask_irq,
        .unmask = pic_unmask_irq,
@@ -194,8 +192,7 @@ static void sic_unmask_irq(unsigned int irq)
        sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET);
 }
 
-static struct irq_chip sic_chip = {
-       .name   = "SIC",
+static struct irqchip sic_chip = {
        .ack    = sic_mask_irq,
        .mask   = sic_mask_irq,
        .unmask = sic_unmask_irq,
@@ -235,6 +232,8 @@ static void __init intcp_init_irq(void)
        for (i = IRQ_PIC_START; i <= IRQ_PIC_END; i++) {
                if (i == 11)
                        i = 22;
+               if (i == IRQ_CP_CPPLDINT)
+                       i++;
                if (i == 29)
                        break;
                set_irq_chip(i, &pic_chip);
@@ -260,7 +259,8 @@ static void __init intcp_init_irq(void)
                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
        }
 
-       set_irq_chained_handler(IRQ_CP_CPPLDINT, sic_handle_irq);
+       set_irq_handler(IRQ_CP_CPPLDINT, sic_handle_irq);
+       pic_unmask_irq(IRQ_CP_CPPLDINT);
 }
 
 /*