Merge branch 'for-2.6.36' into for-2.6.37

Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c

74 files changed, 1809 insertions, 311 deletions

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index ec64264f7a50..b72176434ebe 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -71,22 +71,6 @@ config MAKALU
         help
           This option enables support for the AMCC PPC405EX board.
 
-#config REDWOOD_5
-#       bool "Redwood-5"
-#       depends on 40x
-#       default n
-#       select STB03xxx
-#       help
-#         This option enables support for the IBM STB04 evaluation board.
-
-#config REDWOOD_6
-#       bool "Redwood-6"
-#       depends on 40x
-#       default n
-#       select STB03xxx
-#       help
-#         This option enables support for the IBM STBx25xx evaluation board.
-
 #config SYCAMORE
 #       bool "Sycamore"
 #       depends on 40x
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index eeba0a70e466..69d668c072ae 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -171,6 +171,17 @@ config ISS4xx
         help
           This option enables support for the IBM ISS simulation environment
 
+config ICON
+        bool "Icon"
+        depends on 44x
+        default n
+        select PPC44x_SIMPLE
+        select 440SPe
+        select PCI
+        select PPC4xx_PCI_EXPRESS
+        help
+          This option enables support for the AMCC PPC440SPe evaluation board.
+
 #config LUAN
 #       bool "Luan"
 #       depends on 44x
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c
index e8c23ccaa1fc..5f7a29d7f590 100644
--- a/arch/powerpc/platforms/44x/ppc44x_simple.c
+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
@@ -61,7 +61,8 @@ static char *board[] __initdata = {
         "amcc,redwood",
         "amcc,sequoia",
         "amcc,taishan",
-        "amcc,yosemite"
+        "amcc,yosemite",
+        "mosaixtech,icon"
 };
 
 static int __init ppc44x_probe(void)
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index 4dac9b0525a4..27b0651221d1 100644
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -1,32 +1,34 @@
 config PPC_MPC512x
-        bool
+        bool "512x-based boards"
+        depends on 6xx
         select FSL_SOC
         select IPIC
         select PPC_CLOCK
         select PPC_PCI_CHOICE
         select FSL_PCI if PCI
 
-config PPC_MPC5121
-        bool
-        select PPC_MPC512x
-
 config MPC5121_ADS
         bool "Freescale MPC5121E ADS"
-        depends on 6xx
+        depends on PPC_MPC512x
         select DEFAULT_UIMAGE
-        select PPC_MPC5121
         select MPC5121_ADS_CPLD
         help
           This option enables support for the MPC5121E ADS board.
 
 config MPC5121_GENERIC
         bool "Generic support for simple MPC5121 based boards"
-        depends on 6xx
+        depends on PPC_MPC512x
         select DEFAULT_UIMAGE
-        select PPC_MPC5121
         help
           This option enables support for simple MPC5121 based boards
           which do not need custom platform specific setup.
 
           Compatible boards include:  Protonic LVT base boards (ZANMCU
           and VICVT2).
+
+config PDM360NG
+        bool "ifm PDM360NG board"
+        depends on PPC_MPC512x
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the PDM360NG board.
diff --git a/arch/powerpc/platforms/512x/Makefile b/arch/powerpc/platforms/512x/Makefile
index 90be2f5717e6..4efc1c4b6fb5 100644
--- a/arch/powerpc/platforms/512x/Makefile
+++ b/arch/powerpc/platforms/512x/Makefile
@@ -4,3 +4,4 @@
 obj-y                           += clock.o mpc512x_shared.o
 obj-$(CONFIG_MPC5121_ADS)       += mpc5121_ads.o mpc5121_ads_cpld.o
 obj-$(CONFIG_MPC5121_GENERIC)   += mpc5121_generic.o
+obj-$(CONFIG_PDM360NG)          += pdm360ng.o
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c
index 4c42246b86a7..5b243bd3eb3b 100644
--- a/arch/powerpc/platforms/512x/clock.c
+++ b/arch/powerpc/platforms/512x/clock.c
@@ -292,6 +292,15 @@ static void diu_clk_calc(struct clk *clk)
         clk->rate = rate;
 }
 
