8 files changed, 146 insertions, 105 deletions

diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index 8dc205b275e3..56612a2dca6b 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1299,13 +1299,12 @@ static int __init hvsi_console_init(void)
                 hp->inbuf_end = hp->inbuf;
                 hp->state = HVSI_CLOSED;
                 hp->vtermno = *vtermno;
-                hp->virq = virt_irq_create_mapping(irq[0]);
+                hp->virq = irq_create_mapping(NULL, irq[0], 0);
                 if (hp->virq == NO_IRQ) {
                         printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",
-                                __FUNCTION__, hp->virq);
+                                __FUNCTION__, irq[0]);
                         continue;
-                } else
-                        hp->virq = irq_offset_up(hp->virq);
+                }
 
                 hvsi_count++;
         }
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 314fc0830d90..4b08852c35ee 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -90,22 +90,12 @@ int macio_init(void)
 {
         struct device_node *adbs;
         struct resource r;
+        unsigned int irq;
 
         adbs = find_compatible_devices("adb", "chrp,adb0");
         if (adbs == 0)
                 return -ENXIO;
 
-#if 0
-        { int i = 0;
-
-        printk("macio_adb_init: node = %p, addrs =", adbs->node);
-        while(!of_address_to_resource(adbs, i, &r))
-                printk(" %x(%x)", r.start, r.end - r.start);
-        printk(", intrs =");
-        for (i = 0; i < adbs->n_intrs; ++i)
-                printk(" %x", adbs->intrs[i].line);
-        printk("\n"); }
-#endif
         if (of_address_to_resource(adbs, 0, &r))
                 return -ENXIO;
         adb = ioremap(r.start, sizeof(struct adb_regs));
@@ -117,10 +107,9 @@ int macio_init(void)
         out_8(&adb->active_lo.r, 0xff);
         out_8(&adb->autopoll.r, APE);
 
-        if (request_irq(adbs->intrs[0].line, macio_adb_interrupt,
-                        0, "ADB", (void *)0)) {
-                printk(KERN_ERR "ADB: can't get irq %d\n",
-                       adbs->intrs[0].line);
+        irq = irq_of_parse_and_map(adbs, 0);
+        if (request_irq(irq, macio_adb_interrupt, 0, "ADB", (void *)0)) {
+                printk(KERN_ERR "ADB: can't get irq %d\n", irq);
                 return -EAGAIN;
         }
         out_8(&adb->intr_enb.r, DFB | TAG);
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 40ae7b6a939d..80c0c665b5f6 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -280,75 +280,128 @@ static void macio_release_dev(struct device *dev)
 static int macio_resource_quirks(struct device_node *np, struct resource *res,
                                  int index)
 {
-        if (res->flags & IORESOURCE_MEM) {
-                /* Grand Central has too large resource 0 on some machines */
-                if (index == 0 && !strcmp(np->name, "gc"))
-                        res->end = res->start + 0x1ffff;
+        /* Only quirks for memory resources for now */
+        if ((res->flags & IORESOURCE_MEM) == 0)
+                return 0;
+
+        /* Grand Central has too large resource 0 on some machines */
+        if (index == 0 && !strcmp(np->name, "gc"))
+                res->end = res->start + 0x1ffff;
 
-                /* Airport has bogus resource 2 */
-                if (index >= 2 && !strcmp(np->name, "radio"))
-                        return 1;
+        /* Airport has bogus resource 2 */
+        if (index >= 2 && !strcmp(np->name, "radio"))
+                return 1;
 
 #ifndef CONFIG_PPC64
-                /* DBDMAs may have bogus sizes */
-                if ((res->start & 0x0001f000) == 0x00008000)
-                        res->end = res->start + 0xff;
+        /* DBDMAs may have bogus sizes */
+        if ((res->start & 0x0001f000) == 0x00008000)
+                res->end = res->start + 0xff;
 #endif /* CONFIG_PPC64 */
 
-                /* ESCC parent eats child resources. We could have added a
-                 * level of hierarchy, but I don't really feel the need
-                 * for it
-                 */
-                if (!strcmp(np->name, "escc"))
-                        return 1;
-
-                /* ESCC has bogus resources >= 3 */
-                if (index >= 3 && !(strcmp(np->name, "ch-a") &&
-                                    strcmp(np->name, "ch-b")))
-                        return 1;
-
-                /* Media bay has too many resources, keep only first one */
-                if (index > 0 && !strcmp(np->name, "media-bay"))
-                        return 1;
-
-                /* Some older IDE resources have bogus sizes */
-                if (!(strcmp(np->name, "IDE") && strcmp(np->name, "ATA") &&
-                      strcmp(np->type, "ide") && strcmp(np->type, "ata"))) {
-                        if (index == 0 && (res->end - res->start) > 0xfff)
-                                res->end = res->start + 0xfff;
-                        if (index == 1 && (res->end - res->start) > 0xff)
-                                res->end = res->start + 0xff;
-                }
+        /* ESCC parent eats child resources. We could have added a
+         * level of hierarchy, but I don't really feel the need
+         * for it
+         */
+        if (!strcmp(np->name, "escc"))
+                return 1;
+
+        /* ESCC has bogus resources >= 3 */
+        if (index >= 3 && !(strcmp(np->name, "ch-a") &&
+                            strcmp(np->name, "ch-b")))
+                return 1;
+
+        /* Media bay has too many resources, keep only first one */
+        if (index > 0 && !strcmp(np->name, "media-bay"))
+                return 1;
+
+        /* Some older IDE resources have bogus sizes */
+        if (!(strcmp(np->name, "IDE") && strcmp(np->name, "ATA") &&
+              strcmp(np->type, "ide") && strcmp(np->type, "ata"))) {
+                if (index == 0 && (res->end - res->start) > 0xfff)
+                        res->end = res->start + 0xfff;
+                if (index == 1 && (res->end - res->start) > 0xff)
+                        res->end = res->start + 0xff;
         }
         return 0;
 }
 
+static void macio_create_fixup_irq(struct macio_dev *dev, int index,
+                                   unsigned int line)
+{
+        unsigned int irq;
 
-static void macio_setup_interrupts(struct macio_dev *dev)
+        irq = irq_create_mapping(NULL, line, 0);
+        if (irq != NO_IRQ) {
+                dev->interrupt[index].start = irq;
+                dev->interrupt[index].flags = IORESOURCE_IRQ;
+                dev->interrupt[index].name = dev->ofdev.dev.bus_id;
+        }
+        if (dev->n_interrupts <= index)
+                dev->n_interrupts = index + 1;
+}
+
+static void macio_add_missing_resources(struct macio_dev *dev)
 {
         struct device_node *np = dev->ofdev.node;
-        int i,j;
+        unsigned int irq_base;
+
+        /* Gatwick has some missing interrupts on child nodes */
+        if (dev->bus->chip->type != macio_gatwick)
+                return;
 
-        /* For now, we use pre-parsed entries in the device-tree for
-         * interrupt routing and addresses, but we should change that
-         * to dynamically parsed entries and so get rid of most of the
-         * clutter in struct device_node
+        /* irq_base is always 64 on gatwick. I have no cleaner way to get
+         * that value from here at this point
          */
-        for (i = j = 0; i < np->n_intrs; i++) {
+        irq_base = 64;
+
+        /* Fix SCC */
+        if (strcmp(np->name, "ch-a") == 0) {
+                macio_create_fixup_irq(dev, 0, 15 + irq_base);
+                macio_create_fixup_irq(dev, 1,  4 + irq_base);
+                macio_create_fixup_irq(dev, 2,  5 + irq_base);
+                printk(KERN_INFO "macio: fixed SCC irqs on gatwick\n");
+        }
+
+        /* Fix media-bay */
+        if (strcmp(np->name, "media-bay") == 0) {
+                macio_create_fixup_irq(dev, 0, 29 + irq_base);
+                printk(KERN_INFO "macio: fixed media-bay irq on gatwick\n");
+        }
+
+        /* Fix left media bay childs */
+        if (dev->media_bay != NULL && strcmp(np->name, "floppy") == 0) {
+                macio_create_fixup_irq(dev, 0, 19 + irq_base);
+                macio_create_fixup_irq(dev, 1,  1 + irq_base);
+                printk(KERN_INFO "macio: fixed left floppy irqs\n");
+        }
+        if (dev->media_bay != NULL && strcasecmp(np->name, "ata4") == 0) {
+                macio_create_fixup_irq(dev, 0, 14 + irq_base);
+                macio_create_fixup_irq(dev, 0,  3 + irq_base);
+                printk(KERN_INFO "macio: fixed left ide irqs\n");
+        }
+}
+
+static void macio_setup_interrupts(struct macio_dev *dev)
+{
+        struct device_node *np = dev->ofdev.node;
+        unsigned int irq;
+        int i = 0, j = 0;
+
+        for (;;) {
                 struct resource *res = &dev->interrupt[j];
 
                 if (j >= MACIO_DEV_COUNT_IRQS)
                         break;
-                res->start = np->intrs[i].line;
-                res->flags = IORESOURCE_IO;
-                if (np->intrs[j].sense)
-                        res->flags |= IORESOURCE_IRQ_LOWLEVEL;
-                else
-                        res->flags |= IORESOURCE_IRQ_HIGHEDGE;
+                irq = irq_of_parse_and_map(np, i++);
+                if (irq == NO_IRQ)
+                        break;
+                res->start = irq;
+                res->flags = IORESOURCE_IRQ;
                 res->name = dev->ofdev.dev.bus_id;
-                if (macio_resource_quirks(np, res, i))
+                if (macio_resource_quirks(np, res, i - 1)) {
                         memset(res, 0, sizeof(struct resource));
-                else
+                        continue;
+                } else
                         j++;
         }
         dev->n_interrupts = j;
@@ -445,6 +498,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
         /* Setup interrupts & resources */
         macio_setup_interrupts(dev);
         macio_setup_resources(dev, parent_res);
+        macio_add_missing_resources(dev);
 
         /* Register with core */
         if (of_device_register(&dev->ofdev) != 0) {
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index ff6d9bfdc3d2..f139a74696fe 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -497,8 +497,7 @@ int __init smu_init (void)
         smu->doorbell = *data;
         if (smu->doorbell < 0x50)
                 smu->doorbell += 0x50;
-        if (np->n_intrs > 0)
-                smu->db_irq = np->intrs[0].line;
+        smu->db_irq = irq_of_parse_and_map(np, 0);
 
         of_node_put(np);
 
@@ -515,8 +514,7 @@ int __init smu_init (void)
                 smu->msg = *data;
                 if (smu->msg < 0x50)
                         smu->msg += 0x50;
-                if (np->n_intrs > 0)
-                        smu->msg_irq = np->intrs[0].line;
+                smu->msg_irq = irq_of_parse_and_map(np, 0);
                 of_node_put(np);
         } while(0);
 
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c
index 6501db50fb83..69d5452fd22f 100644
--- a/drivers/macintosh/via-cuda.c
+++ b/drivers/macintosh/via-cuda.c
@@ -34,13 +34,6 @@
 static volatile unsigned char __iomem *via;
 static DEFINE_SPINLOCK(cuda_lock);
 
-#ifdef CONFIG_MAC
-#define CUDA_IRQ IRQ_MAC_ADB
-#define eieio()
-#else
-#define CUDA_IRQ vias->intrs[0].line
-#endif
-
 /* VIA registers - spaced 0x200 bytes apart */
 #define RS              0x200           /* skip between registers */
 #define B               0               /* B-side data */
@@ -189,11 +182,24 @@ int __init find_via_cuda(void)
 
 static int __init via_cuda_start(void)
 {
+    unsigned int irq;
+
     if (via == NULL)
         return -ENODEV;
 
-    if (request_irq(CUDA_IRQ, cuda_interrupt, 0, "ADB", cuda_interrupt)) {
-        printk(KERN_ERR "cuda_init: can't get irq %d\n", CUDA_IRQ);
+#ifdef CONFIG_MAC
+    irq = IRQ_MAC_ADB;
+#else /* CONFIG_MAC */
+    irq = irq_of_parse_and_map(vias, 0);
+    if (irq == NO_IRQ) {
+        printk(KERN_ERR "via-cuda: can't map interrupts for %s\n",
+               vias->full_name);
+        return -ENODEV;
+    }
+#endif /* CONFIG_MAP */
+
+    if (request_irq(irq, cuda_interrupt, 0, "ADB", cuda_interrupt)) {
+        printk(KERN_ERR "via-cuda: can't request irq %d\n", irq);
         return -EAGAIN;
     }
 
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index c1193d34ec9e..06ca80bfd6b9 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -64,10 +64,6 @@
 #include <asm/backlight.h>
 #endif
 
-#ifdef CONFIG_PPC32
-#include <asm/open_pic.h>
-#endif
-
 #include "via-pmu-event.h"
 
 /* Some compile options */
@@ -151,7 +147,7 @@ static int pmu_fully_inited = 0;
 static int pmu_has_adb;
 static struct device_node *gpio_node;
 static unsigned char __iomem *gpio_reg = NULL;
-static int gpio_irq = -1;
+static int gpio_irq = NO_IRQ;
 static int gpio_irq_enabled = -1;
 static volatile int pmu_suspended = 0;
 static spinlock_t pmu_lock;
@@ -403,22 +399,21 @@ static int __init pmu_init(void)
  */
 static int __init via_pmu_start(void)
 {
+        unsigned int irq;
+
         if (vias == NULL)
                 return -ENODEV;
 
         batt_req.complete = 1;
 
-#ifndef CONFIG_PPC_MERGE
-        if (pmu_kind == PMU_KEYLARGO_BASED)
-                openpic_set_irq_priority(vias->intrs[0].line,
-                                         OPENPIC_PRIORITY_DEFAULT + 1);
-#endif
-
-        if (request_irq(vias->intrs[0].line, via_pmu_interrupt, 0, "VIA-PMU",
-                        (void *)0)) {
-                printk(KERN_ERR "VIA-PMU: can't get irq %d\n",
-                       vias->intrs[0].line);
-                return -EAGAIN;
+        irq = irq_of_parse_and_map(vias, 0);
+        if (irq == NO_IRQ) {
+                printk(KERN_ERR "via-pmu: can't map interruptn");
+                return -ENODEV;
+        }
+        if (request_irq(irq, via_pmu_interrupt, 0, "VIA-PMU", (void *)0)) {
+                printk(KERN_ERR "via-pmu: can't request irq %d\n", irq);
+                return -ENODEV;
         }
 
         if (pmu_kind == PMU_KEYLARGO_BASED) {
@@ -426,10 +421,10 @@ static int __init via_pmu_start(void)
                 if (gpio_node == NULL)
                         gpio_node = of_find_node_by_name(NULL,
                                                          "pmu-interrupt");
-                if (gpio_node && gpio_node->n_intrs > 0)
-                        gpio_irq = gpio_node->intrs[0].line;
+                if (gpio_node)
+                        gpio_irq = irq_of_parse_and_map(gpio_node, 0);
 
-                if (gpio_irq != -1) {
+                if (gpio_irq != NO_IRQ) {
                         if (request_irq(gpio_irq, gpio1_interrupt, 0,
                                         "GPIO1 ADB", (void *)0))
                                 printk(KERN_ERR "pmu: can't get irq %d"
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index f2c0bf89f0c7..29e4b5aa6ead 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -242,12 +242,12 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
         }
         rc = request_irq(mp->tx_dma_intr, mace_txdma_intr, 0, "MACE-txdma", dev);
         if (rc) {
-                printk(KERN_ERR "MACE: can't get irq %d\n", mace->intrs[1].line);
+                printk(KERN_ERR "MACE: can't get irq %d\n", mp->tx_dma_intr);
                 goto err_free_irq;
         }
         rc = request_irq(mp->rx_dma_intr, mace_rxdma_intr, 0, "MACE-rxdma", dev);
         if (rc) {
-                printk(KERN_ERR "MACE: can't get irq %d\n", mace->intrs[2].line);
+                printk(KERN_ERR "MACE: can't get irq %d\n", mp->rx_dma_intr);
                 goto err_free_tx_irq;
         }
 
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 459c0231aef3..bfd2a22759eb 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1443,8 +1443,8 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
                         uap->flags &= ~PMACZILOG_FLAG_HAS_DMA;
                         goto no_dma;
                 }
-                uap->tx_dma_irq = np->intrs[1].line;
-                uap->rx_dma_irq = np->intrs[2].line;
+                uap->tx_dma_irq = irq_of_parse_and_map(np, 1);
+                uap->rx_dma_irq = irq_of_parse_and_map(np, 2);
         }
 no_dma:
 
@@ -1491,7 +1491,7 @@ no_dma:
          * Init remaining bits of "port" structure
          */
         uap->port.iotype = UPIO_MEM;
-        uap->port.irq = np->intrs[0].line;
+        uap->port.irq = irq_of_parse_and_map(np, 0);
         uap->port.uartclk = ZS_CLOCK;
         uap->port.fifosize = 1;
         uap->port.ops = &pmz_pops;