3 files changed, 30 insertions, 31 deletions

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 12b65609c072..ef10bcf2d943 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -85,11 +85,8 @@ static int __init gfar_mdio_of_init(void)
                         mdio_data.irq[k] = -1;
 
                 while ((child = of_get_next_child(np, child)) != NULL) {
-                        if (child->n_intrs) {
-                                u32 *id =
-                                    (u32 *) get_property(child, "reg", NULL);
-                                mdio_data.irq[*id] = child->intrs[0].line;
-                        }
+                        u32 *id = get_property(child, "reg", NULL);
+                        mdio_data.irq[*id] = irq_of_parse_and_map(child, 0);
                 }
 
                 ret =
@@ -131,6 +128,7 @@ static int __init gfar_of_init(void)
                 char *model;
                 void *mac_addr;
                 phandle *ph;
+                int n_res = 1;
 
                 memset(r, 0, sizeof(r));
                 memset(&gfar_data, 0, sizeof(gfar_data));
@@ -139,8 +137,7 @@ static int __init gfar_of_init(void)
                 if (ret)
                         goto err;
 
-                r[1].start = np->intrs[0].line;
-                r[1].end = np->intrs[0].line;
+                r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
                 r[1].flags = IORESOURCE_IRQ;
 
                 model = get_property(np, "model", NULL);
@@ -150,19 +147,19 @@ static int __init gfar_of_init(void)
                         r[1].name = gfar_tx_intr;
 
                         r[2].name = gfar_rx_intr;
-                        r[2].start = np->intrs[1].line;
-                        r[2].end = np->intrs[1].line;
+                        r[2].start = r[2].end = irq_of_parse_and_map(np, 1);
                         r[2].flags = IORESOURCE_IRQ;
 
                         r[3].name = gfar_err_intr;
-                        r[3].start = np->intrs[2].line;
-                        r[3].end = np->intrs[2].line;
+                        r[3].start = r[3].end = irq_of_parse_and_map(np, 2);
                         r[3].flags = IORESOURCE_IRQ;
+
+                        n_res += 2;
                 }
 
                 gfar_dev =
                     platform_device_register_simple("fsl-gianfar", i, &r[0],
-                                                    np->n_intrs + 1);
+                                                    n_res + 1);
 
                 if (IS_ERR(gfar_dev)) {
                         ret = PTR_ERR(gfar_dev);
@@ -259,8 +256,7 @@ static int __init fsl_i2c_of_init(void)
                 if (ret)
                         goto err;
 
-                r[1].start = np->intrs[0].line;
-                r[1].end = np->intrs[0].line;
+                r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
                 r[1].flags = IORESOURCE_IRQ;
 
                 i2c_dev = platform_device_register_simple("fsl-i2c", i, r, 2);
@@ -396,8 +392,7 @@ static int __init fsl_usb_of_init(void)
                 if (ret)
                         goto err;
 
-                r[1].start = np->intrs[0].line;
-                r[1].end = np->intrs[0].line;
+                r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
                 r[1].flags = IORESOURCE_IRQ;
 
                 usb_dev_mph =
@@ -445,8 +440,7 @@ static int __init fsl_usb_of_init(void)
                 if (ret)
                         goto unreg_mph;
 
-                r[1].start = np->intrs[0].line;
-                r[1].end = np->intrs[0].line;
+                r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
                 r[1].flags = IORESOURCE_IRQ;
 
                 usb_dev_dr =
diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c
index 26a0cc820cde..f3038461d4c0 100644
--- a/arch/powerpc/sysdev/tsi108_dev.c
+++ b/arch/powerpc/sysdev/tsi108_dev.c
@@ -93,13 +93,15 @@ static int __init tsi108_eth_of_init(void)
                         goto err;
 
                 r[1].name = "tx";
-                r[1].start = np->intrs[0].line;
-                r[1].end = np->intrs[0].line;
+                r[1].start = irq_of_parse_and_map(np, 0);
+                r[1].end = irq_of_parse_and_map(np, 0);
                 r[1].flags = IORESOURCE_IRQ;
+                DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
+                        __FUNCTION__,r[1].name, r[1].start, r[1].end);
 
                 tsi_eth_dev =
                     platform_device_register_simple("tsi-ethernet", i, &r[0],
-                                                    np->n_intrs + 1);
+                                                    1);
 
                 if (IS_ERR(tsi_eth_dev)) {
                         ret = PTR_ERR(tsi_eth_dev);
@@ -127,7 +129,7 @@ static int __init tsi108_eth_of_init(void)
                 tsi_eth_data.regs = r[0].start;
                 tsi_eth_data.phyregs = res.start;
                 tsi_eth_data.phy = *phy_id;
-                tsi_eth_data.irq_num = np->intrs[0].line;
+                tsi_eth_data.irq_num = irq_of_parse_and_map(np, 0);
                 of_node_put(phy);
                 ret =
                     platform_device_add_data(tsi_eth_dev, &tsi_eth_data,
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 3265d54c82ed..2ab06ed3ae73 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -26,7 +26,6 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 
-
 #include <asm/byteorder.h>
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -228,7 +227,7 @@ int __init tsi108_setup_pci(struct device_node *dev)
 
         (hose)->ops = &tsi108_direct_pci_ops;
 
-        printk(KERN_INFO "Found tsi108 PCI host bridge at 0x%08lx. "
+        printk(KERN_INFO "Found tsi108 PCI host bridge at 0x%08x. "
                "Firmware bus number: %d->%d\n",
                rsrc.start, hose->first_busno, hose->last_busno);
 
@@ -278,7 +277,7 @@ static void init_pci_source(void)
         mb();
 }
 
-static inline int get_pci_source(void)
+static inline unsigned int get_pci_source(void)
 {
         u_int temp = 0;
         int irq = -1;
@@ -371,12 +370,12 @@ static void tsi108_pci_irq_end(u_int irq)
  * Interrupt controller descriptor for cascaded PCI interrupt controller.
  */
 
-struct hw_interrupt_type tsi108_pci_irq = {
+static struct irq_chip tsi108_pci_irq = {
         .typename = "tsi108_PCI_int",
-        .enable = tsi108_pci_irq_enable,
-        .disable = tsi108_pci_irq_disable,
+        .mask = tsi108_pci_irq_disable,
         .ack = tsi108_pci_irq_ack,
         .end = tsi108_pci_irq_end,
+        .unmask = tsi108_pci_irq_enable,
 };
 
 /*
@@ -399,14 +398,18 @@ void __init tsi108_pci_int_init(void)
         DBG("Tsi108_pci_int_init: initializing PCI interrupts\n");
 
         for (i = 0; i < NUM_PCI_IRQS; i++) {
-                irq_desc[i + IRQ_PCI_INTAD_BASE].handler = &tsi108_pci_irq;
+                irq_desc[i + IRQ_PCI_INTAD_BASE].chip = &tsi108_pci_irq;
                 irq_desc[i + IRQ_PCI_INTAD_BASE].status |= IRQ_LEVEL;
         }
 
         init_pci_source();
 }
 
-int tsi108_irq_cascade(struct pt_regs *regs, void *unused)
+void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc,
+                            struct pt_regs *regs)
 {
-        return get_pci_source();
+        unsigned int cascade_irq = get_pci_source();
+        if (cascade_irq != NO_IRQ)
+                generic_handle_irq(cascade_irq, regs);
+        desc->chip->eoi(irq);
 }