+static void viu_clk_calc(struct clk *clk)
+{
+        unsigned long rate;
+
+        rate = sys_clk.rate;
+        rate /= 2;
+        clk->rate = rate;
+}
+
 static void half_clk_calc(struct clk *clk)
 {
         clk->rate = clk->parent->rate / 2;
@@ -412,6 +421,14 @@ static struct clk diu_clk = {
         .calc = diu_clk_calc,
 };
 
+static struct clk viu_clk = {
+        .name = "viu_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 18,
+        .calc = viu_clk_calc,
+};
+
 static struct clk axe_clk = {
         .name = "axe_clk",
         .flags = CLK_HAS_CTRL,
@@ -535,6 +552,7 @@ struct clk *rate_clks[] = {
         &ref_clk,
         &sys_clk,
         &diu_clk,
+        &viu_clk,
         &csb_clk,
         &e300_clk,
         &ips_clk,
@@ -660,7 +678,7 @@ static void psc_clks_init(void)
 {
         struct device_node *np;
         const u32 *cell_index;
-        struct of_device *ofdev;
+        struct platform_device *ofdev;
 
         for_each_compatible_node(np, NULL, "fsl,mpc5121-psc") {
                 cell_index = of_get_property(np, "cell-index", NULL);
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index ee6ae129c25c..dcef6ade48e1 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -42,6 +42,7 @@ static void __init mpc5121_ads_setup_arch(void)
         for_each_compatible_node(np, "pci", "fsl,mpc5121-pci")
                 mpc83xx_add_bridge(np);
 #endif
+        mpc512x_setup_diu();
 }
 
 static void __init mpc5121_ads_init_IRQ(void)
@@ -65,6 +66,7 @@ define_machine(mpc5121_ads) {
         .probe                  = mpc5121_ads_probe,
         .setup_arch             = mpc5121_ads_setup_arch,
         .init                   = mpc512x_init,
+        .init_early             = mpc512x_init_diu,
         .init_IRQ               = mpc5121_ads_init_IRQ,
         .get_irq                = ipic_get_irq,
         .calibrate_decr         = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
index a6c0e3a2615d..e487eb06ec6b 100644
--- a/arch/powerpc/platforms/512x/mpc5121_generic.c
+++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
@@ -52,6 +52,8 @@ define_machine(mpc5121_generic) {
         .name                   = "MPC5121 generic",
         .probe                  = mpc5121_generic_probe,
         .init                   = mpc512x_init,
+        .init_early             = mpc512x_init_diu,
+        .setup_arch             = mpc512x_setup_diu,
         .init_IRQ               = mpc512x_init_IRQ,
         .get_irq                = ipic_get_irq,
         .calibrate_decr         = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h
index b2daca0d1488..1ab6d11d0b19 100644
--- a/arch/powerpc/platforms/512x/mpc512x.h
+++ b/arch/powerpc/platforms/512x/mpc512x.h
@@ -16,4 +16,6 @@ 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);
+extern void mpc512x_init_diu(void);
+extern void mpc512x_setup_diu(void);
 #endif                          /* __MPC512X_H__ */
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index 707e572b7c40..e41ebbdb3e12 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -16,7 +16,11 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/of_platform.h>
+#include <linux/fsl-diu-fb.h>
+#include <linux/bootmem.h>
+#include <sysdev/fsl_soc.h>
 
+#include <asm/cacheflush.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
 #include <asm/prom.h>
@@ -54,6 +58,286 @@ void mpc512x_restart(char *cmd)
                 ;
 }
 
+struct fsl_diu_shared_fb {
+        u8              gamma[0x300];   /* 32-bit aligned! */
+        struct diu_ad   ad0;            /* 32-bit aligned! */
+        phys_addr_t     fb_phys;
+        size_t          fb_len;
+        bool            in_use;
+};
+
+unsigned int mpc512x_get_pixel_format(unsigned int bits_per_pixel,
+                                      int monitor_port)
+{
+        switch (bits_per_pixel) {
+        case 32:
+                return 0x88883316;
+        case 24:
+                return 0x88082219;
+        case 16:
+                return 0x65053118;
+        }
+        return 0x00000400;
+}
+
+void mpc512x_set_gamma_table(int monitor_port, char *gamma_table_base)
+{
+}
+
+void mpc512x_set_monitor_port(int monitor_port)
+{
+}
+
+#define DIU_DIV_MASK    0x000000ff
+void mpc512x_set_pixel_clock(unsigned int pixclock)
+{
+        unsigned long bestval, bestfreq, speed, busfreq;
+        unsigned long minpixclock, maxpixclock, pixval;
+        struct mpc512x_ccm __iomem *ccm;
+        struct device_node *np;
+        u32 temp;
+        long err;
+        int i;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-clock");
+        if (!np) {
+                pr_err("Can't find clock control module.\n");
+                return;
+        }
+
+        ccm = of_iomap(np, 0);
+        of_node_put(np);
+        if (!ccm) {
+                pr_err("Can't map clock control module reg.\n");
+                return;
+        }
+
+        np = of_find_node_by_type(NULL, "cpu");
+        if (np) {
+                const unsigned int *prop =
+                        of_get_property(np, "bus-frequency", NULL);
+
+                of_node_put(np);
+                if (prop) {
+                        busfreq = *prop;
+                } else {
+                        pr_err("Can't get bus-frequency property\n");
+                        return;
+                }
+        } else {
+                pr_err("Can't find 'cpu' node.\n");
+                return;
+        }
+
+        /* Pixel Clock configuration */
+        pr_debug("DIU: Bus Frequency = %lu\n", busfreq);
+        speed = busfreq * 4; /* DIU_DIV ratio is 4 * CSB_CLK / DIU_CLK */
+
+        /* Calculate the pixel clock with the smallest error */
+        /* calculate the following in steps to avoid overflow */
+        pr_debug("DIU pixclock in ps - %d\n", pixclock);
+        temp = (1000000000 / pixclock) * 1000;
+        pixclock = temp;
+        pr_debug("DIU pixclock freq - %u\n", pixclock);
+
+        temp = temp / 20; /* pixclock * 0.05 */
+        pr_debug("deviation = %d\n", temp);
+        minpixclock = pixclock - temp;
+        maxpixclock = pixclock + temp;
+        pr_debug("DIU minpixclock - %lu\n", minpixclock);
+        pr_debug("DIU maxpixclock - %lu\n", maxpixclock);
+        pixval = speed/pixclock;
+        pr_debug("DIU pixval = %lu\n", pixval);
+
+        err = LONG_MAX;
+        bestval = pixval;
+        pr_debug("DIU bestval = %lu\n", bestval);
+
+        bestfreq = 0;
+        for (i = -1; i <= 1; i++) {
+                temp = speed / (pixval+i);
+                pr_debug("DIU test pixval i=%d, pixval=%lu, temp freq. = %u\n",
+                        i, pixval, temp);
+                if ((temp < minpixclock) || (temp > maxpixclock))
+                        pr_debug("DIU exceeds monitor range (%lu to %lu)\n",
+                                minpixclock, maxpixclock);
+                else if (abs(temp - pixclock) < err) {
+                        pr_debug("Entered the else if block %d\n", i);
+                        err = abs(temp - pixclock);
+                        bestval = pixval + i;
+                        bestfreq = temp;
+                }
+        }
+
+        pr_debug("DIU chose = %lx\n", bestval);
+        pr_debug("DIU error = %ld\n NomPixClk ", err);
+        pr_debug("DIU: Best Freq = %lx\n", bestfreq);
+        /* Modify DIU_DIV in CCM SCFR1 */
+        temp = in_be32(&ccm->scfr1);
+        pr_debug("DIU: Current value of SCFR1: 0x%08x\n", temp);
+        temp &= ~DIU_DIV_MASK;
+        temp |= (bestval & DIU_DIV_MASK);
+        out_be32(&ccm->scfr1, temp);
+        pr_debug("DIU: Modified value of SCFR1: 0x%08x\n", temp);
+        iounmap(ccm);
+}
+
+ssize_t mpc512x_show_monitor_port(int monitor_port, char *buf)
+{
+        return sprintf(buf, "0 - 5121 LCD\n");
+}
+
+int mpc512x_set_sysfs_monitor_port(int val)
+{
+        return 0;
+}
+
+static struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;
+
+#if defined(CONFIG_FB_FSL_DIU) || \
+    defined(CONFIG_FB_FSL_DIU_MODULE)
+static inline void mpc512x_free_bootmem(struct page *page)
+{
+        __ClearPageReserved(page);
+        BUG_ON(PageTail(page));
+        BUG_ON(atomic_read(&page->_count) > 1);
+        atomic_set(&page->_count, 1);
+        __free_page(page);
+        totalram_pages++;
+}
+
+void mpc512x_release_bootmem(void)
+{
+        unsigned long addr = diu_shared_fb.fb_phys & PAGE_MASK;
+        unsigned long size = diu_shared_fb.fb_len;
+        unsigned long start, end;
+
+        if (diu_shared_fb.in_use) {
+                start = PFN_UP(addr);
+                end = PFN_DOWN(addr + size);
+
+                for (; start < end; start++)
+                        mpc512x_free_bootmem(pfn_to_page(start));
+
+                diu_shared_fb.in_use = false;
+        }
+        diu_ops.release_bootmem = NULL;
+}
+#endif
+
+/*
+ * Check if DIU was pre-initialized. If so, perform steps
+ * needed to continue displaying through the whole boot process.
+ * Move area descriptor and gamma table elsewhere, they are
+ * destroyed by bootmem allocator otherwise. The frame buffer
+ * address range will be reserved in setup_arch() after bootmem
+ * allocator is up.
+ */
+void __init mpc512x_init_diu(void)
+{
+        struct device_node *np;
+        struct diu __iomem *diu_reg;
+        phys_addr_t desc;
+        void __iomem *vaddr;
+        unsigned long mode, pix_fmt, res, bpp;
+        unsigned long dst;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-diu");
+        if (!np) {
+                pr_err("No DIU node\n");
+                return;
+        }
+
+        diu_reg = of_iomap(np, 0);
+        of_node_put(np);
+        if (!diu_reg) {
+                pr_err("Can't map DIU\n");
+                return;
+        }
+
+        mode = in_be32(&diu_reg->diu_mode);
+        if (mode != MFB_MODE1) {
+                pr_info("%s: DIU OFF\n", __func__);
+                goto out;
+        }
+
+        desc = in_be32(&diu_reg->desc[0]);
+        vaddr = ioremap(desc, sizeof(struct diu_ad));
+        if (!vaddr) {
+                pr_err("Can't map DIU area desc.\n");
+                goto out;
+        }
+        memcpy(&diu_shared_fb.ad0, vaddr, sizeof(struct diu_ad));
+        /* flush fb area descriptor */
+        dst = (unsigned long)&diu_shared_fb.ad0;
+        flush_dcache_range(dst, dst + sizeof(struct diu_ad) - 1);
+
+        res = in_be32(&diu_reg->disp_size);
+        pix_fmt = in_le32(vaddr);
+        bpp = ((pix_fmt >> 16) & 0x3) + 1;
+        diu_shared_fb.fb_phys = in_le32(vaddr + 4);
+        diu_shared_fb.fb_len = ((res & 0xfff0000) >> 16) * (res & 0xfff) * bpp;
+        diu_shared_fb.in_use = true;
+        iounmap(vaddr);
+
+        desc = in_be32(&diu_reg->gamma);
+        vaddr = ioremap(desc, sizeof(diu_shared_fb.gamma));
+        if (!vaddr) {
+                pr_err("Can't map DIU area desc.\n");
+                diu_shared_fb.in_use = false;
+                goto out;
+        }
+        memcpy(&diu_shared_fb.gamma, vaddr, sizeof(diu_shared_fb.gamma));
+        /* flush gamma table */
+        dst = (unsigned long)&diu_shared_fb.gamma;
+        flush_dcache_range(dst, dst + sizeof(diu_shared_fb.gamma) - 1);
+
+        iounmap(vaddr);
+        out_be32(&diu_reg->gamma, virt_to_phys(&diu_shared_fb.gamma));
+        out_be32(&diu_reg->desc[1], 0);
+        out_be32(&diu_reg->desc[2], 0);
+        out_be32(&diu_reg->desc[0], virt_to_phys(&diu_shared_fb.ad0));
+
+out:
+        iounmap(diu_reg);
+}
+
+void __init mpc512x_setup_diu(void)
+{
+        int ret;
+
+        /*
+         * We do not allocate and configure new area for bitmap buffer
+         * because it would requere copying bitmap data (splash image)
+         * and so negatively affect boot time. Instead we reserve the
+         * already configured frame buffer area so that it won't be
+         * destroyed. The starting address of the area to reserve and
+         * also it's length is passed to reserve_bootmem(). It will be
+         * freed later on first open of fbdev, when splash image is not
+         * needed any more.
+         */
+        if (diu_shared_fb.in_use) {
+                ret = reserve_bootmem(diu_shared_fb.fb_phys,
+                                      diu_shared_fb.fb_len,
+                                      BOOTMEM_EXCLUSIVE);
+                if (ret) {
+                        pr_err("%s: reserve bootmem failed\n", __func__);
+                        diu_shared_fb.in_use = false;
+                }
+        }
+
+#if defined(CONFIG_FB_FSL_DIU) || \
+    defined(CONFIG_FB_FSL_DIU_MODULE)
+        diu_ops.get_pixel_format        = mpc512x_get_pixel_format;
+        diu_ops.set_gamma_table         = mpc512x_set_gamma_table;
+        diu_ops.set_monitor_port        = mpc512x_set_monitor_port;
+        diu_ops.set_pixel_clock         = mpc512x_set_pixel_clock;
+        diu_ops.show_monitor_port       = mpc512x_show_monitor_port;
+        diu_ops.set_sysfs_monitor_port  = mpc512x_set_sysfs_monitor_port;
+        diu_ops.release_bootmem         = mpc512x_release_bootmem;
+#endif
+}
+
 void __init mpc512x_init_IRQ(void)
 {
         struct device_node *np;
diff --git a/arch/powerpc/platforms/512x/pdm360ng.c b/arch/powerpc/platforms/512x/pdm360ng.c
new file mode 100644
index 000000000000..0575e858291c
--- /dev/null
+++ b/arch/powerpc/platforms/512x/pdm360ng.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2010 DENX Software Engineering
+ *
+ * Anatolij Gustschin, <agust@denx.de>
+ *
+ * PDM360NG board setup
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/ipic.h>
+
+#include "mpc512x.h"
+
+#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
+    defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
+#include <linux/interrupt.h>
+#include <linux/spi/ads7846.h>
+#include <linux/spi/spi.h>
+#include <linux/notifier.h>
+
+static void *pdm360ng_gpio_base;
+
+static int pdm360ng_get_pendown_state(void)
+{
+        u32 reg;
+
+        reg = in_be32(pdm360ng_gpio_base + 0xc);
+        if (reg & 0x40)
+                setbits32(pdm360ng_gpio_base + 0xc, 0x40);
+
+        reg = in_be32(pdm360ng_gpio_base + 0x8);
+
+        /* return 1 if pen is down */
+        return (reg & 0x40) == 0;
+}
+
+static struct ads7846_platform_data pdm360ng_ads7846_pdata = {
+        .model                  = 7845,
+        .get_pendown_state      = pdm360ng_get_pendown_state,
+        .irq_flags              = IRQF_TRIGGER_LOW,
+};
+
+static int __init pdm360ng_penirq_init(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-gpio");
+        if (!np) {
+                pr_err("%s: Can't find 'mpc5121-gpio' node\n", __func__);
+                return -ENODEV;
+        }
+
+        pdm360ng_gpio_base = of_iomap(np, 0);
+        of_node_put(np);
+        if (!pdm360ng_gpio_base) {
+                pr_err("%s: Can't map gpio regs.\n", __func__);
+                return -ENODEV;
+        }
+        out_be32(pdm360ng_gpio_base + 0xc, 0xffffffff);
+        setbits32(pdm360ng_gpio_base + 0x18, 0x2000);
+        setbits32(pdm360ng_gpio_base + 0x10, 0x40);
+
+        return 0;
+}
+
+static int pdm360ng_touchscreen_notifier_call(struct notifier_block *nb,
+                                        unsigned long event, void *__dev)
+{
+        struct device *dev = __dev;
+
+        if ((event == BUS_NOTIFY_ADD_DEVICE) &&
+            of_device_is_compatible(dev->of_node, "ti,ads7846")) {
+                dev->platform_data = &pdm360ng_ads7846_pdata;
+                return NOTIFY_OK;
+        }
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block pdm360ng_touchscreen_nb = {
+        .notifier_call = pdm360ng_touchscreen_notifier_call,
+};
+
+static void __init pdm360ng_touchscreen_init(void)
+{
+        if (pdm360ng_penirq_init())
+                return;
+
+        bus_register_notifier(&spi_bus_type, &pdm360ng_touchscreen_nb);
+}
+#else
+static inline void __init pdm360ng_touchscreen_init(void)
+{
+}
+#endif /* CONFIG_TOUCHSCREEN_ADS7846 */
+
+void __init pdm360ng_init(void)
+{
+        mpc512x_init();
+        pdm360ng_touchscreen_init();
+}
+
+static int __init pdm360ng_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "ifm,pdm360ng");
+}
+
+define_machine(pdm360ng) {
+        .name                   = "PDM360NG",
+        .probe                  = pdm360ng_probe,
+        .setup_arch             = mpc512x_setup_diu,
+        .init                   = pdm360ng_init,
+        .init_early             = mpc512x_init_diu,
+        .init_IRQ               = mpc512x_init_IRQ,
+        .get_irq                = ipic_get_irq,
+        .calibrate_decr         = generic_calibrate_decr,
+        .restart                = mpc512x_restart,
+};
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 6d584f4e3c9a..de55bc0584b5 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
 #include <asm/time.h>
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
index b5c753db125e..80234e5921f5 100644
--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -216,9 +216,6 @@ static int lite5200_pm_enter(suspend_state_t state)
 
         lite5200_restore_regs();
 
-        /* restart jiffies */
-        wakeup_decrementer();
-
         iounmap(mbar);
         return 0;
 }
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index a46bad0c2339..6e905314ad5d 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -12,9 +12,11 @@
 
 #undef DEBUG
 
+#include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/of_platform.h>
+#include <linux/of_gpio.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/mpc52xx.h>
@@ -82,6 +84,14 @@ mpc5200_setup_xlb_arbiter(void)
         iounmap(xlb);
 }
 
+/*
+ * This variable is mapped in mpc52xx_map_common_devices and
+ * used in mpc5200_psc_ac97_gpio_reset().
+ */
+static DEFINE_SPINLOCK(gpio_lock);
+struct mpc52xx_gpio __iomem *simple_gpio;
+struct mpc52xx_gpio_wkup __iomem *wkup_gpio;
+
 /**
  * mpc52xx_declare_of_platform_devices: register internal devices and children
  *                                      of the localplus bus to the of_platform
@@ -109,6 +119,15 @@ static struct of_device_id mpc52xx_cdm_ids[] __initdata = {
         { .compatible = "mpc5200-cdm", }, /* old */
         {}
 };
+static const struct of_device_id mpc52xx_gpio_simple[] = {
+        { .compatible = "fsl,mpc5200-gpio", },
+        {}
+};
+static const struct of_device_id mpc52xx_gpio_wkup[] = {
+        { .compatible = "fsl,mpc5200-gpio-wkup", },
+        {}
+};
+
 
 /**
  * mpc52xx_map_common_devices: iomap devices required by common code
@@ -135,6 +154,16 @@ mpc52xx_map_common_devices(void)
         np = of_find_matching_node(NULL, mpc52xx_cdm_ids);
         mpc52xx_cdm = of_iomap(np, 0);
         of_node_put(np);
+
+        /* simple_gpio registers */
+        np = of_find_matching_node(NULL, mpc52xx_gpio_simple);
+        simple_gpio = of_iomap(np, 0);
+        of_node_put(np);
+
+        /* wkup_gpio registers */
+        np = of_find_matching_node(NULL, mpc52xx_gpio_wkup);
+        wkup_gpio = of_iomap(np, 0);
+        of_node_put(np);
 }
 
 /**
@@ -233,3 +262,80 @@ mpc52xx_restart(char *cmd)
 
         while (1);
 }
+
+#define PSC1_RESET     0x1
+#define PSC1_SYNC      0x4
+#define PSC1_SDATA_OUT 0x1
+#define PSC2_RESET     0x2
+#define PSC2_SYNC      (0x4<<4)
+#define PSC2_SDATA_OUT (0x1<<4)
+#define MPC52xx_GPIO_PSC1_MASK 0x7
+#define MPC52xx_GPIO_PSC2_MASK (0x7<<4)
+
+/**
+ * mpc5200_psc_ac97_gpio_reset: Use gpio pins to reset the ac97 bus
+ *
+ * @psc: psc number to reset (only psc 1 and 2 support ac97)
+ */
+int mpc5200_psc_ac97_gpio_reset(int psc_number)
+{
+        unsigned long flags;
+        u32 gpio;
+        u32 mux;
+        int out;
+        int reset;
+        int sync;
+
+        if ((!simple_gpio) || (!wkup_gpio))
+                return -ENODEV;
+
+        switch (psc_number) {
+        case 0:
+                reset   = PSC1_RESET;           /* AC97_1_RES */
+                sync    = PSC1_SYNC;            /* AC97_1_SYNC */
+                out     = PSC1_SDATA_OUT;       /* AC97_1_SDATA_OUT */
+                gpio    = MPC52xx_GPIO_PSC1_MASK;
+                break;
+        case 1:
+                reset   = PSC2_RESET;           /* AC97_2_RES */
+                sync    = PSC2_SYNC;            /* AC97_2_SYNC */
+                out     = PSC2_SDATA_OUT;       /* AC97_2_SDATA_OUT */
+                gpio    = MPC52xx_GPIO_PSC2_MASK;
+                break;
+        default:
+                pr_err(__FILE__ ": Unable to determine PSC, no ac97 "
+                       "cold-reset will be performed\n");
+                return -ENODEV;
+        }
+
+        spin_lock_irqsave(&gpio_lock, flags);
+
+        /* Reconfiure pin-muxing to gpio */
+        mux = in_be32(&simple_gpio->port_config);
+        out_be32(&simple_gpio->port_config, mux & (~gpio));
+
+        /* enable gpio pins for output */
+        setbits8(&wkup_gpio->wkup_gpioe, reset);
+        setbits32(&simple_gpio->simple_gpioe, sync | out);
+
+        setbits8(&wkup_gpio->wkup_ddr, reset);
+        setbits32(&simple_gpio->simple_ddr, sync | out);
+
+        /* Assert cold reset */
+        clrbits32(&simple_gpio->simple_dvo, sync | out);
+        clrbits8(&wkup_gpio->wkup_dvo, reset);
+
+        /* wait at lease 1 us */
+        udelay(2);
+
+        /* Deassert reset */
+        setbits8(&wkup_gpio->wkup_dvo, reset);
+
+        /* Restore pin-muxing */
+        out_be32(&simple_gpio->port_config, mux);
+
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
+        return 0;
+}
+EXPORT_SYMBOL(mpc5200_psc_ac97_gpio_reset);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
index ca5305a5bd61..0dad9a935eb5 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
@@ -147,26 +147,25 @@ mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
         return 0;
 }
 
-static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev,
+static int __devinit mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev,
                                         const struct of_device_id *match)
 {
         struct mpc52xx_gpiochip *chip;
         struct mpc52xx_gpio_wkup __iomem *regs;
-        struct of_gpio_chip *ofchip;
+        struct gpio_chip *gc;
         int ret;
 
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (!chip)
                 return -ENOMEM;
 
-        ofchip = &chip->mmchip.of_gc;
+        gc = &chip->mmchip.gc;
 
-        ofchip->gpio_cells          = 2;
-        ofchip->gc.ngpio            = 8;
-        ofchip->gc.direction_input  = mpc52xx_wkup_gpio_dir_in;
-        ofchip->gc.direction_output = mpc52xx_wkup_gpio_dir_out;
-        ofchip->gc.get              = mpc52xx_wkup_gpio_get;
-        ofchip->gc.set              = mpc52xx_wkup_gpio_set;
+        gc->ngpio            = 8;
+        gc->direction_input  = mpc52xx_wkup_gpio_dir_in;
+        gc->direction_output = mpc52xx_wkup_gpio_dir_out;
+        gc->get              = mpc52xx_wkup_gpio_get;
+        gc->set              = mpc52xx_wkup_gpio_set;
 
         ret = of_mm_gpiochip_add(ofdev->dev.of_node, &chip->mmchip);
         if (ret)
@@ -180,7 +179,7 @@ static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev,
         return 0;
 }
 
