43 files changed, 236 insertions, 187 deletions
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c
index 84544d072043..4c42246b86a7 100644
--- a/arch/powerpc/platforms/512x/clock.c
+++ b/arch/powerpc/platforms/512x/clock.c
@@ -698,8 +698,7 @@ static struct clk_interface mpc5121_clk_functions = {
        .clk_get_parent         = NULL,
 };
-static int
+int __init mpc5121_clk_init(void)
-mpc5121_clk_init(void)
 {
        struct device_node *np;
@@ -724,6 +723,3 @@ mpc5121_clk_init(void)
        clk_functions = mpc5121_clk_functions;
        return 0;
 }
-arch_initcall(mpc5121_clk_init);
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index 441abc488851..ee6ae129c25c 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -64,8 +64,9 @@ define_machine(mpc5121_ads) {
        .name                   = "MPC5121 ADS",
        .probe                  = mpc5121_ads_probe,
        .setup_arch             = mpc5121_ads_setup_arch,
-        .init                   = mpc512x_declare_of_platform_devices,
+        .init                   = mpc512x_init,
        .init_IRQ               = mpc5121_ads_init_IRQ,
        .get_irq                = ipic_get_irq,
        .calibrate_decr         = generic_calibrate_decr,
+        .restart                = mpc512x_restart,
 };
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
index da9b20a63769..4ecf4cf9a51b 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
@@ -79,7 +79,7 @@ cpld_unmask_irq(unsigned int irq)
 }
 static struct irq_chip cpld_pic = {
-        .name = " CPLD PIC ",
+        .name = "CPLD PIC",
        .mask = cpld_mask_irq,
        .ack = cpld_mask_irq,
        .unmask = cpld_unmask_irq,
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
index 2479de9e2d12..a6c0e3a2615d 100644
--- a/arch/powerpc/platforms/512x/mpc5121_generic.c
+++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
@@ -51,8 +51,9 @@ static int __init mpc5121_generic_probe(void)
 define_machine(mpc5121_generic) {
        .name                   = "MPC5121 generic",
        .probe                  = mpc5121_generic_probe,
-        .init                   = mpc512x_declare_of_platform_devices,
+        .init                   = mpc512x_init,
        .init_IRQ               = mpc512x_init_IRQ,
        .get_irq                = ipic_get_irq,
        .calibrate_decr         = generic_calibrate_decr,
+        .restart                = mpc512x_restart,
 };
diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h
index 22a5352407e0..b2daca0d1488 100644
--- a/arch/powerpc/platforms/512x/mpc512x.h
+++ b/arch/powerpc/platforms/512x/mpc512x.h
@@ -12,5 +12,8 @@
 #ifndef __MPC512X_H__
 #define __MPC512X_H__
 extern void __init mpc512x_init_IRQ(void);
+extern void __init mpc512x_init(void);
+extern int __init mpc5121_clk_init(void);
 void __init mpc512x_declare_of_platform_devices(void);
+extern void mpc512x_restart(char *cmd);
 #endif                          /* __MPC512X_H__ */
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index 434d683df5a0..b7f518a60f03 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -21,9 +21,38 @@
 #include <asm/ipic.h>
 #include <asm/prom.h>
 #include <asm/time.h>
+#include <asm/mpc5121.h>
 #include "mpc512x.h"
+static struct mpc512x_reset_module __iomem *reset_module_base;
+static void __init mpc512x_restart_init(void)
+{
+        struct device_node *np;
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-reset");
+        if (!np)
+                return;
+        reset_module_base = of_iomap(np, 0);
+        of_node_put(np);
+}
+void mpc512x_restart(char *cmd)
+{
+        if (reset_module_base) {
+                /* Enable software reset "RSTE" */
+                out_be32(&reset_module_base->rpr, 0x52535445);
+                /* Set software hard reset */
+                out_be32(&reset_module_base->rcr, 0x2);
+        } else {
+                pr_err("Restart module not mapped.\n");
+        }
+        for (;;)
+                ;
+}
 void __init mpc512x_init_IRQ(void)
 {
        struct device_node *np;
@@ -53,8 +82,22 @@ static struct of_device_id __initdata of_bus_ids[] = {
 void __init mpc512x_declare_of_platform_devices(void)
 {
+        struct device_node *np;
        if (of_platform_bus_probe(NULL, of_bus_ids, NULL))
                printk(KERN_ERR __FILE__ ": "
                        "Error while probing of_platform bus\n");
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-nfc");
+        if (np) {
+                of_platform_device_create(np, NULL, NULL);
+                of_node_put(np);
+        }
 }
+void __init mpc512x_init(void)
+{
+        mpc512x_declare_of_platform_devices();
+        mpc5121_clk_init();
+        mpc512x_restart_init();
+}
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 04ed2156db1c..f0684c8ac960 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -326,11 +326,14 @@ static struct of_device_id mpc85xx_ids[] = {
        { .compatible = "gianfar", },
        { .compatible = "fsl,rapidio-delta", },
        { .compatible = "fsl,mpc8548-guts", },
+        { .compatible = "gpio-leds", },
        {},
 };
 static int __init mpc85xx_publish_devices(void)
 {
+        if (machine_is(mpc8568_mds))
+                simple_gpiochip_init("fsl,mpc8568mds-bcsr-gpio");
        if (machine_is(mpc8569_mds))
                simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio");
@@ -362,7 +365,8 @@ static void __init mpc85xx_mds_pic_init(void)
        }
        mpic = mpic_alloc(np, r.start,
-                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
+                        MPIC_BROKEN_FRR_NIRQS,
                        0, 256, " OpenPIC  ");
        BUG_ON(mpic == NULL);
        of_node_put(np);
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 04160a4cc699..a15f582300d8 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -46,6 +46,7 @@ smp_85xx_kick_cpu(int nr)
        __iomem u32 *bptr_vaddr;
        struct device_node *np;
        int n = 0;
+        int ioremappable;
        WARN_ON (nr < 0 || nr >= NR_CPUS);
@@ -59,21 +60,37 @@ smp_85xx_kick_cpu(int nr)
                return;
        }
+        /*
+         * A secondary core could be in a spinloop in the bootpage
+         * (0xfffff000), somewhere in highmem, or somewhere in lowmem.
+         * The bootpage and highmem can be accessed via ioremap(), but
+         * we need to directly access the spinloop if its in lowmem.
+         */
+        ioremappable = *cpu_rel_addr > virt_to_phys(high_memory);
        /* Map the spin table */
-        bptr_vaddr = ioremap(*cpu_rel_addr, SIZE_BOOT_ENTRY);
+        if (ioremappable)
+                bptr_vaddr = ioremap(*cpu_rel_addr, SIZE_BOOT_ENTRY);
+        else
+                bptr_vaddr = phys_to_virt(*cpu_rel_addr);
        local_irq_save(flags);
        out_be32(bptr_vaddr + BOOT_ENTRY_PIR, nr);
        out_be32(bptr_vaddr + BOOT_ENTRY_ADDR_LOWER, __pa(__early_start));
+        if (!ioremappable)
+                flush_dcache_range((ulong)bptr_vaddr,
+                                (ulong)(bptr_vaddr + SIZE_BOOT_ENTRY));
        /* Wait a bit for the CPU to ack. */
        while ((__secondary_hold_acknowledge != nr) && (++n < 1000))
                mdelay(1);
        local_irq_restore(flags);
-        iounmap(bptr_vaddr);
+        if (ioremappable)
+                iounmap(bptr_vaddr);
        pr_debug("waited %d msecs for CPU #%d.\n", n, nr);
 }
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index e5da5f62b24a..42e87f08aa01 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -232,7 +232,7 @@ static int socrates_fpga_pic_set_type(unsigned int virq,
 }
 static struct irq_chip socrates_fpga_pic_chip = {
-        .name           = " FPGA-PIC ",
+        .name           = "FPGA-PIC",
        .ack            = socrates_fpga_pic_ack,
        .mask           = socrates_fpga_pic_mask,
        .mask_ack       = socrates_fpga_pic_mask_ack,
diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index f559918f3c6f..bc33d1859ae7 100644
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -134,7 +134,7 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)
        pvid = mfspr(SPRN_PVR);
        svid = mfspr(SPRN_SVR);
-        seq_printf(m, "Vendor\t\t: RPC Electronics STx \n");
+        seq_printf(m, "Vendor\t\t: RPC Electronics STx\n");
        seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
index 1b426050a2f9..0125604d096e 100644
--- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c
+++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
@@ -80,8 +80,8 @@ static void xes_mpc85xx_configure_l2(void __iomem *l2_base)
        printk(KERN_INFO "xes_mpc85xx: Enabling L2 as cache\n");
        ctl = MPC85xx_L2CTL_L2E | MPC85xx_L2CTL_L2I;
-        if (machine_is_compatible("MPC8540") ||
+        if (of_machine_is_compatible("MPC8540") ||
-            machine_is_compatible("MPC8560"))
+            of_machine_is_compatible("MPC8560"))
                /*
                 * Assume L2 SRAM is used fully for cache, so set
                 * L2BLKSZ (bits 4:5) to match L2SIZ (bits 2:3).
diff --git a/arch/powerpc/platforms/cell/beat_htab.c b/arch/powerpc/platforms/cell/beat_htab.c
index 35b1ec492715..2516c1cf8467 100644
--- a/arch/powerpc/platforms/cell/beat_htab.c
+++ b/arch/powerpc/platforms/cell/beat_htab.c
@@ -40,7 +40,7 @@
 #define DBG_LOW(fmt...) do { } while (0)
 #endif
-static DEFINE_SPINLOCK(beat_htab_lock);
+static DEFINE_RAW_SPINLOCK(beat_htab_lock);
 static inline unsigned int beat_read_mask(unsigned hpte_group)
 {
@@ -114,18 +114,18 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
        if (rflags & _PAGE_NO_CACHE)
                hpte_r &= ~_PAGE_COHERENT;
-        spin_lock(&beat_htab_lock);
+        raw_spin_lock(&beat_htab_lock);
        lpar_rc = beat_read_mask(hpte_group);
        if (lpar_rc == 0) {
                if (!(vflags & HPTE_V_BOLTED))
                        DBG_LOW(" full\n");
-                spin_unlock(&beat_htab_lock);
+                raw_spin_unlock(&beat_htab_lock);
                return -1;
        }
        lpar_rc = beat_insert_htab_entry(0, hpte_group, lpar_rc << 48,
                hpte_v, hpte_r, &slot);
-        spin_unlock(&beat_htab_lock);
+        raw_spin_unlock(&beat_htab_lock);
        /*
         * Since we try and ioremap PHBs we don't own, the pte insert
@@ -198,17 +198,17 @@ static long beat_lpar_hpte_updatepp(unsigned long slot,
                "avpnv=%016lx, slot=%016lx, psize: %d, newpp %016lx ... ",
                want_v & HPTE_V_AVPN, slot, psize, newpp);
-        spin_lock(&beat_htab_lock);
+        raw_spin_lock(&beat_htab_lock);
        dummy0 = beat_lpar_hpte_getword0(slot);
        if ((dummy0 & ~0x7FUL) != (want_v & ~0x7FUL)) {
                DBG_LOW("not found !\n");
-                spin_unlock(&beat_htab_lock);
+                raw_spin_unlock(&beat_htab_lock);
                return -1;
        }
        lpar_rc = beat_write_htab_entry(0, slot, 0, newpp, 0, 7, &dummy0,
                                        &dummy1);
-        spin_unlock(&beat_htab_lock);
+        raw_spin_unlock(&beat_htab_lock);
        if (lpar_rc != 0 || dummy0 == 0) {
                DBG_LOW("not found !\n");
                return -1;
@@ -262,13 +262,13 @@ static void beat_lpar_hpte_updateboltedpp(unsigned long newpp,
        vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
        va = (vsid << 28) | (ea & 0x0fffffff);
-        spin_lock(&beat_htab_lock);
+        raw_spin_lock(&beat_htab_lock);
        slot = beat_lpar_hpte_find(va, psize);
        BUG_ON(slot == -1);
        lpar_rc = beat_write_htab_entry(0, slot, 0, newpp, 0, 7,
                &dummy0, &dummy1);
-        spin_unlock(&beat_htab_lock);
+        raw_spin_unlock(&beat_htab_lock);
        BUG_ON(lpar_rc != 0);
 }
@@ -285,18 +285,18 @@ static void beat_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
                slot, va, psize, local);
        want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
-        spin_lock_irqsave(&beat_htab_lock, flags);
+        raw_spin_lock_irqsave(&beat_htab_lock, flags);
        dummy1 = beat_lpar_hpte_getword0(slot);
        if ((dummy1 & ~0x7FUL) != (want_v & ~0x7FUL)) {
                DBG_LOW("not found !\n");
-                spin_unlock_irqrestore(&beat_htab_lock, flags);
+                raw_spin_unlock_irqrestore(&beat_htab_lock, flags);
                return;
        }
        lpar_rc = beat_write_htab_entry(0, slot, 0, 0, HPTE_V_VALID, 0,
                &dummy1, &dummy2);
-        spin_unlock_irqrestore(&beat_htab_lock, flags);
+        raw_spin_unlock_irqrestore(&beat_htab_lock, flags);
        BUG_ON(lpar_rc != 0);
 }
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c
index 36052a9ebcda..682af97321a8 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.c
+++ b/arch/powerpc/platforms/cell/beat_interrupt.c
@@ -30,7 +30,7 @@
 #include "beat_wrapper.h"
 #define MAX_IRQS        NR_IRQS
-static DEFINE_SPINLOCK(beatic_irq_mask_lock);
+static DEFINE_RAW_SPINLOCK(beatic_irq_mask_lock);
 static uint64_t beatic_irq_mask_enable[(MAX_IRQS+255)/64];
 static uint64_t beatic_irq_mask_ack[(MAX_IRQS+255)/64];
@@ -65,30 +65,30 @@ static void beatic_mask_irq(unsigned int irq_plug)
 {
        unsigned long flags;
-        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
        beatic_irq_mask_enable[irq_plug/64] &= ~(1UL << (63 - (irq_plug%64)));
        beatic_update_irq_mask(irq_plug);
-        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+        raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 static void beatic_unmask_irq(unsigned int irq_plug)
 {
        unsigned long flags;
-        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
        beatic_irq_mask_enable[irq_plug/64] |= 1UL << (63 - (irq_plug%64));
        beatic_update_irq_mask(irq_plug);
-        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+        raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 static void beatic_ack_irq(unsigned int irq_plug)
 {
        unsigned long flags;
-        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
        beatic_irq_mask_ack[irq_plug/64] &= ~(1UL << (63 - (irq_plug%64)));
        beatic_update_irq_mask(irq_plug);
-        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+        raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 static void beatic_end_irq(unsigned int irq_plug)
@@ -103,14 +103,14 @@ static void beatic_end_irq(unsigned int irq_plug)
                printk(KERN_ERR "IRQ over-downcounted, plug %d\n", irq_plug);
        }
-        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        raw_spin_lock_irqsave(&beatic_irq_mask_lock, flags);
        beatic_irq_mask_ack[irq_plug/64] |= 1UL << (63 - (irq_plug%64));
        beatic_update_irq_mask(irq_plug);
-        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+        raw_spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
 }
 static struct irq_chip beatic_pic = {
-        .name = " CELL-BEAT ",
+        .name = "CELL-BEAT",
        .unmask = beatic_unmask_irq,
        .mask = beatic_mask_irq,
        .eoi = beatic_end_irq,
diff --git a/arch/powerpc/platforms/cell/cbe_powerbutton.c b/arch/powerpc/platforms/cell/cbe_powerbutton.c
index dcddaa5fcb66..f75a4daa4ca2 100644
--- a/arch/powerpc/platforms/cell/cbe_powerbutton.c
+++ b/arch/powerpc/platforms/cell/cbe_powerbutton.c
@@ -48,7 +48,7 @@ static int __init cbe_powerbutton_init(void)
        int ret = 0;
        struct input_dev *dev;
-        if (!machine_is_compatible("IBM,CBPLUS-1.0")) {
+        if (!of_machine_is_compatible("IBM,CBPLUS-1.0")) {
                printk(KERN_ERR "%s: Not a cell blade.\n", __func__);
                ret = -ENODEV;
                goto out;
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 6829cf7e2bda..10eb1a443626 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -88,7 +88,7 @@ static void iic_eoi(unsigned int irq)
 }
 static struct irq_chip iic_chip = {
-        .name = " CELL-IIC ",
+        .name = "CELL-IIC",
        .mask = iic_mask,
        .unmask = iic_unmask,
        .eoi = iic_eoi,
@@ -133,7 +133,7 @@ static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc)
 static struct irq_chip iic_ioexc_chip = {
-        .name = " CELL-IOEX",
+        .name = "CELL-IOEX",
        .mask = iic_mask,
        .unmask = iic_unmask,
        .eoi = iic_ioexc_eoi,
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 5e0a191764fc..608fd2b584c9 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -255,7 +255,7 @@ static int __init cbe_sysreset_init(void)
 {
        struct cbe_pmd_regs __iomem *regs;
-        sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
+        sysreset_hack = of_machine_is_compatible("IBM,CBPLUS-1.0");
        if (!sysreset_hack)
                return 0;
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 01244f254a11..5876e888e412 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -168,7 +168,7 @@ static int spider_set_irq_type(unsigned int virq, unsigned int type)
 }
 static struct irq_chip spider_pic = {
-        .name = " SPIDER   ",
+        .name = "SPIDER",
        .unmask = spider_unmask_irq,
        .mask = spider_mask_irq,
        .ack = spider_ack_irq,
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 4c506c1463cd..891f18e337a2 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -457,7 +457,7 @@ neighbour_spu(int cbe, struct device_node *target, struct device_node *avoid)
                        continue;
                vic_handles = of_get_property(spu_dn, "vicinity", &lenp);
                for (i=0; i < (lenp / sizeof(phandle)); i++) {
-                        if (vic_handles[i] == target->linux_phandle)
+                        if (vic_handles[i] == target->phandle)
                                return spu;
                }
        }
@@ -499,7 +499,7 @@ static void init_affinity_node(int cbe)
                        if (strcmp(name, "spe") == 0) {
                                spu = devnode_spu(cbe, vic_dn);
-                                avoid_ph = last_spu_dn->linux_phandle;
+                                avoid_ph = last_spu_dn->phandle;
                        } else {
                                /*
                                 * "mic-tm" and "bif0" nodes do not have
@@ -514,7 +514,7 @@ static void init_affinity_node(int cbe)
                                        last_spu->has_mem_affinity = 1;
                                        spu->has_mem_affinity = 1;
                                }
-                                avoid_ph = vic_dn->linux_phandle;
+                                avoid_ph = vic_dn->phandle;
                        }
                        list_add_tail(&spu->aff_list, &last_spu->aff_list);
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c
index fd23a1d4b39d..8b0c2082a783 100644
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
@@ -222,6 +222,7 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev)
        int i;
        u8 *dummy;
        struct pci_bus *bus = dev->bus;
+        struct resource *res;
        resource_size_t end = 0;
        for (i = PCI_BRIDGE_RESOURCES; i < PCI_BRIDGE_RESOURCES+3; i++) {
@@ -230,13 +231,12 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev)
                        end = pci_resource_end(dev, i);
        }
-        for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
+        pci_bus_for_each_resource(bus, res, i) {
-                if ((bus->resource[i]) &&
+                if (res && res->flags & IORESOURCE_MEM) {
-                        (bus->resource[i]->flags & IORESOURCE_MEM)) {
+                        if (res->end == end)
-                        if (bus->resource[i]->end == end)
+                                dummy = ioremap(res->start, 0x4);
-                                dummy = ioremap(bus->resource[i]->start, 0x4);
                        else
-                                dummy = ioremap(bus->resource[i]->end - 3, 0x4);
+                                dummy = ioremap(res->end - 3, 0x4);
                        if (dummy) {
                                in_8(dummy);
                                iounmap(dummy);
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 86c4b29eea89..ba446bf355a9 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -273,7 +273,7 @@ static void iseries_end_IRQ(unsigned int irq)
 }
 static struct irq_chip iseries_pic = {
-        .name   = "iSeries irq controller",
+        .name           = "iSeries",
        .startup        = iseries_startup_IRQ,
        .shutdown       = iseries_shutdown_IRQ,
        .unmask         = iseries_enable_IRQ,
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index 91f4c6cd4b99..06763682db47 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -85,7 +85,7 @@ static int proc_titantod_show(struct seq_file *m, void *v)
                seq_printf(m, "  titan elapsed = %lu uSec\n", titan_usec);
                seq_printf(m, "  tb elapsed    = %lu ticks\n", tb_ticks);
-                seq_printf(m, "  titan jiffies = %lu.%04lu \n", titan_jiffies,
+                seq_printf(m, "  titan jiffies = %lu.%04lu\n", titan_jiffies,
                           titan_jiff_rem_usec);
                seq_printf(m, "  tb jiffies    = %lu.%04lu\n", tb_jiffies,
                           tb_jiff_rem_usec);
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index a6cd3394feaa..b0863410517f 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -256,7 +256,7 @@ static unsigned long iSeries_process_mainstore_vpd(struct MemoryBlock *mb_array,
                mem_blocks = iSeries_process_Condor_mainstore_vpd(mb_array,
                                max_entries);
-        printk("Mainstore_VPD: numMemoryBlocks = %ld \n", mem_blocks);
+        printk("Mainstore_VPD: numMemoryBlocks = %ld\n", mem_blocks);
        for (i = 0; i < mem_blocks; ++i) {
                printk("Mainstore_VPD: block %3ld logical chunks %016lx - %016lx\n"
                       "                             abs chunks %016lx - %016lx\n",
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c
index be2527a516ea..d35e0520abf0 100644
--- a/arch/powerpc/platforms/pasemi/cpufreq.c
+++ b/arch/powerpc/platforms/pasemi/cpufreq.c
@@ -304,8 +304,8 @@ static struct cpufreq_driver pas_cpufreq_driver = {
 static int __init pas_cpufreq_init(void)
 {
-        if (!machine_is_compatible("PA6T-1682M") &&
+        if (!of_machine_is_compatible("PA6T-1682M") &&
-            !machine_is_compatible("pasemi,pwrficient"))
+            !of_machine_is_compatible("pasemi,pwrficient"))
                return -ENODEV;
        return cpufreq_register_driver(&pas_cpufreq_driver);
diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c
index 9dd789a7370d..84d7fd9bcc69 100644
--- a/arch/powerpc/platforms/powermac/bootx_init.c
+++ b/arch/powerpc/platforms/powermac/bootx_init.c
@@ -539,7 +539,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
                if (model
                    && (strcmp(model, "iMac,1") == 0
                        || strcmp(model, "PowerMac1,1") == 0)) {
-                        bootx_printf("iMac,1 detected, shutting down USB \n");
+                        bootx_printf("iMac,1 detected, shutting down USB\n");
                        out_le32((unsigned __iomem *)0x80880008, 1);    /* XXX */
                }
        }
