14 files changed, 186 insertions, 171 deletions

diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
new file mode 100644
index 000000000000..5b7afe50039a
--- /dev/null
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -0,0 +1,20 @@
+config PPC_PMAC
+        bool "Apple PowerMac based machines"
+        depends on PPC_MULTIPLATFORM
+        select MPIC
+        select PPC_INDIRECT_PCI if PPC32
+        select PPC_MPC106 if PPC32
+        select PPC_NATIVE
+        default y
+
+config PPC_PMAC64
+        bool
+        depends on PPC_PMAC && POWER4
+        select MPIC
+        select U3_DART
+        select MPIC_U3_HT_IRQS
+        select GENERIC_TBSYNC
+        select PPC_970_NAP
+        default y
+
+
diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c
index de7440e62cc4..d679964ae2ab 100644
--- a/arch/powerpc/platforms/powermac/backlight.c
+++ b/arch/powerpc/platforms/powermac/backlight.c
@@ -56,13 +56,16 @@ struct backlight_device *pmac_backlight;
 
 int pmac_has_backlight_type(const char *type)
 {
-        struct device_node* bk_node = find_devices("backlight");
+        struct device_node* bk_node = of_find_node_by_name(NULL, "backlight");
 
         if (bk_node) {
-                const char *prop = get_property(bk_node,
+                const char *prop = of_get_property(bk_node,
                                 "backlight-control", NULL);
-                if (prop && strncmp(prop, type, strlen(type)) == 0)
+                if (prop && strncmp(prop, type, strlen(type)) == 0) {
+                        of_node_put(bk_node);
                         return 1;
+                }
+                of_node_put(bk_node);
         }
 
         return 0;
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index c2b6b4134f68..8943a9456bb7 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -421,7 +421,7 @@ static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
 static u32 read_gpio(struct device_node *np)
 {
-        const u32 *reg = get_property(np, "reg", NULL);
+        const u32 *reg = of_get_property(np, "reg", NULL);
         u32 offset;
 
         if (reg == NULL)
@@ -521,13 +521,14 @@ static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
                 int lenp, rc;
                 const u32 *freqs, *ratio;
 
-                freqs = get_property(cpunode, "bus-frequencies", &lenp);
+                freqs = of_get_property(cpunode, "bus-frequencies", &lenp);
                 lenp /= sizeof(u32);
                 if (freqs == NULL || lenp != 2) {
                         printk(KERN_ERR "cpufreq: bus-frequencies incorrect or missing\n");
                         return 1;
                 }
-                ratio = get_property(cpunode, "processor-to-bus-ratio*2", NULL);
+                ratio = of_get_property(cpunode, "processor-to-bus-ratio*2",
+                                                NULL);
                 if (ratio == NULL) {
                         printk(KERN_ERR "cpufreq: processor-to-bus-ratio*2 missing\n");
                         return 1;
@@ -562,7 +563,7 @@ static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
         /* If we use the PMU, look for the min & max frequencies in the
          * device-tree
          */
-        value = get_property(cpunode, "min-clock-frequency", NULL);
+        value = of_get_property(cpunode, "min-clock-frequency", NULL);
         if (!value)
                 return 1;
         low_freq = (*value) / 1000;
@@ -571,7 +572,7 @@ static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
         if (low_freq < 100000)
                 low_freq *= 10;
 
-        value = get_property(cpunode, "max-clock-frequency", NULL);
+        value = of_get_property(cpunode, "max-clock-frequency", NULL);
         if (!value)
                 return 1;
         hi_freq = (*value) / 1000;
@@ -585,7 +586,7 @@ static int pmac_cpufreq_init_7447A(struct device_node *cpunode)
 {
         struct device_node *volt_gpio_np;
 
-        if (get_property(cpunode, "dynamic-power-step", NULL) == NULL)
+        if (of_get_property(cpunode, "dynamic-power-step", NULL) == NULL)
                 return 1;
 
         volt_gpio_np = of_find_node_by_name(NULL, "cpu-vcore-select");
@@ -614,11 +615,11 @@ static int pmac_cpufreq_init_750FX(struct device_node *cpunode)
         u32 pvr;
         const u32 *value;
 
-        if (get_property(cpunode, "dynamic-power-step", NULL) == NULL)
+        if (of_get_property(cpunode, "dynamic-power-step", NULL) == NULL)
                 return 1;
 
         hi_freq = cur_freq;
-        value = get_property(cpunode, "reduced-clock-frequency", NULL);
+        value = of_get_property(cpunode, "reduced-clock-frequency", NULL);
         if (!value)
                 return 1;
         low_freq = (*value) / 1000;
@@ -657,19 +658,19 @@ static int __init pmac_cpufreq_setup(void)
                 return 0;
 
         /* Assume only one CPU */
-        cpunode = find_type_devices("cpu");
+        cpunode = of_find_node_by_type(NULL, "cpu");
         if (!cpunode)
                 goto out;
 
         /* Get current cpu clock freq */
-        value = get_property(cpunode, "clock-frequency", NULL);
+        value = of_get_property(cpunode, "clock-frequency", NULL);
         if (!value)
                 goto out;
         cur_freq = (*value) / 1000;
 
         /*  Check for 7447A based MacRISC3 */
         if (machine_is_compatible("MacRISC3") &&
-            get_property(cpunode, "dynamic-power-step", NULL) &&
+            of_get_property(cpunode, "dynamic-power-step", NULL) &&
             PVR_VER(mfspr(SPRN_PVR)) == 0x8003) {
                 pmac_cpufreq_init_7447A(cpunode);
         /* Check for other MacRISC3 machines */
@@ -707,6 +708,7 @@ static int __init pmac_cpufreq_setup(void)
         else if (PVR_VER(mfspr(SPRN_PVR)) == 0x7000)
                 pmac_cpufreq_init_750FX(cpunode);
 out:
+        of_node_put(cpunode);
         if (set_speed_proc == NULL)
                 return -ENODEV;
 
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 9d22361a26d6..567d5523b690 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -410,7 +410,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         /* Get first CPU node */
         for (cpunode = NULL;
              (cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
-                const u32 *reg = get_property(cpunode, "reg", NULL);
+                const u32 *reg = of_get_property(cpunode, "reg", NULL);
                 if (reg == NULL || (*reg) != 0)
                         continue;
                 if (!strcmp(cpunode->type, "cpu"))
@@ -422,7 +422,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         }
 
         /* Check 970FX for now */
-        valp = get_property(cpunode, "cpu-version", NULL);
+        valp = of_get_property(cpunode, "cpu-version", NULL);
         if (!valp) {
                 DBG("No cpu-version property !\n");
                 goto bail_noprops;
@@ -434,7 +434,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         }
 
         /* Look for the powertune data in the device-tree */
-        g5_pmode_data = get_property(cpunode, "power-mode-data",&psize);
+        g5_pmode_data = of_get_property(cpunode, "power-mode-data",&psize);
         if (!g5_pmode_data) {
                 DBG("No power-mode-data !\n");
                 goto bail_noprops;
@@ -493,7 +493,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
          * half freq in this version. So far, I haven't yet seen a machine
          * supporting anything else.
          */
-        valp = get_property(cpunode, "clock-frequency", NULL);
+        valp = of_get_property(cpunode, "clock-frequency", NULL);
         if (!valp)
                 return -ENODEV;
         max_freq = (*valp)/1000;
@@ -563,7 +563,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
         /* Lookup the cpuid eeprom node */
         cpuid = of_find_node_by_path("/u3@0,f8000000/i2c@f8001000/cpuid@a0");
         if (cpuid != NULL)
-                eeprom = get_property(cpuid, "cpuid", NULL);
+                eeprom = of_get_property(cpuid, "cpuid", NULL);
         if (eeprom == NULL) {
                 printk(KERN_ERR "cpufreq: Can't find cpuid EEPROM !\n");
                 rc = -ENODEV;
@@ -573,13 +573,13 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
         /* Lookup the i2c hwclock */
         for (hwclock = NULL;
              (hwclock = of_find_node_by_name(hwclock, "i2c-hwclock")) != NULL;){
-                const char *loc = get_property(hwclock,
+                const char *loc = of_get_property(hwclock,
                                 "hwctrl-location", NULL);
                 if (loc == NULL)
                         continue;
                 if (strcmp(loc, "CPU CLOCK"))
                         continue;
-                if (!get_property(hwclock, "platform-get-frequency", NULL))
+                if (!of_get_property(hwclock, "platform-get-frequency", NULL))
                         continue;
                 break;
         }
@@ -638,7 +638,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
          */
 
         /* Get max frequency from device-tree */
-        valp = get_property(cpunode, "clock-frequency", NULL);
+        valp = of_get_property(cpunode, "clock-frequency", NULL);
         if (!valp) {
                 printk(KERN_ERR "cpufreq: Can't find CPU frequency !\n");
                 rc = -ENODEV;
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 24cc50c1774a..52cfdd86c928 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -1044,6 +1044,7 @@ core99_reset_cpu(struct device_node *node, long param, long value)
         unsigned long flags;
         struct macio_chip *macio;
         struct device_node *np;
+        struct device_node *cpus;
         const int dflt_reset_lines[] = {        KL_GPIO_RESET_CPU0,
                                                 KL_GPIO_RESET_CPU1,
                                                 KL_GPIO_RESET_CPU2,
@@ -1053,12 +1054,12 @@ core99_reset_cpu(struct device_node *node, long param, long value)
         if (macio->type != macio_keylargo)
                 return -ENODEV;
 
-        np = find_path_device("/cpus");
-        if (np == NULL)
+        cpus = of_find_node_by_path("/cpus");
+        if (cpus == NULL)
                 return -ENODEV;
-        for (np = np->child; np != NULL; np = np->sibling) {
-                const u32 *num = get_property(np, "reg", NULL);
-                const u32 *rst = get_property(np, "soft-reset", NULL);
+        for (np = cpus->child; np != NULL; np = np->sibling) {
+                const u32 *num = of_get_property(np, "reg", NULL);
+                const u32 *rst = of_get_property(np, "soft-reset", NULL);
                 if (num == NULL || rst == NULL)
                         continue;
                 if (param == *num) {
@@ -1066,6 +1067,7 @@ core99_reset_cpu(struct device_node *node, long param, long value)
                         break;
                 }
         }
+        of_node_put(cpus);
         if (np == NULL || reset_io == 0)
                 reset_io = dflt_reset_lines[param];
 
@@ -1095,7 +1097,7 @@ core99_usb_enable(struct device_node *node, long param, long value)
             macio->type != macio_intrepid)
                 return -ENODEV;
 
-        prop = get_property(node, "AAPL,clock-id", NULL);
+        prop = of_get_property(node, "AAPL,clock-id", NULL);
         if (!prop)
                 return -ENODEV;
         if (strncmp(prop, "usb0u048", 8) == 0)
@@ -1497,17 +1499,18 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
         unsigned long flags;
         struct macio_chip *macio;
         struct device_node *np;
+        struct device_node *cpus;
 
         macio = &macio_chips[0];
         if (macio->type != macio_keylargo2 && macio->type != macio_shasta)
                 return -ENODEV;
 
-        np = find_path_device("/cpus");
-        if (np == NULL)
+        cpus = of_find_node_by_path("/cpus");
+        if (cpus == NULL)
                 return -ENODEV;
-        for (np = np->child; np != NULL; np = np->sibling) {
-                const u32 *num = get_property(np, "reg", NULL);
-                const u32 *rst = get_property(np, "soft-reset", NULL);
+        for (np = cpus->child; np != NULL; np = np->sibling) {
+                const u32 *num = of_get_property(np, "reg", NULL);
+                const u32 *rst = of_get_property(np, "soft-reset", NULL);
                 if (num == NULL || rst == NULL)
                         continue;
                 if (param == *num) {
@@ -1515,6 +1518,7 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
                         break;
                 }
         }
+        of_node_put(cpus);
         if (np == NULL || reset_io == 0)
                 return -ENODEV;
 
@@ -2404,14 +2408,15 @@ static int __init probe_motherboard(void)
         struct macio_chip *macio = &macio_chips[0];
         const char *model = NULL;
         struct device_node *dt;
+        int ret = 0;
 
         /* Lookup known motherboard type in device-tree. First try an
          * exact match on the "model" property, then try a "compatible"
          * match is none is found.
          */
-        dt = find_devices("device-tree");
+        dt = of_find_node_by_name(NULL, "device-tree");
         if (dt != NULL)
-                model = get_property(dt, "model", NULL);
+                model = of_get_property(dt, "model", NULL);
         for(i=0; model && i<(sizeof(pmac_mb_defs)/sizeof(struct pmac_mb_def)); i++) {
             if (strcmp(model, pmac_mb_defs[i].model_string) == 0) {
                 pmac_mb = pmac_mb_defs[i];
@@ -2474,15 +2479,18 @@ static int __init probe_motherboard(void)
                 break;
 #endif /* CONFIG_POWER4 */
         default:
-                return -ENODEV;
+                ret = -ENODEV;
+                goto done;
         }
 found:
 #ifndef CONFIG_POWER4
         /* Fixup Hooper vs. Comet */
         if (pmac_mb.model_id == PMAC_TYPE_HOOPER) {
                 u32 __iomem * mach_id_ptr = ioremap(0xf3000034, 4);
-                if (!mach_id_ptr)
-                        return -ENODEV;
+                if (!mach_id_ptr) {
+                        ret = -ENODEV;
+                        goto done;
+                }
                 /* Here, I used to disable the media-bay on comet. It
                  * appears this is wrong, the floppy connector is actually
                  * a kind of media-bay and works with the current driver.
@@ -2499,18 +2507,26 @@ found:
          * that all Apple OF revs did it properly, I do it the paranoid way.
          */
         while (uninorth_base && uninorth_rev > 3) {
-                struct device_node *np = find_path_device("/cpus");
-                if (!np || !np->child) {
+                struct device_node *cpus = of_find_node_by_path("/cpus");
+                struct device_node *np;
+
+                if (!cpus || !cpus->child) {
                         printk(KERN_WARNING "Can't find CPU(s) in device tree !\n");
+                        of_node_put(cpus);
                         break;
                 }
-                np = np->child;
+                np = cpus->child;
                 /* Nap mode not supported on SMP */
-                if (np->sibling)
+                if (np->sibling) {
+                        of_node_put(cpus);
                         break;
+                }
                 /* Nap mode not supported if flush-on-lock property is present */
-                if (get_property(np, "flush-on-lock", NULL))
+                if (of_get_property(np, "flush-on-lock", NULL)) {
+                        of_node_put(cpus);
                         break;
+                }
+                of_node_put(cpus);
                 powersave_nap = 1;
                 printk(KERN_DEBUG "Processor NAP mode on idle enabled.\n");
                 break;
@@ -2532,7 +2548,9 @@ found:
 
 
         printk(KERN_INFO "PowerMac motherboard: %s\n", pmac_mb.model_name);
-        return 0;
+done:
+        of_node_put(dt);
+        return ret;
 }
 
 /* Initialize the Core99 UniNorth host bridge and memory controller
@@ -2558,7 +2576,7 @@ static void __init probe_uninorth(void)
         if (uninorth_node == NULL)
                 return;
 
-        addrp = get_property(uninorth_node, "reg", NULL);
+        addrp = of_get_property(uninorth_node, "reg", NULL);
         if (addrp == NULL)
                 return;
         address = of_translate_address(uninorth_node, addrp);
@@ -2642,7 +2660,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
                 return;
         }
         if (type == macio_keylargo || type == macio_keylargo2) {
-                const u32 *did = get_property(node, "device-id", NULL);
+                const u32 *did = of_get_property(node, "device-id", NULL);
                 if (*did == 0x00000025)
                         type = macio_pangea;
                 if (*did == 0x0000003e)
@@ -2655,7 +2673,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
         macio_chips[i].base     = base;
         macio_chips[i].flags    = MACIO_FLAG_SCCB_ON | MACIO_FLAG_SCCB_ON;
         macio_chips[i].name     = macio_names[type];
-        revp = get_property(node, "revision-id", NULL);
+        revp = of_get_property(node, "revision-id", NULL);
         if (revp)
                 macio_chips[i].rev = *revp;
         printk(KERN_INFO "Found a %s mac-io controller, rev: %d, mapped at 0x%p\n",
@@ -2706,8 +2724,8 @@ initial_serial_shutdown(struct device_node *np)
         int port_type = PMAC_SCC_ASYNC;
         int modem = 0;
 
-        slots = get_property(np, "slot-names", &len);
-        conn = get_property(np, "AAPL,connector", &len);
+        slots = of_get_property(np, "slot-names", &len);
+        conn = of_get_property(np, "AAPL,connector", &len);
         if (conn && (strcmp(conn, "infrared") == 0))
                 port_type = PMAC_SCC_IRDA;
         else if (device_is_compatible(np, "cobalt"))
@@ -2735,12 +2753,14 @@ set_initial_features(void)
          * differenciate them all and since that hack was there for a long
          * time, I'll keep it around
          */
-        if (macio_chips[0].type == macio_ohare && !find_devices("via-pmu")) {
+        if (macio_chips[0].type == macio_ohare) {
                 struct macio_chip *macio = &macio_chips[0];
-                MACIO_OUT32(OHARE_FCR, STARMAX_FEATURES);
-        } else if (macio_chips[0].type == macio_ohare) {
-                struct macio_chip *macio = &macio_chips[0];
-                MACIO_BIS(OHARE_FCR, OH_IOBUS_ENABLE);
+                np = of_find_node_by_name(NULL, "via-pmu");
+                if (np)
+                        MACIO_BIS(OHARE_FCR, OH_IOBUS_ENABLE);
+                else
+                        MACIO_OUT32(OHARE_FCR, STARMAX_FEATURES);
+                of_node_put(np);
         } else if (macio_chips[1].type == macio_ohare) {
                 struct macio_chip *macio = &macio_chips[1];
                 MACIO_BIS(OHARE_FCR, OH_IOBUS_ENABLE);
@@ -2833,14 +2853,13 @@ set_initial_features(void)
                 }
 
                 /* Switch airport off */
-                np = find_devices("radio");
-                while(np) {
+                for_each_node_by_name(np, "radio") {
                         if (np && np->parent == macio_chips[0].of_node) {
                                 macio_chips[0].flags |= MACIO_FLAG_AIRPORT_ON;
                                 core99_airport_enable(np, 0, 0);
                         }
-                        np = np->next;
                 }
+                of_node_put(np);
         }
 
         /* On all machines that support sound PM, switch sound off */
@@ -2860,16 +2879,12 @@ set_initial_features(void)
 #endif /* CONFIG_POWER4 */
 
         /* On all machines, switch modem & serial ports off */
-        np = find_devices("ch-a");
-        while(np) {
+        for_each_node_by_name(np, "ch-a")
                 initial_serial_shutdown(np);
-                np = np->next;
-        }
-        np = find_devices("ch-b");
-        while(np) {
+        of_node_put(np);
+        for_each_node_by_name(np, "ch-b")
                 initial_serial_shutdown(np);
-                np = np->next;
-        }
+        of_node_put(np);
 }
 
 void __init
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index bfc4829162f1..5430e146b3e9 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -491,7 +491,7 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
          * on all i2c keywest nodes so far ... we would have to fallback
          * to macio parsing if that wasn't the case
          */
-        addrp = get_property(np, "AAPL,address", NULL);
+        addrp = of_get_property(np, "AAPL,address", NULL);
         if (addrp == NULL) {
                 printk(KERN_ERR "low_i2c: Can't find address for %s\n",
                        np->full_name);
@@ -505,13 +505,13 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
         host->timeout_timer.function = kw_i2c_timeout;
         host->timeout_timer.data = (unsigned long)host;
 
-        psteps = get_property(np, "AAPL,address-step", NULL);
+        psteps = of_get_property(np, "AAPL,address-step", NULL);
         steps = psteps ? (*psteps) : 0x10;
         for (host->bsteps = 0; (steps & 0x01) == 0; host->bsteps++)
                 steps >>= 1;
         /* Select interface rate */
         host->speed = KW_I2C_MODE_25KHZ;
-        prate = get_property(np, "AAPL,i2c-rate", NULL);
+        prate = of_get_property(np, "AAPL,i2c-rate", NULL);
         if (prate) switch(*prate) {
         case 100:
                 host->speed = KW_I2C_MODE_100KHZ;
@@ -619,7 +619,7 @@ static void __init kw_i2c_probe(void)
                 } else {
                         for (child = NULL;
                              (child = of_get_next_child(np, child)) != NULL;) {
-                                const u32 *reg = get_property(child,
+                                const u32 *reg = of_get_property(child,
                                                 "reg", NULL);
                                 if (reg == NULL)
                                         continue;
@@ -905,7 +905,7 @@ static void __init smu_i2c_probe(void)
                 if (strcmp(busnode->type, "i2c") &&
                     strcmp(busnode->type, "i2c-bus"))
                         continue;
-                reg = get_property(busnode, "reg", NULL);
+                reg = of_get_property(busnode, "reg", NULL);
                 if (reg == NULL)
                         continue;
 
@@ -950,7 +950,8 @@ struct pmac_i2c_bus *pmac_i2c_find_bus(struct device_node *node)
                         if (p == bus->busnode) {
                                 if (prev && bus->flags & pmac_i2c_multibus) {
                                         const u32 *reg;
-                                        reg = get_property(prev, "reg", NULL);
+                                        reg = of_get_property(prev, "reg",
+                                                                NULL);
                                         if (!reg)
                                                 continue;
                                         if (((*reg) >> 8) != bus->channel)
@@ -971,7 +972,7 @@ EXPORT_SYMBOL_GPL(pmac_i2c_find_bus);
 
 u8 pmac_i2c_get_dev_addr(struct device_node *device)
 {
-        const u32 *reg = get_property(device, "reg", NULL);
+        const u32 *reg = of_get_property(device, "reg", NULL);
 
         if (reg == NULL)
                 return 0;
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 6fbac308ded6..22c4ae4c6934 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -70,11 +70,11 @@ static int __init fixup_one_level_bus_range(struct device_node *node, int higher
                 int len;
 
                 /* For PCI<->PCI bridges or CardBus bridges, we go down */
-                class_code = get_property(node, "class-code", NULL);
+                class_code = of_get_property(node, "class-code", NULL);
                 if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI &&
                         (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS))
                         continue;
-                bus_range = get_property(node, "bus-range", &len);
+                bus_range = of_get_property(node, "bus-range", &len);
                 if (bus_range != NULL && len > 2 * sizeof(int)) {
                         if (bus_range[1] > higher)
                                 higher = bus_range[1];
@@ -100,7 +100,7 @@ static void __init fixup_bus_range(struct device_node *bridge)
         if (prop == NULL || prop->length < 2 * sizeof(int))
                 return;
 
-        bus_range = (int *)prop->value;
+        bus_range = prop->value;
         bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]);
 }
 
@@ -246,8 +246,8 @@ static int chaos_validate_dev(struct pci_bus *bus, int devfn, int offset)
         if (np == NULL)
                 return PCIBIOS_DEVICE_NOT_FOUND;
 
-        vendor = get_property(np, "vendor-id", NULL);
-        device = get_property(np, "device-id", NULL);
+        vendor = of_get_property(np, "vendor-id", NULL);
+        device = of_get_property(np, "device-id", NULL);
         if (vendor == NULL || device == NULL)
                 return PCIBIOS_DEVICE_NOT_FOUND;
 
@@ -622,13 +622,14 @@ static void __init init_p2pbridge(void)
 
         /* XXX it would be better here to identify the specific
            PCI-PCI bridge chip we have. */
-        if ((p2pbridge = find_devices("pci-bridge")) == 0
+        p2pbridge = of_find_node_by_name(NULL, "pci-bridge");
+        if (p2pbridge == NULL
             || p2pbridge->parent == NULL
             || strcmp(p2pbridge->parent->name, "pci") != 0)
-                return;
+                goto done;
         if (pci_device_from_OF_node(p2pbridge, &bus, &devfn) < 0) {
                 DBG("Can't find PCI infos for PCI<->PCI bridge\n");
-                return;
+                goto done;
         }
         /* Warning: At this point, we have not yet renumbered all busses.
          * So we must use OF walking to find out hose
@@ -636,16 +637,18 @@ static void __init init_p2pbridge(void)
         hose = pci_find_hose_for_OF_device(p2pbridge);
         if (!hose) {
                 DBG("Can't find hose for PCI<->PCI bridge\n");
-                return;
+                goto done;
         }
         if (early_read_config_word(hose, bus, devfn,
                                    PCI_BRIDGE_CONTROL, &val) < 0) {
                 printk(KERN_ERR "init_p2pbridge: couldn't read bridge"
                        " control\n");
-                return;
+                goto done;
         }
         val &= ~PCI_BRIDGE_CTL_MASTER_ABORT;
         early_write_config_word(hose, bus, devfn, PCI_BRIDGE_CONTROL, val);
+done:
+        of_node_put(p2pbridge);
 }
 
 static void __init init_second_ohare(void)
@@ -691,17 +694,17 @@ static void __init fixup_nec_usb2(void)
                 const u32 *prop;
                 u8 bus, devfn;
 
-                prop = get_property(nec, "vendor-id", NULL);
+                prop = of_get_property(nec, "vendor-id", NULL);
                 if (prop == NULL)
                         continue;
                 if (0x1033 != *prop)
                         continue;
-                prop = get_property(nec, "device-id", NULL);
+                prop = of_get_property(nec, "device-id", NULL);
                 if (prop == NULL)
                         continue;
                 if (0x0035 != *prop)
                         continue;
-                prop = get_property(nec, "reg", NULL);
+                prop = of_get_property(nec, "reg", NULL);
                 if (prop == NULL)
                         continue;
                 devfn = (prop[0] >> 8) & 0xff;
@@ -909,7 +912,7 @@ static int __init add_bridge(struct device_node *dev)
         has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
 
         /* Get bus range if any */
-        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, assume"
                        " bus 0\n", dev->full_name);
@@ -1199,8 +1202,7 @@ void __init pmac_pcibios_after_init(void)
         }
 #endif /* CONFIG_BLK_DEV_IDE */
 
-        nd = find_devices("firewire");
-        while (nd) {
+        for_each_node_by_name(nd, "firewire") {
                 if (nd->parent && (device_is_compatible(nd, "pci106b,18") ||
                                    device_is_compatible(nd, "pci106b,30") ||
                                    device_is_compatible(nd, "pci11c1,5811"))
@@ -1208,15 +1210,14 @@ void __init pmac_pcibios_after_init(void)
                         pmac_call_feature(PMAC_FTR_1394_ENABLE, nd, 0, 0);
                         pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, nd, 0, 0);
                 }
-                nd = nd->next;
         }
-        nd = find_devices("ethernet");
-        while (nd) {
+        of_node_put(nd);
+        for_each_node_by_name(nd, "ethernet") {
                 if (nd->parent && device_is_compatible(nd, "gmac")
                     && device_is_compatible(nd->parent, "uni-north"))
                         pmac_call_feature(PMAC_FTR_GMAC_ENABLE, nd, 0, 0);
-                nd = nd->next;
         }
+        of_node_put(nd);
 }
 
 #ifdef CONFIG_PPC32
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c
index 5c6c15c5f9a3..45d54b9ad9e0 100644
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
@@ -114,7 +114,7 @@ static void macio_gpio_init_one(struct macio_chip *macio)
          * we just create them all
          */
         for (gp = NULL; (gp = of_get_next_child(gparent, gp)) != NULL;) {
-                const u32 *reg = get_property(gp, "reg", NULL);
+                const u32 *reg = of_get_property(gp, "reg", NULL);
                 unsigned long offset;
                 if (reg == NULL)
                         continue;
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index 7651f278615a..85434231ae14 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -692,8 +692,7 @@ static int pmf_add_functions(struct pmf_device *dev, void *driverdata)
                 name = pp->name + plen;
                 if (strlen(name) && pp->length >= 12)
                         count += pmf_add_function_prop(dev, driverdata, name,
-                                                       (u32 *)pp->value,
-                                                       pp->length);
+                                                       pp->value, pp->length);
         }
         return count;
 }
@@ -821,7 +820,7 @@ struct pmf_function *__pmf_find_function(struct device_node *target,
          * one, then we fallback to a direct call attempt
          */
         snprintf(fname, 63, "platform-%s", name);
-        prop = get_property(target, fname, NULL);
+        prop = of_get_property(target, fname, NULL);
         if (prop == NULL)
                 goto find_it;
         ph = *prop;
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 5e5c0e4add91..ae5097ac0378 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -482,14 +482,14 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,
         pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0);
 
         flags |= MPIC_WANTS_RESET;
-        if (get_property(np, "big-endian", NULL))
+        if (of_get_property(np, "big-endian", NULL))
                 flags |= MPIC_BIG_ENDIAN;
 
         /* Primary Big Endian means HT interrupts. This is quite dodgy
          * but works until I find a better way
          */
         if (master && (flags & MPIC_BIG_ENDIAN))
-                flags |= MPIC_BROKEN_U3;
+                flags |= MPIC_U3_HT_IRQS;
 
         mpic = mpic_alloc(np, r.start, flags, 0, 0, name);
         if (mpic == NULL)
@@ -510,7 +510,7 @@ static int __init pmac_pic_probe_mpic(void)
         for (np = NULL; (np = of_find_node_by_type(np, "open-pic"))
                      != NULL;) {
                 if (master == NULL &&
-                    get_property(np, "interrupts", NULL) == NULL)
+                    of_get_property(np, "interrupts", NULL) == NULL)
                         master = of_node_get(np);
                 else if (slave == NULL)
                         slave = of_node_get(np);
@@ -575,7 +575,7 @@ void __init pmac_pic_init(void)
 #ifdef CONFIG_PPC32
         if (!pmac_newworld)
                 flags |= OF_IMAP_OLDWORLD_MAC;
-        if (get_property(of_chosen, "linux,bootx", NULL) != NULL)
+        if (of_get_property(of_chosen, "linux,bootx", NULL) != NULL)
                 flags |= OF_IMAP_NO_PHANDLE;
 #endif /* CONFIG_PPC_32 */
 
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 651fa424ea06..b820cabac697 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -42,7 +42,6 @@
 #include <linux/initrd.h>
 #include <linux/vt_kern.h>
 #include <linux/console.h>
-#include <linux/ide.h>
 #include <linux/pci.h>
 #include <linux/adb.h>
 #include <linux/cuda.h>
@@ -135,12 +134,12 @@ static void pmac_show_cpuinfo(struct seq_file *m)
         seq_printf(m, "machine\t\t: ");
         np = of_find_node_by_path("/");
         if (np != NULL) {
-                pp = get_property(np, "model", NULL);
+                pp = of_get_property(np, "model", NULL);
                 if (pp != NULL)
                         seq_printf(m, "%s\n", pp);
                 else
                         seq_printf(m, "PowerMac\n");
-                pp = get_property(np, "compatible", &plen);
+                pp = of_get_property(np, "compatible", &plen);
                 if (pp != NULL) {
                         seq_printf(m, "motherboard\t:");
                         while (plen > 0) {
@@ -164,11 +163,13 @@ static void pmac_show_cpuinfo(struct seq_file *m)
         if (np == NULL)
                 np = of_find_node_by_type(NULL, "cache");
         if (np != NULL) {
-                const unsigned int *ic = get_property(np, "i-cache-size", NULL);
-                const unsigned int *dc = get_property(np, "d-cache-size", NULL);
+                const unsigned int *ic =
+                        of_get_property(np, "i-cache-size", NULL);
+                const unsigned int *dc =
+                        of_get_property(np, "d-cache-size", NULL);
                 seq_printf(m, "L2 cache\t:");
                 has_l2cache = 1;
-                if (get_property(np, "cache-unified", NULL) != 0 && dc) {
+                if (of_get_property(np, "cache-unified", NULL) != 0 && dc) {
                         seq_printf(m, " %dK unified", *dc / 1024);
                 } else {
                         if (ic)
@@ -177,7 +178,7 @@ static void pmac_show_cpuinfo(struct seq_file *m)
                                 seq_printf(m, "%s %dK data",
                                            (ic? " +": ""), *dc / 1024);
                 }
-                pp = get_property(np, "ram-type", NULL);
+                pp = of_get_property(np, "ram-type", NULL);
                 if (pp)
                         seq_printf(m, " %s", pp);
                 seq_printf(m, "\n");
@@ -192,8 +193,11 @@ static void pmac_show_cpuinfo(struct seq_file *m)
 #ifndef CONFIG_ADB_CUDA
 int find_via_cuda(void)
 {
-        if (!find_devices("via-cuda"))
+        struct device_node *dn = of_find_node_by_name(NULL, "via-cuda");
+
+        if (!dn)
                 return 0;
+        of_node_put(dn);
         printk("WARNING ! Your machine is CUDA-based but your kernel\n");
         printk("          wasn't compiled with CONFIG_ADB_CUDA option !\n");
         return 0;
@@ -203,8 +207,11 @@ int find_via_cuda(void)
 #ifndef CONFIG_ADB_PMU
 int find_via_pmu(void)
 {
-        if (!find_devices("via-pmu"))
+        struct device_node *dn = of_find_node_by_name(NULL, "via-pmu");
+
+        if (!dn)
                 return 0;
+        of_node_put(dn);
         printk("WARNING ! Your machine is PMU-based but your kernel\n");
         printk("          wasn't compiled with CONFIG_ADB_PMU option !\n");
         return 0;
@@ -224,6 +231,8 @@ static volatile u32 *sysctrl_regs;
 
 static void __init ohare_init(void)
 {
+        struct device_node *dn;
+
         /* this area has the CPU identification register
            and some registers used by smp boards */
         sysctrl_regs = (volatile u32 *) ioremap(0xf8000000, 0x1000);
@@ -233,7 +242,9 @@ static void __init ohare_init(void)
          * We assume that we have a PSX memory controller iff
          * we have an ohare I/O controller.
          */
-        if (find_devices("ohare") != NULL) {
+        dn = of_find_node_by_name(NULL, "ohare");
+        if (dn) {
+                of_node_put(dn);
                 if (((sysctrl_regs[2] >> 24) & 0xf) >= 3) {
                         if (sysctrl_regs[4] & 0x10)
                                 sysctrl_regs[4] |= 0x04000020;
@@ -249,18 +260,19 @@ static void __init l2cr_init(void)
 {
         /* Checks "l2cr-value" property in the registry */
         if (cpu_has_feature(CPU_FTR_L2CR)) {
-                struct device_node *np = find_devices("cpus");
+                struct device_node *np = of_find_node_by_name(NULL, "cpus");
                 if (np == 0)
-                        np = find_type_devices("cpu");
+                        np = of_find_node_by_type(NULL, "cpu");
                 if (np != 0) {
                         const unsigned int *l2cr =
-                                get_property(np, "l2cr-value", NULL);
+                                of_get_property(np, "l2cr-value", NULL);
                         if (l2cr != 0) {
                                 ppc_override_l2cr = 1;
                                 ppc_override_l2cr_value = *l2cr;
                                 _set_L2CR(0);
                                 _set_L2CR(ppc_override_l2cr_value);
                         }
+                        of_node_put(np);
                 }
         }
 
@@ -286,7 +298,7 @@ static void __init pmac_setup_arch(void)
         loops_per_jiffy = 50000000 / HZ;
         cpu = of_find_node_by_type(NULL, "cpu");
         if (cpu != NULL) {
-                fp = get_property(cpu, "clock-frequency", NULL);
+                fp = of_get_property(cpu, "clock-frequency", NULL);
                 if (fp != NULL) {
                         if (pvr >= 0x30 && pvr < 0x80)
                                 /* PPC970 etc. */
@@ -303,7 +315,7 @@ static void __init pmac_setup_arch(void)
 
         /* See if newworld or oldworld */
         for (ic = NULL; (ic = of_find_all_nodes(ic)) != NULL; )
-                if (get_property(ic, "interrupt-controller", NULL))
+                if (of_get_property(ic, "interrupt-controller", NULL))
                         break;
         if (ic) {
                 pmac_newworld = 1;
@@ -341,8 +353,15 @@ static void __init pmac_setup_arch(void)
 
 #ifdef CONFIG_SMP
         /* Check for Core99 */
-        if (find_devices("uni-n") || find_devices("u3") || find_devices("u4"))
+        ic = of_find_node_by_name(NULL, "uni-n");
+        if (!ic)
+                ic = of_find_node_by_name(NULL, "u3");
+        if (!ic)
+                ic = of_find_node_by_name(NULL, "u4");
+        if (ic) {
+                of_node_put(ic);
                 smp_ops = &core99_smp_ops;
+        }
 #ifdef CONFIG_PPC32
         else
                 smp_ops = &psurge_smp_ops;
@@ -616,15 +635,6 @@ static void __init pmac_init_early(void)
 #endif
 }
 
-/*
- * pmac has no legacy IO, anything calling this function has to
- * fail or bad things will happen
- */
-static int pmac_check_legacy_ioport(unsigned int baseport)
-{
-        return -ENODEV;
-}
-
 static int __init pmac_declare_of_platform_devices(void)
 {
         struct device_node *np;
@@ -736,7 +746,6 @@ define_machine(powermac) {
         .get_rtc_time           = pmac_get_rtc_time,
         .calibrate_decr         = pmac_calibrate_decr,
         .feature_call           = pmac_do_feature_call,
-        .check_legacy_ioport    = pmac_check_legacy_ioport,
         .progress               = udbg_progress,
 #ifdef CONFIG_PPC64
         .pci_probe_mode         = pmac_pci_probe_mode,
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index d73fb73802bb..6f32c4eca6e5 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -264,6 +264,7 @@ static void __init psurge_quad_init(void)
 static int __init smp_psurge_probe(void)
 {
         int i, ncpus;
+        struct device_node *dn;
 
         /* We don't do SMP on the PPC601 -- paulus */
         if (PVR_VER(mfspr(SPRN_PVR)) == 1)
@@ -279,8 +280,10 @@ static int __init smp_psurge_probe(void)
          * in the hammerhead memory controller in the case of the
          * dual-cpu powersurge board.  -- paulus.
          */
-        if (find_devices("hammerhead") == NULL)
+        dn = of_find_node_by_name(NULL, "hammerhead");
+        if (dn == NULL)
                 return 1;
+        of_node_put(dn);
 
         hhead_base = ioremap(HAMMERHEAD_BASE, 0x800);
         quad_base = ioremap(PSURGE_QUAD_REG_ADDR, 1024);
@@ -567,7 +570,7 @@ static void __init smp_core99_setup_i2c_hwsync(int ncpus)
                 pmac_tb_clock_chip_host = pmac_i2c_find_bus(cc);
                 if (pmac_tb_clock_chip_host == NULL)
                         continue;
-                reg = get_property(cc, "reg", NULL);
+                reg = of_get_property(cc, "reg", NULL);
                 if (reg == NULL)
                         continue;
                 switch (*reg) {
@@ -695,7 +698,7 @@ static void __init smp_core99_setup(int ncpus)
                 struct device_node *cpus =
                         of_find_node_by_path("/cpus");
                 if (cpus &&
-                    get_property(cpus, "platform-cpu-timebase", NULL)) {
+                    of_get_property(cpus, "platform-cpu-timebase", NULL)) {
                         pmac_tb_freeze = smp_core99_pfunc_tb_freeze;
                         printk(KERN_INFO "Processor timebase sync using"
                                " platform function\n");
@@ -712,7 +715,7 @@ static void __init smp_core99_setup(int ncpus)
                 core99_tb_gpio = KL_GPIO_TB_ENABLE;     /* default value */
                 cpu = of_find_node_by_type(NULL, "cpu");
                 if (cpu != NULL) {
-                        tbprop = get_property(cpu, "timebase-enable", NULL);
+                        tbprop = of_get_property(cpu, "timebase-enable", NULL);
                         if (tbprop)
                                 core99_tb_gpio = *tbprop;
                         of_node_put(cpu);
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index a4173906e945..bf9da56942e8 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -297,49 +297,11 @@ int __init via_calibrate_decr(void)
 }
 #endif
 
-#ifdef CONFIG_PM
-/*
- * Reset the time after a sleep.
- */
-static int
-time_sleep_notify(struct pmu_sleep_notifier *self, int when)
-{
-        static unsigned long time_diff;
-        unsigned long flags;
-        unsigned long seq;
-        struct timespec tv;
-
-        switch (when) {
-        case PBOOK_SLEEP_NOW:
-                do {
-                        seq = read_seqbegin_irqsave(&xtime_lock, flags);
-                        time_diff = xtime.tv_sec - pmac_get_boot_time();
-                } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-                break;
-        case PBOOK_WAKE:
-                tv.tv_sec = pmac_get_boot_time() + time_diff;
-                tv.tv_nsec = 0;
-                do_settimeofday(&tv);
-                break;
-        }
-        return PBOOK_SLEEP_OK;
-}
-
-static struct pmu_sleep_notifier time_sleep_notifier = {
-        time_sleep_notify, SLEEP_LEVEL_MISC,
-};
-#endif /* CONFIG_PM */
-
 /*
  * Query the OF and get the decr frequency.
  */
 void __init pmac_calibrate_decr(void)
 {
-#if defined(CONFIG_PM) && defined(CONFIG_ADB_PMU)
-        /* XXX why here? */
-        pmu_register_sleep_notifier(&time_sleep_notifier);
-#endif
-
         generic_calibrate_decr();
 
 #ifdef CONFIG_PPC32
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c
index 379db05b0082..47de4d3fc167 100644
--- a/arch/powerpc/platforms/powermac/udbg_scc.c
+++ b/arch/powerpc/platforms/powermac/udbg_scc.c
@@ -81,7 +81,7 @@ void udbg_scc_init(int force_scc)
         macio = of_get_parent(escc);
         if (macio == NULL)
                 goto bail;
-        path = get_property(of_chosen, "linux,stdout-path", NULL);
+        path = of_get_property(of_chosen, "linux,stdout-path", NULL);
         if (path != NULL)
                 stdout = of_find_node_by_path(path);
         for (ch = NULL; (ch = of_get_next_child(escc, ch)) != NULL;) {
@@ -96,13 +96,13 @@ void udbg_scc_init(int force_scc)
         ch = ch_def ? ch_def : ch_a;
 
         /* Get address within mac-io ASIC */
-        reg = get_property(escc, "reg", NULL);
+        reg = of_get_property(escc, "reg", NULL);
         if (reg == NULL)
                 goto bail;
         addr = reg[0];
 
         /* Get address of mac-io PCI itself */
-        reg = get_property(macio, "assigned-addresses", NULL);
+        reg = of_get_property(macio, "assigned-addresses", NULL);
         if (reg == NULL)
                 goto bail;
         addr += reg[2];