-static int mpc52xx_gpiochip_remove(struct of_device *ofdev)
+static int mpc52xx_gpiochip_remove(struct platform_device *ofdev)
 {
         return -EBUSY;
 }
@@ -311,11 +310,11 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
         return 0;
 }
 
-static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev,
+static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev,
                                         const struct of_device_id *match)
 {
         struct mpc52xx_gpiochip *chip;
-        struct of_gpio_chip *ofchip;
+        struct gpio_chip *gc;
         struct mpc52xx_gpio __iomem *regs;
         int ret;
 
@@ -323,14 +322,13 @@ static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev,
         if (!chip)
                 return -ENOMEM;
 
-        ofchip = &chip->mmchip.of_gc;
+        gc = &chip->mmchip.gc;
 
-        ofchip->gpio_cells          = 2;
-        ofchip->gc.ngpio            = 32;
-        ofchip->gc.direction_input  = mpc52xx_simple_gpio_dir_in;
-        ofchip->gc.direction_output = mpc52xx_simple_gpio_dir_out;
-        ofchip->gc.get              = mpc52xx_simple_gpio_get;
-        ofchip->gc.set              = mpc52xx_simple_gpio_set;
+        gc->ngpio            = 32;
+        gc->direction_input  = mpc52xx_simple_gpio_dir_in;
+        gc->direction_output = mpc52xx_simple_gpio_dir_out;
+        gc->get              = mpc52xx_simple_gpio_get;
+        gc->set              = mpc52xx_simple_gpio_set;
 
         ret = of_mm_gpiochip_add(ofdev->dev.of_node, &chip->mmchip);
         if (ret)
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 46c93578cbf0..fea833e18ad5 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -78,7 +78,7 @@ MODULE_LICENSE("GPL");
  * @dev: pointer to device structure
  * @regs: virtual address of GPT registers
  * @lock: spinlock to coordinate between different functions.
- * @of_gc: of_gpio_chip instance structure; used when GPIO is enabled
+ * @gc: gpio_chip instance structure; used when GPIO is enabled
  * @irqhost: Pointer to irq_host instance; used when IRQ mode is supported
  * @wdt_mode: only relevant for gpt0: bit 0 (MPC52xx_GPT_CAN_WDT) indicates
  *   if the gpt may be used as wdt, bit 1 (MPC52xx_GPT_IS_WDT) indicates
@@ -94,7 +94,7 @@ struct mpc52xx_gpt_priv {
         u8 wdt_mode;
 
 #if defined(CONFIG_GPIOLIB)
-        struct of_gpio_chip of_gc;
+        struct gpio_chip gc;
 #endif
 };
 
@@ -280,7 +280,7 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
 #if defined(CONFIG_GPIOLIB)
 static inline struct mpc52xx_gpt_priv *gc_to_mpc52xx_gpt(struct gpio_chip *gc)
 {
-        return container_of(to_of_gpio_chip(gc), struct mpc52xx_gpt_priv,of_gc);
+        return container_of(gc, struct mpc52xx_gpt_priv, gc);
 }
 
 static int mpc52xx_gpt_gpio_get(struct gpio_chip *gc, unsigned int gpio)
@@ -336,28 +336,25 @@ mpc52xx_gpt_gpio_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
         if (!of_find_property(node, "gpio-controller", NULL))
                 return;
 
-        gpt->of_gc.gc.label = kstrdup(node->full_name, GFP_KERNEL);
-        if (!gpt->of_gc.gc.label) {
+        gpt->gc.label = kstrdup(node->full_name, GFP_KERNEL);
+        if (!gpt->gc.label) {
                 dev_err(gpt->dev, "out of memory\n");
                 return;
         }
 
-        gpt->of_gc.gpio_cells = 2;
-        gpt->of_gc.gc.ngpio = 1;
-        gpt->of_gc.gc.direction_input  = mpc52xx_gpt_gpio_dir_in;
-        gpt->of_gc.gc.direction_output = mpc52xx_gpt_gpio_dir_out;
-        gpt->of_gc.gc.get = mpc52xx_gpt_gpio_get;
-        gpt->of_gc.gc.set = mpc52xx_gpt_gpio_set;
-        gpt->of_gc.gc.base = -1;
-        gpt->of_gc.xlate = of_gpio_simple_xlate;
-        node->data = &gpt->of_gc;
-        of_node_get(node);
+        gpt->gc.ngpio = 1;
+        gpt->gc.direction_input  = mpc52xx_gpt_gpio_dir_in;
+        gpt->gc.direction_output = mpc52xx_gpt_gpio_dir_out;
+        gpt->gc.get = mpc52xx_gpt_gpio_get;
+        gpt->gc.set = mpc52xx_gpt_gpio_set;
+        gpt->gc.base = -1;
+        gpt->gc.of_node = node;
 
         /* Setup external pin in GPIO mode */
         clrsetbits_be32(&gpt->regs->mode, MPC52xx_GPT_MODE_MS_MASK,
                         MPC52xx_GPT_MODE_MS_GPIO);
 
-        rc = gpiochip_add(&gpt->of_gc.gc);
+        rc = gpiochip_add(&gpt->gc);
         if (rc)
                 dev_err(gpt->dev, "gpiochip_add() failed; rc=%i\n", rc);
 
@@ -723,7 +720,7 @@ static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt,
 /* ---------------------------------------------------------------------
  * of_platform bus binding code
  */
-static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,
+static int __devinit mpc52xx_gpt_probe(struct platform_device *ofdev,
                                        const struct of_device_id *match)
 {
         struct mpc52xx_gpt_priv *gpt;
@@ -769,7 +766,7 @@ static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,
         return 0;
 }
 
-static int mpc52xx_gpt_remove(struct of_device *ofdev)
+static int mpc52xx_gpt_remove(struct platform_device *ofdev)
 {
         return -EBUSY;
 }
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index e86aec644501..f4ac213c89c0 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -436,8 +436,8 @@ void mpc52xx_lpbfifo_abort(struct mpc52xx_lpbfifo_request *req)
 }
 EXPORT_SYMBOL(mpc52xx_lpbfifo_abort);
 
-static int __devinit
-mpc52xx_lpbfifo_probe(struct of_device *op, const struct of_device_id *match)
+static int __devinit mpc52xx_lpbfifo_probe(struct platform_device *op,
+                                           const struct of_device_id *match)
 {
         struct resource res;
         int rc = -ENOMEM;
@@ -507,7 +507,7 @@ mpc52xx_lpbfifo_probe(struct of_device *op, const struct of_device_id *match)
 }
 
 
-static int __devexit mpc52xx_lpbfifo_remove(struct of_device *op)
+static int __devexit mpc52xx_lpbfifo_remove(struct platform_device *op)
 {
         if (lpbfifo.dev != &op->dev)
                 return 0;
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index a55b0b6813ed..568cef636275 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
@@ -64,10 +64,19 @@ int mpc52xx_pm_prepare(void)
                 { .type = "builtin", .compatible = "mpc5200", }, /* efika */
                 {}
         };
+        struct resource res;
 
         /* map the whole register space */
         np = of_find_matching_node(NULL, immr_ids);
-        mbar = of_iomap(np, 0);
+
+        if (of_address_to_resource(np, 0, &res)) {
+                pr_err("mpc52xx_pm_prepare(): could not get IMMR address\n");
+                of_node_put(np);
+                return -ENOSYS;
+        }
+
+        mbar = ioremap(res.start, 0xc000); /* we should map whole region including SRAM */
+
         of_node_put(np);
         if (!mbar) {
                 pr_err("mpc52xx_pm_prepare(): could not map registers\n");
@@ -162,9 +171,6 @@ int mpc52xx_pm_enter(suspend_state_t state)
         /* restore SRAM */
         memcpy(sram, saved_sram, sram_size);
 
-        /* restart jiffies */
-        wakeup_decrementer();
-
         /* reenable interrupts in PIC */
         out_be32(&intr->main_mask, intr_main_mask);
 
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 9f2e52b36f91..1565e0446dc8 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -111,7 +111,7 @@ static struct mdiobb_ctrl ep8248e_mdio_ctrl = {
         .ops = &ep8248e_mdio_ops,
 };
 
-static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
+static int __devinit ep8248e_mdio_probe(struct platform_device *ofdev,
                                         const struct of_device_id *match)
 {
         struct mii_bus *bus;
@@ -154,7 +154,7 @@ err_free_bus:
         return ret;
 }
 
-static int ep8248e_mdio_remove(struct of_device *ofdev)
+static int ep8248e_mdio_remove(struct platform_device *ofdev)
 {
         BUG();
         return 0;
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index f49a2548c5ff..021763a32c2f 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -9,6 +9,14 @@ menuconfig PPC_83xx
 
 if PPC_83xx
 
+config MPC830x_RDB
+        bool "Freescale MPC830x RDB"
+        select DEFAULT_UIMAGE
+        select PPC_MPC831x
+        select FSL_GTM
+        help
+          This option enables support for the MPC8308 RDB board.
+
 config MPC831x_RDB
         bool "Freescale MPC831x RDB"
         select DEFAULT_UIMAGE
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index e139c36572ec..6e8bbbbcfdf8 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -4,6 +4,7 @@
 obj-y                           := misc.o usb.o
 obj-$(CONFIG_SUSPEND)           += suspend.o suspend-asm.o
 obj-$(CONFIG_MCU_MPC8349EMITX)  += mcu_mpc8349emitx.o
+obj-$(CONFIG_MPC830x_RDB)       += mpc830x_rdb.o
 obj-$(CONFIG_MPC831x_RDB)       += mpc831x_rdb.o
 obj-$(CONFIG_MPC832x_RDB)       += mpc832x_rdb.o
 obj-$(CONFIG_MPC834x_MDS)       += mpc834x_mds.o
diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
index d119a7c1c17a..70798ac911ef 100644
--- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
@@ -35,9 +35,8 @@
 
 struct mcu {
         struct mutex lock;
-        struct device_node *np;
         struct i2c_client *client;
-        struct of_gpio_chip of_gc;
+        struct gpio_chip gc;
         u8 reg_ctrl;
 };
 
@@ -56,8 +55,7 @@ static void mcu_power_off(void)
 
 static void mcu_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 {
-        struct of_gpio_chip *of_gc = to_of_gpio_chip(gc);
-        struct mcu *mcu = container_of(of_gc, struct mcu, of_gc);
+        struct mcu *mcu = container_of(gc, struct mcu, gc);
         u8 bit = 1 << (4 + gpio);
 
         mutex_lock(&mcu->lock);
@@ -79,9 +77,7 @@ static int mcu_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 static int mcu_gpiochip_add(struct mcu *mcu)
 {
         struct device_node *np;
-        struct of_gpio_chip *of_gc = &mcu->of_gc;
-        struct gpio_chip *gc = &of_gc->gc;
-        int ret;
+        struct gpio_chip *gc = &mcu->gc;
 
         np = of_find_compatible_node(NULL, NULL, "fsl,mcu-mpc8349emitx");
         if (!np)
@@ -94,32 +90,14 @@ static int mcu_gpiochip_add(struct mcu *mcu)
         gc->base = -1;
         gc->set = mcu_gpio_set;
         gc->direction_output = mcu_gpio_dir_out;
-        of_gc->gpio_cells = 2;
-        of_gc->xlate = of_gpio_simple_xlate;
+        gc->of_node = np;
 
-        np->data = of_gc;
-        mcu->np = np;
-
-        /*
-         * We don't want to lose the node, its ->data and ->full_name...
-         * So, if succeeded, we don't put the node here.
-         */
-        ret = gpiochip_add(gc);
-        if (ret)
-                of_node_put(np);
-        return ret;
+        return gpiochip_add(gc);
 }
 
 static int mcu_gpiochip_remove(struct mcu *mcu)
 {
-        int ret;
-
-        ret = gpiochip_remove(&mcu->of_gc.gc);
-        if (ret)
-                return ret;
-        of_node_put(mcu->np);
-
-        return 0;
+        return gpiochip_remove(&mcu->gc);
 }
 
 static int __devinit mcu_probe(struct i2c_client *client,
@@ -182,10 +160,16 @@ static const struct i2c_device_id mcu_ids[] = {
 };
 MODULE_DEVICE_TABLE(i2c, mcu_ids);
 
+static struct of_device_id mcu_of_match_table[] __devinitdata = {
+        { .compatible = "fsl,mcu-mpc8349emitx", },
+        { },
+};
+
 static struct i2c_driver mcu_driver = {
         .driver = {
                 .name = "mcu-mpc8349emitx",
                 .owner = THIS_MODULE,
+                .of_match_table = mcu_of_match_table,
         },
         .probe = mcu_probe,
         .remove = __devexit_p(mcu_remove),
diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
new file mode 100644
index 000000000000..ac102ee9abe8
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
@@ -0,0 +1,94 @@
+/*
+ * arch/powerpc/platforms/83xx/mpc830x_rdb.c
+ *
+ * Description: MPC830x RDB board specific routines.
+ * This file is based on mpc831x_rdb.c
+ *
+ * Copyright (C) Freescale Semiconductor, Inc. 2009. All rights reserved.
+ * Copyright (C) 2010. Ilya Yanok, Emcraft Systems, yanok@emcraft.com
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/pci.h>
+#include <linux/of_platform.h>
+#include <asm/time.h>
+#include <asm/ipic.h>
+#include <asm/udbg.h>
+#include <sysdev/fsl_pci.h>
+#include <sysdev/fsl_soc.h>
+#include "mpc83xx.h"
+
+/*
+ * Setup the architecture
+ */
+static void __init mpc830x_rdb_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+        struct device_node *np;
+#endif
+
+        if (ppc_md.progress)
+                ppc_md.progress("mpc830x_rdb_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for_each_compatible_node(np, "pci", "fsl,mpc8308-pcie")
+                mpc83xx_add_bridge(np);
+#endif
+        mpc831x_usb_cfg();
+}
+
+static void __init mpc830x_rdb_init_IRQ(void)
+{
+        struct device_node *np;
+
+        np = of_find_node_by_type(NULL, "ipic");
+        if (!np)
+                return;
+
+        ipic_init(np, 0);
+
+        /* Initialize the default interrupt mapping priorities,
+         * in case the boot rom changed something on us.
+         */
+        ipic_set_default_priority();
+}
+
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init mpc830x_rdb_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "MPC8308RDB") ||
+               of_flat_dt_is_compatible(root, "fsl,mpc8308rdb");
+}
+
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .compatible = "simple-bus" },
+        { .compatible = "gianfar" },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+machine_device_initcall(mpc830x_rdb, declare_of_platform_devices);
+
+define_machine(mpc830x_rdb) {
+        .name                   = "MPC830x RDB",
+        .probe                  = mpc830x_rdb_probe,
+        .setup_arch             = mpc830x_rdb_setup_arch,
+        .init_IRQ               = mpc830x_rdb_init_IRQ,
+        .get_irq                = ipic_get_irq,
+        .restart                = mpc83xx_restart,
+        .time_init              = mpc83xx_time_init,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c
index 51df7e754698..f9751c8905be 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c
@@ -102,7 +102,7 @@ static struct of_device_id mpc837x_ids[] = {
 
 static int __init mpc837x_declare_of_platform_devices(void)
 {
-        /* Publish of_device */
+        /* Publish platform_device */
         of_platform_bus_probe(NULL, mpc837x_ids, NULL);
 
         return 0;
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
index e00801c42540..910caa6b5810 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -78,7 +78,7 @@ static struct of_device_id mpc837x_ids[] = {
 
 static int __init mpc837x_declare_of_platform_devices(void)
 {
-        /* Publish of_device */
+        /* Publish platform_device */
         of_platform_bus_probe(NULL, mpc837x_ids, NULL);
 
         return 0;
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index ebe6c3537209..75ae77f1af6a 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -99,7 +99,7 @@ struct pmc_type {
         int has_deep_sleep;
 };
 
-static struct of_device *pmc_dev;
+static struct platform_device *pmc_dev;
 static int has_deep_sleep, deep_sleeping;
 static int pmc_irq;
 static struct mpc83xx_pmc __iomem *pmc_regs;
@@ -318,7 +318,7 @@ static struct platform_suspend_ops mpc83xx_suspend_ops = {
         .end = mpc83xx_suspend_end,
 };
 
-static int pmc_probe(struct of_device *ofdev,
+static int pmc_probe(struct platform_device *ofdev,
                      const struct of_device_id *match)
 {
         struct device_node *np = ofdev->dev.of_node;
@@ -396,7 +396,7 @@ out:
         return ret;
 }
 
-static int pmc_remove(struct of_device *ofdev)
+static int pmc_remove(struct platform_device *ofdev)
 {
         return -EPERM;
 };
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 3a2ade2e443f..bea1f5905ad4 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -65,6 +65,14 @@ config MPC85xx_RDB
         help
           This option enables support for the MPC85xx RDB (P2020 RDB) board
 
+config P1022_DS
+        bool "Freescale P1022 DS"
+        select DEFAULT_UIMAGE
+        select CONFIG_PHYS_64BIT        # The DTS has 36-bit addresses
+        select SWIOTLB
+        help
+          This option enables support for the Freescale P1022DS reference board.
+
 config SOCRATES
         bool "Socrates"
         select DEFAULT_UIMAGE
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 387c128f2c8c..a2ec3f8f4d06 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o
 obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o
 obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
 obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o
+obj-$(CONFIG_P1022_DS)    += p1022_ds.o
 obj-$(CONFIG_P4080_DS)    += p4080_ds.o corenet_ds.o
 obj-$(CONFIG_STX_GP3)     += stx_gp3.o
 obj-$(CONFIG_TQM85xx)     += tqm85xx.o
diff --git a/arch/powerpc/platforms/85xx/corenet_ds.c b/arch/powerpc/platforms/85xx/corenet_ds.c
index 534c2ecc89d9..2ab338c9ac37 100644
--- a/arch/powerpc/platforms/85xx/corenet_ds.c
+++ b/arch/powerpc/platforms/85xx/corenet_ds.c
@@ -16,7 +16,7 @@
 #include <linux/kdev_t.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -100,7 +100,7 @@ void __init corenet_ds_setup_arch(void)
 #endif
 
 #ifdef CONFIG_SWIOTLB
-        if (lmb_end_of_DRAM() > max) {
+        if (memblock_end_of_DRAM() > max) {
                 ppc_swiotlb_enable = 1;
                 set_pci_dma_ops(&swiotlb_dma_ops);
                 ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;
diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c
index 004b7d36cdb7..f79f2f102141 100644
--- a/arch/powerpc/platforms/85xx/mpc8536_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c
@@ -17,7 +17,7 @@
 #include <linux/seq_file.h>
 #include <linux/interrupt.h>
 #include <linux/of_platform.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -94,7 +94,7 @@ static void __init mpc8536_ds_setup_arch(void)
 #endif
 
 #ifdef CONFIG_SWIOTLB
-        if (lmb_end_of_DRAM() > max) {
+        if (memblock_end_of_DRAM() > max) {
                 ppc_swiotlb_enable = 1;
                 set_pci_dma_ops(&swiotlb_dma_ops);
                 ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 544011a562fb..8190bc25bf27 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -20,7 +20,7 @@
 #include <linux/seq_file.h>
 #include <linux/interrupt.h>
 #include <linux/of_platform.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -190,7 +190,7 @@ static void __init mpc85xx_ds_setup_arch(void)
 #endif
 
 #ifdef CONFIG_SWIOTLB
-        if (lmb_end_of_DRAM() > max) {
+        if (memblock_end_of_DRAM() > max) {
                 ppc_swiotlb_enable = 1;
                 set_pci_dma_ops(&swiotlb_dma_ops);
                 ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index f0684c8ac960..da64be19d099 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Freescale Semicondutor, Inc. 2006-2007. All rights reserved.
+ * Copyright (C) Freescale Semicondutor, Inc. 2006-2010. All rights reserved.
  *
  * Author: Andy Fleming <afleming@freescale.com>
  *
@@ -33,7 +33,7 @@
 #include <linux/of_platform.h>
 #include <linux/of_device.h>
 #include <linux/phy.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/system.h>
 #include <asm/atomic.h>
@@ -154,47 +154,112 @@ static int mpc8568_mds_phy_fixups(struct phy_device *phydev)
  * Setup the architecture
  *
  */
-static void __init mpc85xx_mds_setup_arch(void)
+#ifdef CONFIG_SMP
+extern void __init mpc85xx_smp_init(void);
+#endif
+
+#ifdef CONFIG_QUICC_ENGINE
+static struct of_device_id mpc85xx_qe_ids[] __initdata = {
+        { .type = "qe", },
+        { .compatible = "fsl,qe", },
+        { },
+};
+
+static void __init mpc85xx_publish_qe_devices(void)
 {
         struct device_node *np;
-        static u8 __iomem *bcsr_regs = NULL;
-#ifdef CONFIG_PCI
-        struct pci_controller *hose;
-#endif
-        dma_addr_t max = 0xffffffff;
 
-        if (ppc_md.progress)
-                ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
+        np = of_find_compatible_node(NULL, NULL, "fsl,qe");
+        if (!of_device_is_available(np)) {
+                of_node_put(np);
+                return;
+        }
+
+        of_platform_bus_probe(NULL, mpc85xx_qe_ids, NULL);
+}
+
+static void __init mpc85xx_mds_reset_ucc_phys(void)
+{
+        struct device_node *np;
+        static u8 __iomem *bcsr_regs;
 
         /* Map BCSR area */
         np = of_find_node_by_name(NULL, "bcsr");
-        if (np != NULL) {
-                struct resource res;
+        if (!np)
+                return;
 
-                of_address_to_resource(np, 0, &res);
-                bcsr_regs = ioremap(res.start, res.end - res.start +1);
-                of_node_put(np);
-        }
+        bcsr_regs = of_iomap(np, 0);
+        of_node_put(np);
+        if (!bcsr_regs)
+                return;
 
-#ifdef CONFIG_PCI
-        for_each_node_by_type(np, "pci") {
-                if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
-                    of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
-                        struct resource rsrc;
-                        of_address_to_resource(np, 0, &rsrc);
-                        if ((rsrc.start & 0xfffff) == 0x8000)
-                                fsl_add_bridge(np, 1);
-                        else
-                                fsl_add_bridge(np, 0);
+        if (machine_is(mpc8568_mds)) {
+#define BCSR_UCC1_GETH_EN       (0x1 << 7)
+#define BCSR_UCC2_GETH_EN       (0x1 << 7)
+#define BCSR_UCC1_MODE_MSK      (0x3 << 4)
+#define BCSR_UCC2_MODE_MSK      (0x3 << 0)
 
-                        hose = pci_find_hose_for_OF_device(np);
-                        max = min(max, hose->dma_window_base_cur +
-                                        hose->dma_window_size);
+                /* Turn off UCC1 & UCC2 */
+                clrbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
+                clrbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
+
+                /* Mode is RGMII, all bits clear */
+                clrbits8(&bcsr_regs[11], BCSR_UCC1_MODE_MSK |
+                                         BCSR_UCC2_MODE_MSK);
+
+                /* Turn UCC1 & UCC2 on */
+                setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
+                setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
+        } else if (machine_is(mpc8569_mds)) {
+#define BCSR7_UCC12_GETHnRST    (0x1 << 2)
+#define BCSR8_UEM_MARVELL_RST   (0x1 << 1)
+#define BCSR_UCC_RGMII          (0x1 << 6)
+#define BCSR_UCC_RTBI           (0x1 << 5)
+                /*
+                 * U-Boot mangles interrupt polarity for Marvell PHYs,
+                 * so reset built-in and UEM Marvell PHYs, this puts
+                 * the PHYs into their normal state.
+                 */
+                clrbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST);
+                setbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST);
+
+                setbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST);
+                clrbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST);
+
+                for (np = NULL; (np = of_find_compatible_node(np,
+                                                "network",
+                                                "ucc_geth")) != NULL;) {
+                        const unsigned int *prop;
+                        int ucc_num;
+
+                        prop = of_get_property(np, "cell-index", NULL);
+                        if (prop == NULL)
+                                continue;
+
+                        ucc_num = *prop - 1;
+
+                        prop = of_get_property(np, "phy-connection-type", NULL);
+                        if (prop == NULL)
+                                continue;
+
+                        if (strcmp("rtbi", (const char *)prop) == 0)
+                                clrsetbits_8(&bcsr_regs[7 + ucc_num],
+                                        BCSR_UCC_RGMII, BCSR_UCC_RTBI);
                 }
+        } else if (machine_is(p1021_mds)) {
+#define BCSR11_ENET_MICRST     (0x1 << 5)
+                /* Reset Micrel PHY */
+                clrbits8(&bcsr_regs[11], BCSR11_ENET_MICRST);
+                setbits8(&bcsr_regs[11], BCSR11_ENET_MICRST);
         }
-#endif
 
-#ifdef CONFIG_QUICC_ENGINE
+        iounmap(bcsr_regs);
+}
+
+static void __init mpc85xx_mds_qe_init(void)
+{
+        struct device_node *np;
+
         np = of_find_compatible_node(NULL, NULL, "fsl,qe");
         if (!np) {
                 np = of_find_node_by_name(NULL, "qe");
@@ -202,6 +267,11 @@ static void __init mpc85xx_mds_setup_arch(void)
                         return;
         }
 
+        if (!of_device_is_available(np)) {
+                of_node_put(np);
+                return;
+        }
+
         qe_reset();
         of_node_put(np);
 
@@ -216,68 +286,109 @@ static void __init mpc85xx_mds_setup_arch(void)
                         par_io_of_config(ucc);
         }
 
-        if (bcsr_regs) {
-                if (machine_is(mpc8568_mds)) {
-#define BCSR_UCC1_GETH_EN       (0x1 << 7)
-#define BCSR_UCC2_GETH_EN       (0x1 << 7)
-#define BCSR_UCC1_MODE_MSK      (0x3 << 4)
-#define BCSR_UCC2_MODE_MSK      (0x3 << 0)
+        mpc85xx_mds_reset_ucc_phys();
 
-                        /* Turn off UCC1 & UCC2 */
-                        clrbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
-                        clrbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
+        if (machine_is(p1021_mds)) {
+#define MPC85xx_PMUXCR_OFFSET           0x60
+#define MPC85xx_PMUXCR_QE0              0x00008000
+#define MPC85xx_PMUXCR_QE3              0x00001000
+#define MPC85xx_PMUXCR_QE9              0x00000040
+#define MPC85xx_PMUXCR_QE12             0x00000008
+                static __be32 __iomem *pmuxcr;
 
-                        /* Mode is RGMII, all bits clear */
-                        clrbits8(&bcsr_regs[11], BCSR_UCC1_MODE_MSK |
-                                                 BCSR_UCC2_MODE_MSK);
+                np = of_find_node_by_name(NULL, "global-utilities");
 
-                        /* Turn UCC1 & UCC2 on */
-                        setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
-                        setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
-                } else if (machine_is(mpc8569_mds)) {
-#define BCSR7_UCC12_GETHnRST    (0x1 << 2)
-#define BCSR8_UEM_MARVELL_RST   (0x1 << 1)
-#define BCSR_UCC_RGMII          (0x1 << 6)
-#define BCSR_UCC_RTBI           (0x1 << 5)
-                        /*
-                         * U-Boot mangles interrupt polarity for Marvell PHYs,
-                         * so reset built-in and UEM Marvell PHYs, this puts
-                         * the PHYs into their normal state.
+                if (np) {
+                        pmuxcr = of_iomap(np, 0) + MPC85xx_PMUXCR_OFFSET;
+
+                        if (!pmuxcr)
+                                printk(KERN_EMERG "Error: Alternate function"
+                                        " signal multiplex control register not"
+                                        " mapped!\n");
+                        else
+                        /* P1021 has pins muxed for QE and other functions. To
+                         * enable QE UEC mode, we need to set bit QE0 for UCC1
+                         * in Eth mode, QE0 and QE3 for UCC5 in Eth mode, QE9
+                         * and QE12 for QE MII management singals in PMUXCR
+                         * register.
                          */
-                        clrbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST);
-                        setbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST);
+                                setbits32(pmuxcr, MPC85xx_PMUXCR_QE0 |
+                                                  MPC85xx_PMUXCR_QE3 |
+                                                  MPC85xx_PMUXCR_QE9 |
+                                                  MPC85xx_PMUXCR_QE12);
 
-                        setbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST);
-                        clrbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST);
+                        of_node_put(np);
+                }
 
-                        for (np = NULL; (np = of_find_compatible_node(np,
-                                                        "network",
-                                                        "ucc_geth")) != NULL;) {
-                                const unsigned int *prop;
-                                int ucc_num;
+        }
+}
 
-                                prop = of_get_property(np, "cell-index", NULL);
-                                if (prop == NULL)
-                                        continue;
+static void __init mpc85xx_mds_qeic_init(void)
+{
+        struct device_node *np;
 
-                                ucc_num = *prop - 1;
+        np = of_find_compatible_node(NULL, NULL, "fsl,qe");
+        if (!of_device_is_available(np)) {
+                of_node_put(np);
+                return;
+        }
 
-                                prop = of_get_property(np, "phy-connection-type", NULL);
-                                if (prop == NULL)
-                                        continue;
+        np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
+        if (!np) {
+                np = of_find_node_by_type(NULL, "qeic");
+                if (!np)
+                        return;
+        }
 
-                                if (strcmp("rtbi", (const char *)prop) == 0)
-                                        clrsetbits_8(&bcsr_regs[7 + ucc_num],
-                                                BCSR_UCC_RGMII, BCSR_UCC_RTBI);
-                        }
+        if (machine_is(p1021_mds))
+                qe_ic_init(np, 0, qe_ic_cascade_low_mpic,
+                                qe_ic_cascade_high_mpic);
+        else
+                qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL);
+        of_node_put(np);
+}
+#else
+static void __init mpc85xx_publish_qe_devices(void) { }
+static void __init mpc85xx_mds_qe_init(void) { }
+static void __init mpc85xx_mds_qeic_init(void) { }
+#endif  /* CONFIG_QUICC_ENGINE */
 
+static void __init mpc85xx_mds_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+        struct pci_controller *hose;
+#endif
+        dma_addr_t max = 0xffffffff;
+
+        if (ppc_md.progress)
+                ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
+                    of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                        struct resource rsrc;
+                        of_address_to_resource(np, 0, &rsrc);
+                        if ((rsrc.start & 0xfffff) == 0x8000)
+                                fsl_add_bridge(np, 1);
+                        else
+                                fsl_add_bridge(np, 0);
+
+                        hose = pci_find_hose_for_OF_device(np);
+                        max = min(max, hose->dma_window_base_cur +
+                                        hose->dma_window_size);
                 }
-                iounmap(bcsr_regs);
         }
-#endif  /* CONFIG_QUICC_ENGINE */
+#endif
+
+#ifdef CONFIG_SMP
+        mpc85xx_smp_init();
+#endif
+
+        mpc85xx_mds_qe_init();
 
 #ifdef CONFIG_SWIOTLB
-        if (lmb_end_of_DRAM() > max) {
+        if (memblock_end_of_DRAM() > max) {
                 ppc_swiotlb_enable = 1;
                 set_pci_dma_ops(&swiotlb_dma_ops);
                 ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;
@@ -321,8 +432,6 @@ static struct of_device_id mpc85xx_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
-        { .type = "qe", },
-        { .compatible = "fsl,qe", },
         { .compatible = "gianfar", },
         { .compatible = "fsl,rapidio-delta", },
         { .compatible = "fsl,mpc8548-guts", },
@@ -330,6 +439,14 @@ static struct of_device_id mpc85xx_ids[] = {
         {},
 };
 
+static struct of_device_id p1021_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
+        {},
+};
+
 static int __init mpc85xx_publish_devices(void)
 {
         if (machine_is(mpc8568_mds))
@@ -337,16 +454,27 @@ static int __init mpc85xx_publish_devices(void)
         if (machine_is(mpc8569_mds))
                 simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio");
 
-        /* Publish the QE devices */
         of_platform_bus_probe(NULL, mpc85xx_ids, NULL);
+        mpc85xx_publish_qe_devices();
+
+        return 0;
+}
+
+static int __init p1021_publish_devices(void)
+{
+        of_platform_bus_probe(NULL, p1021_ids, NULL);
+        mpc85xx_publish_qe_devices();
 
         return 0;
 }
+
 machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices);
 machine_device_initcall(mpc8569_mds, mpc85xx_publish_devices);
+machine_device_initcall(p1021_mds, p1021_publish_devices);
 
 machine_arch_initcall(mpc8568_mds, swiotlb_setup_bus_notifier);
 machine_arch_initcall(mpc8569_mds, swiotlb_setup_bus_notifier);
+machine_arch_initcall(p1021_mds, swiotlb_setup_bus_notifier);
 
 static void __init mpc85xx_mds_pic_init(void)
 {
@@ -366,23 +494,13 @@ static void __init mpc85xx_mds_pic_init(void)
 
         mpic = mpic_alloc(np, r.start,
                         MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
-                        MPIC_BROKEN_FRR_NIRQS,
+                        MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
                         0, 256, " OpenPIC  ");
         BUG_ON(mpic == NULL);
         of_node_put(np);
 
         mpic_init(mpic);
-
-#ifdef CONFIG_QUICC_ENGINE
-        np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
-        if (!np) {
-                np = of_find_node_by_type(NULL, "qeic");
-                if (!np)
-                        return;
-        }
-        qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL);
-        of_node_put(np);
-#endif                          /* CONFIG_QUICC_ENGINE */
+        mpc85xx_mds_qeic_init();
 }
 
 static int __init mpc85xx_mds_probe(void)
@@ -426,3 +544,26 @@ define_machine(mpc8569_mds) {
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #endif
 };
+
+static int __init p1021_mds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,P1021MDS");
+
+}
+
+define_machine(p1021_mds) {
+        .name           = "P1021 MDS",
+        .probe          = p1021_mds_probe,
+        .setup_arch     = mpc85xx_mds_setup_arch,
+        .init_IRQ       = mpc85xx_mds_pic_init,
+        .get_irq        = mpic_get_irq,
+        .restart        = fsl_rstcr_restart,
+        .calibrate_decr = generic_calibrate_decr,
+        .progress       = udbg_progress,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+};
+
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
new file mode 100644
index 000000000000..e1467c937450
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -0,0 +1,148 @@
+/*
+ * P1022DS board specific routines
+ *
+ * Authors: Travis Wheatley <travis.wheatley@freescale.com>
+ *          Dave Liu <daveliu@freescale.com>
+ *          Timur Tabi <timur@freescale.com>
+ *
+ * Copyright 2010 Freescale Semiconductor, Inc.
+ *
+ * This file is taken from the Freescale P1022DS BSP, with modifications:
+ * 1) No DIU support (pending rewrite of DIU code)
+ * 2) No AMP support
+ * 3) No PCI endpoint support
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/pci.h>
+#include <linux/of_platform.h>
+#include <linux/lmb.h>
+
+#include <asm/mpic.h>
+#include <asm/swiotlb.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+void __init p1022_ds_pic_init(void)
+{
+        struct mpic *mpic;
+        struct resource r;
+        struct device_node *np;
+
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (!np) {
+                pr_err("Could not find open-pic node\n");
+                return;
+        }
+
+        if (of_address_to_resource(np, 0, &r)) {
+                pr_err("Failed to map mpic register space\n");
+                of_node_put(np);
+                return;
+        }
+
+        mpic = mpic_alloc(np, r.start,
+                MPIC_PRIMARY | MPIC_WANTS_RESET |
+                MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
+                MPIC_SINGLE_DEST_CPU,
+                0, 256, " OpenPIC  ");
+
+        BUG_ON(mpic == NULL);
+        of_node_put(np);
+
+        mpic_init(mpic);
+}
+
+#ifdef CONFIG_SMP
+void __init mpc85xx_smp_init(void);
+#endif
+
+/*
+ * Setup the architecture
+ */
+static void __init p1022_ds_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+        struct device_node *np;
+#endif
+        dma_addr_t max = 0xffffffff;
+
+        if (ppc_md.progress)
+                ppc_md.progress("p1022_ds_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for_each_compatible_node(np, "pci", "fsl,p1022-pcie") {
+                struct resource rsrc;
+                struct pci_controller *hose;
+
+                of_address_to_resource(np, 0, &rsrc);
+
+                if ((rsrc.start & 0xfffff) == 0x8000)
+                        fsl_add_bridge(np, 1);
+                else
+                        fsl_add_bridge(np, 0);
+
+                hose = pci_find_hose_for_OF_device(np);
+                max = min(max, hose->dma_window_base_cur +
+                          hose->dma_window_size);
+        }
+#endif
+
+#ifdef CONFIG_SMP
+        mpc85xx_smp_init();
+#endif
+
+#ifdef CONFIG_SWIOTLB
+        if (lmb_end_of_DRAM() > max) {
+                ppc_swiotlb_enable = 1;
+                set_pci_dma_ops(&swiotlb_dma_ops);
+                ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;
+        }
+#endif
+
+        pr_info("Freescale P1022 DS reference board\n");
+}
+
+static struct of_device_id __initdata p1022_ds_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
+        {},
+};
+
+static int __init p1022_ds_publish_devices(void)
+{
+        return of_platform_bus_probe(NULL, p1022_ds_ids, NULL);
+}
+machine_device_initcall(p1022_ds, p1022_ds_publish_devices);
+
+machine_arch_initcall(p1022_ds, swiotlb_setup_bus_notifier);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init p1022_ds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,p1022ds");
+}
+
+define_machine(p1022_ds) {
+        .name                   = "P1022 DS",
+        .probe                  = p1022_ds_probe,
+        .setup_arch             = p1022_ds_setup_arch,
+        .init_IRQ               = p1022_ds_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index a15f582300d8..a6b106557be4 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/of.h>
+#include <linux/kexec.h>
 
 #include <asm/machdep.h>
 #include <asm/pgtable.h>
@@ -24,6 +25,7 @@
 #include <asm/dbell.h>
 
 #include <sysdev/fsl_soc.h>
+#include <sysdev/mpic.h>
 
 extern void __early_start(void);
 
@@ -99,12 +101,70 @@ static void __init
 smp_85xx_setup_cpu(int cpu_nr)
 {
         mpic_setup_this_cpu();
+        if (cpu_has_feature(CPU_FTR_DBELL))
+                doorbell_setup_this_cpu();
 }
 
 struct smp_ops_t smp_85xx_ops = {
         .kick_cpu = smp_85xx_kick_cpu,
+#ifdef CONFIG_KEXEC
+        .give_timebase  = smp_generic_give_timebase,
+        .take_timebase  = smp_generic_take_timebase,
+#endif
 };
 
+#ifdef CONFIG_KEXEC
+static int kexec_down_cpus = 0;
+
+void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
+{
+        mpic_teardown_this_cpu(1);
+
+        /* When crashing, this gets called on all CPU's we only
+         * take down the non-boot cpus */
+        if (smp_processor_id() != boot_cpuid)
+        {
+                local_irq_disable();
+                kexec_down_cpus++;
+
+                while (1);
+        }
+}
+
+static void mpc85xx_smp_kexec_down(void *arg)
+{
+        if (ppc_md.kexec_cpu_down)
+                ppc_md.kexec_cpu_down(0,1);
+}
+
+static void mpc85xx_smp_machine_kexec(struct kimage *image)
+{
+        int timeout = 2000;
+        int i;
+
+        set_cpus_allowed(current, cpumask_of_cpu(boot_cpuid));
+
+        smp_call_function(mpc85xx_smp_kexec_down, NULL, 0);
+
+        while ( (kexec_down_cpus != (num_online_cpus() - 1)) &&
+                ( timeout > 0 ) )
+        {
+                timeout--;
+        }
+
+        if ( !timeout )
+                printk(KERN_ERR "Unable to bring down secondary cpu(s)");
+
+        for (i = 0; i < num_present_cpus(); i++)
+        {
+                if ( i == smp_processor_id() ) continue;
+                mpic_reset_core(i);
+        }
+
+        default_machine_kexec(image);
+}
+#endif /* CONFIG_KEXEC */
+
 void __init mpc85xx_smp_init(void)
 {
         struct device_node *np;
@@ -117,9 +177,14 @@ void __init mpc85xx_smp_init(void)
         }
 
         if (cpu_has_feature(CPU_FTR_DBELL))
-                smp_85xx_ops.message_pass = smp_dbell_message_pass;
+                smp_85xx_ops.message_pass = doorbell_message_pass;
 
         BUG_ON(!smp_85xx_ops.message_pass);
 
         smp_ops = &smp_85xx_ops;
+
+#ifdef CONFIG_KEXEC
+        ppc_md.kexec_cpu_down = mpc85xx_smp_kexec_cpu_down;
+        ppc_md.machine_kexec = mpc85xx_smp_machine_kexec;
+#endif
 }
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 5b0ab9966e90..8f29bbce5360 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -151,6 +151,27 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m)
         seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
 }
 