@@ -554,7 +554,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
        } else
                space = bi->totalParamsSize;
-        bootx_printf("Total space used by parameters & ramdisk: 0x%x \n", space);
+        bootx_printf("Total space used by parameters & ramdisk: 0x%x\n", space);
        /* New BootX will have flushed all TLBs and enters kernel with
         * MMU switched OFF, so this should not be useful anymore.
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 08d94e4cedd3..d4f127d18141 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -657,31 +657,31 @@ static int __init pmac_cpufreq_setup(void)
        cur_freq = (*value) / 1000;
        /*  Check for 7447A based MacRISC3 */
-        if (machine_is_compatible("MacRISC3") &&
+        if (of_machine_is_compatible("MacRISC3") &&
            of_get_property(cpunode, "dynamic-power-step", NULL) &&
            PVR_VER(mfspr(SPRN_PVR)) == 0x8003) {
                pmac_cpufreq_init_7447A(cpunode);
        /* Check for other MacRISC3 machines */
-        } else if (machine_is_compatible("PowerBook3,4") ||
+        } else if (of_machine_is_compatible("PowerBook3,4") ||
-                   machine_is_compatible("PowerBook3,5") ||
+                   of_machine_is_compatible("PowerBook3,5") ||
-                   machine_is_compatible("MacRISC3")) {
+                   of_machine_is_compatible("MacRISC3")) {
                pmac_cpufreq_init_MacRISC3(cpunode);
        /* Else check for iBook2 500/600 */
-        } else if (machine_is_compatible("PowerBook4,1")) {
+        } else if (of_machine_is_compatible("PowerBook4,1")) {
                hi_freq = cur_freq;
                low_freq = 400000;
                set_speed_proc = pmu_set_cpu_speed;
                is_pmu_based = 1;
        }
        /* Else check for TiPb 550 */
-        else if (machine_is_compatible("PowerBook3,3") && cur_freq == 550000) {
+        else if (of_machine_is_compatible("PowerBook3,3") && cur_freq == 550000) {
                hi_freq = cur_freq;
                low_freq = 500000;
                set_speed_proc = pmu_set_cpu_speed;
                is_pmu_based = 1;
        }
        /* Else check for TiPb 400 & 500 */
-        else if (machine_is_compatible("PowerBook3,2")) {
+        else if (of_machine_is_compatible("PowerBook3,2")) {
                /* We only know about the 400 MHz and the 500Mhz model
                 * they both have 300 MHz as low frequency
                 */
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 708c75133377..3ed288e68ec4 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -398,11 +398,11 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
        int rc = -ENODEV;
        /* Check supported platforms */
-        if (machine_is_compatible("PowerMac8,1") ||
+        if (of_machine_is_compatible("PowerMac8,1") ||
-            machine_is_compatible("PowerMac8,2") ||
+            of_machine_is_compatible("PowerMac8,2") ||
-            machine_is_compatible("PowerMac9,1"))
+            of_machine_is_compatible("PowerMac9,1"))
                use_volts_smu = 1;
-        else if (machine_is_compatible("PowerMac11,2"))
+        else if (of_machine_is_compatible("PowerMac11,2"))
                use_volts_vdnap = 1;
        else
                return -ENODEV;
@@ -729,9 +729,9 @@ static int __init g5_cpufreq_init(void)
                return -ENODEV;
        }
-        if (machine_is_compatible("PowerMac7,2") ||
+        if (of_machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("PowerMac7,3") ||
-            machine_is_compatible("RackMac3,1"))
+            of_machine_is_compatible("RackMac3,1"))
                rc = g5_pm72_cpufreq_init(cpus);
 #ifdef CONFIG_PMAC_SMU
        else
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index fbc9bbd74dbd..9e1b9fd75206 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -59,10 +59,10 @@ extern struct device_node *k2_skiplist[2];
 * We use a single global lock to protect accesses. Each driver has
 * to take care of its own locking
 */
-DEFINE_SPINLOCK(feature_lock);
+DEFINE_RAW_SPINLOCK(feature_lock);
-#define LOCK(flags)     spin_lock_irqsave(&feature_lock, flags);
+#define LOCK(flags)     raw_spin_lock_irqsave(&feature_lock, flags);
-#define UNLOCK(flags)   spin_unlock_irqrestore(&feature_lock, flags);
+#define UNLOCK(flags)   raw_spin_unlock_irqrestore(&feature_lock, flags);
 /*
@@ -2426,7 +2426,7 @@ static int __init probe_motherboard(void)
            }
        }
        for(i=0; i<ARRAY_SIZE(pmac_mb_defs); i++) {
-            if (machine_is_compatible(pmac_mb_defs[i].model_string)) {
+            if (of_machine_is_compatible(pmac_mb_defs[i].model_string)) {
                pmac_mb = pmac_mb_defs[i];
                goto found;
            }
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c
index c6f0f9e738e5..80a5258d0364 100644
--- a/arch/powerpc/platforms/powermac/nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
@@ -80,7 +80,7 @@ static int is_core_99;
 static int core99_bank = 0;
 static int nvram_partitions[3];
 // XXX Turn that into a sem
-static DEFINE_SPINLOCK(nv_lock);
+static DEFINE_RAW_SPINLOCK(nv_lock);
 static int (*core99_write_bank)(int bank, u8* datas);
 static int (*core99_erase_bank)(int bank);
@@ -165,10 +165,10 @@ static unsigned char indirect_nvram_read_byte(int addr)
        unsigned char val;
        unsigned long flags;
-        spin_lock_irqsave(&nv_lock, flags);
+        raw_spin_lock_irqsave(&nv_lock, flags);
        out_8(nvram_addr, addr >> 5);
        val = in_8(&nvram_data[(addr & 0x1f) << 4]);
-        spin_unlock_irqrestore(&nv_lock, flags);
+        raw_spin_unlock_irqrestore(&nv_lock, flags);
        return val;
 }
@@ -177,10 +177,10 @@ static void indirect_nvram_write_byte(int addr, unsigned char val)
 {
        unsigned long flags;
-        spin_lock_irqsave(&nv_lock, flags);
+        raw_spin_lock_irqsave(&nv_lock, flags);
        out_8(nvram_addr, addr >> 5);
        out_8(&nvram_data[(addr & 0x1f) << 4], val);
-        spin_unlock_irqrestore(&nv_lock, flags);
+        raw_spin_unlock_irqrestore(&nv_lock, flags);
 }
@@ -481,7 +481,7 @@ static void core99_nvram_sync(void)
        if (!is_core_99 || !nvram_data || !nvram_image)
                return;
-        spin_lock_irqsave(&nv_lock, flags);
+        raw_spin_lock_irqsave(&nv_lock, flags);
        if (!memcmp(nvram_image, (u8*)nvram_data + core99_bank*NVRAM_SIZE,
                NVRAM_SIZE))
                goto bail;
@@ -503,7 +503,7 @@ static void core99_nvram_sync(void)
                if (core99_write_bank(core99_bank, nvram_image))
                        printk("nvram: Error writing bank %d\n", core99_bank);
 bail:
-        spin_unlock_irqrestore(&nv_lock, flags);
+        raw_spin_unlock_irqrestore(&nv_lock, flags);
 #ifdef DEBUG
        mdelay(2000);
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c
index db20de512f3e..f5e3cda6660e 100644
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
@@ -50,13 +50,13 @@ static int macio_do_gpio_write(PMF_STD_ARGS, u8 value, u8 mask)
                value = ~value;
        /* Toggle the GPIO */
-        spin_lock_irqsave(&feature_lock, flags);
+        raw_spin_lock_irqsave(&feature_lock, flags);
        tmp = readb(addr);
        tmp = (tmp & ~mask) | (value & mask);
        DBG("Do write 0x%02x to GPIO %s (%p)\n",
            tmp, func->node->full_name, addr);
        writeb(tmp, addr);
-        spin_unlock_irqrestore(&feature_lock, flags);
+        raw_spin_unlock_irqrestore(&feature_lock, flags);
        return 0;
 }
@@ -145,9 +145,9 @@ static int macio_do_write_reg32(PMF_STD_ARGS, u32 offset, u32 value, u32 mask)
        struct macio_chip *macio = func->driver_data;
        unsigned long flags;
-        spin_lock_irqsave(&feature_lock, flags);
+        raw_spin_lock_irqsave(&feature_lock, flags);
        MACIO_OUT32(offset, (MACIO_IN32(offset) & ~mask) | (value & mask));
-        spin_unlock_irqrestore(&feature_lock, flags);
+        raw_spin_unlock_irqrestore(&feature_lock, flags);
        return 0;
 }
@@ -168,9 +168,9 @@ static int macio_do_write_reg8(PMF_STD_ARGS, u32 offset, u8 value, u8 mask)
        struct macio_chip *macio = func->driver_data;
        unsigned long flags;
-        spin_lock_irqsave(&feature_lock, flags);
+        raw_spin_lock_irqsave(&feature_lock, flags);
        MACIO_OUT8(offset, (MACIO_IN8(offset) & ~mask) | (value & mask));
-        spin_unlock_irqrestore(&feature_lock, flags);
+        raw_spin_unlock_irqrestore(&feature_lock, flags);
        return 0;
 }
