Pull thermal into release branch

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / 82xx / mpc82xx_ads.c

diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index 4276f087f26ef8e8e3f187ddeb8848f9848c1001..47cb09f08052837cb2c7f5621dfcca30c4a79f0b 100644 (file)
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -12,8 +12,6 @@
  * option) any later version.
  */
 
-
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -53,7 +51,7 @@
 #include <sysdev/fsl_soc.h>
 #include <../sysdev/cpm2_pic.h>
 
-#include "pq2ads_pd.h"
+#include "pq2ads.h"
 
 #ifdef CONFIG_PCI
 static uint pci_clk_frq;
@@ -384,8 +382,7 @@ struct hw_interrupt_type m82xx_pci_ic = {
 };
 
 static void
-m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc,
-                   struct pt_regs *regs)
+m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
        unsigned long stat, mask, pend;
        int bit;
@@ -398,7 +395,7 @@ m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc,
                        break;
                for (bit = 0; pend != 0; ++bit, pend <<= 1) {
                        if (pend & 0x80000000)
-                               __do_IRQ(pci_int_base + bit, regs);
+                               __do_IRQ(pci_int_base + bit);
                }
        }
 }
@@ -459,7 +456,7 @@ void m82xx_pci_init_irq(void)
                iounmap(immap);
                return;
        }
-       irq_map = get_property(np, "interrupt-map", &size);
+       irq_map = of_get_property(np, "interrupt-map", &size);
        if ((!irq_map) || (size <= 7)) {
                printk(KERN_INFO "No interrupt-map property of pci node\n");
                iounmap(immap);
@@ -484,7 +481,7 @@ void m82xx_pci_init_irq(void)
        }
        pci_pic_node = of_node_get(np);
        /* PCI interrupt controller registers: status and mask */
-       regs = get_property(np, "reg", &size);
+       regs = of_get_property(np, "reg", &size);
        if ((!regs) || (size <= 2)) {
                printk(KERN_INFO "No reg property in pci pic node\n");
                iounmap(immap);
@@ -518,36 +515,26 @@ static int m82xx_pci_exclude_device(u_char bus, u_char devfn)
                return PCIBIOS_SUCCESSFUL;
 }
 
-static void
-__init mpc82xx_pcibios_fixup(void)
-{
-       struct pci_dev *dev = NULL;
-
-       for_each_pci_dev(dev) {
-               pci_read_irq_line(dev);
-       }
-}
-
 void __init add_bridge(struct device_node *np)
 {
        int len;
        struct pci_controller *hose;
        struct resource r;
        const int *bus_range;
-       const void *ptr;
+       const uint *ptr;
 
        memset(&r, 0, sizeof(r));
        if (of_address_to_resource(np, 0, &r)) {
                printk(KERN_INFO "No PCI reg property in device tree\n");
                return;
        }
-       if (!(ptr = get_property(np, "clock-frequency", NULL))) {
+       if (!(ptr = of_get_property(np, "clock-frequency", NULL))) {
                printk(KERN_INFO "No clock-frequency property in PCI node");
                return;
        }
-       pci_clk_frq = *(uint *) ptr;
+       pci_clk_frq = *ptr;
        of_node_put(np);
-       bus_range = get_property(np, "bus-range", &len);
+       bus_range = of_get_property(np, "bus-range", &len);
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                printk(KERN_WARNING "Can't get bus-range for %s, assume"
                       " bus 0\n", np->full_name);
@@ -600,9 +587,6 @@ static void __init mpc82xx_ads_setup_arch(void)
                add_bridge(np);
 
        of_node_put(np);
-       ppc_md.pci_map_irq = NULL;
-       ppc_md.pcibios_fixup = mpc82xx_pcibios_fixup;
-       ppc_md.pcibios_fixup_bus = NULL;
 #endif
 
 #ifdef  CONFIG_ROOT_NFS