+static void __init tqm85xx_ti1520_fixup(struct pci_dev *pdev)
+{
+        unsigned int val;
+
+        /* Do not do the fixup on other platforms! */
+        if (!machine_is(tqm85xx))
+                return;
+
+        dev_info(&pdev->dev, "Using TI 1520 fixup on TQM85xx\n");
+
+        /*
+         * Enable P2CCLK bit in system control register
+         * to enable CLOCK output to power chip
+         */
+        pci_read_config_dword(pdev, 0x80, &val);
+        pci_write_config_dword(pdev, 0x80, val | (1 << 27));
+
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520,
+                tqm85xx_ti1520_fixup);
+
 static struct of_device_id __initdata of_bus_ids[] = {
         { .compatible = "simple-bus", },
         { .compatible = "gianfar", },
diff --git a/arch/powerpc/platforms/86xx/gef_gpio.c b/arch/powerpc/platforms/86xx/gef_gpio.c
index b8cb08dbd89c..4ff7b1e7bbad 100644
--- a/arch/powerpc/platforms/86xx/gef_gpio.c
+++ b/arch/powerpc/platforms/86xx/gef_gpio.c
@@ -118,12 +118,12 @@ static int __init gef_gpio_init(void)
                 }
 
                 /* Setup pointers to chip functions */