@@ -223,12 +223,12 @@ static int macio_do_write_reg32_slm(PMF_STD_ARGS, u32 offset, u32 shift,
        if (args == NULL || args->count == 0)
                return -EINVAL;
-        spin_lock_irqsave(&feature_lock, flags);
+        raw_spin_lock_irqsave(&feature_lock, flags);
        tmp = MACIO_IN32(offset);
        val = args->u[0].v << shift;
        tmp = (tmp & ~mask) | (val & mask);
        MACIO_OUT32(offset, tmp);
-        spin_unlock_irqrestore(&feature_lock, flags);
+        raw_spin_unlock_irqrestore(&feature_lock, flags);
        return 0;
 }
@@ -243,12 +243,12 @@ static int macio_do_write_reg8_slm(PMF_STD_ARGS, u32 offset, u32 shift,
        if (args == NULL || args->count == 0)
                return -EINVAL;
-        spin_lock_irqsave(&feature_lock, flags);
+        raw_spin_lock_irqsave(&feature_lock, flags);
        tmp = MACIO_IN8(offset);
        val = args->u[0].v << shift;
        tmp = (tmp & ~mask) | (val & mask);
        MACIO_OUT8(offset, tmp);
-        spin_unlock_irqrestore(&feature_lock, flags);
+        raw_spin_unlock_irqrestore(&feature_lock, flags);
        return 0;
 }
