Merge branch 'linux-2.6' into for-2.6.24

4 files changed, 27 insertions, 39 deletions

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 2326d5dc5752..ab037a3a40db 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -59,8 +59,7 @@
 struct axon_ram_bank {
         struct of_device        *device;
         struct gendisk          *disk;
-        unsigned int            irq_correctable;
-        unsigned int            irq_uncorrectable;
+        unsigned int            irq_id;
         unsigned long           ph_addr;
         unsigned long           io_addr;
         unsigned long           size;
@@ -93,16 +92,9 @@ axon_ram_irq_handler(int irq, void *dev)
 
         BUG_ON(!bank);
 
-        if (irq == bank->irq_correctable) {
-                dev_err(&device->dev, "Correctable memory error occured\n");
-                bank->ecc_counter++;
-                return IRQ_HANDLED;
-        } else if (irq == bank->irq_uncorrectable) {
-                dev_err(&device->dev, "Uncorrectable memory error occured\n");
-                panic("Critical ECC error on %s", device->node->full_name);
-        }
-
-        return IRQ_NONE;
+        dev_err(&device->dev, "Correctable memory error occured\n");
+        bank->ecc_counter++;
+        return IRQ_HANDLED;
 }
 
 /**
@@ -259,28 +251,18 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
         blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
         add_disk(bank->disk);
 
-        bank->irq_correctable = irq_of_parse_and_map(device->node, 0);
-        bank->irq_uncorrectable = irq_of_parse_and_map(device->node, 1);
-        if ((bank->irq_correctable <= 0) || (bank->irq_uncorrectable <= 0)) {
+        bank->irq_id = irq_of_parse_and_map(device->node, 0);
+        if (bank->irq_id == NO_IRQ) {
                 dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
                 rc = -EFAULT;
                 goto failed;
         }
 
-        rc = request_irq(bank->irq_correctable, axon_ram_irq_handler,
-                        AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
-        if (rc != 0) {
-                dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
-                bank->irq_correctable = bank->irq_uncorrectable = 0;
-                rc = -EFAULT;
-                goto failed;
-        }
-
-        rc = request_irq(bank->irq_uncorrectable, axon_ram_irq_handler,
+        rc = request_irq(bank->irq_id, axon_ram_irq_handler,
                         AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
         if (rc != 0) {
                 dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
-                bank->irq_uncorrectable = 0;
+                bank->irq_id = NO_IRQ;
                 rc = -EFAULT;
                 goto failed;
         }
@@ -296,13 +278,9 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
 
 failed:
         if (bank != NULL) {
-                if (bank->irq_uncorrectable > 0)
-                        free_irq(bank->irq_uncorrectable, device);
-                if (bank->irq_correctable > 0)
-                        free_irq(bank->irq_correctable, device);
+                if (bank->irq_id != NO_IRQ)
+                        free_irq(bank->irq_id, device);
                 if (bank->disk != NULL) {
-                        if (bank->disk->queue != NULL)
-                                blk_cleanup_queue(bank->disk->queue);
                         if (bank->disk->major > 0)
                                 unregister_blkdev(bank->disk->major,
                                                 bank->disk->disk_name);
@@ -329,9 +307,7 @@ axon_ram_remove(struct of_device *device)
         BUG_ON(!bank || !bank->disk);
 
         device_remove_file(&device->dev, &dev_attr_ecc);
-        free_irq(bank->irq_uncorrectable, device);
-        free_irq(bank->irq_correctable, device);
-        blk_cleanup_queue(bank->disk->queue);
+        free_irq(bank->irq_id, device);
         unregister_blkdev(bank->disk->major, bank->disk->disk_name);
         del_gendisk(bank->disk);
         iounmap((void __iomem *) bank->io_addr);
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 9fb0ce5c7176..114c90f8f560 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -251,6 +251,8 @@ DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8568E, quirk_fsl_pcie_transpare
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8568, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8567E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8567, quirk_fsl_pcie_transparent);
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533E, quirk_fsl_pcie_transparent);
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent);
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 565f57d777fe..f3abce11bead 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
 #include <linux/phy.h>
 #include <linux/fsl_devices.h>
 #include <linux/fs_enet_pd.h>
diff --git a/arch/powerpc/sysdev/rtc_cmos_setup.c b/arch/powerpc/sysdev/rtc_cmos_setup.c
index e276048b8c5f..0c9ac7ee08fb 100644
--- a/arch/powerpc/sysdev/rtc_cmos_setup.c
+++ b/arch/powerpc/sysdev/rtc_cmos_setup.c
@@ -20,14 +20,16 @@ static int  __init add_rtc(void)
 {
         struct device_node *np;
         struct platform_device *pd;
-        struct resource res;
+        struct resource res[2];
         int ret;
 
+        memset(&res, 0, sizeof(res));
+
         np = of_find_compatible_node(NULL, NULL, "pnpPNP,b00");
         if (!np)
                 return -ENODEV;
 
-        ret = of_address_to_resource(np, 0, &res);
+        ret = of_address_to_resource(np, 0, &res[0]);
         of_node_put(np);
         if (ret)
                 return ret;
@@ -36,11 +38,18 @@ static int  __init add_rtc(void)
          * RTC_PORT(x) is hardcoded in asm/mc146818rtc.h.  Verify that the
          * address provided by the device node matches.
          */
-        if (res.start != RTC_PORT(0))
+        if (res[0].start != RTC_PORT(0))
                 return -EINVAL;
 
+        /* Use a fixed interrupt value of 8 since on PPC if we are using this
+         * its off an i8259 which we ensure has interrupt numbers 0..15. */
+        res[1].start = 8;
+        res[1].end = 8;
+        res[1].flags = IORESOURCE_IRQ;
+
         pd = platform_device_register_simple("rtc_cmos", -1,
-                                             &res, 1);
+                                             &res[0], 2);
+
         if (IS_ERR(pd))
                 return PTR_ERR(pd);