-                gef_gpio_chip->of_gc.gpio_cells = 2;
-                gef_gpio_chip->of_gc.gc.ngpio = 19;
-                gef_gpio_chip->of_gc.gc.direction_input = gef_gpio_dir_in;
-                gef_gpio_chip->of_gc.gc.direction_output = gef_gpio_dir_out;
-                gef_gpio_chip->of_gc.gc.get = gef_gpio_get;
-                gef_gpio_chip->of_gc.gc.set = gef_gpio_set;
+                gef_gpio_chip->gc.of_gpio_n_cells = 2;
+                gef_gpio_chip->gc.ngpio = 19;
+                gef_gpio_chip->gc.direction_input = gef_gpio_dir_in;
+                gef_gpio_chip->gc.direction_output = gef_gpio_dir_out;
+                gef_gpio_chip->gc.get = gef_gpio_get;
+                gef_gpio_chip->gc.set = gef_gpio_set;
 
                 /* This function adds a memory mapped GPIO chip */
                 retval = of_mm_gpiochip_add(np, gef_gpio_chip);
@@ -146,12 +146,12 @@ static int __init gef_gpio_init(void)
                 }
 
                 /* Setup pointers to chip functions */
-                gef_gpio_chip->of_gc.gpio_cells = 2;
-                gef_gpio_chip->of_gc.gc.ngpio = 6;
-                gef_gpio_chip->of_gc.gc.direction_input = gef_gpio_dir_in;
-                gef_gpio_chip->of_gc.gc.direction_output = gef_gpio_dir_out;
-                gef_gpio_chip->of_gc.gc.get = gef_gpio_get;
-                gef_gpio_chip->of_gc.gc.set = gef_gpio_set;
+                gef_gpio_chip->gc.of_gpio_n_cells = 2;
+                gef_gpio_chip->gc.ngpio = 6;
+                gef_gpio_chip->gc.direction_input = gef_gpio_dir_in;
+                gef_gpio_chip->gc.direction_output = gef_gpio_dir_out;
+                gef_gpio_chip->gc.get = gef_gpio_get;
+                gef_gpio_chip->gc.set = gef_gpio_set;
 
                 /* This function adds a memory mapped GPIO chip */
                 retval = of_mm_gpiochip_add(np, gef_gpio_chip);
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 2aa69a69bcc8..b11c3535f350 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -19,7 +19,7 @@
 #include <linux/delay.h>
 #include <linux/seq_file.h>
 #include <linux/of_platform.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -103,7 +103,7 @@ mpc86xx_hpcn_setup_arch(void)
 #endif
 
 #ifdef CONFIG_SWIOTLB