@@ -278,12 +278,12 @@ static int unin_do_write_reg32(PMF_STD_ARGS, u32 offset, u32 value, u32 mask)
 {
        unsigned long flags;
-        spin_lock_irqsave(&feature_lock, flags);
+        raw_spin_lock_irqsave(&feature_lock, flags);
        /* This is fairly bogus in darwin, but it should work for our needs
         * implemeted that way:
         */
        UN_OUT(offset, (UN_IN(offset) & ~mask) | (value & mask));
-        spin_unlock_irqrestore(&feature_lock, flags);
+        raw_spin_unlock_irqrestore(&feature_lock, flags);
        return 0;
 }
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index 96d5ce50364e..ede49e78a8da 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -842,7 +842,7 @@ struct pmf_function *__pmf_find_function(struct device_node *target,
        list_for_each_entry(func, &dev->functions, link) {
                if (name && strcmp(name, func->name))
                        continue;
-                if (func->phandle && target->node != func->phandle)
+                if (func->phandle && target->phandle != func->phandle)
                        continue;
                if ((func->flags & flags) == 0)
                        continue;
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 09e827296276..630a533d0e59 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -57,7 +57,7 @@ static int max_irqs;
 static int max_real_irqs;
 static u32 level_mask[4];
-static DEFINE_SPINLOCK(pmac_pic_lock);
+static DEFINE_RAW_SPINLOCK(pmac_pic_lock);
 #define NR_MASK_WORDS   ((NR_IRQS + 31) / 32)
 static unsigned long ppc_lost_interrupts[NR_MASK_WORDS];
@@ -85,7 +85,7 @@ static void pmac_mask_and_ack_irq(unsigned int virq)
        int i = src >> 5;
        unsigned long flags;
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
        __clear_bit(src, ppc_cached_irq_mask);
        if (__test_and_clear_bit(src, ppc_lost_interrupts))
                atomic_dec(&ppc_n_lost_interrupts);
@@ -97,7 +97,7 @@ static void pmac_mask_and_ack_irq(unsigned int virq)
                mb();
        } while((in_le32(&pmac_irq_hw[i]->enable) & bit)
                != (ppc_cached_irq_mask[i] & bit));
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 static void pmac_ack_irq(unsigned int virq)
@@ -107,12 +107,12 @@ static void pmac_ack_irq(unsigned int virq)
        int i = src >> 5;
        unsigned long flags;
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
        if (__test_and_clear_bit(src, ppc_lost_interrupts))
                atomic_dec(&ppc_n_lost_interrupts);
        out_le32(&pmac_irq_hw[i]->ack, bit);
        (void)in_le32(&pmac_irq_hw[i]->ack);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 static void __pmac_set_irq_mask(unsigned int irq_nr, int nokicklost)
@@ -152,12 +152,12 @@ static unsigned int pmac_startup_irq(unsigned int virq)
        unsigned long bit = 1UL << (src & 0x1f);
        int i = src >> 5;
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
        if ((irq_to_desc(virq)->status & IRQ_LEVEL) == 0)
                out_le32(&pmac_irq_hw[i]->ack, bit);
        __set_bit(src, ppc_cached_irq_mask);
        __pmac_set_irq_mask(src, 0);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
        return 0;
 }
