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>

1 files changed, 3 insertions, 5 deletions

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)