-        if (lmb_end_of_DRAM() > max) {
+        if (memblock_end_of_DRAM() > max) {
                 ppc_swiotlb_enable = 1;
                 set_pci_dma_ops(&swiotlb_dma_ops);
                 ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 48a920a98e7b..dd35ce081cff 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -55,6 +55,12 @@ config PPC_MGSUVD
         help
           This enables support for the Keymile MGSUVD board.
 
+config TQM8XX
+        bool "TQM8XX"
+        select CPM1
+        help
+          support for the mpc8xx based boards from TQM.
+
 endchoice
 
 menu "Freescale Ethernet driver platform-specific options"
diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile
index bdbfd7496018..a491fe6b94fc 100644
--- a/arch/powerpc/platforms/8xx/Makefile
+++ b/arch/powerpc/platforms/8xx/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
 obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
 obj-$(CONFIG_PPC_ADDER875) += adder875.o
 obj-$(CONFIG_PPC_MGSUVD) += mgsuvd.o
+obj-$(CONFIG_TQM8XX)      += tqm8xx_setup.o
diff --git a/arch/powerpc/platforms/8xx/tqm8xx_setup.c b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
new file mode 100644
index 000000000000..b71c650fbb11
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
@@ -0,0 +1,156 @@
+/*
+ * Platform setup for the MPC8xx based boards from TQM.
+ *
+ * Heiko Schocher <hs@denx.de>
+ * Copyright 2010 DENX Software Engineering GmbH
+ *
+ * based on:
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * Copyright 2005 MontaVista Software Inc.
+ *
+ * Heavily modified by Scott Wood <scottwood@freescale.com>
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/param.h>
+#include <linux/string.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+
+#include <linux/fs_enet_pd.h>
+#include <linux/fs_uart_pd.h>
+#include <linux/fsl_devices.h>
+#include <linux/mii.h>
+#include <linux/of_platform.h>
+
+#include <asm/delay.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/page.h>
+#include <asm/processor.h>
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/mpc8xx.h>
+#include <asm/8xx_immap.h>
+#include <asm/cpm1.h>
+#include <asm/fs_pd.h>
+#include <asm/udbg.h>
+
+#include "mpc8xx.h"
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static struct __initdata cpm_pin tqm8xx_pins[] = {
+        /* SMC1 */
+        {CPM_PORTB, 24, CPM_PIN_INPUT}, /* RX */
+        {CPM_PORTB, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
+
+        /* SCC1 */
+        {CPM_PORTA, 5, CPM_PIN_INPUT}, /* CLK1 */
+        {CPM_PORTA, 7, CPM_PIN_INPUT}, /* CLK2 */
+        {CPM_PORTA, 14, CPM_PIN_INPUT}, /* TX */
+        {CPM_PORTA, 15, CPM_PIN_INPUT}, /* RX */
+        {CPM_PORTC, 15, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TENA */
+        {CPM_PORTC, 10, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO},
+        {CPM_PORTC, 11, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO},
+};
+
+static struct __initdata cpm_pin tqm8xx_fec_pins[] = {
+        /* MII */
+        {CPM_PORTD, 3, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 4, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 5, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 6, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 7, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 8, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 9, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 10, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 11, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 12, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 13, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 14, CPM_PIN_OUTPUT},
+        {CPM_PORTD, 15, CPM_PIN_OUTPUT},
+};
+
+static void __init init_pins(int n, struct cpm_pin *pin)
+{
+        int i;
+
+        for (i = 0; i < n; i++) {
+                cpm1_set_pin(pin->port, pin->pin, pin->flags);
+                pin++;
+        }
+}
+
+static void __init init_ioports(void)
+{
+        struct device_node *dnode;
+        struct property *prop;
+        int     len;
+
+        init_pins(ARRAY_SIZE(tqm8xx_pins), &tqm8xx_pins[0]);
+
+        cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
+
+        dnode = of_find_node_by_name(NULL, "aliases");
+        if (dnode == NULL)
+                return;
+        prop = of_find_property(dnode, "ethernet1", &len);
+        if (prop == NULL)
+                return;
+
+        /* init FEC pins */
+        init_pins(ARRAY_SIZE(tqm8xx_fec_pins), &tqm8xx_fec_pins[0]);
+}
+
+static void __init tqm8xx_setup_arch(void)
+{
+        cpm_reset();
+        init_ioports();
+}
+
+static int __init tqm8xx_probe(void)
+{
+        unsigned long node = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(node, "tqc,tqm8xx");
+}
+
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        { .compatible = "simple-bus" },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(tqm8xx, declare_of_platform_devices);
+
+define_machine(tqm8xx) {
+        .name                   = "TQM8xx",
+        .probe                  = tqm8xx_probe,
+        .setup_arch             = tqm8xx_setup_arch,
+        .init_IRQ               = mpc8xx_pics_init,
+        .get_irq                = mpc8xx_get_irq,
+        .restart                = mpc8xx_restart,
+        .calibrate_decr         = mpc8xx_calibrate_decr,
+        .set_rtc_time           = mpc8xx_set_rtc_time,
+        .get_rtc_time           = mpc8xx_get_rtc_time,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
index fb4eb0df054c..03aabc0e16ac 100644
--- a/arch/powerpc/platforms/amigaone/setup.c
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -13,12 +13,13 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/seq_file.h>
 #include <generated/utsrelease.h>
 
 #include <asm/machdep.h>
 #include <asm/cputable.h>
-#include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #include <asm/i8259.h>
 #include <asm/time.h>
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 6257e5378615..97085530aa63 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -328,7 +328,7 @@ static struct irq_host_ops msic_host_ops = {
         .map    = msic_host_map,
 };
 
-static int axon_msi_shutdown(struct of_device *device)
+static int axon_msi_shutdown(struct platform_device *device)
 {
         struct axon_msic *msic = dev_get_drvdata(&device->dev);
         u32 tmp;
@@ -342,7 +342,7 @@ static int axon_msi_shutdown(struct of_device *device)
         return 0;
 }
 
-static int axon_msi_probe(struct of_device *device,
+static int axon_msi_probe(struct platform_device *device,
                           const struct of_device_id *device_id)
 {
         struct device_node *dn = device->dev.of_node;
diff --git a/arch/powerpc/platforms/cell/beat_iommu.c b/arch/powerpc/platforms/cell/beat_iommu.c
index 39d361c5c6d2..beec405eb6f8 100644
--- a/arch/powerpc/platforms/cell/beat_iommu.c
+++ b/arch/powerpc/platforms/cell/beat_iommu.c
@@ -108,7 +108,7 @@ static int __init celleb_init_iommu(void)
         celleb_init_direct_mapping();
         set_pci_dma_ops(&dma_direct_ops);
         ppc_md.pci_dma_dev_setup = celleb_pci_dma_dev_setup;
-        bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
+        bus_register_notifier(&platform_bus_type, &celleb_of_bus_notifier);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 22667a09d40e..58b13ce3847e 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -29,7 +29,7 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/prom.h>
 #include <asm/iommu.h>
@@ -845,10 +845,10 @@ static int __init cell_iommu_init_disabled(void)
         /* If we found a DMA window, we check if it's big enough to enclose
          * all of physical memory. If not, we force enable IOMMU
          */
-        if (np && size < lmb_end_of_DRAM()) {
+        if (np && size < memblock_end_of_DRAM()) {
                 printk(KERN_WARNING "iommu: force-enabled, dma window"
                        " (%ldMB) smaller than total memory (%lldMB)\n",
-                       size >> 20, lmb_end_of_DRAM() >> 20);
+                       size >> 20, memblock_end_of_DRAM() >> 20);
                 return -ENODEV;
         }
 
@@ -1064,9 +1064,9 @@ static int __init cell_iommu_fixed_mapping_init(void)
         }
 
         fbase = _ALIGN_UP(fbase, 1 << IO_SEGMENT_SHIFT);
-        fsize = lmb_phys_mem_size();
+        fsize = memblock_phys_mem_size();
 
-        if ((fbase + fsize) <= 0x800000000)
+        if ((fbase + fsize) <= 0x800000000ul)
                 hbase = 0; /* use the device tree window */
         else {
                 /* If we're over 32 GB we need to cheat. We can't map all of
@@ -1169,7 +1169,7 @@ static int __init cell_iommu_init(void)
          * Note: should we make sure we have the IOMMU actually disabled ?
          */
         if (iommu_is_off ||
-            (!iommu_force_on && lmb_end_of_DRAM() <= 0x80000000ull))
+            (!iommu_force_on && memblock_end_of_DRAM() <= 0x80000000ull))
                 if (cell_iommu_init_disabled() == 0)
                         goto bail;
 
@@ -1204,7 +1204,7 @@ static int __init cell_iommu_init(void)
         /* Register callbacks on OF platform device addition/removal
          * to handle linking them to the right DMA operations
          */
-        bus_register_notifier(&of_platform_bus_type, &cell_of_bus_notifier);
+        bus_register_notifier(&platform_bus_type, &cell_of_bus_notifier);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
index c5ce02e84c8e..1b5749042756 100644
--- a/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -61,12 +61,24 @@ static void qpace_progress(char *s, unsigned short hex)
         printk("*** %04x : %s\n", hex, s ? s : "");
 }
 
+static const struct of_device_id qpace_bus_ids[] __initdata = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .type = "spider", },
+        { .type = "axon", },
+        { .type = "plb5", },
+        { .type = "plb4", },
+        { .type = "opb", },
+        { .type = "ebc", },
+        {},
+};
+
 static int __init qpace_publish_devices(void)
 {
         int node;
 
         /* Publish OF platform devices for southbridge IOs */
-        of_platform_bus_probe(NULL, NULL, NULL);
+        of_platform_bus_probe(NULL, qpace_bus_ids, NULL);
 
         /* There is no device for the MIC memory controller, thus we create
          * a platform device for it to attach the EDAC driver to.
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 50385db586bd..691995761b3d 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -141,6 +141,18 @@ static int __devinit cell_setup_phb(struct pci_controller *phb)
         return 0;
 }
 
+static const struct of_device_id cell_bus_ids[] __initdata = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .type = "spider", },
+        { .type = "axon", },
+        { .type = "plb5", },
+        { .type = "plb4", },
+        { .type = "opb", },
+        { .type = "ebc", },
+        {},
+};
+
 static int __init cell_publish_devices(void)
 {
         struct device_node *root = of_find_node_by_path("/");
@@ -148,7 +160,7 @@ static int __init cell_publish_devices(void)
         int node;
 
         /* Publish OF platform devices for southbridge IOs */
-        of_platform_bus_probe(NULL, NULL, NULL);
+        of_platform_bus_probe(NULL, cell_bus_ids, NULL);
 
         /* On spider based blades, we need to manually create the OF
          * platform devices for the PCI host bridges
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index e5e5f823d687..5dec408d6703 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -110,7 +110,9 @@ spufs_setattr(struct dentry *dentry, struct iattr *attr)
         if ((attr->ia_valid & ATTR_SIZE) &&
             (attr->ia_size != inode->i_size))
                 return -EINVAL;
-        return inode_setattr(inode, attr);
+        setattr_copy(inode, attr);
+        mark_inode_dirty(inode);
+        return 0;
 }
 
 
@@ -141,15 +143,14 @@ out:
 }
 
 static void
-spufs_delete_inode(struct inode *inode)
+spufs_evict_inode(struct inode *inode)
 {
         struct spufs_inode_info *ei = SPUFS_I(inode);
-
+        end_writeback(inode);
         if (ei->i_ctx)
                 put_spu_context(ei->i_ctx);
         if (ei->i_gang)
                 put_spu_gang(ei->i_gang);
-        clear_inode(inode);
 }
 
 static void spufs_prune_dir(struct dentry *dir)
@@ -777,8 +778,7 @@ spufs_fill_super(struct super_block *sb, void *data, int silent)
                 .alloc_inode = spufs_alloc_inode,
                 .destroy_inode = spufs_destroy_inode,
                 .statfs = simple_statfs,
-                .delete_inode = spufs_delete_inode,
-                .drop_inode = generic_delete_inode,
+                .evict_inode = spufs_evict_inode,
                 .show_options = generic_show_options,
         };
 
diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 174a04ac4806..5cdcc7c8d973 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -20,7 +20,7 @@
 #include <linux/seq_file.h>
 #include <linux/kexec.h>
 #include <linux/of_platform.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 #include <mm/mmu_decl.h>
 
 #include <asm/io.h>
@@ -65,7 +65,7 @@ static int __init page_aligned(unsigned long x)
 
 void __init wii_memory_fixups(void)
 {
-        struct lmb_property *p = lmb.memory.region;
+        struct memblock_property *p = memblock.memory.region;
 
         /*
          * This is part of a workaround to allow the use of two
@@ -77,7 +77,7 @@ void __init wii_memory_fixups(void)
          * between both ranges.
          */
 
-        BUG_ON(lmb.memory.cnt != 2);
+        BUG_ON(memblock.memory.cnt != 2);
         BUG_ON(!page_aligned(p[0].base) || !page_aligned(p[1].base));
 
         p[0].size = _ALIGN_DOWN(p[0].size, PAGE_SIZE);
@@ -92,11 +92,11 @@ void __init wii_memory_fixups(void)
 
         p[0].size += wii_hole_size + p[1].size;
 
-        lmb.memory.cnt = 1;
-        lmb_analyze();
+        memblock.memory.cnt = 1;
+        memblock_analyze();
 
         /* reserve the hole */
-        lmb_reserve(wii_hole_start, wii_hole_size);
+        memblock_reserve(wii_hole_start, wii_hole_size);
 
         /* allow ioremapping the address space in the hole */
         __allow_ioremap_reserved = 1;
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index d2c1d497846e..33e5fc7334fc 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/completion.h>
 #include <linux/delay.h>
+#include <linux/proc_fs.h>
 #include <linux/dma-mapping.h>
 #include <linux/bcd.h>
 #include <linux/rtc.h>
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 3fc2e6494b8b..ab3962b0d246 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -445,7 +445,11 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev)
         }
 
         allocate_device_bars(pdev);
-        iseries_device_information(pdev, bus, *sub_bus);
+        if (likely(sub_bus))
+                iseries_device_information(pdev, bus, *sub_bus);
+        else
+                printk(KERN_ERR "PCI: Device node %s has missing or invalid "
+                                "linux,subbus property\n", node->full_name);
 }
 
 /*
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index 00b6730bc48f..b6db7cef83b4 100644
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -87,12 +87,11 @@ static struct device_node *new_node(const char *path,
 
         if (!np)
                 return NULL;
-        np->full_name = kmalloc(strlen(path) + 1, GFP_KERNEL);
+        np->full_name = kstrdup(path, GFP_KERNEL);
         if (!np->full_name) {
                 kfree(np);
                 return NULL;
         }
-        strcpy(np->full_name, path);
         of_node_set_flag(np, OF_DYNAMIC);
         kref_init(&np->kref);
         np->parent = of_node_get(parent);
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 39df70529d29..3fff8d979b41 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -41,7 +41,7 @@
 #include <linux/smp.h>
 #include <linux/bitops.h>
 #include <linux/of_device.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/processor.h>
 #include <asm/sections.h>
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 627ee089e75d..a5d907b5a4c2 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -216,7 +216,7 @@ static int gpio_mdio_reset(struct mii_bus *bus)
 }
 
 
-static int __devinit gpio_mdio_probe(struct of_device *ofdev,
+static int __devinit gpio_mdio_probe(struct platform_device *ofdev,
                                      const struct of_device_id *match)
 {
         struct device *dev = &ofdev->dev;
@@ -275,7 +275,7 @@ out:
 }
 
 
-static int gpio_mdio_remove(struct of_device *dev)
+static int gpio_mdio_remove(struct platform_device *dev)
 {
         struct mii_bus *bus = dev_get_drvdata(&dev->dev);
 
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index 7b1d608ea3c8..1f9fb2c57761 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -204,7 +204,7 @@ int __init iob_init(struct device_node *dn)
         pr_debug(" -> %s\n", __func__);
 
         /* Allocate a spare page to map all invalid IOTLB pages. */