@@ -167,10 +167,10 @@ static void pmac_mask_irq(unsigned int virq)
        unsigned long flags;
        unsigned int src = irq_map[virq].hwirq;
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
        __clear_bit(src, ppc_cached_irq_mask);
        __pmac_set_irq_mask(src, 1);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 static void pmac_unmask_irq(unsigned int virq)
@@ -178,24 +178,24 @@ static void pmac_unmask_irq(unsigned int virq)
        unsigned long flags;
        unsigned int src = irq_map[virq].hwirq;
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
        __set_bit(src, ppc_cached_irq_mask);
        __pmac_set_irq_mask(src, 0);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
 }
 static int pmac_retrigger(unsigned int virq)
 {
        unsigned long flags;
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
        __pmac_retrigger(irq_map[virq].hwirq);
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
        return 1;
 }
 static struct irq_chip pmac_pic = {
-        .name           = " PMAC-PIC ",
+        .name           = "PMAC-PIC",
        .startup        = pmac_startup_irq,
        .mask           = pmac_mask_irq,
        .ack            = pmac_ack_irq,
@@ -210,7 +210,7 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id)
        int irq, bits;
        int rc = IRQ_NONE;
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
        for (irq = max_irqs; (irq -= 32) >= max_real_irqs; ) {
                int i = irq >> 5;
                bits = in_le32(&pmac_irq_hw[i]->event) | ppc_lost_interrupts[i];
@@ -220,12 +220,12 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id)
                if (bits == 0)
                        continue;
                irq += __ilog2(bits);
