powerpc: Merge i8259.c into arch/powerpc/sysdev

This changes the parameters for i8259_init so that it takes two
parameters: a physical address for generating an interrupt
acknowledge cycle, and an interrupt number offset.  i8259_init
now sets the irq_desc[] for its interrupts; all the callers
were doing this, and that code is gone now.  This also defines
a CONFIG_PPC_I8259 symbol to select i8259.o for inclusion, and
makes the platforms that need it select that symbol.

Signed-off-by: Paul Mackerras <paulus@samba.org>

8 files changed, 10 insertions, 40 deletions

diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 9f9039498ae5..eda659916f24 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -173,10 +173,7 @@ mpc85xx_cds_init_IRQ(void)
 #ifdef CONFIG_PCI
         openpic_hookup_cascade(PIRQ0A, "82c59 cascade", i8259_irq);
 
-        for (i = 0; i < NUM_8259_INTERRUPTS; i++)
-                irq_desc[i].handler = &i8259_pic;
-
-        i8259_init(0);
+        i8259_init(0, 0);
 #endif
 
 #ifdef CONFIG_CPM2
diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c
index 56c53bb3dfd4..dad81ffd4013 100644
--- a/arch/ppc/platforms/chrp_setup.c
+++ b/arch/ppc/platforms/chrp_setup.c
@@ -436,9 +436,7 @@ void __init chrp_init_IRQ(void)
                                        i8259_irq);
 
         }
-        for (i = 0; i < NUM_8259_INTERRUPTS; i++)
-                irq_desc[i].handler = &i8259_pic;
-        i8259_init(chrp_int_ack);
+        i8259_init(chrp_int_ack, 0);
 
 #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
         /* see if there is a keyboard in the device tree
diff --git a/arch/ppc/platforms/lopec.c b/arch/ppc/platforms/lopec.c
index 800c56a07a97..06d247c23b82 100644
--- a/arch/ppc/platforms/lopec.c
+++ b/arch/ppc/platforms/lopec.c
@@ -267,15 +267,11 @@ lopec_init_IRQ(void)
         openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
                         &i8259_irq);
 
-        /* Map i8259 interrupts */
-        for(i = 0; i < NUM_8259_INTERRUPTS; i++)
-                irq_desc[i].handler = &i8259_pic;
-
         /*
          * The EPIC allows for a read in the range of 0xFEF00000 ->
          * 0xFEFFFFFF to generate a PCI interrupt-acknowledge transaction.
          */
-        i8259_init(0xfef00000);
+        i8259_init(0xfef00000, 0);
 }
 
 static int __init
diff --git a/arch/ppc/platforms/mvme5100.c b/arch/ppc/platforms/mvme5100.c
index ce2ce88c8033..108eb182dddc 100644
--- a/arch/ppc/platforms/mvme5100.c
+++ b/arch/ppc/platforms/mvme5100.c
@@ -223,11 +223,7 @@ mvme5100_init_IRQ(void)
         openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
                         &i8259_irq);
 
-        /* Map i8259 interrupts. */
-        for (i = 0; i < NUM_8259_INTERRUPTS; i++)
-                irq_desc[i].handler = &i8259_pic;
-
-        i8259_init(0);
+        i8259_init(0, 0);
 #else
         openpic_init(0);
 #endif
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c
index 59eb330b2090..22bd40cfb092 100644
--- a/arch/ppc/platforms/pplus.c
+++ b/arch/ppc/platforms/pplus.c
@@ -665,10 +665,7 @@ static void __init pplus_init_IRQ(void)
                 ppc_md.get_irq = openpic_get_irq;
         }
 
-        for (i = 0; i < NUM_8259_INTERRUPTS; i++)
-                irq_desc[i].handler = &i8259_pic;
-
-        i8259_init(0);
+        i8259_init(0, 0);
 
         if (ppc_md.progress)
                 ppc_md.progress("init_irq: exit", 0);
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index 9e5637e5f5a9..067d7d53b81e 100644
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -954,11 +954,9 @@ prep_init_IRQ(void)
                 openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
                                        i8259_irq);
         }
-        for ( i = 0 ; i < NUM_8259_INTERRUPTS ; i++ )
-                irq_desc[i].handler = &i8259_pic;
 
         if (have_residual_data) {
-                i8259_init(residual_isapic_addr());
+                i8259_init(residual_isapic_addr(), 0);
                 return;
         }
 
@@ -969,11 +967,11 @@ prep_init_IRQ(void)
         if (((pci_viddid & 0xffff) == PCI_VENDOR_ID_MOTOROLA)
                         && ((pci_did == PCI_DEVICE_ID_MOTOROLA_RAVEN)
                                 || (pci_did == PCI_DEVICE_ID_MOTOROLA_HAWK)))
-                i8259_init(0);
+                i8259_init(0, 0);
         else
                 /* PCI interrupt ack address given in section 6.1.8 of the
                  * PReP specification. */
-                i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR);
+                i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR, 0);
 }
 
 #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 5058568c13ec..6f97911c330d 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -514,13 +514,9 @@ static void __init ppc7d_init_irq(void)
         int irq;
 
         pr_debug("%s\n", __FUNCTION__);
-        i8259_init(0);
+        i8259_init(0, 0);
         mv64360_init_irq();
 
-        /* IRQ 0..15 are handled by the cascaded 8259's of the Ali1535 */
-        for (irq = 0; irq < 16; irq++) {
-                irq_desc[irq].handler = &i8259_pic;
-        }
         /* IRQs 5,6,9,10,11,14,15 are level sensitive */
         irq_desc[5].status |= IRQ_LEVEL;
         irq_desc[6].status |= IRQ_LEVEL;
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
index d4c9781989fb..9eeed3572309 100644
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
@@ -494,18 +494,10 @@ sandpoint_init_IRQ(void)
                         i8259_irq);
 
         /*
-         * openpic_init() has set up irq_desc[16-31] to be openpic
-         * interrupts.  We need to set irq_desc[0-15] to be i8259
-         * interrupts.
-         */
-        for(i=0; i < NUM_8259_INTERRUPTS; i++)
-                irq_desc[i].handler = &i8259_pic;
-
-        /*
          * The EPIC allows for a read in the range of 0xFEF00000 ->
          * 0xFEFFFFFF to generate a PCI interrupt-acknowledge transaction.
          */
-        i8259_init(0xfef00000);
+        i8259_init(0xfef00000, 0);
 }
 
 static unsigned long __init