-        tmp = lmb_alloc(IOBMAP_PAGE_SIZE, IOBMAP_PAGE_SIZE);
+        tmp = memblock_alloc(IOBMAP_PAGE_SIZE, IOBMAP_PAGE_SIZE);
         if (!tmp)
                 panic("IOBMAP: Cannot allocate spare page!");
         /* Empty l1 is marked invalid */
@@ -275,7 +275,7 @@ void __init alloc_iobmap_l2(void)
         return;
 #endif
         /* For 2G space, 8x64 pages (2^21 bytes) is max total l2 size */
-        iob_l2_base = (u32 *)abs_to_virt(lmb_alloc_base(1UL<<21, 1UL<<21, 0x80000000));
+        iob_l2_base = (u32 *)abs_to_virt(memblock_alloc_base(1UL<<21, 1UL<<21, 0x80000000));
 
         printk(KERN_INFO "IOBMAP L2 allocated at: %p\n", iob_l2_base);
 }
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 1e9eba175ff0..415ca6d6b273 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -310,8 +310,12 @@ static int pmu_set_cpu_speed(int low_speed)
         /* Restore low level PMU operations */
         pmu_unlock();
 
-        /* Restore decrementer */
-        wakeup_decrementer();
+        /*
+         * Restore decrementer; we'll take a decrementer interrupt
+         * as soon as interrupts are re-enabled and the generic
+         * clockevents code will reprogram it with the right value.
+         */
+        set_dec(1);
 
         /* Restore interrupts */
         mpic_cpu_set_priority(pic_prio);
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 9e1b9fd75206..39df6ab1735a 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -21,6 +21,8 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/spinlock.h>
 #include <linux/adb.h>
 #include <linux/pmu.h>
@@ -2191,7 +2193,11 @@ static struct pmac_mb_def pmac_mb_defs[] = {
                 PMAC_TYPE_UNKNOWN_INTREPID,     intrepid_features,
                 PMAC_MB_MAY_SLEEP,
         },
-        {       "iMac,1",                       "iMac (first generation)",
+        {       "PowerMac10,2",                 "Mac mini (Late 2005)",
+                PMAC_TYPE_UNKNOWN_INTREPID,     intrepid_features,
+                PMAC_MB_MAY_SLEEP,
+        },
+        {       "iMac,1",                       "iMac (first generation)",
                 PMAC_TYPE_ORIG_IMAC,            paddington_features,
                 0
         },
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 06a137c5b8bb..480567e5fa9a 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -542,11 +542,12 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
         /* Make sure IRQ is disabled */
         kw_write_reg(reg_ier, 0);
 
-        /* Request chip interrupt. We set IRQF_TIMER because we don't
+        /* Request chip interrupt. We set IRQF_NO_SUSPEND because we don't
          * want that interrupt disabled between the 2 passes of driver
          * suspend or we'll have issues running the pfuncs
          */
-        if (request_irq(host->irq, kw_i2c_irq, IRQF_TIMER, "keywest i2c", host))
+        if (request_irq(host->irq, kw_i2c_irq, IRQF_NO_SUSPEND,
+                        "keywest i2c", host))
                 host->irq = NO_IRQ;
 
         printk(KERN_INFO "KeyWest i2c @0x%08x irq %d %s\n",
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 630a533d0e59..890d5f72b198 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -46,6 +46,10 @@ struct pmac_irq_hw {
         unsigned int    level;
 };
 
+/* Workaround flags for 32bit powermac machines */
+unsigned int of_irq_workarounds;
+struct device_node *of_irq_dflt_pic;
+
 /* Default addresses */
 static volatile struct pmac_irq_hw __iomem *pmac_irq_hw[4];
 
@@ -428,6 +432,42 @@ static void __init pmac_pic_probe_oldstyle(void)
         setup_irq(irq_create_mapping(NULL, 20), &xmon_action);
 #endif
 }
+
+int of_irq_map_oldworld(struct device_node *device, int index,
+                        struct of_irq *out_irq)
+{
+        const u32 *ints = NULL;
+        int intlen;
+
+        /*
+         * Old machines just have a list of interrupt numbers
+         * and no interrupt-controller nodes. We also have dodgy
+         * cases where the APPL,interrupts property is completely
+         * missing behind pci-pci bridges and we have to get it
+         * from the parent (the bridge itself, as apple just wired
+         * everything together on these)
+         */
+        while (device) {
+                ints = of_get_property(device, "AAPL,interrupts", &intlen);
+                if (ints != NULL)
+                        break;
+                device = device->parent;
+                if (device && strcmp(device->type, "pci") != 0)
+                        break;
+        }
+        if (ints == NULL)
+                return -EINVAL;
+        intlen /= sizeof(u32);
+
+        if (index >= intlen)
+                return -EINVAL;
+
+        out_irq->controller = NULL;
+        out_irq->specifier[0] = ints[index];
+        out_irq->size = 1;
+
+        return 0;
+}
 #endif /* CONFIG_PPC32 */
 
 static void pmac_u3_cascade(unsigned int irq, struct irq_desc *desc)
@@ -559,19 +599,39 @@ static int __init pmac_pic_probe_mpic(void)
 
 void __init pmac_pic_init(void)
 {
-        unsigned int flags = 0;
-
         /* We configure the OF parsing based on our oldworld vs. newworld
          * platform type and wether we were booted by BootX.
          */
 #ifdef CONFIG_PPC32
         if (!pmac_newworld)
-                flags |= OF_IMAP_OLDWORLD_MAC;
+                of_irq_workarounds |= OF_IMAP_OLDWORLD_MAC;
         if (of_get_property(of_chosen, "linux,bootx", NULL) != NULL)
-                flags |= OF_IMAP_NO_PHANDLE;
-#endif /* CONFIG_PPC_32 */
+                of_irq_workarounds |= OF_IMAP_NO_PHANDLE;
 
-        of_irq_map_init(flags);
+        /* If we don't have phandles on a newworld, then try to locate a
+         * default interrupt controller (happens when booting with BootX).
+         * We do a first match here, hopefully, that only ever happens on
+         * machines with one controller.
+         */
+        if (pmac_newworld && (of_irq_workarounds & OF_IMAP_NO_PHANDLE)) {
+                struct device_node *np;
+
+                for_each_node_with_property(np, "interrupt-controller") {
+                        /* Skip /chosen/interrupt-controller */
+                        if (strcmp(np->name, "chosen") == 0)
+                                continue;
+                        /* It seems like at least one person wants
+                         * to use BootX on a machine with an AppleKiwi
+                         * controller which happens to pretend to be an
+                         * interrupt controller too. */
+                        if (strcmp(np->name, "AppleKiwi") == 0)
+                                continue;
+                        /* I think we found one ! */
+                        of_irq_dflt_pic = np;
+                        break;
+                }
+        }
+#endif /* CONFIG_PPC32 */
 
         /* We first try to detect Apple's new Core99 chipset, since mac-io
          * is quite different on those machines and contains an IBM MPIC2.
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index f1d0132ebcc7..9deb274841f1 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -51,7 +51,7 @@
 #include <linux/suspend.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/reg.h>
 #include <asm/sections.h>
@@ -619,7 +619,7 @@ static int __init pmac_probe(void)
          * driver needs that. We have to allocate it now. We allocate 4k
          * (1 small page) for now.
          */
-        smu_cmdbuf_abs = lmb_alloc_base(4096, 4096, 0x80000000UL);
+        smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL);
 #endif /* CONFIG_PMAC_SMU */
 
         return 1;
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 1e8a1e39dfe8..3124cf791ebb 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -19,7 +19,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -136,7 +136,7 @@ static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
          * As lv1_read_htab_entries() does not give us the RPN, we can
          * not synthesize the new hpte_r value here, and therefore can
          * not update the hpte with lv1_insert_htab_entry(), so we
-         * insted invalidate it and ask the caller to update it via
+         * instead invalidate it and ask the caller to update it via
          * ps3_hpte_insert() by returning a -1 value.
          */
         if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) {
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 7925751e464a..c2045880e674 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -21,7 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/memory_hotplug.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 #include <linux/slab.h>
 
 #include <asm/cell-regs.h>
@@ -318,8 +318,8 @@ static int __init ps3_mm_add_memory(void)
                 return result;
         }
 
-        lmb_add(start_addr, map.r1.size);
-        lmb_analyze();
+        memblock_add(start_addr, map.r1.size);
+        memblock_analyze();
 
         result = online_pages(start_pfn, nr_pages);
 
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index dd521a181f23..5b759b669598 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -24,7 +24,7 @@
 #include <linux/fs.h>
 #include <linux/syscalls.h>
 #include <linux/ctype.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 #include <linux/of.h>
 #include <linux/slab.h>
 
@@ -723,7 +723,7 @@ static void os_area_queue_work(void)
  * flash to a high address in the boot memory region and then puts that RAM
  * address and the byte count into the repository for retrieval by the guest.
  * We copy the data we want into a static variable and allow the memory setup
- * by the HV to be claimed by the lmb manager.
+ * by the HV to be claimed by the memblock manager.
  *
  * The os area mirror will not be available to a second stage kernel, and
  * the header verify will fail.  In this case, the saved_params values will
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 3dbef309bc8d..046ace9c4381 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -26,3 +26,7 @@ obj-$(CONFIG_HCALL_STATS)	+= hvCall_inst.o
 obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o
 obj-$(CONFIG_CMM)               += cmm.o
 obj-$(CONFIG_DTL)               += dtl.o