-                spin_unlock_irqrestore(&pmac_pic_lock, flags);
+                raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
                generic_handle_irq(irq);
-                spin_lock_irqsave(&pmac_pic_lock, flags);
+                raw_spin_lock_irqsave(&pmac_pic_lock, flags);
                rc = IRQ_HANDLED;
        }
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
        return rc;
 }
@@ -244,7 +244,7 @@ static unsigned int pmac_pic_get_irq(void)
                return NO_IRQ_IGNORE;   /* ignore, already handled */
        }
 #endif /* CONFIG_SMP */
-        spin_lock_irqsave(&pmac_pic_lock, flags);
+        raw_spin_lock_irqsave(&pmac_pic_lock, flags);
        for (irq = max_real_irqs; (irq -= 32) >= 0; ) {
                int i = irq >> 5;
                bits = in_le32(&pmac_irq_hw[i]->event) | ppc_lost_interrupts[i];
@@ -256,7 +256,7 @@ static unsigned int pmac_pic_get_irq(void)
                irq += __ilog2(bits);
                break;
        }
-        spin_unlock_irqrestore(&pmac_pic_lock, flags);
+        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
        if (unlikely(irq < 0))
                return NO_IRQ;
        return irq_linear_revmap(pmac_pic_host, irq);
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index b40c22d697f0..6898e8241cd0 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -693,9 +693,9 @@ static void __init smp_core99_setup(int ncpus)
 #ifdef CONFIG_PPC64
        /* i2c based HW sync on some G5s */
-        if (machine_is_compatible("PowerMac7,2") ||
+        if (of_machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("PowerMac7,3") ||
-            machine_is_compatible("RackMac3,1"))
+            of_machine_is_compatible("RackMac3,1"))
                smp_core99_setup_i2c_hwsync(ncpus);
        /* pfunc based HW sync on recent G5s */
@@ -713,7 +713,7 @@ static void __init smp_core99_setup(int ncpus)
 #else /* CONFIG_PPC64 */
        /* GPIO based HW sync on ppc32 Core99 */
-        if (pmac_tb_freeze == NULL && !machine_is_compatible("MacRISC4")) {
+        if (pmac_tb_freeze == NULL && !of_machine_is_compatible("MacRISC4")) {
                struct device_node *cpu;
                const u32 *tbprop = NULL;
@@ -750,7 +750,7 @@ static void __init smp_core99_setup(int ncpus)
 #endif
        /* 32 bits SMP can't NAP */
-        if (!machine_is_compatible("MacRISC4"))
+        if (!of_machine_is_compatible("MacRISC4"))
                powersave_nap = 0;
 }
@@ -852,7 +852,7 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr)
                /* If we didn't start the second CPU, we must take
                 * it off the bus
                 */
