Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / chrp / pci.c

diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 0f4340506c758bda68b119dd22cba485c065b6fb..d32fedc991d36d5a98452dcab5eccfbec09676c8 100644 (file)
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -7,7 +7,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/ide.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
@@ -137,9 +136,11 @@ hydra_init(void)
        struct device_node *np;
        struct resource r;
 
-       np = find_devices("mac-io");
-       if (np == NULL || of_address_to_resource(np, 0, &r))
+       np = of_find_node_by_name(NULL, "mac-io");
+       if (np == NULL || of_address_to_resource(np, 0, &r)) {
+               of_node_put(np);
                return 0;
+       }
        Hydra = ioremap(r.start, r.end-r.start);
        printk("Hydra Mac I/O at %llx\n", (unsigned long long)r.start);
        printk("Hydra Feature_Control was %x",
@@ -156,15 +157,6 @@ hydra_init(void)
        return 1;
 }
 
-void __init
-chrp_pcibios_fixup(void)
-{
-       struct pci_dev *dev = NULL;
-
-       for_each_pci_dev(dev)
-               pci_read_irq_line(dev);
-}
-
 #define PRG_CL_RESET_VALID 0x00010000
 
 static void __init
@@ -195,10 +187,9 @@ setup_python(struct pci_controller *hose, struct device_node *dev)
 /* Marvell Discovery II based Pegasos 2 */
 static void __init setup_peg2(struct pci_controller *hose, struct device_node *dev)
 {
-       struct device_node *root = find_path_device("/");
+       struct device_node *root = of_find_node_by_path("/");
        struct device_node *rtas;
 
-       of_node_get(root);
        rtas = of_find_node_by_name (root, "rtas");
        if (rtas) {
                hose->ops = &rtas_pci_ops;
@@ -208,6 +199,7 @@ static void __init setup_peg2(struct pci_controller *hose, struct device_node *d
                        " your firmware\n");
        }
        pci_assign_all_buses = 1;
+       /* keep the reference to the root node */
 }
 
 void __init
@@ -220,14 +212,14 @@ chrp_find_bridges(void)
        const unsigned int *dma;
        const char *model, *machine;
        int is_longtrail = 0, is_mot = 0, is_pegasos = 0;
-       struct device_node *root = find_path_device("/");
+       struct device_node *root = of_find_node_by_path("/");
        struct resource r;
        /*
         * The PCI host bridge nodes on some machines don't have
         * properties to adequately identify them, so we have to
         * look at what sort of machine this is as well.
         */
-       machine = get_property(root, "model", NULL);
+       machine = of_get_property(root, "model", NULL);
        if (machine != NULL) {
                is_longtrail = strncmp(machine, "IBM,LongTrail", 13) == 0;
                is_mot = strncmp(machine, "MOT", 3) == 0;
@@ -246,7 +238,7 @@ chrp_find_bridges(void)
                               dev->full_name);
                        continue;
                }
-               bus_range = get_property(dev, "bus-range", &len);
+               bus_range = of_get_property(dev, "bus-range", &len);
                if (bus_range == NULL || len < 2 * sizeof(int)) {
                        printk(KERN_WARNING "Can't get bus-range for %s\n",
                                dev->full_name);
@@ -272,10 +264,10 @@ chrp_find_bridges(void)
                hose->first_busno = bus_range[0];
                hose->last_busno = bus_range[1];
 
-               model = get_property(dev, "model", NULL);
+               model = of_get_property(dev, "model", NULL);
                if (model == NULL)
                        model = "<none>";
-               if (device_is_compatible(dev, "IBM,python")) {
+               if (of_device_is_compatible(dev, "IBM,python")) {
                        setup_python(hose, dev);
                } else if (is_mot
                           || strncmp(model, "Motorola, Grackle", 17) == 0) {
@@ -294,7 +286,8 @@ chrp_find_bridges(void)
                                           r.start + 0x000f8000,
                                           r.start + 0x000f8010);
                        if (index == 0) {
-                               dma = get_property(dev, "system-dma-base",&len);
+                               dma = of_get_property(dev, "system-dma-base",
+                                                       &len);
                                if (dma && len >= sizeof(*dma)) {
                                        dma = (unsigned int *)
                                                (((unsigned long)dma) +
@@ -312,12 +305,13 @@ chrp_find_bridges(void)
 
                /* check the first bridge for a property that we can
                   use to set pci_dram_offset */
-               dma = get_property(dev, "ibm,dma-ranges", &len);
+               dma = of_get_property(dev, "ibm,dma-ranges", &len);
                if (index == 0 && dma != NULL && len >= 6 * sizeof(*dma)) {
                        pci_dram_offset = dma[2] - dma[3];
                        printk("pci_dram_offset = %lx\n", pci_dram_offset);
                }
        }
+       of_node_put(root);
 }
 
 /* SL82C105 IDE Control/Status Register */