+
+ifeq ($(CONFIG_PPC_PSERIES),y)
+obj-$(CONFIG_SUSPEND)           += suspend.o
+endif
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index d71e58584086..227c1c3d585e 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -463,6 +463,7 @@ static int dlpar_offline_cpu(struct device_node *dn)
                                 break;
 
                         if (get_cpu_current_state(cpu) == CPU_STATE_ONLINE) {
+                                set_preferred_offline_state(cpu, CPU_STATE_OFFLINE);
                                 cpu_maps_update_done();
                                 rc = cpu_down(cpu);
                                 if (rc)
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index 30b987b73c20..8ed0d2d0e1b5 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -288,8 +288,7 @@ void __init pci_addr_cache_build(void)
 
         spin_lock_init(&pci_io_addr_cache_root.piar_lock);
 
-        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-
+        for_each_pci_dev(dev) {
                 pci_addr_cache_insert_device(dev);
 
                 dn = pci_device_to_OF_node(dev);
diff --git a/arch/powerpc/platforms/pseries/event_sources.c b/arch/powerpc/platforms/pseries/event_sources.c
index e889c9d9586a..2605c310166a 100644
--- a/arch/powerpc/platforms/pseries/event_sources.c
+++ b/arch/powerpc/platforms/pseries/event_sources.c
@@ -41,9 +41,12 @@ void request_event_sources_irqs(struct device_node *np,
                         if (count > 15)
                                 break;
                         virqs[count] = irq_create_mapping(NULL, *(opicprop++));
-                        if (virqs[count] == NO_IRQ)
-                                printk(KERN_ERR "Unable to allocate interrupt "
-                                       "number for %s\n", np->full_name);
+                        if (virqs[count] == NO_IRQ) {
+                                pr_err("event-sources: Unable to allocate "
+                                       "interrupt number for %s\n",
+                                       np->full_name);
+                                WARN_ON(1);
+                        }
                         else
                                 count++;
 
@@ -59,9 +62,12 @@ void request_event_sources_irqs(struct device_node *np,
                         virqs[count] = irq_create_of_mapping(oirq.controller,
                                                             oirq.specifier,
                                                             oirq.size);
-                        if (virqs[count] == NO_IRQ)
-                                printk(KERN_ERR "Unable to allocate interrupt "
-                                       "number for %s\n", np->full_name);
+                        if (virqs[count] == NO_IRQ) {
+                                pr_err("event-sources: Unable to allocate "
+                                       "interrupt number for %s\n",
+                                       np->full_name);
+                                WARN_ON(1);
+                        }
                         else
                                 count++;
                 }
@@ -70,8 +76,9 @@ void request_event_sources_irqs(struct device_node *np,
         /* Now request them */
         for (i = 0; i < count; i++) {
                 if (request_irq(virqs[i], handler, 0, name, NULL)) {
-                        printk(KERN_ERR "Unable to request interrupt %d for "
-                               "%s\n", virqs[i], np->full_name);
+                        pr_err("event-sources: Unable to request interrupt "
+                               "%d for %s\n", virqs[i], np->full_name);
+                        WARN_ON(1);
                         return;
                 }
         }
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 8f85f399ab9f..fd50ccd4bac1 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -116,6 +116,9 @@ static void pseries_mach_cpu_die(void)
 
         if (get_preferred_offline_state(cpu) == CPU_STATE_INACTIVE) {
                 set_cpu_current_state(cpu, CPU_STATE_INACTIVE);
+                if (ppc_md.suspend_disable_cpu)
+                        ppc_md.suspend_disable_cpu();
+
                 cede_latency_hint = 2;
 
                 get_lppaca()->idle = 1;
@@ -190,12 +193,12 @@ static void pseries_cpu_die(unsigned int cpu)
 
         if (get_preferred_offline_state(cpu) == CPU_STATE_INACTIVE) {
                 cpu_status = 1;
-                for (tries = 0; tries < 1000; tries++) {
+                for (tries = 0; tries < 5000; tries++) {
                         if (get_cpu_current_state(cpu) == CPU_STATE_INACTIVE) {
                                 cpu_status = 0;
                                 break;
                         }
-                        cpu_relax();
+                        msleep(1);
                 }
         } else if (get_preferred_offline_state(cpu) == CPU_STATE_OFFLINE) {
 
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 01e7b5bb3c1d..bc8803664140 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -10,14 +10,14 @@
  */
 
 #include <linux/of.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 #include <linux/vmalloc.h>
 #include <asm/firmware.h>
 #include <asm/machdep.h>
 #include <asm/pSeries_reconfig.h>
 #include <asm/sparsemem.h>
 
-static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size)
+static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
 {
         unsigned long start, start_pfn;
         struct zone *zone;
@@ -26,7 +26,7 @@ static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size)
         start_pfn = base >> PAGE_SHIFT;
 
         if (!pfn_valid(start_pfn)) {
-                lmb_remove(base, lmb_size);
+                memblock_remove(base, memblock_size);
                 return 0;
         }
 
@@ -41,20 +41,20 @@ static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size)
          * to sysfs "state" file and we can't remove sysfs entries
          * while writing to it. So we have to defer it to here.
          */
-        ret = __remove_pages(zone, start_pfn, lmb_size >> PAGE_SHIFT);
+        ret = __remove_pages(zone, start_pfn, memblock_size >> PAGE_SHIFT);
         if (ret)
                 return ret;
 
         /*
          * Update memory regions for memory remove
          */
-        lmb_remove(base, lmb_size);
+        memblock_remove(base, memblock_size);
 
         /*
          * Remove htab bolted mappings for this section of memory
          */
         start = (unsigned long)__va(base);
-        ret = remove_section_mapping(start, start + lmb_size);
+        ret = remove_section_mapping(start, start + memblock_size);
 
         /* Ensure all vmalloc mappings are flushed in case they also
          * hit that section of memory
@@ -80,7 +80,7 @@ static int pseries_remove_memory(struct device_node *np)
                 return 0;
 
         /*
-         * Find the bae address and size of the lmb
+         * Find the bae address and size of the memblock
          */
         regs = of_get_property(np, "reg", NULL);
         if (!regs)
@@ -89,7 +89,7 @@ static int pseries_remove_memory(struct device_node *np)
         base = *(unsigned long *)regs;
         lmb_size = regs[3];
 
-        ret = pseries_remove_lmb(base, lmb_size);
+        ret = pseries_remove_memblock(base, lmb_size);
         return ret;
 }
 
@@ -109,7 +109,7 @@ static int pseries_add_memory(struct device_node *np)
                 return 0;
 
         /*
-         * Find the base and size of the lmb
+         * Find the base and size of the memblock
          */
         regs = of_get_property(np, "reg", NULL);
         if (!regs)
@@ -121,7 +121,7 @@ static int pseries_add_memory(struct device_node *np)
         /*
          * Update memory region to represent the memory add
          */
-        ret = lmb_add(base, lmb_size);
+        ret = memblock_add(base, lmb_size);
         return (ret < 0) ? -EINVAL : 0;
 }
 
@@ -142,10 +142,10 @@ static int pseries_drconf_memory(unsigned long *base, unsigned int action)
         }
 
         if (action == PSERIES_DRCONF_MEM_ADD) {
-                rc = lmb_add(*base, *lmb_size);
+                rc = memblock_add(*base, *lmb_size);
                 rc = (rc < 0) ? -EINVAL : 0;
         } else if (action == PSERIES_DRCONF_MEM_REMOVE) {
-                rc = pseries_remove_lmb(*base, *lmb_size);
+                rc = pseries_remove_memblock(*base, *lmb_size);
         } else {
                 rc = -EINVAL;
         }
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index d26182d42cbf..395848e30c52 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -66,7 +66,7 @@ static int tce_build_pSeries(struct iommu_table *tbl, long index,
         tcep = ((u64 *)tbl->it_base) + index;
 
         while (npages--) {
-                /* can't move this out since we might cross LMB boundary */
+                /* can't move this out since we might cross MEMBLOCK boundary */
                 rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
                 *tcep = proto_tce | (rpn & TCE_RPN_MASK) << TCE_RPN_SHIFT;
 
diff --git a/arch/powerpc/platforms/pseries/phyp_dump.c b/arch/powerpc/platforms/pseries/phyp_dump.c
index 7ebd9e88d369..6e7742da0072 100644
--- a/arch/powerpc/platforms/pseries/phyp_dump.c
+++ b/arch/powerpc/platforms/pseries/phyp_dump.c
@@ -255,12 +255,12 @@ void invalidate_last_dump(struct phyp_dump_header *ph, unsigned long addr)
 
 /* ------------------------------------------------- */
 /**
- * release_memory_range -- release memory previously lmb_reserved
+ * release_memory_range -- release memory previously memblock_reserved
  * @start_pfn: starting physical frame number
  * @nr_pages: number of pages to free.
  *
  * This routine will release memory that had been previously
- * lmb_reserved in early boot. The released memory becomes
+ * memblock_reserved in early boot. The released memory becomes
  * available for genreal use.
  */
 static void release_memory_range(unsigned long start_pfn,
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 41a3e9a039ed..a4fc6da87c2e 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -61,7 +61,6 @@ static int ras_check_exception_token;
 
 #define EPOW_SENSOR_TOKEN       9
 #define EPOW_SENSOR_INDEX       0
-#define RAS_VECTOR_OFFSET       0x500
 
 static irqreturn_t ras_epow_interrupt(int irq, void *dev_id);
 static irqreturn_t ras_error_interrupt(int irq, void *dev_id);
@@ -121,7 +120,7 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id)
         spin_lock(&ras_log_buf_lock);
 
         status = rtas_call(ras_check_exception_token, 6, 1, NULL,
-                           RAS_VECTOR_OFFSET,
+                           RTAS_VECTOR_EXTERNAL_INTERRUPT,
                            irq_map[irq].hwirq,
                            RTAS_EPOW_WARNING | RTAS_POWERMGM_EVENTS,
                            critical, __pa(&ras_log_buf),
@@ -156,7 +155,7 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id)
         spin_lock(&ras_log_buf_lock);
 
         status = rtas_call(ras_check_exception_token, 6, 1, NULL,
-                           RAS_VECTOR_OFFSET,
+                           RTAS_VECTOR_EXTERNAL_INTERRUPT,
                            irq_map[irq].hwirq,
                            RTAS_INTERNAL_ERROR, 1 /*Time Critical */,
                            __pa(&ras_log_buf),
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 1a58637bcea5..57ddbb43b33a 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -118,12 +118,10 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
         if (!np)
                 goto out_err;
 
-        np->full_name = kmalloc(strlen(path) + 1, GFP_KERNEL);
+        np->full_name = kstrdup(path, GFP_KERNEL);
         if (!np->full_name)
                 goto out_err;
 
-        strcpy(np->full_name, path);
-
         np->properties = proplist;
         of_node_set_flag(np, OF_DYNAMIC);
         kref_init(&np->kref);
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
new file mode 100644
index 000000000000..ed72098bb4e3
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -0,0 +1,214 @@
+/*
+  * Copyright (C) 2010 Brian King IBM Corporation
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  */
+
+#include <linux/delay.h>
+#include <linux/suspend.h>
+#include <asm/firmware.h>
+#include <asm/hvcall.h>
+#include <asm/machdep.h>
+#include <asm/mmu.h>
+#include <asm/rtas.h>
+
+static u64 stream_id;
+static struct sys_device suspend_sysdev;
+static DECLARE_COMPLETION(suspend_work);
+static struct rtas_suspend_me_data suspend_data;
+static atomic_t suspending;
+
+/**
+ * pseries_suspend_begin - First phase of hibernation
+ *
+ * Check to ensure we are in a valid state to hibernate
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int pseries_suspend_begin(suspend_state_t state)
+{
+        long vasi_state, rc;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+
+        /* Make sure the state is valid */
+        rc = plpar_hcall(H_VASI_STATE, retbuf, stream_id);
+
+        vasi_state = retbuf[0];
+
+        if (rc) {
+                pr_err("pseries_suspend_begin: vasi_state returned %ld\n",rc);
+                return rc;
+        } else if (vasi_state == H_VASI_ENABLED) {
+                return -EAGAIN;
+        } else if (vasi_state != H_VASI_SUSPENDING) {
+                pr_err("pseries_suspend_begin: vasi_state returned state %ld\n",
+                       vasi_state);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+/**
+ * pseries_suspend_cpu - Suspend a single CPU
+ *
+ * Makes the H_JOIN call to suspend the CPU
+ *
+ **/
+static int pseries_suspend_cpu(void)
+{
+        if (atomic_read(&suspending))
+                return rtas_suspend_cpu(&suspend_data);
+        return 0;
+}
+
+/**
+ * pseries_suspend_enter - Final phase of hibernation
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int pseries_suspend_enter(suspend_state_t state)
+{
+        int rc = rtas_suspend_last_cpu(&suspend_data);
+
+        atomic_set(&suspending, 0);
+        atomic_set(&suspend_data.done, 1);
+        return rc;
+}
+
+/**
+ * pseries_prepare_late - Prepare to suspend all other CPUs
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int pseries_prepare_late(void)
+{
+        atomic_set(&suspending, 1);
+        atomic_set(&suspend_data.working, 0);
+        atomic_set(&suspend_data.done, 0);
+        atomic_set(&suspend_data.error, 0);
+        suspend_data.complete = &suspend_work;
+        INIT_COMPLETION(suspend_work);
+        return 0;
+}
+
+/**
+ * store_hibernate - Initiate partition hibernation
+ * @classdev:   sysdev class struct
+ * @attr:               class device attribute struct
+ * @buf:                buffer
+ * @count:              buffer size
+ *
+ * Write the stream ID received from the HMC to this file
+ * to trigger hibernating the partition
+ *
+ * Return value:
+ *      number of bytes printed to buffer / other on failure
+ **/
+static ssize_t store_hibernate(struct sysdev_class *classdev,
+                               struct sysdev_class_attribute *attr,
+                               const char *buf, size_t count)
+{
+        int rc;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        stream_id = simple_strtoul(buf, NULL, 16);
+
+        do {
+                rc = pseries_suspend_begin(PM_SUSPEND_MEM);
+                if (rc == -EAGAIN)
+                        ssleep(1);
+        } while (rc == -EAGAIN);
+
+        if (!rc)
+                rc = pm_suspend(PM_SUSPEND_MEM);
+
+        stream_id = 0;
+
+        if (!rc)
+                rc = count;
+        return rc;
+}
+
+static SYSDEV_CLASS_ATTR(hibernate, S_IWUSR, NULL, store_hibernate);
+
+static struct sysdev_class suspend_sysdev_class = {
+        .name = "power",
+};
+
+static struct platform_suspend_ops pseries_suspend_ops = {
+        .valid          = suspend_valid_only_mem,
+        .begin          = pseries_suspend_begin,
+        .prepare_late   = pseries_prepare_late,
+        .enter          = pseries_suspend_enter,
+};
+
+/**
+ * pseries_suspend_sysfs_register - Register with sysfs
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int pseries_suspend_sysfs_register(struct sys_device *sysdev)
+{
+        int rc;
+
+        if ((rc = sysdev_class_register(&suspend_sysdev_class)))
+                return rc;
+
+        sysdev->id = 0;
+        sysdev->cls = &suspend_sysdev_class;
+
+        if ((rc = sysdev_class_create_file(&suspend_sysdev_class, &attr_hibernate)))
+                goto class_unregister;
+
+        return 0;
+
+class_unregister:
+        sysdev_class_unregister(&suspend_sysdev_class);
+        return rc;
+}
+
+/**
+ * pseries_suspend_init - initcall for pSeries suspend
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int __init pseries_suspend_init(void)
+{
+        int rc;
+
+        if (!machine_is(pseries) || !firmware_has_feature(FW_FEATURE_LPAR))
+                return 0;
+
+        suspend_data.token = rtas_token("ibm,suspend-me");
+        if (suspend_data.token == RTAS_UNKNOWN_SERVICE)
+                return 0;
+
+        if ((rc = pseries_suspend_sysfs_register(&suspend_sysdev)))
+                return rc;
+
+        ppc_md.suspend_disable_cpu = pseries_suspend_cpu;
+        suspend_set_ops(&pseries_suspend_ops);
+        return 0;
+}
+
+__initcall(pseries_suspend_init);
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index f19d19468393..5b22b07c8f67 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -549,8 +549,6 @@ 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 (*tgt) {
                 if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION, tgt)) {