-                if (machine_is_compatible("MacRISC4") &&
+                if (of_machine_is_compatible("MacRISC4") &&
                    num_online_cpus() < 2)              
                        g5_phy_disable_cpu1();
 #endif /* CONFIG_PPC64 */
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index 1810e4226e56..48211ca134c3 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -317,9 +317,9 @@ void __init pmac_calibrate_decr(void)
         * calibration. That's better since the VIA itself seems
         * to be slightly off. --BenH
         */
-        if (!machine_is_compatible("MacRISC2") &&
+        if (!of_machine_is_compatible("MacRISC2") &&
-            !machine_is_compatible("MacRISC3") &&
+            !of_machine_is_compatible("MacRISC3") &&
-            !machine_is_compatible("MacRISC4"))
+            !of_machine_is_compatible("MacRISC4"))
                if (via_calibrate_decr())
                        return;
@@ -328,7 +328,7 @@ void __init pmac_calibrate_decr(void)
         * probably implement calibration based on the KL timer on these
         * machines anyway... -BenH
         */
-        if (machine_is_compatible("PowerMac3,5"))
+        if (of_machine_is_compatible("PowerMac3,5"))
                if (via_calibrate_decr())
                        return;
 #endif
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c
index 9490157da62e..d83135a9830e 100644
--- a/arch/powerpc/platforms/powermac/udbg_scc.c
+++ b/arch/powerpc/platforms/powermac/udbg_scc.c
@@ -132,9 +132,9 @@ void udbg_scc_init(int force_scc)
                scc_inittab[1] = in_8(sccc);
                out_8(sccc, 12);
                scc_inittab[3] = in_8(sccc);
-        } else if (machine_is_compatible("RackMac1,1")
+        } else if (of_machine_is_compatible("RackMac1,1")
-                   || machine_is_compatible("RackMac1,2")
+                   || of_machine_is_compatible("RackMac1,2")
-                   || machine_is_compatible("MacRISC4")) {
+                   || of_machine_is_compatible("MacRISC4")) {
                /* Xserves and G5s default to 57600 */
                scc_inittab[1] = 0;
                scc_inittab[3] = 0;
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index ccd8dd03b8c9..7df7fbb7cacb 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -100,7 +100,7 @@ int eeh_subsystem_enabled;
 EXPORT_SYMBOL(eeh_subsystem_enabled);
 /* Lock to avoid races due to multiple reports of an error */
-static DEFINE_SPINLOCK(confirm_error_lock);
+static DEFINE_RAW_SPINLOCK(confirm_error_lock);
 /* Buffer for reporting slot-error-detail rtas calls. Its here
 * in BSS, and not dynamically alloced, so that it ends up in
@@ -436,7 +436,7 @@ static void __eeh_clear_slot(struct device_node *parent, int mode_flag)
 void eeh_clear_slot (struct device_node *dn, int mode_flag)
 {
        unsigned long flags;
-        spin_lock_irqsave(&confirm_error_lock, flags);
+        raw_spin_lock_irqsave(&confirm_error_lock, flags);
        
        dn = find_device_pe (dn);
        
@@ -447,7 +447,7 @@ void eeh_clear_slot (struct device_node *dn, int mode_flag)
        PCI_DN(dn)->eeh_mode &= ~mode_flag;
        PCI_DN(dn)->eeh_check_count = 0;
        __eeh_clear_slot(dn, mode_flag);
-        spin_unlock_irqrestore(&confirm_error_lock, flags);
+        raw_spin_unlock_irqrestore(&confirm_error_lock, flags);
 }
 /**
@@ -491,7 +491,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
            pdn->eeh_mode & EEH_MODE_NOCHECK) {
                ignored_check++;
                pr_debug("EEH: Ignored check (%x) for %s %s\n",
-                         pdn->eeh_mode, pci_name (dev), dn->full_name);
+                         pdn->eeh_mode, eeh_pci_name(dev), dn->full_name);
                return 0;
        }
@@ -506,7 +506,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
         * in one slot might report errors simultaneously, and we
         * only want one error recovery routine running.
         */
-        spin_lock_irqsave(&confirm_error_lock, flags);
+        raw_spin_lock_irqsave(&confirm_error_lock, flags);
        rc = 1;
        if (pdn->eeh_mode & EEH_MODE_ISOLATED) {
                pdn->eeh_check_count ++;
@@ -515,7 +515,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                        printk (KERN_ERR "EEH: %d reads ignored for recovering device at "
                                "location=%s driver=%s pci addr=%s\n",
                                pdn->eeh_check_count, location,
-                                dev->driver->name, pci_name(dev));
+                                dev->driver->name, eeh_pci_name(dev));
                        printk (KERN_ERR "EEH: Might be infinite loop in %s driver\n",
                                dev->driver->name);
                        dump_stack();
@@ -575,7 +575,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
         * with other functions on this device, and functions under
         * bridges. */
        eeh_mark_slot (dn, EEH_MODE_ISOLATED);
-        spin_unlock_irqrestore(&confirm_error_lock, flags);
+        raw_spin_unlock_irqrestore(&confirm_error_lock, flags);
        eeh_send_failure_event (dn, dev);
@@ -586,7 +586,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
        return 1;
 dn_unlock:
-        spin_unlock_irqrestore(&confirm_error_lock, flags);
+        raw_spin_unlock_irqrestore(&confirm_error_lock, flags);
        return rc;
 }
@@ -1064,7 +1064,7 @@ void __init eeh_init(void)
        struct device_node *phb, *np;
        struct eeh_early_enable_info info;
-        spin_lock_init(&confirm_error_lock);
+        raw_spin_lock_init(&confirm_error_lock);
        spin_lock_init(&slot_errbuf_lock);
        np = of_find_node_by_path("/rtas");
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index ef8e45448480..b8d70f5d9aa9 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -337,7 +337,7 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
                location = location ? location : "unknown";
                printk(KERN_ERR "EEH: Error: Cannot find partition endpoint "
                                "for location=%s pci addr=%s\n",
-                        location, pci_name(event->dev));
+                        location, eeh_pci_name(event->dev));
                return NULL;
        }
@@ -368,7 +368,7 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
                pci_str = pci_name (frozen_pdn->pcidev);
                drv_str = pcid_name (frozen_pdn->pcidev);
        } else {
-                pci_str = pci_name (event->dev);
+                pci_str = eeh_pci_name(event->dev);
                drv_str = pcid_name (event->dev);
        }
        
@@ -478,9 +478,9 @@ excess_failures:
         * due to actual, failed cards.
         */
        printk(KERN_ERR
-           "EEH: PCI device at location=%s driver=%s pci addr=%s \n"
+           "EEH: PCI device at location=%s driver=%s pci addr=%s\n"
                "has failed %d times in the last hour "
-                "and has been permanently disabled. \n"
+                "and has been permanently disabled.\n"
                "Please try reseating this device or replacing it.\n",
                location, drv_str, pci_str, frozen_pdn->eeh_freeze_count);
        goto perm_error;
@@ -488,7 +488,7 @@ excess_failures:
 hard_fail:
        printk(KERN_ERR
           "EEH: Unable to recover from failure of PCI device "
-           "at location=%s driver=%s pci addr=%s \n"
+           "at location=%s driver=%s pci addr=%s\n"
           "Please try reseating this device or replacing it.\n",
                location, drv_str, pci_str);
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index ddb80f5d850b..ec5df8f519c7 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -80,7 +80,7 @@ static int eeh_event_handler(void * dummy)
        eeh_mark_slot(event->dn, EEH_MODE_RECOVERING);
        printk(KERN_INFO "EEH: Detected PCI bus error on device %s\n",
-               pci_name(event->dev));
+               eeh_pci_name(event->dev));
        pdn = handle_eeh_events(event);
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 6ea4698d9176..d1b124e44d77 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -387,24 +387,12 @@ static char cede_parameters[CEDE_LATENCY_PARAM_MAX_LENGTH];
 static int parse_cede_parameters(void)
 {
-        int call_status;
        memset(cede_parameters, 0, CEDE_LATENCY_PARAM_MAX_LENGTH);
-        call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,
+        return rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,
-                                NULL,
+                         NULL,
-                                CEDE_LATENCY_TOKEN,
+                         CEDE_LATENCY_TOKEN,
-                                __pa(cede_parameters),
+                         __pa(cede_parameters),
-                                CEDE_LATENCY_PARAM_MAX_LENGTH);
+                         CEDE_LATENCY_PARAM_MAX_LENGTH);
-        if (call_status != 0)
-                printk(KERN_INFO "CEDE_LATENCY: \
-                        %s %s Error calling get-system-parameter(0x%x)\n",
-                        __FILE__, __func__, call_status);
-        else
-                printk(KERN_INFO "CEDE_LATENCY: \
-                        get-system-parameter successful.\n");
-        return call_status;
 }
 static int __init pseries_cpu_hotplug_init(void)
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
index 2f58c71b7259..1fefae76e295 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -124,8 +124,8 @@ static void probe_hcall_exit(unsigned long opcode, unsigned long retval,
        h = &__get_cpu_var(hcall_stats)[opcode / 4];
        h->num_calls++;
-        h->tb_total = mftb() - h->tb_start;
+        h->tb_total += mftb() - h->tb_start;
-        h->purr_total = mfspr(SPRN_PURR) - h->purr_start;
+        h->purr_total += mfspr(SPRN_PURR) - h->purr_start;
        put_cpu_var(hcall_stats);
 }
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index b6fa3e4b51b5..4b7a062dee15 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -165,7 +165,7 @@ int remove_phb_dynamic(struct pci_controller *phb)
        struct resource *res;
        int rc, i;
-        pr_debug("PCI: Removing PHB %04x:%02x... \n",
+        pr_debug("PCI: Removing PHB %04x:%02x...\n",
                 pci_domain_nr(b), b->number);
        /* We cannot to remove a root bus that has children */
diff --git a/arch/powerpc/platforms/pseries/phyp_dump.c b/arch/powerpc/platforms/pseries/phyp_dump.c
index 15eb6107bcd2..225a50ab14be 100644
--- a/arch/powerpc/platforms/pseries/phyp_dump.c
+++ b/arch/powerpc/platforms/pseries/phyp_dump.c
@@ -150,7 +150,7 @@ static void print_dump_header(const struct phyp_dump_header *ph)
        printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto);
        /*set cpu state and hpte states as well scratch pad area */
-        printk(KERN_INFO " CPU AREA \n");
+        printk(KERN_INFO " CPU AREA\n");
        printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags);
        printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type);
        printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags);
@@ -161,7 +161,7 @@ static void print_dump_header(const struct phyp_dump_header *ph)
        printk(KERN_INFO "cpu length_copied =%llx\n",
                ph->cpu_data.length_copied);
-        printk(KERN_INFO " HPTE AREA \n");
+        printk(KERN_INFO " HPTE AREA\n");
        printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags);
        printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type);
        printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags);
@@ -172,7 +172,7 @@ static void print_dump_header(const struct phyp_dump_header *ph)
        printk(KERN_INFO "HPTE length_copied =%llx\n",
                ph->hpte_data.length_copied);
-        printk(KERN_INFO " SRSD AREA \n");
+        printk(KERN_INFO " SRSD AREA\n");
        printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags);
        printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type);
        printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags);
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index b4886635972c..4e7f89a84561 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -144,8 +144,8 @@ static void __devinit smp_pSeries_kick_cpu(int nr)
                hcpuid = get_hard_smp_processor_id(nr);
                rc = plpar_hcall_norets(H_PROD, hcpuid);
                if (rc != H_SUCCESS)
-                        printk(KERN_ERR "Error: Prod to wake up processor %d\
+                        printk(KERN_ERR "Error: Prod to wake up processor %d "
-                                                Ret= %ld\n", nr, rc);
+                                                "Ret= %ld\n", nr, rc);
        }
 }
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index f5f79196721c..4ca641042ec3 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -127,7 +127,7 @@ static inline unsigned int lpar_xirr_info_get(void)
        lpar_rc = plpar_xirr(&return_value);
        if (lpar_rc != H_SUCCESS)
-                panic(" bad return code xirr - rc = %lx \n", lpar_rc);
+                panic(" bad return code xirr - rc = %lx\n", lpar_rc);
        return (unsigned int)return_value;
 }
@@ -424,7 +424,7 @@ static int xics_set_affinity(unsigned int virq, const struct cpumask *cpumask)
 }
 static struct irq_chip xics_pic_direct = {
-        .name = " XICS     ",
+        .name = "XICS",
        .startup = xics_startup,
        .mask = xics_mask_irq,
        .unmask = xics_unmask_irq,
@@ -433,7 +433,7 @@ static struct irq_chip xics_pic_direct = {
 };
 static struct irq_chip xics_pic_lpar = {
-        .name = " XICS     ",
+        .name = "XICS",
        .startup = xics_startup,
        .mask = xics_mask_irq,
        .unmask = xics_unmask_irq,
@@ -510,15 +510,13 @@ static void __init xics_init_host(void)
 /*
 * XICS only has a single IPI, so encode the messages per CPU
 */
-struct xics_ipi_struct {
+static DEFINE_PER_CPU_SHARED_ALIGNED(unsigned long, xics_ipi_message);
-        unsigned long value;
-        } ____cacheline_aligned;
-static struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
 static inline void smp_xics_do_message(int cpu, int msg)
 {
-        set_bit(msg, &xics_ipi_message[cpu].value);
+        unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
+        set_bit(msg, tgt);
        mb();
        if (firmware_has_feature(FW_FEATURE_LPAR))
                lpar_qirr_info(cpu, IPI_PRIORITY);
@@ -544,25 +542,23 @@ void smp_xics_message_pass(int target, int msg)
 static irqreturn_t xics_ipi_dispatch(int cpu)
 {
+        unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
        WARN_ON(cpu_is_offline(cpu));
        mb();   /* order mmio clearing qirr */
-        while (xics_ipi_message[cpu].value) {
+        while (*tgt) {
-                if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION,
+                if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION, tgt)) {
-                                       &xics_ipi_message[cpu].value)) {
                        smp_message_recv(PPC_MSG_CALL_FUNCTION);
                }
-                if (test_and_clear_bit(PPC_MSG_RESCHEDULE,
+                if (test_and_clear_bit(PPC_MSG_RESCHEDULE, tgt)) {
-                                       &xics_ipi_message[cpu].value)) {
                        smp_message_recv(PPC_MSG_RESCHEDULE);
                }
-                if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE,
+                if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE, tgt)) {
-                                       &xics_ipi_message[cpu].value)) {
                        smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);
                }
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
-                if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK,
+                if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK, tgt)) {
-                                       &xics_ipi_message[cpu].value)) {
                        smp_message_recv(PPC_MSG_DEBUGGER_BREAK);
                }
 #endif