120 files changed, 8878 insertions, 2001 deletions

diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
index a46184a0c750..07cdbcacf156 100644
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -3,7 +3,8 @@
 #
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-y                           += mpc52xx_pic.o mpc52xx_common.o
+obj-$(CONFIG_PCI)               += mpc52xx_pci.o
 endif
 
-obj-$(CONFIG_PPC_EFIKA)         += efika-setup.o efika-pci.o
+obj-$(CONFIG_PPC_EFIKA)         += efika.o
 obj-$(CONFIG_PPC_LITE5200)      += lite5200.o
diff --git a/arch/powerpc/platforms/52xx/efika-pci.c b/arch/powerpc/platforms/52xx/efika-pci.c
deleted file mode 100644
index 62e05b2a9227..000000000000
--- a/arch/powerpc/platforms/52xx/efika-pci.c
+++ /dev/null
@@ -1,119 +0,0 @@
-
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/string.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/prom.h>
-#include <asm/machdep.h>
-#include <asm/sections.h>
-#include <asm/pci-bridge.h>
-#include <asm/rtas.h>
-
-#include "efika.h"
-
-#ifdef CONFIG_PCI
-/*
- * Access functions for PCI config space using RTAS calls.
- */
-static int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
-                            int len, u32 * val)
-{
-        struct pci_controller *hose = bus->sysdata;
-        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
-            | (((bus->number - hose->first_busno) & 0xff) << 16)
-            | (hose->index << 24);
-        int ret = -1;
-        int rval;
-
-        rval = rtas_call(rtas_token("read-pci-config"), 2, 2, &ret, addr, len);
-        *val = ret;
-        return rval ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
-}
-
-static int rtas_write_config(struct pci_bus *bus, unsigned int devfn,
-                             int offset, int len, u32 val)
-{
-        struct pci_controller *hose = bus->sysdata;
-        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
-            | (((bus->number - hose->first_busno) & 0xff) << 16)
-            | (hose->index << 24);
-        int rval;
-
-        rval = rtas_call(rtas_token("write-pci-config"), 3, 1, NULL,
-                         addr, len, val);
-        return rval ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops rtas_pci_ops = {
-        rtas_read_config,
-        rtas_write_config
-};
-
-void __init efika_pcisetup(void)
-{
-        const int *bus_range;
-        int len;
-        struct pci_controller *hose;
-        struct device_node *root;
-        struct device_node *pcictrl;
-
-        root = of_find_node_by_path("/");
-        if (root == NULL) {
-                printk(KERN_WARNING EFIKA_PLATFORM_NAME
-                       ": Unable to find the root node\n");
-                return;
-        }
-
-        for (pcictrl = NULL;;) {
-                pcictrl = of_get_next_child(root, pcictrl);
-                if ((pcictrl == NULL) || (strcmp(pcictrl->name, "pci") == 0))
-                        break;
-        }
-
-        of_node_put(root);
-
-        if (pcictrl == NULL) {
-                printk(KERN_WARNING EFIKA_PLATFORM_NAME
-                       ": Unable to find the PCI bridge node\n");
-                return;
-        }
-
-        bus_range = get_property(pcictrl, "bus-range", &len);
-        if (bus_range == NULL || len < 2 * sizeof(int)) {
-                printk(KERN_WARNING EFIKA_PLATFORM_NAME
-                       ": Can't get bus-range for %s\n", pcictrl->full_name);
-                return;
-        }
-
-        if (bus_range[1] == bus_range[0])
-                printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI bus %d",
-                       bus_range[0]);
-        else
-                printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI buses %d..%d",
-                       bus_range[0], bus_range[1]);
-        printk(" controlled by %s\n", pcictrl->full_name);
-        printk("\n");
-
-        hose = pcibios_alloc_controller();
-        if (!hose) {
-                printk(KERN_WARNING EFIKA_PLATFORM_NAME
-                       ": Can't allocate PCI controller structure for %s\n",
-                       pcictrl->full_name);
-                return;
-        }
-
-        hose->arch_data = of_node_get(pcictrl);
-        hose->first_busno = bus_range[0];
-        hose->last_busno = bus_range[1];
-        hose->ops = &rtas_pci_ops;
-
-        pci_process_bridge_OF_ranges(hose, pcictrl, 0);
-}
-
-#else
-void __init efika_pcisetup(void)
-{}
-#endif
diff --git a/arch/powerpc/platforms/52xx/efika-setup.c b/arch/powerpc/platforms/52xx/efika-setup.c
deleted file mode 100644
index 110c980ed1e0..000000000000
--- a/arch/powerpc/platforms/52xx/efika-setup.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Efika 5K2 platform setup
- * Some code really inspired from the lite5200b platform.
- * 
- * Copyright (C) 2006 bplan GmbH
- *
- * 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/errno.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/reboot.h>
-#include <linux/init.h>
-#include <linux/utsrelease.h>
-#include <linux/seq_file.h>
-#include <linux/root_dev.h>
-#include <linux/initrd.h>
-#include <linux/timer.h>
-#include <linux/pci.h>
-
-#include <asm/pgtable.h>
-#include <asm/prom.h>
-#include <asm/time.h>
-#include <asm/machdep.h>
-#include <asm/rtas.h>
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
-#include <asm/mpc52xx.h>
-
-#include "efika.h"
-
-static void efika_show_cpuinfo(struct seq_file *m)
-{
-        struct device_node *root;
-        const char *revision = NULL;
-        const char *codegendescription = NULL;
-        const char *codegenvendor = NULL;
-
-        root = of_find_node_by_path("/");
-        if (root) {
-                revision = get_property(root, "revision", NULL);
-                codegendescription =
-                    get_property(root, "CODEGEN,description", NULL);
-                codegenvendor = get_property(root, "CODEGEN,vendor", NULL);
-
-                of_node_put(root);
-        }
-
-        if (codegendescription)
-                seq_printf(m, "machine\t\t: %s\n", codegendescription);
-        else
-                seq_printf(m, "machine\t\t: Efika\n");
-
-        if (revision)
-                seq_printf(m, "revision\t: %s\n", revision);
-
-        if (codegenvendor)
-                seq_printf(m, "vendor\t\t: %s\n", codegenvendor);
-
-        of_node_put(root);
-}
-
-static void __init efika_setup_arch(void)
-{
-        rtas_initialize();
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        initrd_below_start_ok = 1;
-
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-                ROOT_DEV = Root_SDA2;   /* sda2 (sda1 is for the kernel) */
-
-        efika_pcisetup();
-
-        if (ppc_md.progress)
-                ppc_md.progress("Linux/PPC " UTS_RELEASE " runnung on Efika ;-)\n", 0x0);
-}
-
-static void __init efika_init(void)
-{
-        struct device_node *np;
-        struct device_node *cnp = NULL;
-        const u32 *base;
-
-        /* Find every child of the SOC node and add it to of_platform */
-        np = of_find_node_by_name(NULL, "builtin");
-        if (np) {
-                char name[BUS_ID_SIZE];
-                while ((cnp = of_get_next_child(np, cnp))) {
-                        strcpy(name, cnp->name);
-
-                        base = get_property(cnp, "reg", NULL);
-                        if (base == NULL)
-                                continue;
-
-                        snprintf(name+strlen(name), BUS_ID_SIZE, "@%x", *base);
-                        of_platform_device_create(cnp, name, NULL);
-
-                        printk(KERN_INFO EFIKA_PLATFORM_NAME" : Added %s (type '%s' at '%s') to the known devices\n", name, cnp->type, cnp->full_name);
-                }
-        }
-
-        if (ppc_md.progress)
-                ppc_md.progress("  Have fun with your Efika!    ", 0x7777);
-}
-
-static int __init efika_probe(void)
-{
-        char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
-                                          "model", NULL);
-
-        if (model == NULL)
-                return 0;
-        if (strcmp(model, "EFIKA5K2"))
-                return 0;
-
-        ISA_DMA_THRESHOLD = ~0L;
-        DMA_MODE_READ = 0x44;
-        DMA_MODE_WRITE = 0x48;
-
-        return 1;
-}
-
-define_machine(efika)
-{
-        .name = EFIKA_PLATFORM_NAME,
-        .probe = efika_probe,
-        .setup_arch = efika_setup_arch,
-        .init = efika_init,
-        .show_cpuinfo = efika_show_cpuinfo,
-        .init_IRQ = mpc52xx_init_irq,
-        .get_irq = mpc52xx_get_irq,
-        .restart = rtas_restart,
-        .power_off = rtas_power_off,
-        .halt = rtas_halt,
-        .set_rtc_time = rtas_set_rtc_time,
-        .get_rtc_time = rtas_get_rtc_time,
-        .progress = rtas_progress,
-        .get_boot_time = rtas_get_boot_time,
-        .calibrate_decr = generic_calibrate_decr,
-        .phys_mem_access_prot = pci_phys_mem_access_prot,
-};
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
new file mode 100644
index 000000000000..8de034116681
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -0,0 +1,243 @@
+/*
+ * Efika 5K2 platform code
+ * Some code really inspired from the lite5200b platform.
+ *
+ * Copyright (C) 2006 bplan GmbH
+ *
+ * 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/errno.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/utsrelease.h>
+#include <linux/seq_file.h>
+#include <linux/string.h>
+#include <linux/root_dev.h>
+#include <linux/initrd.h>
+#include <linux/timer.h>
+#include <linux/pci.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/sections.h>
+#include <asm/pci-bridge.h>
+#include <asm/pgtable.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/rtas.h>
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#include <asm/mpc52xx.h>
+
+
+#define EFIKA_PLATFORM_NAME "Efika"
+
+
+/* ------------------------------------------------------------------------ */
+/* PCI accesses thru RTAS                                                   */
+/* ------------------------------------------------------------------------ */
+
+#ifdef CONFIG_PCI
+
+/*
+ * Access functions for PCI config space using RTAS calls.
+ */
+static int rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
+                            int len, u32 * val)
+{
+        struct pci_controller *hose = bus->sysdata;
+        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
+            | (((bus->number - hose->first_busno) & 0xff) << 16)
+            | (hose->index << 24);
+        int ret = -1;
+        int rval;
+
+        rval = rtas_call(rtas_token("read-pci-config"), 2, 2, &ret, addr, len);
+        *val = ret;
+        return rval ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
+}
+
+static int rtas_write_config(struct pci_bus *bus, unsigned int devfn,
+                             int offset, int len, u32 val)
+{
+        struct pci_controller *hose = bus->sysdata;
+        unsigned long addr = (offset & 0xff) | ((devfn & 0xff) << 8)
+            | (((bus->number - hose->first_busno) & 0xff) << 16)
+            | (hose->index << 24);
+        int rval;
+
+        rval = rtas_call(rtas_token("write-pci-config"), 3, 1, NULL,
+                         addr, len, val);
+        return rval ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops rtas_pci_ops = {
+        rtas_read_config,
+        rtas_write_config
+};
+
+
+void __init efika_pcisetup(void)
+{
+        const int *bus_range;
+        int len;
+        struct pci_controller *hose;
+        struct device_node *root;
+        struct device_node *pcictrl;
+
+        root = of_find_node_by_path("/");
+        if (root == NULL) {
+                printk(KERN_WARNING EFIKA_PLATFORM_NAME
+                       ": Unable to find the root node\n");
+                return;
+        }
+
+        for (pcictrl = NULL;;) {
+                pcictrl = of_get_next_child(root, pcictrl);
+                if ((pcictrl == NULL) || (strcmp(pcictrl->name, "pci") == 0))
+                        break;
+        }
+
+        of_node_put(root);
+
+        if (pcictrl == NULL) {
+                printk(KERN_WARNING EFIKA_PLATFORM_NAME
+                       ": Unable to find the PCI bridge node\n");
+                return;
+        }
+
+        bus_range = get_property(pcictrl, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int)) {
+                printk(KERN_WARNING EFIKA_PLATFORM_NAME
+                       ": Can't get bus-range for %s\n", pcictrl->full_name);
+                return;
+        }
+
+        if (bus_range[1] == bus_range[0])
+                printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI bus %d",
+                       bus_range[0]);
+        else
+                printk(KERN_INFO EFIKA_PLATFORM_NAME ": PCI buses %d..%d",
+                       bus_range[0], bus_range[1]);
+        printk(" controlled by %s\n", pcictrl->full_name);
+        printk("\n");
+
+        hose = pcibios_alloc_controller();
+        if (!hose) {
+                printk(KERN_WARNING EFIKA_PLATFORM_NAME
+                       ": Can't allocate PCI controller structure for %s\n",
+                       pcictrl->full_name);
+                return;
+        }
+
+        hose->arch_data = of_node_get(pcictrl);
+        hose->first_busno = bus_range[0];
+        hose->last_busno = bus_range[1];
+        hose->ops = &rtas_pci_ops;
+
+        pci_process_bridge_OF_ranges(hose, pcictrl, 0);
+}
+
+#else
+void __init efika_pcisetup(void)
+{}
+#endif
+
+
+
+/* ------------------------------------------------------------------------ */
+/* Platform setup                                                           */
+/* ------------------------------------------------------------------------ */
+
+static void efika_show_cpuinfo(struct seq_file *m)
+{
+        struct device_node *root;
+        const char *revision = NULL;
+        const char *codegendescription = NULL;
+        const char *codegenvendor = NULL;
+
+        root = of_find_node_by_path("/");
+        if (!root)
+                return;
+
+        revision = get_property(root, "revision", NULL);
+        codegendescription =
+                    get_property(root, "CODEGEN,description", NULL);
+        codegenvendor = get_property(root, "CODEGEN,vendor", NULL);
+
+        if (codegendescription)
+                seq_printf(m, "machine\t\t: %s\n", codegendescription);
+        else
+                seq_printf(m, "machine\t\t: Efika\n");
+
+        if (revision)
+                seq_printf(m, "revision\t: %s\n", revision);
+
+        if (codegenvendor)
+                seq_printf(m, "vendor\t\t: %s\n", codegenvendor);
+
+        of_node_put(root);
+}
+
+static void __init efika_setup_arch(void)
+{
+        rtas_initialize();
+
+#ifdef CONFIG_BLK_DEV_INITRD
+        initrd_below_start_ok = 1;
+
+        if (initrd_start)
+                ROOT_DEV = Root_RAM0;
+        else
+#endif
+                ROOT_DEV = Root_SDA2;   /* sda2 (sda1 is for the kernel) */
+
+        efika_pcisetup();
+
+        if (ppc_md.progress)
+                ppc_md.progress("Linux/PPC " UTS_RELEASE " running on Efika ;-)\n", 0x0);
+}
+
+static int __init efika_probe(void)
+{
+        char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
+                                          "model", NULL);
+
+        if (model == NULL)
+                return 0;
+        if (strcmp(model, "EFIKA5K2"))
+                return 0;
+
+        ISA_DMA_THRESHOLD = ~0L;
+        DMA_MODE_READ = 0x44;
+        DMA_MODE_WRITE = 0x48;
+
+        return 1;
+}
+
+define_machine(efika)
+{
+        .name                   = EFIKA_PLATFORM_NAME,
+        .probe                  = efika_probe,
+        .setup_arch             = efika_setup_arch,
+        .init                   = mpc52xx_declare_of_platform_devices,
+        .show_cpuinfo           = efika_show_cpuinfo,
+        .init_IRQ               = mpc52xx_init_irq,
+        .get_irq                = mpc52xx_get_irq,
+        .restart                = rtas_restart,
+        .power_off              = rtas_power_off,
+        .halt                   = rtas_halt,
+        .set_rtc_time           = rtas_set_rtc_time,
+        .get_rtc_time           = rtas_get_rtc_time,
+        .progress               = rtas_progress,
+        .get_boot_time          = rtas_get_boot_time,
+        .calibrate_decr         = generic_calibrate_decr,
+        .phys_mem_access_prot   = pci_phys_mem_access_prot,
+};
+
diff --git a/arch/powerpc/platforms/52xx/efika.h b/arch/powerpc/platforms/52xx/efika.h
deleted file mode 100644
index 2f060fd097d7..000000000000
--- a/arch/powerpc/platforms/52xx/efika.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Efika 5K2 platform setup - Header file
- *
- * Copyright (C) 2006 bplan GmbH
- *
- * 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.
- *
- */
-
-#ifndef __ARCH_POWERPC_EFIKA__
-#define __ARCH_POWERPC_EFIKA__
-
-#define EFIKA_PLATFORM_NAME "Efika"
-
-extern void __init efika_pcisetup(void);
-
-#endif
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 0f21bab33f6c..cc3b40de21dd 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -51,13 +51,13 @@
  */
 
 static void __init
-lite52xx_setup_cpu(void)
+lite5200_setup_cpu(void)
 {
         struct mpc52xx_gpio __iomem *gpio;
         u32 port_config;
 
         /* Map zones */
-        gpio = mpc52xx_find_and_map("mpc52xx-gpio");
+        gpio = mpc52xx_find_and_map("mpc5200-gpio");
         if (!gpio) {
                 printk(KERN_ERR __FILE__ ": "
                         "Error while mapping GPIO register for port config. "
@@ -85,12 +85,12 @@ error:
         iounmap(gpio);
 }
 
-static void __init lite52xx_setup_arch(void)
+static void __init lite5200_setup_arch(void)
 {
         struct device_node *np;
 
         if (ppc_md.progress)
-                ppc_md.progress("lite52xx_setup_arch()", 0);
+                ppc_md.progress("lite5200_setup_arch()", 0);
 
         np = of_find_node_by_type(NULL, "cpu");
         if (np) {
@@ -105,7 +105,13 @@ static void __init lite52xx_setup_arch(void)
 
         /* CPU & Port mux setup */
         mpc52xx_setup_cpu();    /* Generic */
-        lite52xx_setup_cpu();   /* Platorm specific */
+        lite5200_setup_cpu();   /* Platorm specific */
+
+#ifdef CONFIG_PCI
+        np = of_find_node_by_type(np, "pci");
+        if (np)
+                mpc52xx_add_bridge(np);
+#endif
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
@@ -120,7 +126,7 @@ static void __init lite52xx_setup_arch(void)
 
 }
 
-void lite52xx_show_cpuinfo(struct seq_file *m)
+void lite5200_show_cpuinfo(struct seq_file *m)
 {
         struct device_node* np = of_find_all_nodes(NULL);
         const char *model = NULL;
@@ -137,25 +143,26 @@ void lite52xx_show_cpuinfo(struct seq_file *m)
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
-static int __init lite52xx_probe(void)
+static int __init lite5200_probe(void)
 {
         unsigned long node = of_get_flat_dt_root();
         const char *model = of_get_flat_dt_prop(node, "model", NULL);
 
-        if (!of_flat_dt_is_compatible(node, "lite52xx"))
+        if (!of_flat_dt_is_compatible(node, "fsl,lite5200") &&
+            !of_flat_dt_is_compatible(node, "fsl,lite5200b"))
                 return 0;
-        pr_debug("%s board w/ mpc52xx found\n", model ? model : "unknown");
+        pr_debug("%s board found\n", model ? model : "unknown");
 
         return 1;
 }
 
-define_machine(lite52xx) {
-        .name           = "lite52xx",
-        .probe          = lite52xx_probe,
-        .setup_arch     = lite52xx_setup_arch,
+define_machine(lite5200) {
+        .name           = "lite5200",
+        .probe          = lite5200_probe,
+        .setup_arch     = lite5200_setup_arch,
         .init           = mpc52xx_declare_of_platform_devices,
         .init_IRQ       = mpc52xx_init_irq,
         .get_irq        = mpc52xx_get_irq,
-        .show_cpuinfo   = lite52xx_show_cpuinfo,
+        .show_cpuinfo   = lite5200_show_cpuinfo,
         .calibrate_decr = generic_calibrate_decr,
 };
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index cc40889074bd..ed0cb694aea8 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -83,8 +83,8 @@ mpc52xx_setup_cpu(void)
         struct mpc52xx_xlb  __iomem *xlb;
 
         /* Map zones */
-        cdm = mpc52xx_find_and_map("mpc52xx-cdm");
-        xlb = mpc52xx_find_and_map("mpc52xx-xlb");
+        cdm = mpc52xx_find_and_map("mpc5200-cdm");
+        xlb = mpc52xx_find_and_map("mpc5200-xlb");
 
         if (!cdm || !xlb) {
                 printk(KERN_ERR __FILE__ ": "
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
new file mode 100644
index 000000000000..faf161bdbc1c
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -0,0 +1,412 @@
+/*
+ * PCI code for the Freescale MPC52xx embedded CPU.
+ *
+ * Copyright (C) 2006 Secret Lab Technologies Ltd.
+ *                        Grant Likely <grant.likely@secretlab.ca>
+ * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com>
+ *
+ * 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.
+ */
+
+#undef DEBUG
+
+#include <asm/pci.h>
+#include <asm/mpc52xx.h>
+#include <asm/delay.h>
+#include <asm/machdep.h>
+#include <linux/kernel.h>
+
+
+/* ======================================================================== */
+/* PCI windows config                                                       */
+/* ======================================================================== */
+
+#define MPC52xx_PCI_TARGET_IO   0xf0000000
+#define MPC52xx_PCI_TARGET_MEM  0x00000000
+
+
+/* ======================================================================== */
+/* Structures mapping & Defines for PCI Unit                                */
+/* ======================================================================== */
+
+#define MPC52xx_PCI_GSCR_BM             0x40000000
+#define MPC52xx_PCI_GSCR_PE             0x20000000
+#define MPC52xx_PCI_GSCR_SE             0x10000000
+#define MPC52xx_PCI_GSCR_XLB2PCI_MASK   0x07000000
+#define MPC52xx_PCI_GSCR_XLB2PCI_SHIFT  24
+#define MPC52xx_PCI_GSCR_IPG2PCI_MASK   0x00070000
+#define MPC52xx_PCI_GSCR_IPG2PCI_SHIFT  16
+#define MPC52xx_PCI_GSCR_BME            0x00004000
+#define MPC52xx_PCI_GSCR_PEE            0x00002000
+#define MPC52xx_PCI_GSCR_SEE            0x00001000
+#define MPC52xx_PCI_GSCR_PR             0x00000001
+
+
+#define MPC52xx_PCI_IWBTAR_TRANSLATION(proc_ad,pci_ad,size)       \
+                ( ( (proc_ad) & 0xff000000 )                    | \
+                  ( (((size) - 1) >> 8) & 0x00ff0000 )          | \
+                  ( ((pci_ad) >> 16) & 0x0000ff00 ) )
+
+#define MPC52xx_PCI_IWCR_PACK(win0,win1,win2)   (((win0) << 24) | \
+                                                 ((win1) << 16) | \
+                                                 ((win2) <<  8))
+
+#define MPC52xx_PCI_IWCR_DISABLE        0x0
+#define MPC52xx_PCI_IWCR_ENABLE         0x1
+#define MPC52xx_PCI_IWCR_READ           0x0
+#define MPC52xx_PCI_IWCR_READ_LINE      0x2
+#define MPC52xx_PCI_IWCR_READ_MULTI     0x4
+#define MPC52xx_PCI_IWCR_MEM            0x0
+#define MPC52xx_PCI_IWCR_IO             0x8
+
+#define MPC52xx_PCI_TCR_P               0x01000000
+#define MPC52xx_PCI_TCR_LD              0x00010000
+
+#define MPC52xx_PCI_TBATR_DISABLE       0x0
+#define MPC52xx_PCI_TBATR_ENABLE        0x1
+
+struct mpc52xx_pci {
+        u32     idr;            /* PCI + 0x00 */
+        u32     scr;            /* PCI + 0x04 */
+        u32     ccrir;          /* PCI + 0x08 */
+        u32     cr1;            /* PCI + 0x0C */
+        u32     bar0;           /* PCI + 0x10 */
+        u32     bar1;           /* PCI + 0x14 */
+        u8      reserved1[16];  /* PCI + 0x18 */
+        u32     ccpr;           /* PCI + 0x28 */
+        u32     sid;            /* PCI + 0x2C */
+        u32     erbar;          /* PCI + 0x30 */
+        u32     cpr;            /* PCI + 0x34 */
+        u8      reserved2[4];   /* PCI + 0x38 */
+        u32     cr2;            /* PCI + 0x3C */
+        u8      reserved3[32];  /* PCI + 0x40 */
+        u32     gscr;           /* PCI + 0x60 */
+        u32     tbatr0;         /* PCI + 0x64 */
+        u32     tbatr1;         /* PCI + 0x68 */
+        u32     tcr;            /* PCI + 0x6C */
+        u32     iw0btar;        /* PCI + 0x70 */
+        u32     iw1btar;        /* PCI + 0x74 */
+        u32     iw2btar;        /* PCI + 0x78 */
+        u8      reserved4[4];   /* PCI + 0x7C */
+        u32     iwcr;           /* PCI + 0x80 */
+        u32     icr;            /* PCI + 0x84 */
+        u32     isr;            /* PCI + 0x88 */
+        u32     arb;            /* PCI + 0x8C */
+        u8      reserved5[104]; /* PCI + 0x90 */
+        u32     car;            /* PCI + 0xF8 */
+        u8      reserved6[4];   /* PCI + 0xFC */
+};
+
+
+/* ======================================================================== */
+/* PCI configuration acess                                                  */
+/* ======================================================================== */
+
+static int
+mpc52xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
+                                int offset, int len, u32 *val)
+{
+        struct pci_controller *hose = bus->sysdata;
+        u32 value;
+
+        if (ppc_md.pci_exclude_device)
+                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+
+        out_be32(hose->cfg_addr,
+                (1 << 31) |
+                ((bus->number - hose->bus_offset) << 16) |
+                (devfn << 8) |
+                (offset & 0xfc));
+        mb();
+
+#if defined(CONFIG_PPC_MPC5200_BUGFIX)
+        if (bus->number != hose->bus_offset) {
+                /* workaround for the bug 435 of the MPC5200 (L25R);
+                 * Don't do 32 bits config access during type-1 cycles */
+                switch (len) {
+                      case 1:
+                        value = in_8(((u8 __iomem *)hose->cfg_data) +
+                                     (offset & 3));
+                        break;
+                      case 2:
+                        value = in_le16(((u16 __iomem *)hose->cfg_data) +
+                                        ((offset>>1) & 1));
+                        break;
+
+                      default:
+                        value = in_le16((u16 __iomem *)hose->cfg_data) |
+                                (in_le16(((u16 __iomem *)hose->cfg_data) + 1) << 16);
+                        break;
+                }
+        }
+        else
+#endif
+        {
+                value = in_le32(hose->cfg_data);
+
+                if (len != 4) {
+                        value >>= ((offset & 0x3) << 3);
+                        value &= 0xffffffff >> (32 - (len << 3));
+                }
+        }
+
+        *val = value;
+
+        out_be32(hose->cfg_addr, 0);
+        mb();
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int
+mpc52xx_pci_write_config(struct pci_bus *bus, unsigned int devfn,
+                                int offset, int len, u32 val)
+{
+        struct pci_controller *hose = bus->sysdata;
+        u32 value, mask;
+
+        if (ppc_md.pci_exclude_device)
+                if (ppc_md.pci_exclude_device(bus->number, devfn))
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+
+        out_be32(hose->cfg_addr,
+                (1 << 31) |
+                ((bus->number - hose->bus_offset) << 16) |
+                (devfn << 8) |
+                (offset & 0xfc));
+        mb();
+
+#if defined(CONFIG_PPC_MPC5200_BUGFIX)
+        if (bus->number != hose->bus_offset) {
+                /* workaround for the bug 435 of the MPC5200 (L25R);
+                 * Don't do 32 bits config access during type-1 cycles */
+                switch (len) {
+                      case 1:
+                        out_8(((u8 __iomem *)hose->cfg_data) +
+                                (offset & 3), val);
+                        break;
+                      case 2:
+                        out_le16(((u16 __iomem *)hose->cfg_data) +
+                                ((offset>>1) & 1), val);
+                        break;
+
+                      default:
+                        out_le16((u16 __iomem *)hose->cfg_data,
+                                (u16)val);
+                        out_le16(((u16 __iomem *)hose->cfg_data) + 1,
+                                (u16)(val>>16));
+                        break;
+                }
+        }
+        else
+#endif
+        {
+                if (len != 4) {
+                        value = in_le32(hose->cfg_data);
+
+                        offset = (offset & 0x3) << 3;
+                        mask = (0xffffffff >> (32 - (len << 3)));
+                        mask <<= offset;
+
+                        value &= ~mask;
+                        val = value | ((val << offset) & mask);
+                }
+
+                out_le32(hose->cfg_data, val);
+        }
+        mb();
+
+        out_be32(hose->cfg_addr, 0);
+        mb();
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops mpc52xx_pci_ops = {
+        .read  = mpc52xx_pci_read_config,
+        .write = mpc52xx_pci_write_config
+};
+
+
+/* ======================================================================== */
+/* PCI setup                                                                */
+/* ======================================================================== */
+
+static void __init
+mpc52xx_pci_setup(struct pci_controller *hose,
+                  struct mpc52xx_pci __iomem *pci_regs)
+{
+        struct resource *res;
+        u32 tmp;
+        int iwcr0 = 0, iwcr1 = 0, iwcr2 = 0;
+
+        pr_debug("mpc52xx_pci_setup(hose=%p, pci_regs=%p)\n", hose, pci_regs);
+
+        /* pci_process_bridge_OF_ranges() found all our addresses for us;
+         * now store them in the right places */
+        hose->cfg_addr = &pci_regs->car;
+        hose->cfg_data = hose->io_base_virt;
+
+        /* Control regs */
+        tmp = in_be32(&pci_regs->scr);
+        tmp |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
+        out_be32(&pci_regs->scr, tmp);
+
+        /* Memory windows */
+        res = &hose->mem_resources[0];
+        if (res->flags) {
+                pr_debug("mem_resource[0] = {.start=%x, .end=%x, .flags=%lx}\n",
+                         res->start, res->end, res->flags);
+                out_be32(&pci_regs->iw0btar,
+                         MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start,
+                                  res->end - res->start + 1));
+                iwcr0 = MPC52xx_PCI_IWCR_ENABLE | MPC52xx_PCI_IWCR_MEM;
+                if (res->flags & IORESOURCE_PREFETCH)
+                        iwcr0 |= MPC52xx_PCI_IWCR_READ_MULTI;
+                else
+                        iwcr0 |= MPC52xx_PCI_IWCR_READ;
+        }
+
+        res = &hose->mem_resources[1];
+        if (res->flags) {
+                pr_debug("mem_resource[1] = {.start=%x, .end=%x, .flags=%lx}\n",
+                         res->start, res->end, res->flags);
+                out_be32(&pci_regs->iw1btar,
+                         MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start,
+                                  res->end - res->start + 1));
+                iwcr1 = MPC52xx_PCI_IWCR_ENABLE | MPC52xx_PCI_IWCR_MEM;
+                if (res->flags & IORESOURCE_PREFETCH)
+                        iwcr1 |= MPC52xx_PCI_IWCR_READ_MULTI;
+                else
+                        iwcr1 |= MPC52xx_PCI_IWCR_READ;
+        }
+
+        /* IO resources */
+        res = &hose->io_resource;
+        if (!res) {
+                printk(KERN_ERR "%s: Didn't find IO resources\n", __FILE__);
+                return;
+        }
+        pr_debug(".io_resource={.start=%x,.end=%x,.flags=%lx} "
+                 ".io_base_phys=0x%p\n",
+                 res->start, res->end, res->flags, (void*)hose->io_base_phys);
+        out_be32(&pci_regs->iw2btar,
+                 MPC52xx_PCI_IWBTAR_TRANSLATION(hose->io_base_phys,
+                                                res->start,
+                                                res->end - res->start + 1));
+        iwcr2 = MPC52xx_PCI_IWCR_ENABLE | MPC52xx_PCI_IWCR_IO;
+
+        /* Set all the IWCR fields at once; they're in the same reg */
+        out_be32(&pci_regs->iwcr, MPC52xx_PCI_IWCR_PACK(iwcr0, iwcr1, iwcr2));
+
+        out_be32(&pci_regs->tbatr0,
+                MPC52xx_PCI_TBATR_ENABLE | MPC52xx_PCI_TARGET_IO );
+        out_be32(&pci_regs->tbatr1,
+                MPC52xx_PCI_TBATR_ENABLE | MPC52xx_PCI_TARGET_MEM );
+
+        out_be32(&pci_regs->tcr, MPC52xx_PCI_TCR_LD);
+
+        tmp = in_be32(&pci_regs->gscr);
+#if 0
+        /* Reset the exteral bus ( internal PCI controller is NOT resetted ) */
+        /* Not necessary and can be a bad thing if for example the bootloader
+           is displaying a splash screen or ... Just left here for
+           documentation purpose if anyone need it */
+        out_be32(&pci_regs->gscr, tmp | MPC52xx_PCI_GSCR_PR);
+        udelay(50);
+#endif
+
+        /* Make sure the PCI bridge is out of reset */
+        out_be32(&pci_regs->gscr, tmp & ~MPC52xx_PCI_GSCR_PR);
+}
+
+static void
+mpc52xx_pci_fixup_resources(struct pci_dev *dev)
+{
+        int i;
+
+        pr_debug("mpc52xx_pci_fixup_resources() %.4x:%.4x\n",
+                 dev->vendor, dev->device);
+
+        /* We don't rely on boot loader for PCI and resets all
+           devices */
+        for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                struct resource *res = &dev->resource[i];
+                if (res->end > res->start) {    /* Only valid resources */
+                        res->end -= res->start;
+                        res->start = 0;
+                        res->flags |= IORESOURCE_UNSET;
+                }
+        }
+
+        /* The PCI Host bridge of MPC52xx has a prefetch memory resource
+           fixed to 1Gb. Doesn't fit in the resource system so we remove it */
+        if ( (dev->vendor == PCI_VENDOR_ID_MOTOROLA) &&
+             (   dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200
+              || dev->device == PCI_DEVICE_ID_MOTOROLA_MPC5200B) ) {
+                struct resource *res = &dev->resource[1];
+                res->start = res->end = res->flags = 0;
+        }
+}
+
+int __init
+mpc52xx_add_bridge(struct device_node *node)
+{
+        int len;
+        struct mpc52xx_pci __iomem *pci_regs;
+        struct pci_controller *hose;
+        const int *bus_range;
+        struct resource rsrc;
+
+        pr_debug("Adding MPC52xx PCI host bridge %s\n", node->full_name);
+
+        pci_assign_all_buses = 1;
+
+        if (of_address_to_resource(node, 0, &rsrc) != 0) {
+                printk(KERN_ERR "Can't get %s resources\n", node->full_name);
+                return -EINVAL;
+        }
+
+        bus_range = get_property(node, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int)) {
+                printk(KERN_WARNING "Can't get %s bus-range, assume bus 0\n",
+                       node->full_name);
+                bus_range = NULL;
+        }
+
+        /* There are some PCI quirks on the 52xx, register the hook to
+         * fix them. */
+        ppc_md.pcibios_fixup_resources = mpc52xx_pci_fixup_resources;
+
+        /* Alloc and initialize the pci controller.  Values in the device
+         * tree are needed to configure the 52xx PCI controller.  Rather
+         * than parse the tree here, let pci_process_bridge_OF_ranges()
+         * do it for us and extract the values after the fact */
+        hose = pcibios_alloc_controller();
+        if (!hose)
+                return -ENOMEM;
+
+        hose->arch_data = node;
+        hose->set_cfg_type = 1;
+
+        hose->first_busno = bus_range ? bus_range[0] : 0;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+
+        hose->bus_offset = 0;
+        hose->ops = &mpc52xx_pci_ops;
+
+        pci_regs = ioremap(rsrc.start, rsrc.end - rsrc.start + 1);
+        if (!pci_regs)
+                return -ENOMEM;
+
+        pci_process_bridge_OF_ranges(hose, node, 1);
+
+        /* Finish setting up PCI using values obtained by
+         * pci_proces_bridge_OF_ranges */
+        mpc52xx_pci_setup(hose, pci_regs);
+
+        return 0;
+}
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index cd91a6c3aafa..c75192567e55 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -383,16 +383,16 @@ void __init mpc52xx_init_irq(void)
         struct device_node *picnode;
 
         /* Remap the necessary zones */
-        picnode = of_find_compatible_node(NULL, NULL, "mpc52xx-pic");
+        picnode = of_find_compatible_node(NULL, NULL, "mpc5200-pic");
 
-        intr = mpc52xx_find_and_map("mpc52xx-pic");
+        intr = mpc52xx_find_and_map("mpc5200-pic");
         if (!intr)
-                panic(__FILE__  ": find_and_map failed on 'mpc52xx-pic'. "
+                panic(__FILE__  ": find_and_map failed on 'mpc5200-pic'. "
                                 "Check node !");
 
-        sdma = mpc52xx_find_and_map("mpc52xx-bestcomm");
+        sdma = mpc52xx_find_and_map("mpc5200-bestcomm");
         if (!sdma)
-                panic(__FILE__  ": find_and_map failed on 'mpc52xx-bestcomm'. "
+                panic(__FILE__  ": find_and_map failed on 'mpc5200-bestcomm'. "
                                 "Check node !");
 
         /* Disable all interrupt sources. */
diff --git a/arch/powerpc/platforms/82xx/mpc82xx.c b/arch/powerpc/platforms/82xx/mpc82xx.c
index 0f5b30dc60da..74e7892cdfcf 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx.c
@@ -50,7 +50,7 @@
 #include <sysdev/fsl_soc.h>
 #include <sysdev/cpm2_pic.h>
 
-#include "pq2ads_pd.h"
+#include "pq2ads.h"
 
 static int __init get_freq(char *name, unsigned long *val)
 {
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index ea880f1f0dcd..7334c1a15b90 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -51,7 +51,7 @@
 #include <sysdev/fsl_soc.h>
 #include <../sysdev/cpm2_pic.h>
 
-#include "pq2ads_pd.h"
+#include "pq2ads.h"
 
 #ifdef CONFIG_PCI
 static uint pci_clk_frq;
diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h
index fb2f92bcd770..5b5cca6c8c88 100644
--- a/arch/powerpc/platforms/82xx/pq2ads.h
+++ b/arch/powerpc/platforms/82xx/pq2ads.h
@@ -22,6 +22,7 @@
 #ifndef __MACH_ADS8260_DEFS
 #define __MACH_ADS8260_DEFS
 
+#include <linux/seq_file.h>
 #include <asm/ppcboot.h>
 
 /* For our show_cpuinfo hooks. */
@@ -46,12 +47,12 @@
 #define BCSR1_RS232_EN1         ((uint)0x02000000)      /* 0 ==enable */
 #define BCSR1_RS232_EN2         ((uint)0x01000000)      /* 0 ==enable */
 #define BCSR3_FETHIEN2          ((uint)0x10000000)      /* 0 == enable*/
-#define BCSR3_FETH2_RS          ((uint)0x80000000)      /* 0 == reset */
+#define BCSR3_FETH2_RST         ((uint)0x80000000)      /* 0 == reset */
 
 /* cpm serial driver works with constants below */
 
 #define SIU_INT_SMC1            ((uint)0x04+CPM_IRQ_OFFSET)
-#define SIU_INT_SMC2i           ((uint)0x05+CPM_IRQ_OFFSET)
+#define SIU_INT_SMC2            ((uint)0x05+CPM_IRQ_OFFSET)
 #define SIU_INT_SCC1            ((uint)0x28+CPM_IRQ_OFFSET)
 #define SIU_INT_SCC2            ((uint)0x29+CPM_IRQ_OFFSET)
 #define SIU_INT_SCC3            ((uint)0x2a+CPM_IRQ_OFFSET)
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index edcd5b875b66..713b31a16ce9 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -3,7 +3,13 @@ menu "Platform support"
 
 choice
         prompt "Machine Type"
-        default MPC834x_SYS
+        default MPC834x_MDS
+
+config MPC8313_RDB
+        bool "Freescale MPC8313 RDB"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the MPC8313 RDB board.
 
 config MPC832x_MDS
         bool "Freescale MPC832x MDS"
@@ -12,13 +18,13 @@ config MPC832x_MDS
         help
           This option enables support for the MPC832x MDS evaluation board.
 
-config MPC834x_SYS
-        bool "Freescale MPC834x SYS"
+config MPC834x_MDS
+        bool "Freescale MPC834x MDS"
         select DEFAULT_UIMAGE
         help
-          This option enables support for the MPC 834x SYS evaluation board.
+          This option enables support for the MPC 834x MDS evaluation board.
 
-          Be aware that PCI buses can only function when SYS board is plugged
+          Be aware that PCI buses can only function when MDS board is plugged
           into the PIB (Platform IO Board) board from Freescale which provide
           3 PCI slots.  The PIBs PCI initialization is the bootloader's
           responsibility.
@@ -32,15 +38,21 @@ config MPC834x_ITX
           Be aware that PCI initialization is the bootloader's
           responsibility.
 
-config MPC8360E_PB
-        bool "Freescale MPC8360E PB"
+config MPC836x_MDS
+        bool "Freescale MPC836x MDS"
         select DEFAULT_UIMAGE
         select QUICC_ENGINE
         help
-          This option enables support for the MPC836x EMDS Processor Board.
+          This option enables support for the MPC836x MDS Processor Board.
 
 endchoice
 
+config PPC_MPC831x
+        bool
+        select PPC_UDBG_16550
+        select PPC_INDIRECT_PCI
+        default y if MPC8313_RDB
+
 config PPC_MPC832x
         bool
         select PPC_UDBG_16550
@@ -51,12 +63,12 @@ config MPC834x
         bool
         select PPC_UDBG_16550
         select PPC_INDIRECT_PCI
-        default y if MPC834x_SYS || MPC834x_ITX
+        default y if MPC834x_MDS || MPC834x_ITX
 
 config PPC_MPC836x
         bool
         select PPC_UDBG_16550
         select PPC_INDIRECT_PCI
-        default y if MPC8360E_PB
+        default y if MPC836x_MDS
 
 endmenu
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index f1aa7e24a938..dfc970d0df10 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -3,7 +3,8 @@
 #
 obj-y                           := misc.o
 obj-$(CONFIG_PCI)               += pci.o
-obj-$(CONFIG_MPC834x_SYS)       += mpc834x_sys.o
+obj-$(CONFIG_MPC8313_RDB)       += mpc8313_rdb.o
+obj-$(CONFIG_MPC834x_MDS)       += mpc834x_mds.o
 obj-$(CONFIG_MPC834x_ITX)       += mpc834x_itx.o
-obj-$(CONFIG_MPC8360E_PB)       += mpc8360e_pb.o
+obj-$(CONFIG_MPC836x_MDS)       += mpc836x_mds.o
 obj-$(CONFIG_MPC832x_MDS)       += mpc832x_mds.o
diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c
index f0c6df61faa9..f01806c940e1 100644
--- a/arch/powerpc/platforms/83xx/misc.c
+++ b/arch/powerpc/platforms/83xx/misc.c
@@ -18,23 +18,36 @@
 
 #include "mpc83xx.h"
 
+static __be32 __iomem *restart_reg_base;
+
+static int __init mpc83xx_restart_init(void)
+{
+        /* map reset restart_reg_baseister space */
+        restart_reg_base = ioremap(get_immrbase() + 0x900, 0xff);
+
+        return 0;
+}
+
+arch_initcall(mpc83xx_restart_init);
+
 void mpc83xx_restart(char *cmd)
 {
 #define RST_OFFSET      0x00000900
 #define RST_PROT_REG    0x00000018
 #define RST_CTRL_REG    0x0000001c
-        __be32 __iomem *reg;
-
-        /* map reset register space */
-        reg = ioremap(get_immrbase() + 0x900, 0xff);
 
         local_irq_disable();
 
-        /* enable software reset "RSTE" */
-        out_be32(reg + (RST_PROT_REG >> 2), 0x52535445);
+        if (restart_reg_base) {
+                /* enable software reset "RSTE" */
+                out_be32(restart_reg_base + (RST_PROT_REG >> 2), 0x52535445);
+
+                /* set software hard reset */
+                out_be32(restart_reg_base + (RST_CTRL_REG >> 2), 0x2);
+        } else {
+                printk (KERN_EMERG "Error: Restart registers not mapped, spinning!\n");
+        }
 
-        /* set software hard reset */
-        out_be32(reg + (RST_CTRL_REG >> 2), 0x2);
         for (;;) ;
 }
 
diff --git a/arch/powerpc/platforms/83xx/mpc8313_rdb.c b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
new file mode 100644
index 000000000000..32e9e9492841
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
@@ -0,0 +1,92 @@
+/*
+ * arch/powerpc/platforms/83xx/mpc8313_rdb.c
+ *
+ * Description: MPC8313x RDB board specific routines.
+ * This file is based on mpc834x_sys.c
+ * Author: Lo Wlison <r43300@freescale.com>
+ *
+ * Copyright (C) Freescale Semiconductor, Inc. 2006. All rights reserved.
+ *
+ * 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 <asm/time.h>
+#include <asm/ipic.h>
+#include <asm/udbg.h>
+
+#include "mpc83xx.h"
+
+#undef DEBUG
+#ifdef DEBUG
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...)
+#endif
+
+#ifndef CONFIG_PCI
+unsigned long isa_io_base = 0;
+unsigned long isa_mem_base = 0;
+#endif
+
+/* ************************************************************************
+ *
+ * Setup the architecture
+ *
+ */
+static void __init mpc8313_rdb_setup_arch(void)
+{
+        struct device_node *np;
+
+        if (ppc_md.progress)
+                ppc_md.progress("mpc8313_rdb_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+                add_bridge(np);
+
+        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
+#endif
+}
+
+void __init mpc8313_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 mpc8313_rdb_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "MPC8313ERDB");
+}
+
+define_machine(mpc8313_rdb) {
+        .name                   = "MPC8313 RDB",
+        .probe                  = mpc8313_rdb_probe,
+        .setup_arch             = mpc8313_rdb_setup_arch,
+        .init_IRQ               = mpc8313_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/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 4d471190be8d..17e3a3c6d8b4 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -25,6 +25,7 @@
 #include <linux/initrd.h>
 
 #include <asm/of_device.h>
+#include <asm/of_platform.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/time.h>
@@ -56,11 +57,6 @@ unsigned long isa_mem_base = 0;
 
 static u8 *bcsr_regs = NULL;
 
-u8 *get_bcsr(void)
-{
-        return bcsr_regs;
-}
-
 /* ************************************************************************
  *
  * Setup the architecture
@@ -73,17 +69,6 @@ static void __init mpc832x_sys_setup_arch(void)
         if (ppc_md.progress)
                 ppc_md.progress("mpc832x_sys_setup_arch()", 0);
 
-        np = of_find_node_by_type(NULL, "cpu");
-        if (np != 0) {
-                unsigned int *fp =
-                    (int *)get_property(np, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(np);
-        }
-
         /* Map BCSR area */
         np = of_find_node_by_name(NULL, "bcsr");
         if (np != 0) {
@@ -120,42 +105,30 @@ static void __init mpc832x_sys_setup_arch(void)
                 iounmap(bcsr_regs);
                 of_node_put(np);
         }
-
 #endif                          /* CONFIG_QUICC_ENGINE */
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-#ifdef  CONFIG_ROOT_NFS
-                ROOT_DEV = Root_NFS;
-#else
-                ROOT_DEV = Root_HDA1;
-#endif
 }
 
+static struct of_device_id mpc832x_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .type = "qe", },
+        {},
+};
+
 static int __init mpc832x_declare_of_platform_devices(void)
 {
-        struct device_node *np;
-
-        for (np = NULL; (np = of_find_compatible_node(np, "network",
-                                        "ucc_geth")) != NULL;) {
-                int ucc_num;
-                char bus_id[BUS_ID_SIZE];
+        if (!machine_is(mpc832x_mds))
+                return 0;
 
-                ucc_num = *((uint *) get_property(np, "device-id", NULL)) - 1;
-                snprintf(bus_id, BUS_ID_SIZE, "ucc_geth.%u", ucc_num);
-                of_platform_device_create(np, bus_id, NULL);
-        }
+        /* Publish the QE devices */
+        of_platform_bus_probe(NULL, mpc832x_ids, NULL);
 
         return 0;
 }
 device_initcall(mpc832x_declare_of_platform_devices);
 
-void __init mpc832x_sys_init_IRQ(void)
+static void __init mpc832x_sys_init_IRQ(void)
 {
-
         struct device_node *np;
 
         np = of_find_node_by_type(NULL, "ipic");
@@ -188,6 +161,9 @@ static int __init mpc832x_rtc_hookup(void)
 {
         struct timespec tv;
 
+        if (!machine_is(mpc832x_mds))
+                return 0;
+
         ppc_md.get_rtc_time = ds1374_get_rtc_time;
         ppc_md.set_rtc_time = ds1374_set_rtc_time;
 
@@ -206,17 +182,9 @@ late_initcall(mpc832x_rtc_hookup);
  */
 static int __init mpc832x_sys_probe(void)
 {
-        char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
-                                          "model", NULL);
-
-        if (model == NULL)
-                return 0;
-        if (strcmp(model, "MPC8323EMDS"))
-                return 0;
-
-        DBG("%s found\n", model);
+        unsigned long root = of_get_flat_dt_root();
 
-        return 1;
+        return of_flat_dt_is_compatible(root, "MPC832xMDS");
 }
 
 define_machine(mpc832x_mds) {
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 314c42ac6048..3c009f6d4a4f 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -38,8 +38,6 @@
 
 #include "mpc83xx.h"
 
-#include <platforms/83xx/mpc834x_sys.h>
-
 #ifndef CONFIG_PCI
 unsigned long isa_io_base = 0;
 unsigned long isa_mem_base = 0;
@@ -57,31 +55,15 @@ static void __init mpc834x_itx_setup_arch(void)
         if (ppc_md.progress)
                 ppc_md.progress("mpc834x_itx_setup_arch()", 0);
 
-        np = of_find_node_by_type(NULL, "cpu");
-        if (np != 0) {
-                const unsigned int *fp =
-                        get_property(np, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(np);
-        }
 #ifdef CONFIG_PCI
         for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
                 add_bridge(np);
 
         ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
-
-#ifdef  CONFIG_ROOT_NFS
-        ROOT_DEV = Root_NFS;
-#else
-        ROOT_DEV = Root_HDA1;
-#endif
 }
 
-void __init mpc834x_itx_init_IRQ(void)
+static void __init mpc834x_itx_init_IRQ(void)
 {
         struct device_node *np;
 
@@ -102,10 +84,9 @@ void __init mpc834x_itx_init_IRQ(void)
  */
 static int __init mpc834x_itx_probe(void)
 {
-        /* We always match for now, eventually we should look at the flat
-           dev tree to ensure this is the board we are suppose to run on
-        */
-        return 1;
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "MPC834xMITX");
 }
 
 define_machine(mpc834x_itx) {
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 80b735a414d9..e5d819166874 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -1,7 +1,7 @@
 /*
- * arch/powerpc/platforms/83xx/mpc834x_sys.c
+ * arch/powerpc/platforms/83xx/mpc834x_mds.c
  *
- * MPC834x SYS board specific routines
+ * MPC834x MDS board specific routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
  *
@@ -43,28 +43,88 @@ unsigned long isa_io_base = 0;
 unsigned long isa_mem_base = 0;
 #endif
 
+#define BCSR5_INT_USB           0x02
+/* Note: This is only for PB, not for PB+PIB
+ * On PB only port0 is connected using ULPI */
+static int mpc834x_usb_cfg(void)
+{
+        unsigned long sccr, sicrl;
+        void __iomem *immap;
+        void __iomem *bcsr_regs = NULL;
+        u8 bcsr5;
+        struct device_node *np = NULL;
+        int port0_is_dr = 0;
+
+        if ((np = of_find_compatible_node(np, "usb", "fsl-usb2-dr")) != NULL)
+                port0_is_dr = 1;
+        if ((np = of_find_compatible_node(np, "usb", "fsl-usb2-mph")) != NULL){
+                if (port0_is_dr) {
+                        printk(KERN_WARNING
+                                "There is only one USB port on PB board! \n");
+                        return -1;
+                } else if (!port0_is_dr)
+                        /* No usb port enabled */
+                        return -1;
+        }
+
+        immap = ioremap(get_immrbase(), 0x1000);
+        if (!immap)
+                return -1;
+
+        /* Configure clock */
+        sccr = in_be32(immap + MPC83XX_SCCR_OFFS);
+        if (port0_is_dr)
+                sccr |= MPC83XX_SCCR_USB_DRCM_11;  /* 1:3 */
+        else
+                sccr |= MPC83XX_SCCR_USB_MPHCM_11; /* 1:3 */
+        out_be32(immap + MPC83XX_SCCR_OFFS, sccr);
+
+        /* Configure Pin */
+        sicrl = in_be32(immap + MPC83XX_SICRL_OFFS);
+        /* set port0 only */
+        if (port0_is_dr)
+                sicrl |= MPC83XX_SICRL_USB0;
+        else
+                sicrl &= ~(MPC83XX_SICRL_USB0);
+        out_be32(immap + MPC83XX_SICRL_OFFS, sicrl);
+
+        iounmap(immap);
+
+        /* Map BCSR area */
+        np = of_find_node_by_name(NULL, "bcsr");
+        if (np != 0) {
+                struct resource res;
+
+                of_address_to_resource(np, 0, &res);
+                bcsr_regs = ioremap(res.start, res.end - res.start + 1);
+                of_node_put(np);
+        }
+        if (!bcsr_regs)
+                return -1;
+
+        /*
+         * if MDS board is plug into PIB board,
+         * force to use the PHY on MDS board
+         */
+        bcsr5 = in_8(bcsr_regs + 5);
+        if (!(bcsr5 & BCSR5_INT_USB))
+                out_8(bcsr_regs + 5, (bcsr5 | BCSR5_INT_USB));
+        iounmap(bcsr_regs);
+        return 0;
+}
+
 /* ************************************************************************
  *
  * Setup the architecture
  *
  */
-static void __init mpc834x_sys_setup_arch(void)
+static void __init mpc834x_mds_setup_arch(void)
 {
         struct device_node *np;
 
         if (ppc_md.progress)
-                ppc_md.progress("mpc834x_sys_setup_arch()", 0);
+                ppc_md.progress("mpc834x_mds_setup_arch()", 0);
 
-        np = of_find_node_by_type(NULL, "cpu");
-        if (np != 0) {
-                const unsigned int *fp =
-                        get_property(np, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(np);
-        }
 #ifdef CONFIG_PCI
         for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
                 add_bridge(np);
@@ -72,14 +132,10 @@ static void __init mpc834x_sys_setup_arch(void)
         ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
 
-#ifdef  CONFIG_ROOT_NFS
-        ROOT_DEV = Root_NFS;
-#else
-        ROOT_DEV = Root_HDA1;
-#endif
+        mpc834x_usb_cfg();
 }
 
-void __init mpc834x_sys_init_IRQ(void)
+static void __init mpc834x_mds_init_IRQ(void)
 {
         struct device_node *np;
 
@@ -103,6 +159,9 @@ static int __init mpc834x_rtc_hookup(void)
 {
         struct timespec tv;
 
+        if (!machine_is(mpc834x_mds))
+                return 0;
+
         ppc_md.get_rtc_time = ds1374_get_rtc_time;
         ppc_md.set_rtc_time = ds1374_set_rtc_time;
 
@@ -119,19 +178,18 @@ late_initcall(mpc834x_rtc_hookup);
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
-static int __init mpc834x_sys_probe(void)
+static int __init mpc834x_mds_probe(void)
 {
-        /* We always match for now, eventually we should look at the flat
-           dev tree to ensure this is the board we are suppose to run on
-        */
-        return 1;
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "MPC834xMDS");
 }
 
-define_machine(mpc834x_sys) {
-        .name                   = "MPC834x SYS",
-        .probe                  = mpc834x_sys_probe,
-        .setup_arch             = mpc834x_sys_setup_arch,
-        .init_IRQ               = mpc834x_sys_init_IRQ,
+define_machine(mpc834x_mds) {
+        .name                   = "MPC834x MDS",
+        .probe                  = mpc834x_mds_probe,
+        .setup_arch             = mpc834x_mds_setup_arch,
+        .init_IRQ               = mpc834x_mds_init_IRQ,
         .get_irq                = ipic_get_irq,
         .restart                = mpc83xx_restart,
         .time_init              = mpc83xx_time_init,
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.h b/arch/powerpc/platforms/83xx/mpc834x_sys.h
deleted file mode 100644
index 7d5bbef084e7..000000000000
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/powerpc/platforms/83xx/mpc834x_sys.h
- *
- * MPC834X SYS common board definitions
- *
- * Maintainer: Kumar Gala <galak@kernel.crashing.org>
- *
- * 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.
- *
- */
-
-#ifndef __MACH_MPC83XX_SYS_H__
-#define __MACH_MPC83XX_SYS_H__
-
-#define PIRQA   MPC83xx_IRQ_EXT4
-#define PIRQB   MPC83xx_IRQ_EXT5
-#define PIRQC   MPC83xx_IRQ_EXT6
-#define PIRQD   MPC83xx_IRQ_EXT7
-
-#endif                          /* __MACH_MPC83XX_SYS_H__ */
diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 53b92a904e8e..526ed090a446 100644
--- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -5,12 +5,12 @@
  *         Yin Olivia <Hong-hua.Yin@freescale.com>
  *
  * Description:
- * MPC8360E MDS PB board specific routines.
+ * MPC8360E MDS board specific routines.
  *
  * Changelog:
  * Jun 21, 2006 Initial version
  *
- * This program is free software; you can redistribute  it and/or modify it
+ * 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.
@@ -31,6 +31,7 @@
 #include <linux/initrd.h>
 
 #include <asm/of_device.h>
+#include <asm/of_platform.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/time.h>
@@ -61,33 +62,17 @@ unsigned long isa_mem_base = 0;
 
 static u8 *bcsr_regs = NULL;
 
-u8 *get_bcsr(void)
-{
-        return bcsr_regs;
-}
-
 /* ************************************************************************
  *
  * Setup the architecture
  *
  */
-static void __init mpc8360_sys_setup_arch(void)
+static void __init mpc836x_mds_setup_arch(void)
 {
         struct device_node *np;
 
         if (ppc_md.progress)
-                ppc_md.progress("mpc8360_sys_setup_arch()", 0);
-
-        np = of_find_node_by_type(NULL, "cpu");
-        if (np != 0) {
-                const unsigned int *fp =
-                    get_property(np, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(np);
-        }
+                ppc_md.progress("mpc836x_mds_setup_arch()", 0);
 
         /* Map BCSR area */
         np = of_find_node_by_name(NULL, "bcsr");
@@ -127,40 +112,29 @@ static void __init mpc8360_sys_setup_arch(void)
         }
 
 #endif                          /* CONFIG_QUICC_ENGINE */
-
-#ifdef CONFIG_BLK_DEV_INITRD
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-#ifdef  CONFIG_ROOT_NFS
-                ROOT_DEV = Root_NFS;
-#else
-                ROOT_DEV = Root_HDA1;
-#endif
 }
 
-static int __init mpc8360_declare_of_platform_devices(void)
-{
-        struct device_node *np;
+static struct of_device_id mpc836x_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .type = "qe", },
+        {},
+};
 
-        for (np = NULL; (np = of_find_compatible_node(np, "network",
-                                        "ucc_geth")) != NULL;) {
-                int ucc_num;
-                char bus_id[BUS_ID_SIZE];
+static int __init mpc836x_declare_of_platform_devices(void)
+{
+        if (!machine_is(mpc836x_mds))
+                return 0;
 
-                ucc_num = *((uint *) get_property(np, "device-id", NULL)) - 1;
-                snprintf(bus_id, BUS_ID_SIZE, "ucc_geth.%u", ucc_num);
-                of_platform_device_create(np, bus_id, NULL);
-        }
+        /* Publish the QE devices */
+        of_platform_bus_probe(NULL, mpc836x_ids, NULL);
 
         return 0;
 }
-device_initcall(mpc8360_declare_of_platform_devices);
+device_initcall(mpc836x_declare_of_platform_devices);
 
-void __init mpc8360_sys_init_IRQ(void)
+static void __init mpc836x_mds_init_IRQ(void)
 {
-
         struct device_node *np;
 
         np = of_find_node_by_type(NULL, "ipic");
@@ -193,6 +167,9 @@ static int __init mpc8360_rtc_hookup(void)
 {
         struct timespec tv;
 
+        if (!machine_is(mpc836x_mds))
+                return 0;
+
         ppc_md.get_rtc_time = ds1374_get_rtc_time;
         ppc_md.set_rtc_time = ds1374_set_rtc_time;
 
@@ -209,28 +186,21 @@ late_initcall(mpc8360_rtc_hookup);
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
-static int __init mpc8360_sys_probe(void)
+static int __init mpc836x_mds_probe(void)
 {
-        char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
-                                          "model", NULL);
-        if (model == NULL)
-                return 0;
-        if (strcmp(model, "MPC8360EPB"))
-                return 0;
-
-        DBG("MPC8360EMDS-PB found\n");
+        unsigned long root = of_get_flat_dt_root();
 
-        return 1;
+        return of_flat_dt_is_compatible(root, "MPC836xMDS");
 }
 
-define_machine(mpc8360_sys) {
-        .name           = "MPC8360E PB",
-        .probe          = mpc8360_sys_probe,
-        .setup_arch     = mpc8360_sys_setup_arch,
-        .init_IRQ       = mpc8360_sys_init_IRQ,
-        .get_irq        = ipic_get_irq,
-        .restart        = mpc83xx_restart,
-        .time_init      = mpc83xx_time_init,
+define_machine(mpc836x_mds) {
+        .name           = "MPC836x MDS",
+        .probe          = mpc836x_mds_probe,
+        .setup_arch     = mpc836x_mds_setup_arch,
+        .init_IRQ       = mpc836x_mds_init_IRQ,
+        .get_irq        = ipic_get_irq,
+        .restart        = mpc83xx_restart,
+        .time_init      = mpc83xx_time_init,
         .calibrate_decr = generic_calibrate_decr,
-        .progress       = udbg_progress,
+        .progress       = udbg_progress,
 };
diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
index 01cae106912b..9cd03b59c8f4 100644
--- a/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -4,6 +4,24 @@
 #include <linux/init.h>
 #include <linux/device.h>
 
+/* System Clock Control Register */
+#define MPC83XX_SCCR_OFFS          0xA08
+#define MPC83XX_SCCR_USB_MPHCM_11  0x00c00000
+#define MPC83XX_SCCR_USB_MPHCM_01  0x00400000
+#define MPC83XX_SCCR_USB_MPHCM_10  0x00800000
+#define MPC83XX_SCCR_USB_DRCM_11   0x00300000
+#define MPC83XX_SCCR_USB_DRCM_01   0x00100000
+#define MPC83XX_SCCR_USB_DRCM_10   0x00200000
+
+/* system i/o configuration register low */
+#define MPC83XX_SICRL_OFFS         0x114
+#define MPC83XX_SICRL_USB0         0x40000000
+#define MPC83XX_SICRL_USB1         0x20000000
+
+/* system i/o configuration register high */
+#define MPC83XX_SICRH_OFFS         0x118
+#define MPC83XX_SICRH_USB_UTMI     0x00020000
+
 /*
  * Declaration for the various functions exported by the
  * mpc83xx_* files. Mostly for use by mpc83xx_setup
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 0584f3c7e884..eb661ccf2dab 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -23,6 +23,13 @@ config MPC85xx_CDS
         help
           This option enables support for the MPC85xx CDS board
 
+config MPC85xx_MDS
+        bool "Freescale MPC85xx MDS"
+        select DEFAULT_UIMAGE
+#       select QUICC_ENGINE
+        help
+          This option enables support for the MPC85xx MDS board
+
 endchoice
 
 config MPC8540
@@ -36,6 +43,12 @@ config MPC8560
         select PPC_INDIRECT_PCI
         default y if MPC8560_ADS
 
+config MPC85xx
+        bool
+        select PPC_UDBG_16550
+        select PPC_INDIRECT_PCI
+        default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
+
 config PPC_INDIRECT_PCI_BE
         bool
         depends on PPC_85xx
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 282f5d0d0152..4e63917ada9d 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_PPC_85xx)	+= misc.o pci.o
 obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
+obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index bda2e55e6c4c..8ed034aeca5f 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -17,7 +17,6 @@
 #include <linux/kdev_t.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
-#include <linux/root_dev.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -45,8 +44,7 @@ unsigned long isa_mem_base = 0;
 #endif
 
 #ifdef CONFIG_PCI
-int
-mpc85xx_exclude_device(u_char bus, u_char devfn)
+static int mpc85xx_exclude_device(u_char bus, u_char devfn)
 {
         if (bus == 0 && PCI_SLOT(devfn) == 0)
                 return PCIBIOS_DEVICE_NOT_FOUND;
@@ -69,7 +67,7 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 
 #endif /* CONFIG_CPM2 */
 
-void __init mpc85xx_ads_pic_init(void)
+static void __init mpc85xx_ads_pic_init(void)
 {
         struct mpic *mpic;
         struct resource r;
@@ -246,15 +244,9 @@ static void __init mpc85xx_ads_setup_arch(void)
                 add_bridge(np);
         ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 #endif
-
-#ifdef  CONFIG_ROOT_NFS
-        ROOT_DEV = Root_NFS;
-#else
-        ROOT_DEV = Root_HDA1;
-#endif
 }
 
-void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
+static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
         uint memsize = total_memory;
@@ -280,10 +272,9 @@ void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
  */
 static int __init mpc85xx_ads_probe(void)
 {
-        /* We always match for now, eventually we should look at the flat
-           dev tree to ensure this is the board we are suppose to run on
-        */
-        return 1;
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "MPC85xxADS");
 }
 
 define_machine(mpc85xx_ads) {
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 953cd5dd3f54..4232686be441 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -22,7 +22,6 @@
 #include <linux/console.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
-#include <linux/root_dev.h>
 #include <linux/initrd.h>
 #include <linux/module.h>
 #include <linux/fsl_devices.h>
@@ -56,7 +55,6 @@ unsigned long isa_mem_base = 0;
 static int cds_pci_slot = 2;
 static volatile u8 *cadmus;
 
-
 #ifdef CONFIG_PCI
 
 #define ARCADIA_HOST_BRIDGE_IDSEL       17
@@ -64,8 +62,7 @@ static volatile u8 *cadmus;
 
 extern int mpc85xx_pci2_busno;
 
-int
-mpc85xx_exclude_device(u_char bus, u_char devfn)
+static int mpc85xx_exclude_device(u_char bus, u_char devfn)
 {
         if (bus == 0 && PCI_SLOT(devfn) == 0)
                 return PCIBIOS_DEVICE_NOT_FOUND;
@@ -81,8 +78,7 @@ mpc85xx_exclude_device(u_char bus, u_char devfn)
                 return PCIBIOS_SUCCESSFUL;
 }
 
-void __init
-mpc85xx_cds_pcibios_fixup(void)
+static void __init mpc85xx_cds_pcibios_fixup(void)
 {
         struct pci_dev *dev;
         u_char          c;
@@ -144,7 +140,7 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 #endif /* PPC_I8259 */
 #endif /* CONFIG_PCI */
 
-void __init mpc85xx_cds_pic_init(void)
+static void __init mpc85xx_cds_pic_init(void)
 {
         struct mpic *mpic;
         struct resource r;
@@ -224,12 +220,10 @@ void __init mpc85xx_cds_pic_init(void)
 #endif /* CONFIG_PPC_I8259 */
 }
 
-
 /*
  * Setup the architecture
  */
-static void __init
-mpc85xx_cds_setup_arch(void)
+static void __init mpc85xx_cds_setup_arch(void)
 {
         struct device_node *cpu;
 #ifdef CONFIG_PCI
@@ -268,17 +262,9 @@ mpc85xx_cds_setup_arch(void)
         ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
         ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 #endif
-
-#ifdef  CONFIG_ROOT_NFS
-        ROOT_DEV = Root_NFS;
-#else
-        ROOT_DEV = Root_HDA1;
-#endif
 }
 
-
-void
-mpc85xx_cds_show_cpuinfo(struct seq_file *m)
+static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)
 {
         uint pvid, svid, phid1;
         uint memsize = total_memory;
@@ -305,11 +291,9 @@ mpc85xx_cds_show_cpuinfo(struct seq_file *m)
  */
 static int __init mpc85xx_cds_probe(void)
 {
-        /* We always match for now, eventually we should look at
-         * the flat dev tree to ensure this is the board we are
-         * supposed to run on
-         */
-        return 1;
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "MPC85xxCDS");
 }
 
 define_machine(mpc85xx_cds) {
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
new file mode 100644
index 000000000000..81144d2ae455
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) Freescale Semicondutor, Inc. 2006-2007. All rights reserved.
+ *
+ * Author: Andy Fleming <afleming@freescale.com>
+ *
+ * Based on 83xx/mpc8360e_pb.c by:
+ *         Li Yang <LeoLi@freescale.com>
+ *         Yin Olivia <Hong-hua.Yin@freescale.com>
+ *
+ * Description:
+ * MPC85xx MDS board specific routines.
+ *
+ * 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/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/reboot.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/major.h>
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/initrd.h>
+#include <linux/module.h>
+#include <linux/fsl_devices.h>
+
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#include <asm/system.h>
+#include <asm/atomic.h>
+#include <asm/time.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/bootinfo.h>
+#include <asm/pci-bridge.h>
+#include <asm/mpc85xx.h>
+#include <asm/irq.h>
+#include <mm/mmu_decl.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <sysdev/fsl_soc.h>
+#include <asm/qe.h>
+#include <asm/qe_ic.h>
+#include <asm/mpic.h>
+
+#include "mpc85xx.h"
+
+#undef DEBUG
+#ifdef DEBUG
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...)
+#endif
+
+#ifndef CONFIG_PCI
+unsigned long isa_io_base = 0;
+unsigned long isa_mem_base = 0;
+#endif
+
+/* ************************************************************************
+ *
+ * Setup the architecture
+ *
+ */
+static void __init mpc85xx_mds_setup_arch(void)
+{
+        struct device_node *np;
+        static u8 *bcsr_regs = NULL;
+
+        if (ppc_md.progress)
+                ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
+
+        np = of_find_node_by_type(NULL, "cpu");
+        if (np != NULL) {
+                const unsigned int *fp =
+                    get_property(np, "clock-frequency", NULL);
+                if (fp != NULL)
+                        loops_per_jiffy = *fp / HZ;
+                else
+                        loops_per_jiffy = 50000000 / HZ;
+                of_node_put(np);
+        }
+
+        /* Map BCSR area */
+        np = of_find_node_by_name(NULL, "bcsr");
+        if (np != NULL) {
+                struct resource res;
+
+                of_address_to_resource(np, 0, &res);
+                bcsr_regs = ioremap(res.start, res.end - res.start +1);
+                of_node_put(np);
+        }
+
+#ifdef CONFIG_PCI
+        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) {
+                add_bridge(np);
+        }
+        of_node_put(np);
+#endif
+
+#ifdef CONFIG_QUICC_ENGINE
+        if ((np = of_find_node_by_name(NULL, "qe")) != NULL) {
+                qe_reset();
+                of_node_put(np);
+        }
+
+        if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) {
+                struct device_node *ucc = NULL;
+
+                par_io_init(np);
+                of_node_put(np);
+
+                for ( ;(ucc = of_find_node_by_name(ucc, "ucc")) != NULL;)
+                        par_io_of_config(ucc);
+
+                of_node_put(ucc);
+        }
+
+        if (bcsr_regs) {
+                u8 bcsr_phy;
+
+                /* Reset the Ethernet PHY */
+                bcsr_phy = in_be8(&bcsr_regs[9]);
+                bcsr_phy &= ~0x20;
+                out_be8(&bcsr_regs[9], bcsr_phy);
+
+                udelay(1000);
+
+                bcsr_phy = in_be8(&bcsr_regs[9]);
+                bcsr_phy |= 0x20;
+                out_be8(&bcsr_regs[9], bcsr_phy);
+
+                iounmap(bcsr_regs);
+        }
+
+#endif  /* CONFIG_QUICC_ENGINE */
+}
+
+static struct of_device_id mpc85xx_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .type = "qe", },
+        {},
+};
+
+static int __init mpc85xx_publish_devices(void)
+{
+        if (!machine_is(mpc85xx_mds))
+                return 0;
+
+        /* Publish the QE devices */
+        of_platform_bus_probe(NULL,mpc85xx_ids,NULL);
+
+        return 0;
+}
+device_initcall(mpc85xx_publish_devices);
+
+static void __init mpc85xx_mds_pic_init(void)
+{
+        struct mpic *mpic;
+        struct resource r;
+        struct device_node *np = NULL;
+
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (!np)
+                return;
+
+        if (of_address_to_resource(np, 0, &r)) {
+                printk(KERN_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,
+                        4, 0, " OpenPIC  ");
+        BUG_ON(mpic == NULL);
+        of_node_put(np);
+
+        /* Internal Interrupts */
+        mpic_assign_isu(mpic, 0, r.start + 0x10200);
+        mpic_assign_isu(mpic, 1, r.start + 0x10280);
+        mpic_assign_isu(mpic, 2, r.start + 0x10300);
+        mpic_assign_isu(mpic, 3, r.start + 0x10380);
+        mpic_assign_isu(mpic, 4, r.start + 0x10400);
+        mpic_assign_isu(mpic, 5, r.start + 0x10480);
+        mpic_assign_isu(mpic, 6, r.start + 0x10500);
+        mpic_assign_isu(mpic, 7, r.start + 0x10580);
+        mpic_assign_isu(mpic, 8, r.start + 0x10600);
+        mpic_assign_isu(mpic, 9, r.start + 0x10680);
+        mpic_assign_isu(mpic, 10, r.start + 0x10700);
+        mpic_assign_isu(mpic, 11, r.start + 0x10780);
+
+        /* External Interrupts */
+        mpic_assign_isu(mpic, 12, r.start + 0x10000);
+        mpic_assign_isu(mpic, 13, r.start + 0x10080);
+        mpic_assign_isu(mpic, 14, r.start + 0x10100);
+
+        mpic_init(mpic);
+
+#ifdef CONFIG_QUICC_ENGINE
+        np = of_find_node_by_type(NULL, "qeic");
+        if (!np)
+                return;
+
+        qe_ic_init(np, 0);
+        of_node_put(np);
+#endif                          /* CONFIG_QUICC_ENGINE */
+}
+
+static int __init mpc85xx_mds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "MPC85xxMDS");
+}
+
+define_machine(mpc85xx_mds) {
+        .name           = "MPC85xx MDS",
+        .probe          = mpc85xx_mds_probe,
+        .setup_arch     = mpc85xx_mds_setup_arch,
+        .init_IRQ       = mpc85xx_mds_pic_init,
+        .get_irq        = mpic_get_irq,
+        .restart        = mpc85xx_restart,
+        .calibrate_decr = generic_calibrate_decr,
+        .progress       = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index d1ecc0f9ab58..0c70944d0e37 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -8,6 +8,7 @@ choice
 config MPC8641_HPCN
         bool "Freescale MPC8641 HPCN"
         select PPC_I8259
+        select DEFAULT_UIMAGE
         help
           This option enables support for the MPC8641 HPCN board.
 
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index f4dd5f2f8a28..f42f801cf84e 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -18,7 +18,6 @@
 #include <linux/kdev_t.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
-#include <linux/root_dev.h>
 
 #include <asm/system.h>
 #include <asm/time.h>
@@ -120,6 +119,8 @@ mpc86xx_hpcn_init_irq(void)
         DBG("mpc86xxhpcn: cascade mapped to irq %d\n", cascade_irq);
 
         i8259_init(cascade_node, 0);
+        of_node_put(cascade_node);
+
         set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);
 #endif
 }
@@ -365,12 +366,6 @@ mpc86xx_hpcn_setup_arch(void)
 
         printk("MPC86xx HPCN board from Freescale Semiconductor\n");
 
-#ifdef  CONFIG_ROOT_NFS
-        ROOT_DEV = Root_NFS;
-#else
-        ROOT_DEV = Root_HDA1;
-#endif
-
 #ifdef CONFIG_SMP
         mpc86xx_smp_init();
 #endif
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index bb7fb41933ad..7ef0c6854799 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -65,7 +65,6 @@ smp_86xx_kick_cpu(int nr)
         pr_debug("smp_86xx_kick_cpu: kick CPU #%d\n", nr);
 
         local_irq_save(flags);
-        local_irq_disable();
 
         /* Save reset vector */
         save_vector = *vector;
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index c8c0ba3cf8e8..beea6834bb7e 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -1,105 +1,16 @@
+menu "Platform support"
+        depends on PPC_8xx
+
 config FADS
         bool
 
+config CPM1
+        bool
+
 choice
         prompt "8xx Machine Type"
         depends on 8xx
-        default RPXLITE
-
-config RPXLITE
-        bool "RPX-Lite"
-        ---help---
-          Single-board computers based around the PowerPC MPC8xx chips and
-          intended for embedded applications.  The following types are
-          supported:
-
-          RPX-Lite:
-          Embedded Planet RPX Lite. PC104 form-factor SBC based on the MPC823.
-
-          RPX-Classic:
-          Embedded Planet RPX Classic Low-fat. Credit-card-size SBC based on
-          the MPC 860
-
-          BSE-IP:
-          Bright Star Engineering ip-Engine.
-
-          TQM823L:
-          TQM850L:
-          TQM855L:
-          TQM860L:
-          MPC8xx based family of mini modules, half credit card size,
-          up to 64 MB of RAM, 8 MB Flash, (Fast) Ethernet, 2 x serial ports,
-          2 x CAN bus interface, ...
-          Manufacturer: TQ Components, www.tq-group.de
-          Date of Release: October (?) 1999
-          End of Life: not yet :-)
-          URL:
-          - module: <http://www.denx.de/PDF/TQM8xxLHWM201.pdf>
-          - starter kit: <http://www.denx.de/PDF/STK8xxLHWM201.pdf>
-          - images: <http://www.denx.de/embedded-ppc-en.html>
-
-          FPS850L:
-          FingerPrint Sensor System (based on TQM850L)
-          Manufacturer: IKENDI AG, <http://www.ikendi.com/>
-          Date of Release: November 1999
-          End of life: end 2000 ?
-          URL: see TQM850L
-
-          IVMS8:
-          MPC860 based board used in the "Integrated Voice Mail System",
-          Small Version (8 voice channels)
-          Manufacturer: Speech Design, <http://www.speech-design.de/>
-          Date of Release: December 2000 (?)
-          End of life: -
-          URL: <http://www.speech-design.de/>
-
-          IVML24:
-          MPC860 based board used in the "Integrated Voice Mail System",
-          Large Version (24 voice channels)
-          Manufacturer: Speech Design, <http://www.speech-design.de/>
-          Date of Release: March 2001  (?)
-          End of life: -
-          URL: <http://www.speech-design.de/>
-
-          HERMES:
-          Hermes-Pro ISDN/LAN router with integrated 8 x hub
-          Manufacturer: Multidata Gesellschaft fur Datentechnik und Informatik
-          <http://www.multidata.de/>
-          Date of Release: 2000 (?)
-          End of life: -
-          URL: <http://www.multidata.de/english/products/hpro.htm>
-
-          IP860:
-          VMEBus IP (Industry Pack) carrier board with MPC860
-          Manufacturer: MicroSys GmbH, <http://www.microsys.de/>
-          Date of Release: ?
-          End of life: -
-          URL: <http://www.microsys.de/html/ip860.html>
-
-          PCU_E:
-          PCU = Peripheral Controller Unit, Extended
-          Manufacturer: Siemens AG, ICN (Information and Communication Networks)
-                <http://www.siemens.de/page/1,3771,224315-1-999_2_226207-0,00.html>
-          Date of Release: April 2001
-          End of life: August 2001
-          URL: n. a.
-
-config RPXCLASSIC
-        bool "RPX-Classic"
-        help
-          The RPX-Classic is a single-board computer based on the Motorola
-          MPC860.  It features 16MB of DRAM and a variable amount of flash,
-          I2C EEPROM, thermal monitoring, a PCMCIA slot, a DIP switch and two
-          LEDs.  Variants with Ethernet ports exist.  Say Y here to support it
-          directly.
-
-config BSEIP
-        bool "BSE-IP"
-        help
-          Say Y here to support the Bright Star Engineering ipEngine SBC.
-          This is a credit-card-sized device featuring a MPC823 processor,
-          26MB DRAM, 4MB flash, Ethernet, a 16K-gate FPGA, USB, an LCD/video
-          controller, and two RS232 ports.
+        default MPC885ADS
 
 config MPC8XXFADS
         bool "FADS"
@@ -107,110 +18,58 @@ config MPC8XXFADS
 
 config MPC86XADS
         bool "MPC86XADS"
+        select CPM1
         help
           MPC86x Application Development System by Freescale Semiconductor.
           The MPC86xADS is meant to serve as a platform for s/w and h/w
           development around the MPC86X processor families.
-        select FADS
 
 config MPC885ADS
         bool "MPC885ADS"
+        select CPM1
         help
           Freescale Semiconductor MPC885 Application Development System (ADS).
           Also known as DUET.
           The MPC885ADS is meant to serve as a platform for s/w and h/w
           development around the MPC885 processor family.
 
-config TQM823L
-        bool "TQM823L"
-        help
-          Say Y here to support the TQM823L, one of an MPC8xx-based family of
-          mini SBCs (half credit-card size) from TQ Components first released
-          in late 1999.  Technical references are at
-          <http://www.denx.de/PDF/TQM8xxLHWM201.pdf>, and
-          <http://www.denx.de/PDF/STK8xxLHWM201.pdf>, and an image at
-          <http://www.denx.de/embedded-ppc-en.html>.
-
-config TQM850L
-        bool "TQM850L"
-        help
-          Say Y here to support the TQM850L, one of an MPC8xx-based family of
-          mini SBCs (half credit-card size) from TQ Components first released
-          in late 1999.  Technical references are at
-          <http://www.denx.de/PDF/TQM8xxLHWM201.pdf>, and
-          <http://www.denx.de/PDF/STK8xxLHWM201.pdf>, and an image at
-          <http://www.denx.de/embedded-ppc-en.html>.
-
-config TQM855L
-        bool "TQM855L"
-        help
-          Say Y here to support the TQM855L, one of an MPC8xx-based family of
-          mini SBCs (half credit-card size) from TQ Components first released
-          in late 1999.  Technical references are at
-          <http://www.denx.de/PDF/TQM8xxLHWM201.pdf>, and
-          <http://www.denx.de/PDF/STK8xxLHWM201.pdf>, and an image at
-          <http://www.denx.de/embedded-ppc-en.html>.
-
-config TQM860L
-        bool "TQM860L"
-        help
-          Say Y here to support the TQM860L, one of an MPC8xx-based family of
-          mini SBCs (half credit-card size) from TQ Components first released
-          in late 1999.  Technical references are at
-          <http://www.denx.de/PDF/TQM8xxLHWM201.pdf>, and
-          <http://www.denx.de/PDF/STK8xxLHWM201.pdf>, and an image at
-          <http://www.denx.de/embedded-ppc-en.html>.
-
-config FPS850L
-        bool "FPS850L"
-
-config IVMS8
-        bool "IVMS8"
-        help
-          Say Y here to support the Integrated Voice-Mail Small 8-channel SBC
-          from Speech Design, released March 2001.  The manufacturer's website
-          is at <http://www.speech-design.de/>.
-
-config IVML24
-        bool "IVML24"
-        help
-          Say Y here to support the Integrated Voice-Mail Large 24-channel SBC
-          from Speech Design, released March 2001.  The manufacturer's website
-          is at <http://www.speech-design.de/>.
-
-config HERMES_PRO
-        bool "HERMES"
-
-config IP860
-        bool "IP860"
-
-config LWMON
-        bool "LWMON"
-
-config PCU_E
-        bool "PCU_E"
-
-config CCM
-        bool "CCM"
-
-config LANTEC
-        bool "LANTEC"
+endchoice
 
-config MBX
-        bool "MBX"
-        help
-          MBX is a line of Motorola single-board computer based around the
-          MPC821 and MPC860 processors, and intended for embedded-controller
-          applications.  Say Y here to support these boards directly.
+menu "Freescale Ethernet driver platform-specific options"
+        depends on (FS_ENET && MPC885ADS)
+
+        config MPC8xx_SECOND_ETH
+        bool "Second Ethernet channel"
+        depends on MPC885ADS
+        default y
+        help
+          This enables support for second Ethernet on MPC885ADS and MPC86xADS boards.
+          The latter will use SCC1, for 885ADS you can select it below.
+
+        choice
+                prompt "Second Ethernet channel"
+                depends on MPC8xx_SECOND_ETH
+                default MPC8xx_SECOND_ETH_FEC2
+
+                config MPC8xx_SECOND_ETH_FEC2
+                bool "FEC2"
+                depends on MPC885ADS
+                help
+                  Enable FEC2 to serve as 2-nd Ethernet channel. Note that SMC2
+                  (often 2-nd UART) will not work if this is enabled.
+
+                config MPC8xx_SECOND_ETH_SCC3
+                bool "SCC3"
+                depends on MPC885ADS
+                help
+                  Enable SCC3 to serve as 2-nd Ethernet channel. Note that SMC1
+                  (often 1-nd UART) will not work if this is enabled.
+
+        endchoice
 
-config WINCEPT
-        bool "WinCept"
-        help
-          The Wincept 100/110 is a Motorola single-board computer based on the
-          MPC821 PowerPC, introduced in 1998 and designed to be used in
-          thin-client machines.  Say Y to support it directly.
+endmenu
 
-endchoice
+endmenu
 
 #
 # MPC8xx Communication options
@@ -219,79 +78,6 @@ endchoice
 menu "MPC8xx CPM Options"
         depends on 8xx
 
-config SCC_ENET
-        bool "CPM SCC Ethernet"
-        depends on NET_ETHERNET
-        help
-          Enable Ethernet support via the Motorola MPC8xx serial
-          communications controller.
-
-choice
-        prompt "SCC used for Ethernet"
-        depends on SCC_ENET
-        default SCC1_ENET
-
-config SCC1_ENET
-        bool "SCC1"
-        help
-          Use MPC8xx serial communications controller 1 to drive Ethernet
-          (default).
-
-config SCC2_ENET
-        bool "SCC2"
-        help
-          Use MPC8xx serial communications controller 2 to drive Ethernet.
-
-config SCC3_ENET
-        bool "SCC3"
-        help
-          Use MPC8xx serial communications controller 3 to drive Ethernet.
-
-endchoice
-
-config FEC_ENET
-        bool "860T FEC Ethernet"
-        depends on NET_ETHERNET
-        help
-          Enable Ethernet support via the Fast Ethernet Controller (FCC) on
-          the Motorola MPC8260.
-
-config USE_MDIO
-        bool "Use MDIO for PHY configuration"
-        depends on FEC_ENET
-        help
-          On some boards the hardware configuration of the ethernet PHY can be
-          used without any software interaction over the MDIO interface, so
-          all MII code can be omitted. Say N here if unsure or if you don't
-          need link status reports.
-
-config  FEC_AM79C874
-        bool "Support AMD79C874 PHY"
-        depends on USE_MDIO
-
-config FEC_LXT970
-        bool "Support LXT970 PHY"
-        depends on USE_MDIO
-
-config FEC_LXT971
-        bool "Support LXT971 PHY"
-        depends on USE_MDIO
-        
-config FEC_QS6612
-        bool "Support QS6612 PHY"
-        depends on USE_MDIO
-        
-config ENET_BIG_BUFFERS
-        bool "Use Big CPM Ethernet Buffers"
-        depends on SCC_ENET || FEC_ENET
-        help
-          Allocate large buffers for MPC8xx Ethernet. Increases throughput
-          and decreases the likelihood of dropped packets, but costs memory.
-
-config HTDMSOUND
-        bool "Embedded Planet HIOX Audio"
-        depends on SOUND=y
-
 # This doesn't really belong here, but it is convenient to ask
 # 8xx specific questions.
 comment "Generic MPC8xx Options"
diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile
new file mode 100644
index 000000000000..5e2dae3afd2f
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the PowerPC 8xx linux kernel.
+#
+obj-$(CONFIG_PPC_8xx)     += m8xx_setup.o
+obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
+obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
new file mode 100644
index 000000000000..9ed7125f0150
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -0,0 +1,303 @@
+/*
+ *  Copyright (C) 1995  Linus Torvalds
+ *  Adapted from 'alpha' version by Gary Thomas
+ *  Modified by Cort Dougan (cort@cs.nmt.edu)
+ *  Modified for MBX using prep/chrp/pmac functions by Dan (dmalek@jlc.net)
+ *  Further modified for generic 8xx by Dan.
+ */
+
+/*
+ * bootup setup stuff..
+ */
+
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/stddef.h>
+#include <linux/unistd.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/user.h>
+#include <linux/a.out.h>
+#include <linux/tty.h>
+#include <linux/major.h>
+#include <linux/interrupt.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/initrd.h>
+#include <linux/ioport.h>
+#include <linux/bootmem.h>
+#include <linux/seq_file.h>
+#include <linux/root_dev.h>
+#include <linux/time.h>
+#include <linux/rtc.h>
+
+#include <asm/mmu.h>
+#include <asm/reg.h>
+#include <asm/residual.h>
+#include <asm/io.h>
+#include <asm/pgtable.h>
+#include <asm/mpc8xx.h>
+#include <asm/8xx_immap.h>
+#include <asm/machdep.h>
+#include <asm/bootinfo.h>
+#include <asm/time.h>
+#include <asm/prom.h>
+#include <asm/fs_pd.h>
+#include <mm/mmu_decl.h>
+
+#include "sysdev/mpc8xx_pic.h"
+
+void m8xx_calibrate_decr(void);
+extern void m8xx_wdt_handler_install(bd_t *bp);
+extern int cpm_pic_init(void);
+extern int cpm_get_irq(void);
+
+/* A place holder for time base interrupts, if they are ever enabled. */
+irqreturn_t timebase_interrupt(int irq, void * dev)
+{
+        printk ("timebase_interrupt()\n");
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction tbint_irqaction = {
+        .handler = timebase_interrupt,
+        .mask = CPU_MASK_NONE,
+        .name = "tbint",
+};
+
+/* per-board overridable init_internal_rtc() function. */
+void __init __attribute__ ((weak))
+init_internal_rtc(void)
+{
+        sit8xx_t *sys_tmr = (sit8xx_t *) immr_map(im_sit);
+
+        /* Disable the RTC one second and alarm interrupts. */
+        clrbits16(&sys_tmr->sit_rtcsc, (RTCSC_SIE | RTCSC_ALE));
+
+        /* Enable the RTC */
+        setbits16(&sys_tmr->sit_rtcsc, (RTCSC_RTF | RTCSC_RTE));
+        immr_unmap(sys_tmr);
+}
+
+static int __init get_freq(char *name, unsigned long *val)
+{
+        struct device_node *cpu;
+        unsigned int *fp;
+        int found = 0;
+
+        /* The cpu node should have timebase and clock frequency properties */
+        cpu = of_find_node_by_type(NULL, "cpu");
+
+        if (cpu) {
+                fp = (unsigned int *)get_property(cpu, name, NULL);
+                if (fp) {
+                        found = 1;
+                        *val = *fp++;
+                }
+
+                of_node_put(cpu);
+        }
+
+        return found;
+}
+
+/* The decrementer counts at the system (internal) clock frequency divided by
+ * sixteen, or external oscillator divided by four.  We force the processor
+ * to use system clock divided by sixteen.
+ */
+void __init mpc8xx_calibrate_decr(void)
+{
+        struct device_node *cpu;
+        cark8xx_t *clk_r1;
+        car8xx_t *clk_r2;
+        sitk8xx_t *sys_tmr1;
+        sit8xx_t *sys_tmr2;
+        int irq, virq;
+
+        clk_r1 = (cark8xx_t *) immr_map(im_clkrstk);
+
+        /* Unlock the SCCR. */
+        out_be32(&clk_r1->cark_sccrk, ~KAPWR_KEY);
+        out_be32(&clk_r1->cark_sccrk, KAPWR_KEY);
+        immr_unmap(clk_r1);
+
+        /* Force all 8xx processors to use divide by 16 processor clock. */
+        clk_r2 = (car8xx_t *) immr_map(im_clkrst);
+        setbits32(&clk_r2->car_sccr, 0x02000000);
+        immr_unmap(clk_r2);
+
+        /* Processor frequency is MHz.
+         */
+        ppc_tb_freq = 50000000;
+        if (!get_freq("bus-frequency", &ppc_tb_freq)) {
+                printk(KERN_ERR "WARNING: Estimating decrementer frequency "
+                                "(not found)\n");
+        }
+        ppc_tb_freq /= 16;
+        ppc_proc_freq = 50000000;
+        if (!get_freq("clock-frequency", &ppc_proc_freq))
+                printk(KERN_ERR "WARNING: Estimating processor frequency"
+                                "(not found)\n");
+
+        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
+
+        /* Perform some more timer/timebase initialization.  This used
+         * to be done elsewhere, but other changes caused it to get
+         * called more than once....that is a bad thing.
+         *
+         * First, unlock all of the registers we are going to modify.
+         * To protect them from corruption during power down, registers
+         * that are maintained by keep alive power are "locked".  To
+         * modify these registers we have to write the key value to
+         * the key location associated with the register.
+         * Some boards power up with these unlocked, while others
+         * are locked.  Writing anything (including the unlock code?)
+         * to the unlocked registers will lock them again.  So, here
+         * we guarantee the registers are locked, then we unlock them
+         * for our use.
+         */
+        sys_tmr1 = (sitk8xx_t *) immr_map(im_sitk);
+        out_be32(&sys_tmr1->sitk_tbscrk, ~KAPWR_KEY);
+        out_be32(&sys_tmr1->sitk_rtcsck, ~KAPWR_KEY);
+        out_be32(&sys_tmr1->sitk_tbk, ~KAPWR_KEY);
+        out_be32(&sys_tmr1->sitk_tbscrk, KAPWR_KEY);
+        out_be32(&sys_tmr1->sitk_rtcsck, KAPWR_KEY);
+        out_be32(&sys_tmr1->sitk_tbk, KAPWR_KEY);
+        immr_unmap(sys_tmr1);
+
+        init_internal_rtc();
+
+        /* Enabling the decrementer also enables the timebase interrupts
+         * (or from the other point of view, to get decrementer interrupts
+         * we have to enable the timebase).  The decrementer interrupt
+         * is wired into the vector table, nothing to do here for that.
+         */
+        cpu = of_find_node_by_type(NULL, "cpu");
+        virq= irq_of_parse_and_map(cpu, 0);
+        irq = irq_map[virq].hwirq;
+
+        sys_tmr2 = (sit8xx_t *) immr_map(im_sit);
+        out_be16(&sys_tmr2->sit_tbscr, ((1 << (7 - (irq/2))) << 8) |
+                                        (TBSCR_TBF | TBSCR_TBE));
+        immr_unmap(sys_tmr2);
+
+        if (setup_irq(virq, &tbint_irqaction))
+                panic("Could not allocate timer IRQ!");
+
+#ifdef CONFIG_8xx_WDT
+        /* Install watchdog timer handler early because it might be
+         * already enabled by the bootloader
+         */
+        m8xx_wdt_handler_install(binfo);
+#endif
+}
+
+/* The RTC on the MPC8xx is an internal register.
+ * We want to protect this during power down, so we need to unlock,
+ * modify, and re-lock.
+ */
+
+int mpc8xx_set_rtc_time(struct rtc_time *tm)
+{
+        sitk8xx_t *sys_tmr1;
+        sit8xx_t *sys_tmr2;
+        int time;
+
+        sys_tmr1 = (sitk8xx_t *) immr_map(im_sitk);
+        sys_tmr2 = (sit8xx_t *) immr_map(im_sit);
+        time = mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+                      tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+        out_be32(&sys_tmr1->sitk_rtck, KAPWR_KEY);
+        out_be32(&sys_tmr2->sit_rtc, time);
+        out_be32(&sys_tmr1->sitk_rtck, ~KAPWR_KEY);
+
+        immr_unmap(sys_tmr2);
+        immr_unmap(sys_tmr1);
+        return 0;
+}
+
+void mpc8xx_get_rtc_time(struct rtc_time *tm)
+{
+        unsigned long data;
+        sit8xx_t *sys_tmr = (sit8xx_t *) immr_map(im_sit);
+
+        /* Get time from the RTC. */
+        data = in_be32(&sys_tmr->sit_rtc);
+        to_tm(data, tm);
+        tm->tm_year -= 1900;
+        tm->tm_mon -= 1;
+        immr_unmap(sys_tmr);
+        return;
+}
+
+void mpc8xx_restart(char *cmd)
+{
+        __volatile__ unsigned char dummy;
+        car8xx_t * clk_r = (car8xx_t *) immr_map(im_clkrst);
+
+
+        local_irq_disable();
+
+        setbits32(&clk_r->car_plprcr, 0x00000080);
+        /* Clear the ME bit in MSR to cause checkstop on machine check
+        */
+        mtmsr(mfmsr() & ~0x1000);
+
+        dummy = in_8(&clk_r->res[0]);
+        printk("Restart failed\n");
+        while(1);
+}
+
+void mpc8xx_show_cpuinfo(struct seq_file *m)
+{
+        struct device_node *root;
+        uint memsize = total_memory;
+        const char *model = "";
+
+        seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
+
+        root = of_find_node_by_path("/");
+        if (root)
+                model = get_property(root, "model", NULL);
+        seq_printf(m, "Machine\t\t: %s\n", model);
+        of_node_put(root);
+
+        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
+}
+
+static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        int cascade_irq;
+
+        if ((cascade_irq = cpm_get_irq()) >= 0) {
+                struct irq_desc *cdesc = irq_desc + cascade_irq;
+
+                generic_handle_irq(cascade_irq);
+                cdesc->chip->eoi(cascade_irq);
+        }
+        desc->chip->eoi(irq);
+}
+
+/* Initialize the internal interrupt controller.  The number of
+ * interrupts supported can vary with the processor type, and the
+ * 82xx family can have up to 64.
+ * External interrupts can be either edge or level triggered, and
+ * need to be initialized by the appropriate driver.
+ */
+void __init m8xx_pic_init(void)
+{
+        int irq;
+
+        if (mpc8xx_pic_init()) {
+                printk(KERN_ERR "Failed interrupt 8xx controller  initialization\n");
+                return;
+        }
+
+        irq = cpm_pic_init();
+        if (irq != NO_IRQ)
+                set_irq_chained_handler(irq, cpm_cascade);
+}
diff --git a/arch/powerpc/platforms/8xx/mpc86xads.h b/arch/powerpc/platforms/8xx/mpc86xads.h
new file mode 100644
index 000000000000..b5d19dd0619c
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/mpc86xads.h
@@ -0,0 +1,95 @@
+/*
+ * A collection of structures, addresses, and values associated with
+ * the Freescale MPC86xADS board.
+ * Copied from the FADS stuff.
+ *
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * 2005 (c) MontaVista Software, 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.
+ */
+
+#ifdef __KERNEL__
+#ifndef __ASM_MPC86XADS_H__
+#define __ASM_MPC86XADS_H__
+
+#include <asm/ppcboot.h>
+#include <sysdev/fsl_soc.h>
+
+/* U-Boot maps BCSR to 0xff080000 */
+#define BCSR_ADDR               ((uint)0xff080000)
+#define BCSR_SIZE               ((uint)32)
+#define BCSR0                   ((uint)(BCSR_ADDR + 0x00))
+#define BCSR1                   ((uint)(BCSR_ADDR + 0x04))
+#define BCSR2                   ((uint)(BCSR_ADDR + 0x08))
+#define BCSR3                   ((uint)(BCSR_ADDR + 0x0c))
+#define BCSR4                   ((uint)(BCSR_ADDR + 0x10))
+
+#define CFG_PHYDEV_ADDR         ((uint)0xff0a0000)
+#define BCSR5                   ((uint)(CFG_PHYDEV_ADDR + 0x300))
+
+#define IMAP_ADDR               (get_immrbase())
+#define IMAP_SIZE               ((uint)(64 * 1024))
+
+#define MPC8xx_CPM_OFFSET       (0x9c0)
+#define CPM_MAP_ADDR            (get_immrbase() + MPC8xx_CPM_OFFSET)
+#define CPM_IRQ_OFFSET          16     // for compability with cpm_uart driver
+
+#define PCMCIA_MEM_ADDR         (uint)0xff020000)
+#define PCMCIA_MEM_SIZE         ((uint)(64 * 1024))
+
+/* Bits of interest in the BCSRs.
+ */
+#define BCSR1_ETHEN             ((uint)0x20000000)
+#define BCSR1_IRDAEN            ((uint)0x10000000)
+#define BCSR1_RS232EN_1         ((uint)0x01000000)
+#define BCSR1_PCCEN             ((uint)0x00800000)
+#define BCSR1_PCCVCC0           ((uint)0x00400000)
+#define BCSR1_PCCVPP0           ((uint)0x00200000)
+#define BCSR1_PCCVPP1           ((uint)0x00100000)
+#define BCSR1_PCCVPP_MASK       (BCSR1_PCCVPP0 | BCSR1_PCCVPP1)
+#define BCSR1_RS232EN_2         ((uint)0x00040000)
+#define BCSR1_PCCVCC1           ((uint)0x00010000)
+#define BCSR1_PCCVCC_MASK       (BCSR1_PCCVCC0 | BCSR1_PCCVCC1)
+
+#define BCSR4_ETH10_RST         ((uint)0x80000000)      /* 10Base-T PHY reset*/
+#define BCSR4_USB_LO_SPD        ((uint)0x04000000)
+#define BCSR4_USB_VCC           ((uint)0x02000000)
+#define BCSR4_USB_FULL_SPD      ((uint)0x00040000)
+#define BCSR4_USB_EN            ((uint)0x00020000)
+
+#define BCSR5_MII2_EN           0x40
+#define BCSR5_MII2_RST          0x20
+#define BCSR5_T1_RST            0x10
+#define BCSR5_ATM155_RST        0x08
+#define BCSR5_ATM25_RST         0x04
+#define BCSR5_MII1_EN           0x02
+#define BCSR5_MII1_RST          0x01
+
+/* Interrupt level assignments */
+#define PHY_INTERRUPT   SIU_IRQ7        /* PHY link change interrupt */
+#define SIU_INT_FEC1    SIU_LEVEL1      /* FEC1 interrupt */
+#define FEC_INTERRUPT   SIU_INT_FEC1    /* FEC interrupt */
+
+/* We don't use the 8259 */
+#define NR_8259_INTS    0
+
+/* CPM Ethernet through SCC1 */
+#define PA_ENET_RXD     ((ushort)0x0001)
+#define PA_ENET_TXD     ((ushort)0x0002)
+#define PA_ENET_TCLK    ((ushort)0x0100)
+#define PA_ENET_RCLK    ((ushort)0x0200)
+#define PB_ENET_TENA    ((uint)0x00001000)
+#define PC_ENET_CLSN    ((ushort)0x0010)
+#define PC_ENET_RENA    ((ushort)0x0020)
+
+/* Control bits in the SICR to route TCLK (CLK1) and RCLK (CLK2) to
+ * SCC1.  Also, make sure GR1 (bit 24) and SC1 (bit 25) are zero.
+ */
+#define SICR_ENET_MASK  ((uint)0x000000ff)
+#define SICR_ENET_CLKRT ((uint)0x0000002c)
+
+#endif /* __ASM_MPC86XADS_H__ */
+#endif /* __KERNEL__ */
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
new file mode 100644
index 000000000000..ef52ce701b0e
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -0,0 +1,301 @@
+/*arch/ppc/platforms/mpc86xads-setup.c
+ *
+ * Platform setup for the Freescale mpc86xads board
+ *
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * Copyright 2005 MontaVista Software 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/root_dev.h>
+
+#include <linux/fs_enet_pd.h>
+#include <linux/fs_uart_pd.h>
+#include <linux/mii.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/ppcboot.h>
+#include <asm/mpc8xx.h>
+#include <asm/8xx_immap.h>
+#include <asm/commproc.h>
+#include <asm/fs_pd.h>
+#include <asm/prom.h>
+
+extern void cpm_reset(void);
+extern void mpc8xx_show_cpuinfo(struct seq_file*);
+extern void mpc8xx_restart(char *cmd);
+extern void mpc8xx_calibrate_decr(void);
+extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
+extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
+extern void m8xx_pic_init(void);
+extern unsigned int mpc8xx_get_irq(void);
+
+static void init_smc1_uart_ioports(struct fs_uart_platform_info* fpi);
+static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi);
+static void init_scc1_ioports(struct fs_platform_info* ptr);
+
+void __init mpc86xads_board_setup(void)
+{
+        cpm8xx_t *cp;
+        unsigned int *bcsr_io;
+        u8 tmpval8;
+
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+        cp = (cpm8xx_t *)immr_map(im_cpm);
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR\n");
+                return;
+        }
+#ifdef CONFIG_SERIAL_CPM_SMC1
+        clrbits32(bcsr_io, BCSR1_RS232EN_1);
+        clrbits32(&cp->cp_simode, 0xe0000000 >> 17);    /* brg1 */
+        tmpval8 = in_8(&(cp->cp_smc[0].smc_smcm)) | (SMCM_RX | SMCM_TX);
+        out_8(&(cp->cp_smc[0].smc_smcm), tmpval8);
+        clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN);
+#else
+        setbits32(bcsr_io,BCSR1_RS232EN_1);
+        out_be16(&cp->cp_smc[0].smc_smcmr, 0);
+        out_8(&cp->cp_smc[0].smc_smce, 0);
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SMC2
+        clrbits32(bcsr_io,BCSR1_RS232EN_2);
+        clrbits32(&cp->cp_simode, 0xe0000000 >> 1);
+        setbits32(&cp->cp_simode, 0x20000000 >> 1);     /* brg2 */
+        tmpval8 = in_8(&(cp->cp_smc[1].smc_smcm)) | (SMCM_RX | SMCM_TX);
+        out_8(&(cp->cp_smc[1].smc_smcm), tmpval8);
+        clrbits16(&cp->cp_smc[1].smc_smcmr, SMCMR_REN | SMCMR_TEN);
+
+        init_smc2_uart_ioports(0);
+#else
+        setbits32(bcsr_io,BCSR1_RS232EN_2);
+        out_be16(&cp->cp_smc[1].smc_smcmr, 0);
+        out_8(&cp->cp_smc[1].smc_smce, 0);
+#endif
+        immr_unmap(cp);
+        iounmap(bcsr_io);
+}
+
+
+static void init_fec1_ioports(struct fs_platform_info* ptr)
+{
+        iop8xx_t *io_port = (iop8xx_t *)immr_map(im_ioport);
+
+        /* configure FEC1 pins  */
+
+        setbits16(&io_port->iop_pdpar, 0x1fff);
+        setbits16(&io_port->iop_pddir, 0x1fff);
+
+        immr_unmap(io_port);
+}
+
+void init_fec_ioports(struct fs_platform_info *fpi)
+{
+        int fec_no = fs_get_fec_index(fpi->fs_no);
+
+        switch (fec_no) {
+        case 0:
+                init_fec1_ioports(fpi);
+                break;
+        default:
+                printk(KERN_ERR "init_fec_ioports: invalid FEC number\n");
+                return;
+        }
+}
+
+static void init_scc1_ioports(struct fs_platform_info* fpi)
+{
+        unsigned *bcsr_io;
+        iop8xx_t *io_port;
+        cpm8xx_t *cp;
+
+        bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE);
+        io_port = (iop8xx_t *)immr_map(im_ioport);
+        cp = (cpm8xx_t *)immr_map(im_cpm);
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR\n");
+                return;
+        }
+
+        /* Configure port A pins for Txd and Rxd.
+         */
+        setbits16(&io_port->iop_papar, PA_ENET_RXD | PA_ENET_TXD);
+        clrbits16(&io_port->iop_padir, PA_ENET_RXD | PA_ENET_TXD);
+        clrbits16(&io_port->iop_paodr, PA_ENET_TXD);
+
+        /* Configure port C pins to enable CLSN and RENA.
+         */
+        clrbits16(&io_port->iop_pcpar, PC_ENET_CLSN | PC_ENET_RENA);
+        clrbits16(&io_port->iop_pcdir, PC_ENET_CLSN | PC_ENET_RENA);
+        setbits16(&io_port->iop_pcso, PC_ENET_CLSN | PC_ENET_RENA);
+
+        /* Configure port A for TCLK and RCLK.
+         */
+        setbits16(&io_port->iop_papar, PA_ENET_TCLK | PA_ENET_RCLK);
+        clrbits16(&io_port->iop_padir, PA_ENET_TCLK | PA_ENET_RCLK);
+        clrbits32(&cp->cp_pbpar, PB_ENET_TENA);
+        clrbits32(&cp->cp_pbdir, PB_ENET_TENA);
+
+        /* Configure Serial Interface clock routing.
+         * First, clear all SCC bits to zero, then set the ones we want.
+         */
+        clrbits32(&cp->cp_sicr, SICR_ENET_MASK);
+        setbits32(&cp->cp_sicr, SICR_ENET_CLKRT);
+
+        /* In the original SCC enet driver the following code is placed at
+           the end of the initialization */
+        setbits32(&cp->cp_pbpar, PB_ENET_TENA);
+        setbits32(&cp->cp_pbdir, PB_ENET_TENA);
+
+        clrbits32(bcsr_io+1, BCSR1_ETHEN);
+        iounmap(bcsr_io);
+        immr_unmap(cp);
+        immr_unmap(io_port);
+}
+
+void init_scc_ioports(struct fs_platform_info *fpi)
+{
+        int scc_no = fs_get_scc_index(fpi->fs_no);
+
+        switch (scc_no) {
+        case 0:
+                init_scc1_ioports(fpi);
+                break;
+        default:
+                printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
+                return;
+        }
+}
+
+
+
+static void init_smc1_uart_ioports(struct fs_uart_platform_info* ptr)
+{
+        unsigned *bcsr_io;
+        cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm);
+
+        setbits32(&cp->cp_pbpar, 0x000000c0);
+        clrbits32(&cp->cp_pbdir, 0x000000c0);
+        clrbits16(&cp->cp_pbodr, 0x00c0);
+        immr_unmap(cp);
+
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR1\n");
+                return;
+        }
+        clrbits32(bcsr_io,BCSR1_RS232EN_1);
+        iounmap(bcsr_io);
+}
+
+static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi)
+{
+        unsigned *bcsr_io;
+        cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm);
+
+        setbits32(&cp->cp_pbpar, 0x00000c00);
+        clrbits32(&cp->cp_pbdir, 0x00000c00);
+        clrbits16(&cp->cp_pbodr, 0x0c00);
+        immr_unmap(cp);
+
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR1\n");
+                return;
+        }
+        clrbits32(bcsr_io,BCSR1_RS232EN_2);
+        iounmap(bcsr_io);
+}
+
+void init_smc_ioports(struct fs_uart_platform_info *data)
+{
+        int smc_no = fs_uart_id_fsid2smc(data->fs_no);
+
+        switch (smc_no) {
+        case 0:
+                init_smc1_uart_ioports(data);
+                data->brg = data->clk_rx;
+                break;
+        case 1:
+                init_smc2_uart_ioports(data);
+                data->brg = data->clk_rx;
+                break;
+        default:
+                printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
+                return;
+        }
+}
+
+int platform_device_skip(char *model, int id)
+{
+        return 0;
+}
+
+static void __init mpc86xads_setup_arch(void)
+{
+        struct device_node *cpu;
+
+        cpu = of_find_node_by_type(NULL, "cpu");
+        if (cpu != 0) {
+                const unsigned int *fp;
+
+                fp = get_property(cpu, "clock-frequency", NULL);
+                if (fp != 0)
+                        loops_per_jiffy = *fp / HZ;
+                else
+                        loops_per_jiffy = 50000000 / HZ;
+                of_node_put(cpu);
+        }
+
+        cpm_reset();
+
+        mpc86xads_board_setup();
+
+        ROOT_DEV = Root_NFS;
+}
+
+static int __init mpc86xads_probe(void)
+{
+        char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
+                                          "model", NULL);
+        if (model == NULL)
+                return 0;
+        if (strcmp(model, "MPC866ADS"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(mpc86x_ads) {
+        .name                   = "MPC86x ADS",
+        .probe                  = mpc86xads_probe,
+        .setup_arch             = mpc86xads_setup_arch,
+        .init_IRQ               = m8xx_pic_init,
+        .show_cpuinfo           = mpc8xx_show_cpuinfo,
+        .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,
+};
diff --git a/arch/powerpc/platforms/8xx/mpc885ads.h b/arch/powerpc/platforms/8xx/mpc885ads.h
new file mode 100644
index 000000000000..30cbebfe84c5
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/mpc885ads.h
@@ -0,0 +1,95 @@
+/*
+ * A collection of structures, addresses, and values associated with
+ * the Freescale MPC885ADS board.
+ * Copied from the FADS stuff.
+ *
+ * Author: MontaVista Software, Inc.
+ *         source@mvista.com
+ *
+ * 2005 (c) MontaVista Software, 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.
+ */
+
+#ifdef __KERNEL__
+#ifndef __ASM_MPC885ADS_H__
+#define __ASM_MPC885ADS_H__
+
+#include <asm/ppcboot.h>
+#include <sysdev/fsl_soc.h>
+
+/* U-Boot maps BCSR to 0xff080000 */
+#define BCSR_ADDR               ((uint)0xff080000)
+#define BCSR_SIZE               ((uint)32)
+#define BCSR0                   ((uint)(BCSR_ADDR + 0x00))
+#define BCSR1                   ((uint)(BCSR_ADDR + 0x04))
+#define BCSR2                   ((uint)(BCSR_ADDR + 0x08))
+#define BCSR3                   ((uint)(BCSR_ADDR + 0x0c))
+#define BCSR4                   ((uint)(BCSR_ADDR + 0x10))
+
+#define CFG_PHYDEV_ADDR         ((uint)0xff0a0000)
+#define BCSR5                   ((uint)(CFG_PHYDEV_ADDR + 0x300))
+
+#define IMAP_ADDR               (get_immrbase())
+#define IMAP_SIZE               ((uint)(64 * 1024))
+
+#define MPC8xx_CPM_OFFSET       (0x9c0)
+#define CPM_MAP_ADDR            (get_immrbase() + MPC8xx_CPM_OFFSET)
+#define CPM_IRQ_OFFSET          16     // for compability with cpm_uart driver
+
+#define PCMCIA_MEM_ADDR         (uint)0xff020000)
+#define PCMCIA_MEM_SIZE         ((uint)(64 * 1024))
+
+/* Bits of interest in the BCSRs.
+ */
+#define BCSR1_ETHEN             ((uint)0x20000000)
+#define BCSR1_IRDAEN            ((uint)0x10000000)
+#define BCSR1_RS232EN_1         ((uint)0x01000000)
+#define BCSR1_PCCEN             ((uint)0x00800000)
+#define BCSR1_PCCVCC0           ((uint)0x00400000)
+#define BCSR1_PCCVPP0           ((uint)0x00200000)
+#define BCSR1_PCCVPP1           ((uint)0x00100000)
+#define BCSR1_PCCVPP_MASK       (BCSR1_PCCVPP0 | BCSR1_PCCVPP1)
+#define BCSR1_RS232EN_2         ((uint)0x00040000)
+#define BCSR1_PCCVCC1           ((uint)0x00010000)
+#define BCSR1_PCCVCC_MASK       (BCSR1_PCCVCC0 | BCSR1_PCCVCC1)
+
+#define BCSR4_ETH10_RST         ((uint)0x80000000)      /* 10Base-T PHY reset*/
+#define BCSR4_USB_LO_SPD        ((uint)0x04000000)
+#define BCSR4_USB_VCC           ((uint)0x02000000)
+#define BCSR4_USB_FULL_SPD      ((uint)0x00040000)
+#define BCSR4_USB_EN            ((uint)0x00020000)
+
+#define BCSR5_MII2_EN           0x40
+#define BCSR5_MII2_RST          0x20
+#define BCSR5_T1_RST            0x10
+#define BCSR5_ATM155_RST        0x08
+#define BCSR5_ATM25_RST         0x04
+#define BCSR5_MII1_EN           0x02
+#define BCSR5_MII1_RST          0x01
+
+/* Interrupt level assignments */
+#define PHY_INTERRUPT   SIU_IRQ7        /* PHY link change interrupt */
+#define SIU_INT_FEC1    SIU_LEVEL1      /* FEC1 interrupt */
+#define SIU_INT_FEC2    SIU_LEVEL3      /* FEC2 interrupt */
+#define FEC_INTERRUPT   SIU_INT_FEC1    /* FEC interrupt */
+
+/* We don't use the 8259 */
+#define NR_8259_INTS    0
+
+/* CPM Ethernet through SCC3 */
+#define PA_ENET_RXD     ((ushort)0x0040)
+#define PA_ENET_TXD     ((ushort)0x0080)
+#define PE_ENET_TCLK    ((uint)0x00004000)
+#define PE_ENET_RCLK    ((uint)0x00008000)
+#define PE_ENET_TENA    ((uint)0x00000010)
+#define PC_ENET_CLSN    ((ushort)0x0400)
+#define PC_ENET_RENA    ((ushort)0x0800)
+
+/* Control bits in the SICR to route TCLK (CLK5) and RCLK (CLK6) to
+ * SCC3.  Also, make sure GR3 (bit 8) and SC3 (bit 9) are zero */
+#define SICR_ENET_MASK  ((uint)0x00ff0000)
+#define SICR_ENET_CLKRT ((uint)0x002c0000)
+
+#endif /* __ASM_MPC885ADS_H__ */
+#endif /* __KERNEL__ */
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
new file mode 100644
index 000000000000..c5fefdf66c0a
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -0,0 +1,387 @@
+/*arch/ppc/platforms/mpc885ads-setup.c
+ *
+ * Platform setup for the Freescale mpc885ads board
+ *
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * Copyright 2005 MontaVista Software 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/root_dev.h>
+
+#include <linux/fs_enet_pd.h>
+#include <linux/fs_uart_pd.h>
+#include <linux/mii.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/ppcboot.h>
+#include <asm/mpc8xx.h>
+#include <asm/8xx_immap.h>
+#include <asm/commproc.h>
+#include <asm/fs_pd.h>
+#include <asm/prom.h>
+
+extern void cpm_reset(void);
+extern void mpc8xx_show_cpuinfo(struct seq_file*);
+extern void mpc8xx_restart(char *cmd);
+extern void mpc8xx_calibrate_decr(void);
+extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
+extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
+extern void m8xx_pic_init(void);
+extern unsigned int mpc8xx_get_irq(void);
+
+static void init_smc1_uart_ioports(struct fs_uart_platform_info* fpi);
+static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi);
+static void init_scc3_ioports(struct fs_platform_info* ptr);
+
+void __init mpc885ads_board_setup(void)
+{
+        cpm8xx_t *cp;
+        unsigned int *bcsr_io;
+        u8 tmpval8;
+
+#ifdef CONFIG_FS_ENET
+        iop8xx_t *io_port;
+#endif
+
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+        cp = (cpm8xx_t *)immr_map(im_cpm);
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR\n");
+                return;
+        }
+#ifdef CONFIG_SERIAL_CPM_SMC1
+        clrbits32(bcsr_io, BCSR1_RS232EN_1);
+        clrbits32(&cp->cp_simode, 0xe0000000 >> 17);    /* brg1 */
+        tmpval8 = in_8(&(cp->cp_smc[0].smc_smcm)) | (SMCM_RX | SMCM_TX);
+        out_8(&(cp->cp_smc[0].smc_smcm), tmpval8);
+        clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN);     /* brg1 */
+#else
+        setbits32(bcsr_io,BCSR1_RS232EN_1);
+        out_be16(&cp->cp_smc[0].smc_smcmr, 0);
+        out_8(&cp->cp_smc[0].smc_smce, 0);
+#endif
+
+#ifdef CONFIG_SERIAL_CPM_SMC2
+        clrbits32(bcsr_io,BCSR1_RS232EN_2);
+        clrbits32(&cp->cp_simode, 0xe0000000 >> 1);
+        setbits32(&cp->cp_simode, 0x20000000 >> 1);     /* brg2 */
+        tmpval8 = in_8(&(cp->cp_smc[1].smc_smcm)) | (SMCM_RX | SMCM_TX);
+        out_8(&(cp->cp_smc[1].smc_smcm), tmpval8);
+        clrbits16(&cp->cp_smc[1].smc_smcmr, SMCMR_REN | SMCMR_TEN);
+
+        init_smc2_uart_ioports(0);
+#else
+        setbits32(bcsr_io,BCSR1_RS232EN_2);
+        out_be16(&cp->cp_smc[1].smc_smcmr, 0);
+        out_8(&cp->cp_smc[1].smc_smce, 0);
+#endif
+        immr_unmap(cp);
+        iounmap(bcsr_io);
+
+#ifdef CONFIG_FS_ENET
+        /* use MDC for MII (common) */
+        io_port = (iop8xx_t*)immr_map(im_ioport);
+        setbits16(&io_port->iop_pdpar, 0x0080);
+        clrbits16(&io_port->iop_pddir, 0x0080);
+
+        bcsr_io = ioremap(BCSR5, sizeof(unsigned long));
+        clrbits32(bcsr_io,BCSR5_MII1_EN);
+        clrbits32(bcsr_io,BCSR5_MII1_RST);
+#ifndef CONFIG_FC_ENET_HAS_SCC
+        clrbits32(bcsr_io,BCSR5_MII2_EN);
+        clrbits32(bcsr_io,BCSR5_MII2_RST);
+
+#endif
+        iounmap(bcsr_io);
+        immr_unmap(io_port);
+
+#endif
+}
+
+
+static void init_fec1_ioports(struct fs_platform_info* ptr)
+{
+        cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm);
+        iop8xx_t *io_port = (iop8xx_t *)immr_map(im_ioport);
+
+        /* configure FEC1 pins  */
+        setbits16(&io_port->iop_papar, 0xf830);
+        setbits16(&io_port->iop_padir, 0x0830);
+        clrbits16(&io_port->iop_padir, 0xf000);
+
+        setbits32(&cp->cp_pbpar, 0x00001001);
+        clrbits32(&cp->cp_pbdir, 0x00001001);
+
+        setbits16(&io_port->iop_pcpar, 0x000c);
+        clrbits16(&io_port->iop_pcdir, 0x000c);
+
+        setbits32(&cp->cp_pepar, 0x00000003);
+        setbits32(&cp->cp_pedir, 0x00000003);
+        clrbits32(&cp->cp_peso, 0x00000003);
+        clrbits32(&cp->cp_cptr, 0x00000100);
+
+        immr_unmap(io_port);
+        immr_unmap(cp);
+}
+
+
+static void init_fec2_ioports(struct fs_platform_info* ptr)
+{
+        cpm8xx_t *cp = (cpm8xx_t *)immr_map(im_cpm);
+        iop8xx_t *io_port = (iop8xx_t *)immr_map(im_ioport);
+
+        /* configure FEC2 pins */
+        setbits32(&cp->cp_pepar, 0x0003fffc);
+        setbits32(&cp->cp_pedir, 0x0003fffc);
+        clrbits32(&cp->cp_peso, 0x000087fc);
+        setbits32(&cp->cp_peso, 0x00037800);
+        clrbits32(&cp->cp_cptr, 0x00000080);
+
+        immr_unmap(io_port);
+        immr_unmap(cp);
+}
+
+void init_fec_ioports(struct fs_platform_info *fpi)
+{
+        int fec_no = fs_get_fec_index(fpi->fs_no);
+
+        switch (fec_no) {
+        case 0:
+                init_fec1_ioports(fpi);
+                break;
+        case 1:
+                init_fec2_ioports(fpi);
+                break;
+        default:
+                printk(KERN_ERR "init_fec_ioports: invalid FEC number\n");
+                return;
+        }
+}
+
+static void init_scc3_ioports(struct fs_platform_info* fpi)
+{
+        unsigned *bcsr_io;
+        iop8xx_t *io_port;
+        cpm8xx_t *cp;
+
+        bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE);
+        io_port = (iop8xx_t *)immr_map(im_ioport);
+        cp = (cpm8xx_t *)immr_map(im_cpm);
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR\n");
+                return;
+        }
+
+        /* Enable the PHY.
+         */
+        clrbits32(bcsr_io+4, BCSR4_ETH10_RST);
+        udelay(1000);
+        setbits32(bcsr_io+4, BCSR4_ETH10_RST);
+        /* Configure port A pins for Txd and Rxd.
+         */
+        setbits16(&io_port->iop_papar, PA_ENET_RXD | PA_ENET_TXD);
+        clrbits16(&io_port->iop_padir, PA_ENET_RXD | PA_ENET_TXD);
+
+        /* Configure port C pins to enable CLSN and RENA.
+         */
+        clrbits16(&io_port->iop_pcpar, PC_ENET_CLSN | PC_ENET_RENA);
+        clrbits16(&io_port->iop_pcdir, PC_ENET_CLSN | PC_ENET_RENA);
+        setbits16(&io_port->iop_pcso, PC_ENET_CLSN | PC_ENET_RENA);
+
+        /* Configure port E for TCLK and RCLK.
+         */
+        setbits32(&cp->cp_pepar, PE_ENET_TCLK | PE_ENET_RCLK);
+        clrbits32(&cp->cp_pepar, PE_ENET_TENA);
+        clrbits32(&cp->cp_pedir,
+                  PE_ENET_TCLK | PE_ENET_RCLK | PE_ENET_TENA);
+        clrbits32(&cp->cp_peso, PE_ENET_TCLK | PE_ENET_RCLK);
+        setbits32(&cp->cp_peso, PE_ENET_TENA);
+
+        /* Configure Serial Interface clock routing.
+         * First, clear all SCC bits to zero, then set the ones we want.
+         */
+        clrbits32(&cp->cp_sicr, SICR_ENET_MASK);
+        setbits32(&cp->cp_sicr, SICR_ENET_CLKRT);
+
+        /* Disable Rx and Tx. SMC1 sshould be stopped if SCC3 eternet are used.
+         */
+        clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN);
+        /* On the MPC885ADS SCC ethernet PHY is initialized in the full duplex mode
+         * by H/W setting after reset. SCC ethernet controller support only half duplex.
+         * This discrepancy of modes causes a lot of carrier lost errors.
+         */
+
+        /* In the original SCC enet driver the following code is placed at
+           the end of the initialization */
+        setbits32(&cp->cp_pepar, PE_ENET_TENA);
+        clrbits32(&cp->cp_pedir, PE_ENET_TENA);
+        setbits32(&cp->cp_peso, PE_ENET_TENA);
+
+        setbits32(bcsr_io+4, BCSR1_ETHEN);
+        iounmap(bcsr_io);
+        immr_unmap(io_port);
+        immr_unmap(cp);
+}
+
+void init_scc_ioports(struct fs_platform_info *fpi)
+{
+        int scc_no = fs_get_scc_index(fpi->fs_no);
+
+        switch (scc_no) {
+        case 2:
+                init_scc3_ioports(fpi);
+                break;
+        default:
+                printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
+                return;
+        }
+}
+
+
+
+static void init_smc1_uart_ioports(struct fs_uart_platform_info* ptr)
+{
+        unsigned *bcsr_io;
+        cpm8xx_t *cp;
+
+        cp = (cpm8xx_t *)immr_map(im_cpm);
+        setbits32(&cp->cp_pepar, 0x000000c0);
+        clrbits32(&cp->cp_pedir, 0x000000c0);
+        clrbits32(&cp->cp_peso, 0x00000040);
+        setbits32(&cp->cp_peso, 0x00000080);
+        immr_unmap(cp);
+
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR1\n");
+                return;
+        }
+        clrbits32(bcsr_io,BCSR1_RS232EN_1);
+        iounmap(bcsr_io);
+}
+
+static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi)
+{
+        unsigned *bcsr_io;
+        cpm8xx_t *cp;
+
+        cp = (cpm8xx_t *)immr_map(im_cpm);
+        setbits32(&cp->cp_pepar, 0x00000c00);
+        clrbits32(&cp->cp_pedir, 0x00000c00);
+        clrbits32(&cp->cp_peso, 0x00000400);
+        setbits32(&cp->cp_peso, 0x00000800);
+        immr_unmap(cp);
+
+        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
+
+        if (bcsr_io == NULL) {
+                printk(KERN_CRIT "Could not remap BCSR1\n");
+                return;
+        }
+        clrbits32(bcsr_io,BCSR1_RS232EN_2);
+        iounmap(bcsr_io);
+}
+
+void init_smc_ioports(struct fs_uart_platform_info *data)
+{
+        int smc_no = fs_uart_id_fsid2smc(data->fs_no);
+
+        switch (smc_no) {
+        case 0:
+                init_smc1_uart_ioports(data);
+                data->brg = data->clk_rx;
+                break;
+        case 1:
+                init_smc2_uart_ioports(data);
+                data->brg = data->clk_rx;
+                break;
+        default:
+                printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
+                return;
+        }
+}
+
+int platform_device_skip(char *model, int id)
+{
+#ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3
+        const char *dev = "FEC";
+        int n = 2;
+#else
+        const char *dev = "SCC";
+        int n = 3;
+#endif
+
+        if (!strcmp(model, dev) && n == id)
+                return 1;
+
+        return 0;
+}
+
+static void __init mpc885ads_setup_arch(void)
+{
+        struct device_node *cpu;
+
+        cpu = of_find_node_by_type(NULL, "cpu");
+        if (cpu != 0) {
+                const unsigned int *fp;
+
+                fp = get_property(cpu, "clock-frequency", NULL);
+                if (fp != 0)
+                        loops_per_jiffy = *fp / HZ;
+                else
+                        loops_per_jiffy = 50000000 / HZ;
+                of_node_put(cpu);
+        }
+
+        cpm_reset();
+
+        mpc885ads_board_setup();
+
+        ROOT_DEV = Root_NFS;
+}
+
+static int __init mpc885ads_probe(void)
+{
+        char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
+                                          "model", NULL);
+        if (model == NULL)
+                return 0;
+        if (strcmp(model, "MPC885ADS"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(mpc885_ads) {
+        .name                   = "MPC885 ADS",
+        .probe                  = mpc885ads_probe,
+        .setup_arch             = mpc885ads_setup_arch,
+        .init_IRQ               = m8xx_pic_init,
+        .show_cpuinfo           = mpc8xx_show_cpuinfo,
+        .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,
+};
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 507d1b98f270..452004283f17 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -5,9 +5,11 @@ ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_PPC_PMAC)          += powermac/
 endif
 endif
-obj-$(CONFIG_PPC_MPC52xx)       += 52xx/
 obj-$(CONFIG_PPC_CHRP)          += chrp/
 obj-$(CONFIG_4xx)               += 4xx/
+obj-$(CONFIG_PPC_MPC52xx)       += 52xx/
+obj-$(CONFIG_PPC_8xx)           += 8xx/
+obj-$(CONFIG_PPC_82xx)          += 82xx/
 obj-$(CONFIG_PPC_83xx)          += 83xx/
 obj-$(CONFIG_PPC_85xx)          += 85xx/
 obj-$(CONFIG_PPC_86xx)          += 86xx/
@@ -17,4 +19,5 @@ obj-$(CONFIG_PPC_MAPLE)		+= maple/
 obj-$(CONFIG_PPC_PASEMI)        += pasemi/
 obj-$(CONFIG_PPC_CELL)          += cell/
 obj-$(CONFIG_PPC_PS3)           += ps3/
+obj-$(CONFIG_PPC_CELLEB)        += celleb/
 obj-$(CONFIG_EMBEDDED6xx)       += embedded6xx/
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index f90e8337796c..869af89df6ff 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -14,7 +14,12 @@ endif
 spufs-modular-$(CONFIG_SPU_FS)          += spu_syscalls.o
 spu-priv1-$(CONFIG_PPC_CELL_NATIVE)     += spu_priv1_mmio.o
 
+spu-manage-$(CONFIG_PPC_CELLEB)         += spu_manage.o
+spu-manage-$(CONFIG_PPC_CELL_NATIVE)    += spu_manage.o
+
 obj-$(CONFIG_SPU_BASE)                  += spu_callbacks.o spu_base.o \
                                            spu_coredump.o \
                                            $(spufs-modular-m) \
-                                           $(spu-priv1-y) spufs/
+                                           $(spu-priv1-y) \
+                                           $(spu-manage-y) \
+                                           spufs/
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index b43466ba8096..67d617b60a23 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -149,7 +149,8 @@ static int cbe_nr_iommus;
 static void invalidate_tce_cache(struct cbe_iommu *iommu, unsigned long *pte,
                 long n_ptes)
 {
-        unsigned long *reg, val;
+        unsigned long __iomem *reg;
+        unsigned long val;
         long n;
 
         reg = iommu->xlate_regs + IOC_IOPT_CacheInvd;
@@ -592,7 +593,7 @@ static void __init cell_iommu_init_one(struct device_node *np, unsigned long off
         /* Init base fields */
         i = cbe_nr_iommus++;
         iommu = &iommus[i];
-        iommu->stab = 0;
+        iommu->stab = NULL;
         iommu->nid = nid;
         snprintf(iommu->name, sizeof(iommu->name), "iommu%d", i);
         INIT_LIST_HEAD(&iommu->windows);
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
index d04ae1671e6c..66ca4b5a1dbc 100644
--- a/arch/powerpc/platforms/cell/pmu.c
+++ b/arch/powerpc/platforms/cell/pmu.c
@@ -345,18 +345,12 @@ EXPORT_SYMBOL_GPL(cbe_read_trace_buffer);
  * Enabling/disabling interrupts for the entire performance monitoring unit.
  */
 
-u32 cbe_query_pm_interrupts(u32 cpu)
-{
-        return cbe_read_pm(cpu, pm_status);
-}
-EXPORT_SYMBOL_GPL(cbe_query_pm_interrupts);
-
-u32 cbe_clear_pm_interrupts(u32 cpu)
+u32 cbe_get_and_clear_pm_interrupts(u32 cpu)
 {
         /* Reading pm_status clears the interrupt bits. */
-        return cbe_query_pm_interrupts(cpu);
+        return cbe_read_pm(cpu, pm_status);
 }
-EXPORT_SYMBOL_GPL(cbe_clear_pm_interrupts);
+EXPORT_SYMBOL_GPL(cbe_get_and_clear_pm_interrupts);
 
 void cbe_enable_pm_interrupts(u32 cpu, u32 thread, u32 mask)
 {
@@ -371,7 +365,7 @@ EXPORT_SYMBOL_GPL(cbe_enable_pm_interrupts);
 
 void cbe_disable_pm_interrupts(u32 cpu)
 {
-        cbe_clear_pm_interrupts(cpu);
+        cbe_get_and_clear_pm_interrupts(cpu);
         cbe_write_pm(cpu, pm_status, 0);
 }
 EXPORT_SYMBOL_GPL(cbe_disable_pm_interrupts);
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index bd7bffc3ddd0..c43999a10deb 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -170,9 +170,11 @@ int
 spu_irq_class_0_bottom(struct spu *spu)
 {
         unsigned long stat, mask;
+        unsigned long flags;
 
         spu->class_0_pending = 0;
 
+        spin_lock_irqsave(&spu->register_lock, flags);
         mask = spu_int_mask_get(spu, 0);
         stat = spu_int_stat_get(spu, 0);
 
@@ -188,6 +190,7 @@ spu_irq_class_0_bottom(struct spu *spu)
                 __spu_trap_error(spu);
 
         spu_int_stat_clear(spu, 0, stat);
+        spin_unlock_irqrestore(&spu->register_lock, flags);
 
         return (stat & 0x7) ? -EIO : 0;
 }
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
new file mode 100644
index 000000000000..e34599f53d28
--- /dev/null
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -0,0 +1,366 @@
+/*
+ * spu management operations for of based platforms
+ *
+ * (C) Copyright IBM Deutschland Entwicklung GmbH 2005
+ * Copyright 2006 Sony Corp.
+ * (C) Copyright 2007 TOSHIBA 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; version 2 of the License.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/wait.h>
+#include <linux/mm.h>
+#include <linux/io.h>
+#include <linux/mutex.h>
+#include <linux/device.h>
+
+#include <asm/spu.h>
+#include <asm/spu_priv1.h>
+#include <asm/firmware.h>
+#include <asm/prom.h>
+
+#include "interrupt.h"
+
+struct device_node *spu_devnode(struct spu *spu)
+{
+        return spu->devnode;
+}
+
+EXPORT_SYMBOL_GPL(spu_devnode);
+
+static u64 __init find_spu_unit_number(struct device_node *spe)
+{
+        const unsigned int *prop;
+        int proplen;
+        prop = get_property(spe, "unit-id", &proplen);
+        if (proplen == 4)
+                return (u64)*prop;
+
+        prop = get_property(spe, "reg", &proplen);
+        if (proplen == 4)
+                return (u64)*prop;
+
+        return 0;
+}
+
+static void spu_unmap(struct spu *spu)
+{
+        if (!firmware_has_feature(FW_FEATURE_LPAR))
+                iounmap(spu->priv1);
+        iounmap(spu->priv2);
+        iounmap(spu->problem);
+        iounmap((__force u8 __iomem *)spu->local_store);
+}
+
+static int __init spu_map_interrupts_old(struct spu *spu,
+        struct device_node *np)
+{
+        unsigned int isrc;
+        const u32 *tmp;
+        int nid;
+
+        /* Get the interrupt source unit from the device-tree */
+        tmp = get_property(np, "isrc", NULL);
+        if (!tmp)
+                return -ENODEV;
+        isrc = tmp[0];
+
+        tmp = get_property(np->parent->parent, "node-id", NULL);
+        if (!tmp) {
+                printk(KERN_WARNING "%s: can't find node-id\n", __FUNCTION__);
+                nid = spu->node;
+        } else
+                nid = tmp[0];
+
+        /* Add the node number */
+        isrc |= nid << IIC_IRQ_NODE_SHIFT;
+
+        /* Now map interrupts of all 3 classes */
+        spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);
+        spu->irqs[1] = irq_create_mapping(NULL, IIC_IRQ_CLASS_1 | isrc);
+        spu->irqs[2] = irq_create_mapping(NULL, IIC_IRQ_CLASS_2 | isrc);
+
+        /* Right now, we only fail if class 2 failed */
+        return spu->irqs[2] == NO_IRQ ? -EINVAL : 0;
+}
+
+static void __iomem * __init spu_map_prop_old(struct spu *spu,
+                                              struct device_node *n,
+                                              const char *name)
+{
+        const struct address_prop {
+                unsigned long address;
+                unsigned int len;
+        } __attribute__((packed)) *prop;
+        int proplen;
+
+        prop = get_property(n, name, &proplen);
+        if (prop == NULL || proplen != sizeof (struct address_prop))
+                return NULL;
+
+        return ioremap(prop->address, prop->len);
+}
+
+static int __init spu_map_device_old(struct spu *spu)
+{
+        struct device_node *node = spu->devnode;
+        const char *prop;
+        int ret;
+
+        ret = -ENODEV;
+        spu->name = get_property(node, "name", NULL);
+        if (!spu->name)
+                goto out;
+
+        prop = get_property(node, "local-store", NULL);
+        if (!prop)
+                goto out;
+        spu->local_store_phys = *(unsigned long *)prop;
+
+        /* we use local store as ram, not io memory */
+        spu->local_store = (void __force *)
+                spu_map_prop_old(spu, node, "local-store");
+        if (!spu->local_store)
+                goto out;
+
+        prop = get_property(node, "problem", NULL);
+        if (!prop)
+                goto out_unmap;
+        spu->problem_phys = *(unsigned long *)prop;
+
+        spu->problem = spu_map_prop_old(spu, node, "problem");
+        if (!spu->problem)
+                goto out_unmap;
+
+        spu->priv2 = spu_map_prop_old(spu, node, "priv2");
+        if (!spu->priv2)
+                goto out_unmap;
+
+        if (!firmware_has_feature(FW_FEATURE_LPAR)) {
+                spu->priv1 = spu_map_prop_old(spu, node, "priv1");
+                if (!spu->priv1)
+                        goto out_unmap;
+        }
+
+        ret = 0;
+        goto out;
+
+out_unmap:
+        spu_unmap(spu);
+out:
+        return ret;
+}
+
+static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
+{
+        struct of_irq oirq;
+        int ret;
+        int i;
+
+        for (i=0; i < 3; i++) {
+                ret = of_irq_map_one(np, i, &oirq);
+                if (ret) {
+                        pr_debug("spu_new: failed to get irq %d\n", i);
+                        goto err;
+                }
+                ret = -EINVAL;
+                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.specifier[0],
+                         oirq.controller->full_name);
+                spu->irqs[i] = irq_create_of_mapping(oirq.controller,
+                                        oirq.specifier, oirq.size);
+                if (spu->irqs[i] == NO_IRQ) {
+                        pr_debug("spu_new: failed to map it !\n");
+                        goto err;
+                }
+        }
+        return 0;
+
+err:
+        pr_debug("failed to map irq %x for spu %s\n", *oirq.specifier,
+                spu->name);
+        for (; i >= 0; i--) {
+                if (spu->irqs[i] != NO_IRQ)
+                        irq_dispose_mapping(spu->irqs[i]);
+        }
+        return ret;
+}
+
+static int spu_map_resource(struct spu *spu, int nr,
+                            void __iomem** virt, unsigned long *phys)
+{
+        struct device_node *np = spu->devnode;
+        struct resource resource = { };
+        unsigned long len;
+        int ret;
+
+        ret = of_address_to_resource(np, nr, &resource);
+        if (ret)
+                return ret;
+        if (phys)
+                *phys = resource.start;
+        len = resource.end - resource.start + 1;
+        *virt = ioremap(resource.start, len);
+        if (!*virt)
+                return -EINVAL;
+        return 0;
+}
+
+static int __init spu_map_device(struct spu *spu)
+{
+        struct device_node *np = spu->devnode;
+        int ret = -ENODEV;
+
+        spu->name = get_property(np, "name", NULL);
+        if (!spu->name)
+                goto out;
+
+        ret = spu_map_resource(spu, 0, (void __iomem**)&spu->local_store,
+                               &spu->local_store_phys);
+        if (ret) {
+                pr_debug("spu_new: failed to map %s resource 0\n",
+                         np->full_name);
+                goto out;
+        }
+        ret = spu_map_resource(spu, 1, (void __iomem**)&spu->problem,
+                               &spu->problem_phys);
+        if (ret) {
+                pr_debug("spu_new: failed to map %s resource 1\n",
+                         np->full_name);
+                goto out_unmap;
+        }
+        ret = spu_map_resource(spu, 2, (void __iomem**)&spu->priv2, NULL);
+        if (ret) {
+                pr_debug("spu_new: failed to map %s resource 2\n",
+                         np->full_name);
+                goto out_unmap;
+        }
+        if (!firmware_has_feature(FW_FEATURE_LPAR))
+                ret = spu_map_resource(spu, 3,
+                               (void __iomem**)&spu->priv1, NULL);
+        if (ret) {
+                pr_debug("spu_new: failed to map %s resource 3\n",
+                         np->full_name);
+                goto out_unmap;
+        }
+        pr_debug("spu_new: %s maps:\n", np->full_name);
+        pr_debug("  local store   : 0x%016lx -> 0x%p\n",
+                 spu->local_store_phys, spu->local_store);
+        pr_debug("  problem state : 0x%016lx -> 0x%p\n",
+                 spu->problem_phys, spu->problem);
+        pr_debug("  priv2         :                       0x%p\n", spu->priv2);
+        pr_debug("  priv1         :                       0x%p\n", spu->priv1);
+
+        return 0;
+
+out_unmap:
+        spu_unmap(spu);
+out:
+        pr_debug("failed to map spe %s: %d\n", spu->name, ret);
+        return ret;
+}
+
+static int __init of_enumerate_spus(int (*fn)(void *data))
+{
+        int ret;
+        struct device_node *node;
+
+        ret = -ENODEV;
+        for (node = of_find_node_by_type(NULL, "spe");
+                        node; node = of_find_node_by_type(node, "spe")) {
+                ret = fn(node);
+                if (ret) {
+                        printk(KERN_WARNING "%s: Error initializing %s\n",
+                                __FUNCTION__, node->name);
+                        break;
+                }
+        }
+        return ret;
+}
+
+static int __init of_create_spu(struct spu *spu, void *data)
+{
+        int ret;
+        struct device_node *spe = (struct device_node *)data;
+        static int legacy_map = 0, legacy_irq = 0;
+
+        spu->devnode = of_node_get(spe);
+        spu->spe_id = find_spu_unit_number(spe);
+
+        spu->node = of_node_to_nid(spe);
+        if (spu->node >= MAX_NUMNODES) {
+                printk(KERN_WARNING "SPE %s on node %d ignored,"
+                       " node number too big\n", spe->full_name, spu->node);
+                printk(KERN_WARNING "Check if CONFIG_NUMA is enabled.\n");
+                ret = -ENODEV;
+                goto out;
+        }
+
+        ret = spu_map_device(spu);
+        if (ret) {
+                if (!legacy_map) {
+                        legacy_map = 1;
+                        printk(KERN_WARNING "%s: Legacy device tree found, "
+                                "trying to map old style\n", __FUNCTION__);
+                }
+                ret = spu_map_device_old(spu);
+                if (ret) {
+                        printk(KERN_ERR "Unable to map %s\n",
+                                spu->name);
+                        goto out;
+                }
+        }
+
+        ret = spu_map_interrupts(spu, spe);
+        if (ret) {
+                if (!legacy_irq) {
+                        legacy_irq = 1;
+                        printk(KERN_WARNING "%s: Legacy device tree found, "
+                                "trying old style irq\n", __FUNCTION__);
+                }
+                ret = spu_map_interrupts_old(spu, spe);
+                if (ret) {
+                        printk(KERN_ERR "%s: could not map interrupts",
+                                spu->name);
+                        goto out_unmap;
+                }
+        }
+
+        pr_debug("Using SPE %s %p %p %p %p %d\n", spu->name,
+                spu->local_store, spu->problem, spu->priv1,
+                spu->priv2, spu->number);
+        goto out;
+
+out_unmap:
+        spu_unmap(spu);
+out:
+        return ret;
+}
+
+static int of_destroy_spu(struct spu *spu)
+{
+        spu_unmap(spu);
+        of_node_put(spu->devnode);
+        return 0;
+}
+
+const struct spu_management_ops spu_management_of_ops = {
+        .enumerate_spus = of_enumerate_spus,
+        .create_spu = of_create_spu,
+        .destroy_spu = of_destroy_spu,
+};
diff --git a/arch/powerpc/platforms/cell/spu_priv1_mmio.c b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
index 910a926b61a2..67fa7247b80a 100644
--- a/arch/powerpc/platforms/cell/spu_priv1_mmio.c
+++ b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
@@ -37,490 +37,112 @@
 #include "interrupt.h"
 #include "spu_priv1_mmio.h"
 
-static DEFINE_MUTEX(add_spumem_mutex);
-
-struct spu_pdata {
-        struct device_node *devnode;
-        struct spu_priv1 __iomem *priv1;
-};
-
-static struct spu_pdata *spu_get_pdata(struct spu *spu)
-{
-        BUG_ON(!spu->pdata);
-        return spu->pdata;
-}
-
-struct device_node *spu_devnode(struct spu *spu)
-{
-        return spu_get_pdata(spu)->devnode;
-}
-
-EXPORT_SYMBOL_GPL(spu_devnode);
-
-static int __init cell_spuprop_present(struct spu *spu, struct device_node *spe,
-                const char *prop)
-{
-        const struct address_prop {
-                unsigned long address;
-                unsigned int len;
-        } __attribute__((packed)) *p;
-        int proplen;
-
-        unsigned long start_pfn, nr_pages;
-        struct pglist_data *pgdata;
-        struct zone *zone;
-        int ret;
-
-        p = get_property(spe, prop, &proplen);
-        WARN_ON(proplen != sizeof (*p));
-
-        start_pfn = p->address >> PAGE_SHIFT;
-        nr_pages = ((unsigned long)p->len + PAGE_SIZE - 1) >> PAGE_SHIFT;
-
-        pgdata = NODE_DATA(spu->node);
-        zone = pgdata->node_zones;
-
-        /* XXX rethink locking here */
-        mutex_lock(&add_spumem_mutex);
-        ret = __add_pages(zone, start_pfn, nr_pages);
-        mutex_unlock(&add_spumem_mutex);
-
-        return ret;
-}
-
-static void __iomem * __init map_spe_prop(struct spu *spu,
-                struct device_node *n, const char *name)
-{
-        const struct address_prop {
-                unsigned long address;
-                unsigned int len;
-        } __attribute__((packed)) *prop;
-
-        const void *p;
-        int proplen;
-        void __iomem *ret = NULL;
-        int err = 0;
-
-        p = get_property(n, name, &proplen);
-        if (proplen != sizeof (struct address_prop))
-                return NULL;
-
-        prop = p;
-
-        err = cell_spuprop_present(spu, n, name);
-        if (err && (err != -EEXIST))
-                goto out;
-
-        ret = ioremap(prop->address, prop->len);
-
- out:
-        return ret;
-}
-
-static void spu_unmap(struct spu *spu)
-{
-        iounmap(spu->priv2);
-        iounmap(spu_get_pdata(spu)->priv1);
-        iounmap(spu->problem);
-        iounmap((__force u8 __iomem *)spu->local_store);
-}
-
-static int __init spu_map_interrupts_old(struct spu *spu,
-        struct device_node *np)
-{
-        unsigned int isrc;
-        const u32 *tmp;
-        int nid;
-
-        /* Get the interrupt source unit from the device-tree */
-        tmp = get_property(np, "isrc", NULL);
-        if (!tmp)
-                return -ENODEV;
-        isrc = tmp[0];
-
-        tmp = get_property(np->parent->parent, "node-id", NULL);
-        if (!tmp) {
-                printk(KERN_WARNING "%s: can't find node-id\n", __FUNCTION__);
-                nid = spu->node;
-        } else
-                nid = tmp[0];
-
-        /* Add the node number */
-        isrc |= nid << IIC_IRQ_NODE_SHIFT;
-
-        /* Now map interrupts of all 3 classes */
-        spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);
-        spu->irqs[1] = irq_create_mapping(NULL, IIC_IRQ_CLASS_1 | isrc);
-        spu->irqs[2] = irq_create_mapping(NULL, IIC_IRQ_CLASS_2 | isrc);
-
-        /* Right now, we only fail if class 2 failed */
-        return spu->irqs[2] == NO_IRQ ? -EINVAL : 0;
-}
-
-static int __init spu_map_device_old(struct spu *spu, struct device_node *node)
-{
-        const char *prop;
-        int ret;
-
-        ret = -ENODEV;
-        spu->name = get_property(node, "name", NULL);
-        if (!spu->name)
-                goto out;
-
-        prop = get_property(node, "local-store", NULL);
-        if (!prop)
-                goto out;
-        spu->local_store_phys = *(unsigned long *)prop;
-
-        /* we use local store as ram, not io memory */
-        spu->local_store = (void __force *)
-                map_spe_prop(spu, node, "local-store");
-        if (!spu->local_store)
-                goto out;
-
-        prop = get_property(node, "problem", NULL);
-        if (!prop)
-                goto out_unmap;
-        spu->problem_phys = *(unsigned long *)prop;
-
-        spu->problem= map_spe_prop(spu, node, "problem");
-        if (!spu->problem)
-                goto out_unmap;
-
-        spu_get_pdata(spu)->priv1= map_spe_prop(spu, node, "priv1");
-
-        spu->priv2= map_spe_prop(spu, node, "priv2");
-        if (!spu->priv2)
-                goto out_unmap;
-        ret = 0;
-        goto out;
-
-out_unmap:
-        spu_unmap(spu);
-out:
-        return ret;
-}
-
-static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
-{
-        struct of_irq oirq;
-        int ret;
-        int i;
-
-        for (i=0; i < 3; i++) {
-                ret = of_irq_map_one(np, i, &oirq);
-                if (ret) {
-                        pr_debug("spu_new: failed to get irq %d\n", i);
-                        goto err;
-                }
-                ret = -EINVAL;
-                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.specifier[0],
-                         oirq.controller->full_name);
-                spu->irqs[i] = irq_create_of_mapping(oirq.controller,
-                                        oirq.specifier, oirq.size);
-                if (spu->irqs[i] == NO_IRQ) {
-                        pr_debug("spu_new: failed to map it !\n");
-                        goto err;
-                }
-        }
-        return 0;
-
-err:
-        pr_debug("failed to map irq %x for spu %s\n", *oirq.specifier,
-                spu->name);
-        for (; i >= 0; i--) {
-                if (spu->irqs[i] != NO_IRQ)
-                        irq_dispose_mapping(spu->irqs[i]);
-        }
-        return ret;
-}
-
-static int spu_map_resource(struct spu *spu, int nr,
-                            void __iomem** virt, unsigned long *phys)
-{
-        struct device_node *np = spu_get_pdata(spu)->devnode;
-        unsigned long start_pfn, nr_pages;
-        struct pglist_data *pgdata;
-        struct zone *zone;
-        struct resource resource = { };
-        unsigned long len;
-        int ret;
-
-        ret = of_address_to_resource(np, nr, &resource);
-        if (ret)
-                goto out;
-
-        if (phys)
-                *phys = resource.start;
-        len = resource.end - resource.start + 1;
-        *virt = ioremap(resource.start, len);
-        if (!*virt)
-                ret = -EINVAL;
-
-        start_pfn = resource.start >> PAGE_SHIFT;
-        nr_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
-
-        pgdata = NODE_DATA(spu->node);
-        zone = pgdata->node_zones;
-
-        /* XXX rethink locking here */
-        mutex_lock(&add_spumem_mutex);
-        ret = __add_pages(zone, start_pfn, nr_pages);
-        mutex_unlock(&add_spumem_mutex);
-
-out:
-        return ret;
-}
-
-static int __init spu_map_device(struct spu *spu)
-{
-        struct device_node *np = spu_get_pdata(spu)->devnode;
-        int ret = -ENODEV;
-
-        spu->name = get_property(np, "name", NULL);
-        if (!spu->name)
-                goto out;
-
-        ret = spu_map_resource(spu, 0, (void __iomem**)&spu->local_store,
-                               &spu->local_store_phys);
-        if (ret) {
-                pr_debug("spu_new: failed to map %s resource 0\n",
-                         np->full_name);
-                goto out;
-        }
-        ret = spu_map_resource(spu, 1, (void __iomem**)&spu->problem,
-                               &spu->problem_phys);
-        if (ret) {
-                pr_debug("spu_new: failed to map %s resource 1\n",
-                         np->full_name);
-                goto out_unmap;
-        }
-        ret = spu_map_resource(spu, 2, (void __iomem**)&spu->priv2, NULL);
-        if (ret) {
-                pr_debug("spu_new: failed to map %s resource 2\n",
-                         np->full_name);
-                goto out_unmap;
-        }
-        if (!firmware_has_feature(FW_FEATURE_LPAR))
-                ret = spu_map_resource(spu, 3,
-                               (void __iomem**)&spu_get_pdata(spu)->priv1, NULL);
-        if (ret) {
-                pr_debug("spu_new: failed to map %s resource 3\n",
-                         np->full_name);
-                goto out_unmap;
-        }
-        pr_debug("spu_new: %s maps:\n", np->full_name);
-        pr_debug("  local store   : 0x%016lx -> 0x%p\n",
-                 spu->local_store_phys, spu->local_store);
-        pr_debug("  problem state : 0x%016lx -> 0x%p\n",
-                 spu->problem_phys, spu->problem);
-        pr_debug("  priv2         :                       0x%p\n", spu->priv2);
-        pr_debug("  priv1         :                       0x%p\n",
-                 spu_get_pdata(spu)->priv1);
-
-        return 0;
-
-out_unmap:
-        spu_unmap(spu);
-out:
-        pr_debug("failed to map spe %s: %d\n", spu->name, ret);
-        return ret;
-}
-
-static int __init of_enumerate_spus(int (*fn)(void *data))
-{
-        int ret;
-        struct device_node *node;
-
-        ret = -ENODEV;
-        for (node = of_find_node_by_type(NULL, "spe");
-                        node; node = of_find_node_by_type(node, "spe")) {
-                ret = fn(node);
-                if (ret) {
-                        printk(KERN_WARNING "%s: Error initializing %s\n",
-                                __FUNCTION__, node->name);
-                        break;
-                }
-        }
-        return ret;
-}
-
-static int __init of_create_spu(struct spu *spu, void *data)
-{
-        int ret;
-        struct device_node *spe = (struct device_node *)data;
-
-        spu->pdata = kzalloc(sizeof(struct spu_pdata),
-                GFP_KERNEL);
-        if (!spu->pdata) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        spu_get_pdata(spu)->devnode = of_node_get(spe);
-
-        spu->node = of_node_to_nid(spe);
-        if (spu->node >= MAX_NUMNODES) {
-                printk(KERN_WARNING "SPE %s on node %d ignored,"
-                       " node number too big\n", spe->full_name, spu->node);
-                printk(KERN_WARNING "Check if CONFIG_NUMA is enabled.\n");
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        ret = spu_map_device(spu);
-        /* try old method */
-        if (ret)
-                ret = spu_map_device_old(spu, spe);
-        if (ret)
-                goto out_free;
-
-        ret = spu_map_interrupts(spu, spe);
-        if (ret)
-                ret = spu_map_interrupts_old(spu, spe);
-        if (ret)
-                goto out_unmap;
-
-        pr_debug(KERN_DEBUG "Using SPE %s %p %p %p %p %d\n", spu->name,
-                spu->local_store, spu->problem, spu_get_pdata(spu)->priv1,
-                spu->priv2, spu->number);
-        goto out;
-
-out_unmap:
-        spu_unmap(spu);
-out_free:
-        kfree(spu->pdata);
-        spu->pdata = NULL;
-out:
-        return ret;
-}
-
-static int of_destroy_spu(struct spu *spu)
-{
-        spu_unmap(spu);
-        of_node_put(spu_get_pdata(spu)->devnode);
-        kfree(spu->pdata);
-        spu->pdata = NULL;
-        return 0;
-}
-
-const struct spu_management_ops spu_management_of_ops = {
-        .enumerate_spus = of_enumerate_spus,
-        .create_spu = of_create_spu,
-        .destroy_spu = of_destroy_spu,
-};
-
 static void int_mask_and(struct spu *spu, int class, u64 mask)
 {
         u64 old_mask;
 
-        old_mask = in_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class]);
-        out_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class],
-                old_mask & mask);
+        old_mask = in_be64(&spu->priv1->int_mask_RW[class]);
+        out_be64(&spu->priv1->int_mask_RW[class], old_mask & mask);
 }
 
 static void int_mask_or(struct spu *spu, int class, u64 mask)
 {
         u64 old_mask;
 
-        old_mask = in_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class]);
-        out_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class],
-                old_mask | mask);
+        old_mask = in_be64(&spu->priv1->int_mask_RW[class]);
+        out_be64(&spu->priv1->int_mask_RW[class], old_mask | mask);
 }
 
 static void int_mask_set(struct spu *spu, int class, u64 mask)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class], mask);
+        out_be64(&spu->priv1->int_mask_RW[class], mask);
 }
 
 static u64 int_mask_get(struct spu *spu, int class)
 {
-        return in_be64(&spu_get_pdata(spu)->priv1->int_mask_RW[class]);
+        return in_be64(&spu->priv1->int_mask_RW[class]);
 }
 
 static void int_stat_clear(struct spu *spu, int class, u64 stat)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->int_stat_RW[class], stat);
+        out_be64(&spu->priv1->int_stat_RW[class], stat);
 }
 
 static u64 int_stat_get(struct spu *spu, int class)
 {
-        return in_be64(&spu_get_pdata(spu)->priv1->int_stat_RW[class]);
+        return in_be64(&spu->priv1->int_stat_RW[class]);
 }
 
 static void cpu_affinity_set(struct spu *spu, int cpu)
 {
         u64 target = iic_get_target_id(cpu);
         u64 route = target << 48 | target << 32 | target << 16;
-        out_be64(&spu_get_pdata(spu)->priv1->int_route_RW, route);
+        out_be64(&spu->priv1->int_route_RW, route);
 }
 
 static u64 mfc_dar_get(struct spu *spu)
 {
-        return in_be64(&spu_get_pdata(spu)->priv1->mfc_dar_RW);
+        return in_be64(&spu->priv1->mfc_dar_RW);
 }
 
 static u64 mfc_dsisr_get(struct spu *spu)
 {
-        return in_be64(&spu_get_pdata(spu)->priv1->mfc_dsisr_RW);
+        return in_be64(&spu->priv1->mfc_dsisr_RW);
 }
 
 static void mfc_dsisr_set(struct spu *spu, u64 dsisr)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->mfc_dsisr_RW, dsisr);
+        out_be64(&spu->priv1->mfc_dsisr_RW, dsisr);
 }
 
 static void mfc_sdr_setup(struct spu *spu)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->mfc_sdr_RW, mfspr(SPRN_SDR1));
+        out_be64(&spu->priv1->mfc_sdr_RW, mfspr(SPRN_SDR1));
 }
 
 static void mfc_sr1_set(struct spu *spu, u64 sr1)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->mfc_sr1_RW, sr1);
+        out_be64(&spu->priv1->mfc_sr1_RW, sr1);
 }
 
 static u64 mfc_sr1_get(struct spu *spu)
 {
-        return in_be64(&spu_get_pdata(spu)->priv1->mfc_sr1_RW);
+        return in_be64(&spu->priv1->mfc_sr1_RW);
 }
 
 static void mfc_tclass_id_set(struct spu *spu, u64 tclass_id)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->mfc_tclass_id_RW, tclass_id);
+        out_be64(&spu->priv1->mfc_tclass_id_RW, tclass_id);
 }
 
 static u64 mfc_tclass_id_get(struct spu *spu)
 {
-        return in_be64(&spu_get_pdata(spu)->priv1->mfc_tclass_id_RW);
+        return in_be64(&spu->priv1->mfc_tclass_id_RW);
 }
 
 static void tlb_invalidate(struct spu *spu)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->tlb_invalidate_entry_W, 0ul);
+        out_be64(&spu->priv1->tlb_invalidate_entry_W, 0ul);
 }
 
 static void resource_allocation_groupID_set(struct spu *spu, u64 id)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->resource_allocation_groupID_RW,
-                id);
+        out_be64(&spu->priv1->resource_allocation_groupID_RW, id);
 }
 
 static u64 resource_allocation_groupID_get(struct spu *spu)
 {
-        return in_be64(
-                &spu_get_pdata(spu)->priv1->resource_allocation_groupID_RW);
+        return in_be64(&spu->priv1->resource_allocation_groupID_RW);
 }
 
 static void resource_allocation_enable_set(struct spu *spu, u64 enable)
 {
-        out_be64(&spu_get_pdata(spu)->priv1->resource_allocation_enable_RW,
-                enable);
+        out_be64(&spu->priv1->resource_allocation_enable_RW, enable);
 }
 
 static u64 resource_allocation_enable_get(struct spu *spu)
 {
-        return in_be64(
-                &spu_get_pdata(spu)->priv1->resource_allocation_enable_RW);
+        return in_be64(&spu->priv1->resource_allocation_enable_RW);
 }
 
 const struct spu_priv1_ops spu_priv1_mmio_ops =
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 0870009f56db..04ad2e364e97 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -42,7 +42,7 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
         }
         spin_lock_init(&ctx->mmio_lock);
         kref_init(&ctx->kref);
-        init_rwsem(&ctx->state_sema);
+        mutex_init(&ctx->state_mutex);
         init_MUTEX(&ctx->run_sema);
         init_waitqueue_head(&ctx->ibox_wq);
         init_waitqueue_head(&ctx->wbox_wq);
@@ -53,6 +53,10 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
         ctx->owner = get_task_mm(current);
         if (gang)
                 spu_gang_add_ctx(gang, ctx);
+        ctx->rt_priority = current->rt_priority;
+        ctx->policy = current->policy;
+        ctx->prio = current->prio;
+        INIT_DELAYED_WORK(&ctx->sched_work, spu_sched_tick);
         goto out;
 out_free:
         kfree(ctx);
@@ -65,9 +69,9 @@ void destroy_spu_context(struct kref *kref)
 {
         struct spu_context *ctx;
         ctx = container_of(kref, struct spu_context, kref);
-        down_write(&ctx->state_sema);
+        mutex_lock(&ctx->state_mutex);
         spu_deactivate(ctx);
-        up_write(&ctx->state_sema);
+        mutex_unlock(&ctx->state_mutex);
         spu_fini_csa(&ctx->csa);
         if (ctx->gang)
                 spu_gang_remove_ctx(ctx->gang, ctx);
@@ -96,107 +100,102 @@ void spu_forget(struct spu_context *ctx)
         spu_release(ctx);
 }
 
-void spu_acquire(struct spu_context *ctx)
-{
-        down_read(&ctx->state_sema);
-}
-
-void spu_release(struct spu_context *ctx)
-{
-        up_read(&ctx->state_sema);
-}
-
 void spu_unmap_mappings(struct spu_context *ctx)
 {
         if (ctx->local_store)
                 unmap_mapping_range(ctx->local_store, 0, LS_SIZE, 1);
         if (ctx->mfc)
-                unmap_mapping_range(ctx->mfc, 0, 0x4000, 1);
+                unmap_mapping_range(ctx->mfc, 0, 0x1000, 1);
         if (ctx->cntl)
-                unmap_mapping_range(ctx->cntl, 0, 0x4000, 1);
+                unmap_mapping_range(ctx->cntl, 0, 0x1000, 1);
         if (ctx->signal1)
-                unmap_mapping_range(ctx->signal1, 0, 0x4000, 1);
+                unmap_mapping_range(ctx->signal1, 0, PAGE_SIZE, 1);
         if (ctx->signal2)
-                unmap_mapping_range(ctx->signal2, 0, 0x4000, 1);
+                unmap_mapping_range(ctx->signal2, 0, PAGE_SIZE, 1);
+        if (ctx->mss)
+                unmap_mapping_range(ctx->mss, 0, 0x1000, 1);
+        if (ctx->psmap)
+                unmap_mapping_range(ctx->psmap, 0, 0x20000, 1);
 }
 
+/**
+ * spu_acquire_exclusive - lock spu contex and protect against userspace access
+ * @ctx:        spu contex to lock
+ *
+ * Note:
+ *      Returns 0 and with the context locked on success
+ *      Returns negative error and with the context _unlocked_ on failure.
+ */
 int spu_acquire_exclusive(struct spu_context *ctx)
 {
-        int ret = 0;
+        int ret = -EINVAL;
 
-        down_write(&ctx->state_sema);
-        /* ctx is about to be freed, can't acquire any more */
-        if (!ctx->owner) {
-                ret = -EINVAL;
-                goto out;
-        }
+        spu_acquire(ctx);
+        /*
+         * Context is about to be freed, so we can't acquire it anymore.
+         */
+        if (!ctx->owner)
+                goto out_unlock;
 
         if (ctx->state == SPU_STATE_SAVED) {
                 ret = spu_activate(ctx, 0);
                 if (ret)
-                        goto out;
-                ctx->state = SPU_STATE_RUNNABLE;
+                        goto out_unlock;
         } else {
-                /* We need to exclude userspace access to the context. */
+                /*
+                 * We need to exclude userspace access to the context.
+                 *
+                 * To protect against memory access we invalidate all ptes
+                 * and make sure the pagefault handlers block on the mutex.
+                 */
                 spu_unmap_mappings(ctx);
         }
 
-out:
-        if (ret)
-                up_write(&ctx->state_sema);
+        return 0;
+
+ out_unlock:
+        spu_release(ctx);
         return ret;
 }
 
-int spu_acquire_runnable(struct spu_context *ctx)
+/**
+ * spu_acquire_runnable - lock spu contex and make sure it is in runnable state
+ * @ctx:        spu contex to lock
+ *
+ * Note:
+ *      Returns 0 and with the context locked on success
+ *      Returns negative error and with the context _unlocked_ on failure.
+ */
+int spu_acquire_runnable(struct spu_context *ctx, unsigned long flags)
 {
-        int ret = 0;
-
-        down_read(&ctx->state_sema);
-        if (ctx->state == SPU_STATE_RUNNABLE) {
-                ctx->spu->prio = current->prio;
-                return 0;
-        }
-        up_read(&ctx->state_sema);
-
-        down_write(&ctx->state_sema);
-        /* ctx is about to be freed, can't acquire any more */
-        if (!ctx->owner) {
-                ret = -EINVAL;
-                goto out;
-        }
+        int ret = -EINVAL;
 
+        spu_acquire(ctx);
         if (ctx->state == SPU_STATE_SAVED) {
-                ret = spu_activate(ctx, 0);
+                /*
+                 * Context is about to be freed, so we can't acquire it anymore.
+                 */
+                if (!ctx->owner)
+                        goto out_unlock;
+                ret = spu_activate(ctx, flags);
                 if (ret)
-                        goto out;
-                ctx->state = SPU_STATE_RUNNABLE;
+                        goto out_unlock;
         }
 
-        downgrade_write(&ctx->state_sema);
-        /* On success, we return holding the lock */
-
-        return ret;
-out:
-        /* Release here, to simplify calling code. */
-        up_write(&ctx->state_sema);
+        return 0;
 
+ out_unlock:
+        spu_release(ctx);
         return ret;
 }
 
+/**
+ * spu_acquire_saved - lock spu contex and make sure it is in saved state
+ * @ctx:        spu contex to lock
+ */
 void spu_acquire_saved(struct spu_context *ctx)
 {
-        down_read(&ctx->state_sema);
-
-        if (ctx->state == SPU_STATE_SAVED)
-                return;
-
-        up_read(&ctx->state_sema);
-        down_write(&ctx->state_sema);
-
-        if (ctx->state == SPU_STATE_RUNNABLE) {
+        spu_acquire(ctx);
+        if (ctx->state != SPU_STATE_SAVED)
                 spu_deactivate(ctx);
-                ctx->state = SPU_STATE_SAVED;
-        }
-
-        downgrade_write(&ctx->state_sema);
 }
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 347eff56fcbd..b00653d69c01 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -45,8 +45,8 @@ spufs_mem_open(struct inode *inode, struct file *file)
         struct spufs_inode_info *i = SPUFS_I(inode);
         struct spu_context *ctx = i->i_ctx;
         file->private_data = ctx;
-        file->f_mapping = inode->i_mapping;
         ctx->local_store = inode->i_mapping;
+        smp_wmb();
         return 0;
 }
 
@@ -95,39 +95,38 @@ spufs_mem_write(struct file *file, const char __user *buffer,
         return ret;
 }
 
-static struct page *
-spufs_mem_mmap_nopage(struct vm_area_struct *vma,
-                      unsigned long address, int *type)
+static unsigned long spufs_mem_mmap_nopfn(struct vm_area_struct *vma,
+                                          unsigned long address)
 {
-        struct page *page = NOPAGE_SIGBUS;
-
         struct spu_context *ctx = vma->vm_file->private_data;
-        unsigned long offset = address - vma->vm_start;
+        unsigned long pfn, offset = address - vma->vm_start;
+
         offset += vma->vm_pgoff << PAGE_SHIFT;
 
+        if (offset >= LS_SIZE)
+                return NOPFN_SIGBUS;
+
         spu_acquire(ctx);
 
         if (ctx->state == SPU_STATE_SAVED) {
                 vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                                         & ~_PAGE_NO_CACHE);
-                page = vmalloc_to_page(ctx->csa.lscsa->ls + offset);
+                pfn = vmalloc_to_pfn(ctx->csa.lscsa->ls + offset);
         } else {
                 vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                                        | _PAGE_NO_CACHE);
-                page = pfn_to_page((ctx->spu->local_store_phys + offset)
-                                   >> PAGE_SHIFT);
+                                             | _PAGE_NO_CACHE);
+                pfn = (ctx->spu->local_store_phys + offset) >> PAGE_SHIFT;
         }
-        spu_release(ctx);
+        vm_insert_pfn(vma, address, pfn);
 
-        if (type)
-                *type = VM_FAULT_MINOR;
+        spu_release(ctx);
 
-        page_cache_get(page);
-        return page;
+        return NOPFN_REFAULT;
 }
 
+
 static struct vm_operations_struct spufs_mem_mmap_vmops = {
-        .nopage = spufs_mem_mmap_nopage,
+        .nopfn = spufs_mem_mmap_nopfn,
 };
 
 static int
@@ -136,7 +135,7 @@ spufs_mem_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_IO | VM_PFNMAP;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE);
 
@@ -144,7 +143,7 @@ spufs_mem_mmap(struct file *file, struct vm_area_struct *vma)
         return 0;
 }
 
-static struct file_operations spufs_mem_fops = {
+static const struct file_operations spufs_mem_fops = {
         .open    = spufs_mem_open,
         .read    = spufs_mem_read,
         .write   = spufs_mem_write,
@@ -152,49 +151,42 @@ static struct file_operations spufs_mem_fops = {
         .mmap    = spufs_mem_mmap,
 };
 
-static struct page *spufs_ps_nopage(struct vm_area_struct *vma,
+static unsigned long spufs_ps_nopfn(struct vm_area_struct *vma,
                                     unsigned long address,
-                                    int *type, unsigned long ps_offs,
+                                    unsigned long ps_offs,
                                     unsigned long ps_size)
 {
-        struct page *page = NOPAGE_SIGBUS;
-        int fault_type = VM_FAULT_SIGBUS;
         struct spu_context *ctx = vma->vm_file->private_data;
-        unsigned long offset = address - vma->vm_start;
-        unsigned long area;
+        unsigned long area, offset = address - vma->vm_start;
         int ret;
 
         offset += vma->vm_pgoff << PAGE_SHIFT;
         if (offset >= ps_size)
-                goto out;
+                return NOPFN_SIGBUS;
 
-        ret = spu_acquire_runnable(ctx);
+        /* error here usually means a signal.. we might want to test
+         * the error code more precisely though
+         */
+        ret = spu_acquire_runnable(ctx, 0);
         if (ret)
-                goto out;
+                return NOPFN_REFAULT;
 
         area = ctx->spu->problem_phys + ps_offs;
-        page = pfn_to_page((area + offset) >> PAGE_SHIFT);
-        fault_type = VM_FAULT_MINOR;
-        page_cache_get(page);
-
+        vm_insert_pfn(vma, address, (area + offset) >> PAGE_SHIFT);
         spu_release(ctx);
 
-      out:
-        if (type)
-                *type = fault_type;
-
-        return page;
+        return NOPFN_REFAULT;
 }
 
 #if SPUFS_MMAP_4K
-static struct page *spufs_cntl_mmap_nopage(struct vm_area_struct *vma,
-                                           unsigned long address, int *type)
+static unsigned long spufs_cntl_mmap_nopfn(struct vm_area_struct *vma,
+                                           unsigned long address)
 {
-        return spufs_ps_nopage(vma, address, type, 0x4000, 0x1000);
+        return spufs_ps_nopfn(vma, address, 0x4000, 0x1000);
 }
 
 static struct vm_operations_struct spufs_cntl_mmap_vmops = {
-        .nopage = spufs_cntl_mmap_nopage,
+        .nopfn = spufs_cntl_mmap_nopfn,
 };
 
 /*
@@ -205,7 +197,7 @@ static int spufs_cntl_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_IO | VM_PFNMAP;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -243,13 +235,13 @@ static int spufs_cntl_open(struct inode *inode, struct file *file)
         struct spu_context *ctx = i->i_ctx;
 
         file->private_data = ctx;
-        file->f_mapping = inode->i_mapping;
         ctx->cntl = inode->i_mapping;
+        smp_wmb();
         return simple_attr_open(inode, file, spufs_cntl_get,
                                         spufs_cntl_set, "0x%08lx");
 }
 
-static struct file_operations spufs_cntl_fops = {
+static const struct file_operations spufs_cntl_fops = {
         .open = spufs_cntl_open,
         .release = simple_attr_close,
         .read = simple_attr_read,
@@ -309,7 +301,7 @@ spufs_regs_write(struct file *file, const char __user *buffer,
         return ret;
 }
 
-static struct file_operations spufs_regs_fops = {
+static const struct file_operations spufs_regs_fops = {
         .open    = spufs_regs_open,
         .read    = spufs_regs_read,
         .write   = spufs_regs_write,
@@ -360,7 +352,7 @@ spufs_fpcr_write(struct file *file, const char __user * buffer,
         return ret;
 }
 
-static struct file_operations spufs_fpcr_fops = {
+static const struct file_operations spufs_fpcr_fops = {
         .open = spufs_regs_open,
         .read = spufs_fpcr_read,
         .write = spufs_fpcr_write,
@@ -426,7 +418,7 @@ static ssize_t spufs_mbox_read(struct file *file, char __user *buf,
         return count;
 }
 
-static struct file_operations spufs_mbox_fops = {
+static const struct file_operations spufs_mbox_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_mbox_read,
 };
@@ -452,7 +444,7 @@ static ssize_t spufs_mbox_stat_read(struct file *file, char __user *buf,
         return 4;
 }
 
-static struct file_operations spufs_mbox_stat_fops = {
+static const struct file_operations spufs_mbox_stat_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_mbox_stat_read,
 };
@@ -559,7 +551,7 @@ static unsigned int spufs_ibox_poll(struct file *file, poll_table *wait)
         return mask;
 }
 
-static struct file_operations spufs_ibox_fops = {
+static const struct file_operations spufs_ibox_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_ibox_read,
         .poll   = spufs_ibox_poll,
@@ -585,7 +577,7 @@ static ssize_t spufs_ibox_stat_read(struct file *file, char __user *buf,
         return 4;
 }
 
-static struct file_operations spufs_ibox_stat_fops = {
+static const struct file_operations spufs_ibox_stat_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_ibox_stat_read,
 };
@@ -692,7 +684,7 @@ static unsigned int spufs_wbox_poll(struct file *file, poll_table *wait)
         return mask;
 }
 
-static struct file_operations spufs_wbox_fops = {
+static const struct file_operations spufs_wbox_fops = {
         .open   = spufs_pipe_open,
         .write  = spufs_wbox_write,
         .poll   = spufs_wbox_poll,
@@ -718,7 +710,7 @@ static ssize_t spufs_wbox_stat_read(struct file *file, char __user *buf,
         return 4;
 }
 
-static struct file_operations spufs_wbox_stat_fops = {
+static const struct file_operations spufs_wbox_stat_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_wbox_stat_read,
 };
@@ -728,8 +720,8 @@ static int spufs_signal1_open(struct inode *inode, struct file *file)
         struct spufs_inode_info *i = SPUFS_I(inode);
         struct spu_context *ctx = i->i_ctx;
         file->private_data = ctx;
-        file->f_mapping = inode->i_mapping;
         ctx->signal1 = inode->i_mapping;
+        smp_wmb();
         return nonseekable_open(inode, file);
 }
 
@@ -791,23 +783,23 @@ static ssize_t spufs_signal1_write(struct file *file, const char __user *buf,
         return 4;
 }
 
-static struct page *spufs_signal1_mmap_nopage(struct vm_area_struct *vma,
-                                              unsigned long address, int *type)
+static unsigned long spufs_signal1_mmap_nopfn(struct vm_area_struct *vma,
+                                              unsigned long address)
 {
 #if PAGE_SIZE == 0x1000
-        return spufs_ps_nopage(vma, address, type, 0x14000, 0x1000);
+        return spufs_ps_nopfn(vma, address, 0x14000, 0x1000);
 #elif PAGE_SIZE == 0x10000
         /* For 64k pages, both signal1 and signal2 can be used to mmap the whole
          * signal 1 and 2 area
          */
-        return spufs_ps_nopage(vma, address, type, 0x10000, 0x10000);
+        return spufs_ps_nopfn(vma, address, 0x10000, 0x10000);
 #else
 #error unsupported page size
 #endif
 }
 
 static struct vm_operations_struct spufs_signal1_mmap_vmops = {
-        .nopage = spufs_signal1_mmap_nopage,
+        .nopfn = spufs_signal1_mmap_nopfn,
 };
 
 static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
@@ -815,7 +807,7 @@ static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_IO | VM_PFNMAP;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -823,7 +815,7 @@ static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
         return 0;
 }
 
-static struct file_operations spufs_signal1_fops = {
+static const struct file_operations spufs_signal1_fops = {
         .open = spufs_signal1_open,
         .read = spufs_signal1_read,
         .write = spufs_signal1_write,
@@ -835,8 +827,8 @@ static int spufs_signal2_open(struct inode *inode, struct file *file)
         struct spufs_inode_info *i = SPUFS_I(inode);
         struct spu_context *ctx = i->i_ctx;
         file->private_data = ctx;
-        file->f_mapping = inode->i_mapping;
         ctx->signal2 = inode->i_mapping;
+        smp_wmb();
         return nonseekable_open(inode, file);
 }
 
@@ -899,23 +891,23 @@ static ssize_t spufs_signal2_write(struct file *file, const char __user *buf,
 }
 
 #if SPUFS_MMAP_4K
-static struct page *spufs_signal2_mmap_nopage(struct vm_area_struct *vma,
-                                              unsigned long address, int *type)
+static unsigned long spufs_signal2_mmap_nopfn(struct vm_area_struct *vma,
+                                              unsigned long address)
 {
 #if PAGE_SIZE == 0x1000
-        return spufs_ps_nopage(vma, address, type, 0x1c000, 0x1000);
+        return spufs_ps_nopfn(vma, address, 0x1c000, 0x1000);
 #elif PAGE_SIZE == 0x10000
         /* For 64k pages, both signal1 and signal2 can be used to mmap the whole
          * signal 1 and 2 area
          */
-        return spufs_ps_nopage(vma, address, type, 0x10000, 0x10000);
+        return spufs_ps_nopfn(vma, address, 0x10000, 0x10000);
 #else
 #error unsupported page size
 #endif
 }
 
 static struct vm_operations_struct spufs_signal2_mmap_vmops = {
-        .nopage = spufs_signal2_mmap_nopage,
+        .nopfn = spufs_signal2_mmap_nopfn,
 };
 
 static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
@@ -923,7 +915,7 @@ static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_IO | VM_PFNMAP;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -934,7 +926,7 @@ static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
 #define spufs_signal2_mmap NULL
 #endif /* !SPUFS_MMAP_4K */
 
-static struct file_operations spufs_signal2_fops = {
+static const struct file_operations spufs_signal2_fops = {
         .open = spufs_signal2_open,
         .read = spufs_signal2_read,
         .write = spufs_signal2_write,
@@ -1000,14 +992,14 @@ DEFINE_SIMPLE_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
                                         spufs_signal2_type_set, "%llu");
 
 #if SPUFS_MMAP_4K
-static struct page *spufs_mss_mmap_nopage(struct vm_area_struct *vma,
-                                           unsigned long address, int *type)
+static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
+                                          unsigned long address)
 {
-        return spufs_ps_nopage(vma, address, type, 0x0000, 0x1000);
+        return spufs_ps_nopfn(vma, address, 0x0000, 0x1000);
 }
 
 static struct vm_operations_struct spufs_mss_mmap_vmops = {
-        .nopage = spufs_mss_mmap_nopage,
+        .nopfn = spufs_mss_mmap_nopfn,
 };
 
 /*
@@ -1018,7 +1010,7 @@ static int spufs_mss_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_IO | VM_PFNMAP;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -1032,24 +1024,27 @@ static int spufs_mss_mmap(struct file *file, struct vm_area_struct *vma)
 static int spufs_mss_open(struct inode *inode, struct file *file)
 {
         struct spufs_inode_info *i = SPUFS_I(inode);
+        struct spu_context *ctx = i->i_ctx;
 
         file->private_data = i->i_ctx;
+        ctx->mss = inode->i_mapping;
+        smp_wmb();
         return nonseekable_open(inode, file);
 }
 
-static struct file_operations spufs_mss_fops = {
+static const struct file_operations spufs_mss_fops = {
         .open    = spufs_mss_open,
         .mmap    = spufs_mss_mmap,
 };
 
-static struct page *spufs_psmap_mmap_nopage(struct vm_area_struct *vma,
-                                           unsigned long address, int *type)
+static unsigned long spufs_psmap_mmap_nopfn(struct vm_area_struct *vma,
+                                            unsigned long address)
 {
-        return spufs_ps_nopage(vma, address, type, 0x0000, 0x20000);
+        return spufs_ps_nopfn(vma, address, 0x0000, 0x20000);
 }
 
 static struct vm_operations_struct spufs_psmap_mmap_vmops = {
-        .nopage = spufs_psmap_mmap_nopage,
+        .nopfn = spufs_psmap_mmap_nopfn,
 };
 
 /*
@@ -1060,7 +1055,7 @@ static int spufs_psmap_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_IO | VM_PFNMAP;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -1071,26 +1066,29 @@ static int spufs_psmap_mmap(struct file *file, struct vm_area_struct *vma)
 static int spufs_psmap_open(struct inode *inode, struct file *file)
 {
         struct spufs_inode_info *i = SPUFS_I(inode);
+        struct spu_context *ctx = i->i_ctx;
 
         file->private_data = i->i_ctx;
+        ctx->psmap = inode->i_mapping;
+        smp_wmb();
         return nonseekable_open(inode, file);
 }
 
-static struct file_operations spufs_psmap_fops = {
+static const struct file_operations spufs_psmap_fops = {
         .open    = spufs_psmap_open,
         .mmap    = spufs_psmap_mmap,
 };
 
 
 #if SPUFS_MMAP_4K
-static struct page *spufs_mfc_mmap_nopage(struct vm_area_struct *vma,
-                                           unsigned long address, int *type)
+static unsigned long spufs_mfc_mmap_nopfn(struct vm_area_struct *vma,
+                                          unsigned long address)
 {
-        return spufs_ps_nopage(vma, address, type, 0x3000, 0x1000);
+        return spufs_ps_nopfn(vma, address, 0x3000, 0x1000);
 }
 
 static struct vm_operations_struct spufs_mfc_mmap_vmops = {
-        .nopage = spufs_mfc_mmap_nopage,
+        .nopfn = spufs_mfc_mmap_nopfn,
 };
 
 /*
@@ -1101,7 +1099,7 @@ static int spufs_mfc_mmap(struct file *file, struct vm_area_struct *vma)
         if (!(vma->vm_flags & VM_SHARED))
                 return -EINVAL;
 
-        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_IO | VM_PFNMAP;
         vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
                                      | _PAGE_NO_CACHE | _PAGE_GUARDED);
 
@@ -1125,6 +1123,8 @@ static int spufs_mfc_open(struct inode *inode, struct file *file)
                 return -EBUSY;
 
         file->private_data = ctx;
+        ctx->mfc = inode->i_mapping;
+        smp_wmb();
         return nonseekable_open(inode, file);
 }
 
@@ -1309,7 +1309,7 @@ static ssize_t spufs_mfc_write(struct file *file, const char __user *buffer,
         if (ret)
                 goto out;
 
-        spu_acquire_runnable(ctx);
+        spu_acquire_runnable(ctx, 0);
         if (file->f_flags & O_NONBLOCK) {
                 ret = ctx->ops->send_mfc_command(ctx, &cmd);
         } else {
@@ -1393,7 +1393,7 @@ static int spufs_mfc_fasync(int fd, struct file *file, int on)
         return fasync_helper(fd, file, on, &ctx->mfc_fasync);
 }
 
-static struct file_operations spufs_mfc_fops = {
+static const struct file_operations spufs_mfc_fops = {
         .open    = spufs_mfc_open,
         .read    = spufs_mfc_read,
         .write   = spufs_mfc_write,
@@ -1650,7 +1650,7 @@ static ssize_t spufs_mbox_info_read(struct file *file, char __user *buf,
         return ret;
 }
 
-static struct file_operations spufs_mbox_info_fops = {
+static const struct file_operations spufs_mbox_info_fops = {
         .open = spufs_info_open,
         .read = spufs_mbox_info_read,
         .llseek  = generic_file_llseek,
@@ -1688,7 +1688,7 @@ static ssize_t spufs_ibox_info_read(struct file *file, char __user *buf,
         return ret;
 }
 
-static struct file_operations spufs_ibox_info_fops = {
+static const struct file_operations spufs_ibox_info_fops = {
         .open = spufs_info_open,
         .read = spufs_ibox_info_read,
         .llseek  = generic_file_llseek,
@@ -1729,7 +1729,7 @@ static ssize_t spufs_wbox_info_read(struct file *file, char __user *buf,
         return ret;
 }
 
-static struct file_operations spufs_wbox_info_fops = {
+static const struct file_operations spufs_wbox_info_fops = {
         .open = spufs_info_open,
         .read = spufs_wbox_info_read,
         .llseek  = generic_file_llseek,
@@ -1779,7 +1779,7 @@ static ssize_t spufs_dma_info_read(struct file *file, char __user *buf,
         return ret;
 }
 
-static struct file_operations spufs_dma_info_fops = {
+static const struct file_operations spufs_dma_info_fops = {
         .open = spufs_info_open,
         .read = spufs_dma_info_read,
 };
@@ -1830,7 +1830,7 @@ static ssize_t spufs_proxydma_info_read(struct file *file, char __user *buf,
         return ret;
 }
 
-static struct file_operations spufs_proxydma_info_fops = {
+static const struct file_operations spufs_proxydma_info_fops = {
         .open = spufs_info_open,
         .read = spufs_proxydma_info_read,
 };
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 738b9244382f..8079983ef94f 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -220,11 +220,11 @@ static int spufs_dir_close(struct inode *inode, struct file *file)
         return dcache_dir_close(inode, file);
 }
 
-struct inode_operations spufs_dir_inode_operations = {
+const struct inode_operations spufs_dir_inode_operations = {
         .lookup = simple_lookup,
 };
 
-struct file_operations spufs_context_fops = {
+const struct file_operations spufs_context_fops = {
         .open           = dcache_dir_open,
         .release        = spufs_dir_close,
         .llseek         = dcache_dir_lseek,
@@ -372,7 +372,7 @@ static int spufs_gang_close(struct inode *inode, struct file *file)
         return dcache_dir_close(inode, file);
 }
 
-struct file_operations spufs_gang_fops = {
+const struct file_operations spufs_gang_fops = {
         .open           = dcache_dir_open,
         .release        = spufs_gang_close,
         .llseek         = dcache_dir_lseek,
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index 1acc2ffef8c8..353a8fa07ab8 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -133,7 +133,7 @@ out_drop_priv:
         spu_mfc_sr1_set(ctx->spu, sr1);
 
 out_unlock:
-        spu_release_exclusive(ctx);
+        spu_release(ctx);
 out:
         return ret;
 }
@@ -143,7 +143,7 @@ static inline int spu_run_init(struct spu_context *ctx, u32 * npc)
         int ret;
         unsigned long runcntl = SPU_RUNCNTL_RUNNABLE;
 
-        ret = spu_acquire_runnable(ctx);
+        ret = spu_acquire_runnable(ctx, SPU_ACTIVATE_NOWAKE);
         if (ret)
                 return ret;
 
@@ -155,7 +155,7 @@ static inline int spu_run_init(struct spu_context *ctx, u32 * npc)
                         spu_release(ctx);
                         ret = spu_setup_isolated(ctx);
                         if (!ret)
-                                ret = spu_acquire_runnable(ctx);
+                                ret = spu_acquire_runnable(ctx, SPU_ACTIVATE_NOWAKE);
                 }
 
                 /* if userspace has set the runcntrl register (eg, to issue an
@@ -164,8 +164,10 @@ static inline int spu_run_init(struct spu_context *ctx, u32 * npc)
                         (SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE);
                 if (runcntl == 0)
                         runcntl = SPU_RUNCNTL_RUNNABLE;
-        } else
+        } else {
+                spu_start_tick(ctx);
                 ctx->ops->npc_write(ctx, *npc);
+        }
 
         ctx->ops->runcntl_write(ctx, runcntl);
         return ret;
@@ -176,6 +178,7 @@ static inline int spu_run_fini(struct spu_context *ctx, u32 * npc,
 {
         int ret = 0;
 
+        spu_stop_tick(ctx);
         *status = ctx->ops->status_read(ctx);
         *npc = ctx->ops->npc_read(ctx);
         spu_release(ctx);
@@ -329,8 +332,10 @@ long spufs_run_spu(struct file *file, struct spu_context *ctx,
                 }
                 if (unlikely(ctx->state != SPU_STATE_RUNNABLE)) {
                         ret = spu_reacquire_runnable(ctx, npc, &status);
-                        if (ret)
+                        if (ret) {
+                                spu_stop_tick(ctx);
                                 goto out2;
+                        }
                         continue;
                 }
                 ret = spu_process_events(ctx);
@@ -361,4 +366,3 @@ out:
         up(&ctx->run_sema);
         return ret;
 }
-
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index bd6fe4b7a84b..2f25e68b4bac 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -44,17 +44,18 @@
 #include <asm/spu_priv1.h>
 #include "spufs.h"
 
-#define SPU_MIN_TIMESLICE       (100 * HZ / 1000)
+#define SPU_TIMESLICE   (HZ)
 
-#define SPU_BITMAP_SIZE (((MAX_PRIO+BITS_PER_LONG)/BITS_PER_LONG)+1)
 struct spu_prio_array {
-        unsigned long bitmap[SPU_BITMAP_SIZE];
-        wait_queue_head_t waitq[MAX_PRIO];
+        DECLARE_BITMAP(bitmap, MAX_PRIO);
+        struct list_head runq[MAX_PRIO];
+        spinlock_t runq_lock;
         struct list_head active_list[MAX_NUMNODES];
         struct mutex active_mutex[MAX_NUMNODES];
 };
 
 static struct spu_prio_array *spu_prio;
+static struct workqueue_struct *spu_sched_wq;
 
 static inline int node_allowed(int node)
 {
@@ -68,6 +69,64 @@ static inline int node_allowed(int node)
         return 1;
 }
 
+void spu_start_tick(struct spu_context *ctx)
+{
+        if (ctx->policy == SCHED_RR)
+                queue_delayed_work(spu_sched_wq, &ctx->sched_work, SPU_TIMESLICE);
+}
+
+void spu_stop_tick(struct spu_context *ctx)
+{
+        if (ctx->policy == SCHED_RR)
+                cancel_delayed_work(&ctx->sched_work);
+}
+
+void spu_sched_tick(struct work_struct *work)
+{
+        struct spu_context *ctx =
+                container_of(work, struct spu_context, sched_work.work);
+        struct spu *spu;
+        int rearm = 1;
+
+        mutex_lock(&ctx->state_mutex);
+        spu = ctx->spu;
+        if (spu) {
+                int best = sched_find_first_bit(spu_prio->bitmap);
+                if (best <= ctx->prio) {
+                        spu_deactivate(ctx);
+                        rearm = 0;
+                }
+        }
+        mutex_unlock(&ctx->state_mutex);
+
+        if (rearm)
+                spu_start_tick(ctx);
+}
+
+/**
+ * spu_add_to_active_list - add spu to active list
+ * @spu:        spu to add to the active list
+ */
+static void spu_add_to_active_list(struct spu *spu)
+{
+        mutex_lock(&spu_prio->active_mutex[spu->node]);
+        list_add_tail(&spu->list, &spu_prio->active_list[spu->node]);
+        mutex_unlock(&spu_prio->active_mutex[spu->node]);
+}
+
+/**
+ * spu_remove_from_active_list - remove spu from active list
+ * @spu:       spu to remove from the active list
+ */
+static void spu_remove_from_active_list(struct spu *spu)
+{
+        int node = spu->node;
+
+        mutex_lock(&spu_prio->active_mutex[node]);
+        list_del_init(&spu->list);
+        mutex_unlock(&spu_prio->active_mutex[node]);
+}
+
 static inline void mm_needs_global_tlbie(struct mm_struct *mm)
 {
         int nr = (NR_CPUS > 1) ? NR_CPUS : NR_CPUS + 1;
@@ -94,8 +153,12 @@ int spu_switch_event_unregister(struct notifier_block * n)
         return blocking_notifier_chain_unregister(&spu_switch_notifier, n);
 }
 
-
-static inline void bind_context(struct spu *spu, struct spu_context *ctx)
+/**
+ * spu_bind_context - bind spu context to physical spu
+ * @spu:        physical spu to bind to
+ * @ctx:        context to bind
+ */
+static void spu_bind_context(struct spu *spu, struct spu_context *ctx)
 {
         pr_debug("%s: pid=%d SPU=%d NODE=%d\n", __FUNCTION__, current->pid,
                  spu->number, spu->node);
@@ -104,7 +167,6 @@ static inline void bind_context(struct spu *spu, struct spu_context *ctx)
         ctx->spu = spu;
         ctx->ops = &spu_hw_ops;
         spu->pid = current->pid;
-        spu->prio = current->prio;
         spu->mm = ctx->owner;
         mm_needs_global_tlbie(spu->mm);
         spu->ibox_callback = spufs_ibox_callback;
@@ -118,12 +180,21 @@ static inline void bind_context(struct spu *spu, struct spu_context *ctx)
         spu->timestamp = jiffies;
         spu_cpu_affinity_set(spu, raw_smp_processor_id());
         spu_switch_notify(spu, ctx);
+        spu_add_to_active_list(spu);
+        ctx->state = SPU_STATE_RUNNABLE;
 }
 
-static inline void unbind_context(struct spu *spu, struct spu_context *ctx)
+/**
+ * spu_unbind_context - unbind spu context from physical spu
+ * @spu:        physical spu to unbind from
+ * @ctx:        context to unbind
+ */
+static void spu_unbind_context(struct spu *spu, struct spu_context *ctx)
 {
         pr_debug("%s: unbind pid=%d SPU=%d NODE=%d\n", __FUNCTION__,
                  spu->pid, spu->number, spu->node);
+
+        spu_remove_from_active_list(spu);
         spu_switch_notify(spu, NULL);
         spu_unmap_mappings(ctx);
         spu_save(&ctx->csa, spu);
@@ -136,95 +207,98 @@ static inline void unbind_context(struct spu *spu, struct spu_context *ctx)
         spu->dma_callback = NULL;
         spu->mm = NULL;
         spu->pid = 0;
-        spu->prio = MAX_PRIO;
         ctx->ops = &spu_backing_ops;
         ctx->spu = NULL;
         spu->flags = 0;
         spu->ctx = NULL;
 }
 
-static inline void spu_add_wq(wait_queue_head_t * wq, wait_queue_t * wait,
-                              int prio)
+/**
+ * spu_add_to_rq - add a context to the runqueue
+ * @ctx:       context to add
+ */
+static void spu_add_to_rq(struct spu_context *ctx)
 {
-        prepare_to_wait_exclusive(wq, wait, TASK_INTERRUPTIBLE);
-        set_bit(prio, spu_prio->bitmap);
+        spin_lock(&spu_prio->runq_lock);
+        list_add_tail(&ctx->rq, &spu_prio->runq[ctx->prio]);
+        set_bit(ctx->prio, spu_prio->bitmap);
+        spin_unlock(&spu_prio->runq_lock);
 }
 
-static inline void spu_del_wq(wait_queue_head_t * wq, wait_queue_t * wait,
-                              int prio)
+/**
+ * spu_del_from_rq - remove a context from the runqueue
+ * @ctx:       context to remove
+ */
+static void spu_del_from_rq(struct spu_context *ctx)
 {
-        u64 flags;
-
-        __set_current_state(TASK_RUNNING);
-
-        spin_lock_irqsave(&wq->lock, flags);
+        spin_lock(&spu_prio->runq_lock);
+        list_del_init(&ctx->rq);
+        if (list_empty(&spu_prio->runq[ctx->prio]))
+                clear_bit(ctx->prio, spu_prio->bitmap);
+        spin_unlock(&spu_prio->runq_lock);
+}
 
-        remove_wait_queue_locked(wq, wait);
-        if (list_empty(&wq->task_list))
-                clear_bit(prio, spu_prio->bitmap);
+/**
+ * spu_grab_context - remove one context from the runqueue
+ * @prio:      priority of the context to be removed
+ *
+ * This function removes one context from the runqueue for priority @prio.
+ * If there is more than one context with the given priority the first
+ * task on the runqueue will be taken.
+ *
+ * Returns the spu_context it just removed.
+ *
+ * Must be called with spu_prio->runq_lock held.
+ */
+static struct spu_context *spu_grab_context(int prio)
+{
+        struct list_head *rq = &spu_prio->runq[prio];
 
-        spin_unlock_irqrestore(&wq->lock, flags);
+        if (list_empty(rq))
+                return NULL;
+        return list_entry(rq->next, struct spu_context, rq);
 }
 
-static void spu_prio_wait(struct spu_context *ctx, u64 flags)
+static void spu_prio_wait(struct spu_context *ctx)
 {
-        int prio = current->prio;
-        wait_queue_head_t *wq = &spu_prio->waitq[prio];
         DEFINE_WAIT(wait);
 
-        if (ctx->spu)
-                return;
-
-        spu_add_wq(wq, &wait, prio);
-
+        set_bit(SPU_SCHED_WAKE, &ctx->sched_flags);
+        prepare_to_wait_exclusive(&ctx->stop_wq, &wait, TASK_INTERRUPTIBLE);
         if (!signal_pending(current)) {
-                up_write(&ctx->state_sema);
-                pr_debug("%s: pid=%d prio=%d\n", __FUNCTION__,
-                         current->pid, current->prio);
+                mutex_unlock(&ctx->state_mutex);
                 schedule();
-                down_write(&ctx->state_sema);
+                mutex_lock(&ctx->state_mutex);
         }
-
-        spu_del_wq(wq, &wait, prio);
+        __set_current_state(TASK_RUNNING);
+        remove_wait_queue(&ctx->stop_wq, &wait);
+        clear_bit(SPU_SCHED_WAKE, &ctx->sched_flags);
 }
 
-static void spu_prio_wakeup(void)
+/**
+ * spu_reschedule - try to find a runnable context for a spu
+ * @spu:       spu available
+ *
+ * This function is called whenever a spu becomes idle.  It looks for the
+ * most suitable runnable spu context and schedules it for execution.
+ */
+static void spu_reschedule(struct spu *spu)
 {
-        int best = sched_find_first_bit(spu_prio->bitmap);
-        if (best < MAX_PRIO) {
-                wait_queue_head_t *wq = &spu_prio->waitq[best];
-                wake_up_interruptible_nr(wq, 1);
-        }
-}
+        int best;
 
-static int get_active_spu(struct spu *spu)
-{
-        int node = spu->node;
-        struct spu *tmp;
-        int rc = 0;
+        spu_free(spu);
 
-        mutex_lock(&spu_prio->active_mutex[node]);
-        list_for_each_entry(tmp, &spu_prio->active_list[node], list) {
-                if (tmp == spu) {
-                        list_del_init(&spu->list);
-                        rc = 1;
-                        break;
-                }
+        spin_lock(&spu_prio->runq_lock);
+        best = sched_find_first_bit(spu_prio->bitmap);
+        if (best < MAX_PRIO) {
+                struct spu_context *ctx = spu_grab_context(best);
+                if (ctx && test_bit(SPU_SCHED_WAKE, &ctx->sched_flags))
+                        wake_up(&ctx->stop_wq);
         }
-        mutex_unlock(&spu_prio->active_mutex[node]);
-        return rc;
-}
-
-static void put_active_spu(struct spu *spu)
-{
-        int node = spu->node;
-
-        mutex_lock(&spu_prio->active_mutex[node]);
-        list_add_tail(&spu->list, &spu_prio->active_list[node]);
-        mutex_unlock(&spu_prio->active_mutex[node]);
+        spin_unlock(&spu_prio->runq_lock);
 }
 
-static struct spu *spu_get_idle(struct spu_context *ctx, u64 flags)
+static struct spu *spu_get_idle(struct spu_context *ctx)
 {
         struct spu *spu = NULL;
         int node = cpu_to_node(raw_smp_processor_id());
@@ -241,87 +315,154 @@ static struct spu *spu_get_idle(struct spu_context *ctx, u64 flags)
         return spu;
 }
 
-static inline struct spu *spu_get(struct spu_context *ctx, u64 flags)
+/**
+ * find_victim - find a lower priority context to preempt
+ * @ctx:        canidate context for running
+ *
+ * Returns the freed physical spu to run the new context on.
+ */
+static struct spu *find_victim(struct spu_context *ctx)
 {
-        /* Future: spu_get_idle() if possible,
-         * otherwise try to preempt an active
-         * context.
+        struct spu_context *victim = NULL;
+        struct spu *spu;
+        int node, n;
+
+        /*
+         * Look for a possible preemption candidate on the local node first.
+         * If there is no candidate look at the other nodes.  This isn't
+         * exactly fair, but so far the whole spu schedule tries to keep
+         * a strong node affinity.  We might want to fine-tune this in
+         * the future.
          */
-        return spu_get_idle(ctx, flags);
+ restart:
+        node = cpu_to_node(raw_smp_processor_id());
+        for (n = 0; n < MAX_NUMNODES; n++, node++) {
+                node = (node < MAX_NUMNODES) ? node : 0;
+                if (!node_allowed(node))
+                        continue;
+
+                mutex_lock(&spu_prio->active_mutex[node]);
+                list_for_each_entry(spu, &spu_prio->active_list[node], list) {
+                        struct spu_context *tmp = spu->ctx;
+
+                        if (tmp->rt_priority < ctx->rt_priority &&
+                            (!victim || tmp->rt_priority < victim->rt_priority))
+                                victim = spu->ctx;
+                }
+                mutex_unlock(&spu_prio->active_mutex[node]);
+
+                if (victim) {
+                        /*
+                         * This nests ctx->state_mutex, but we always lock
+                         * higher priority contexts before lower priority
+                         * ones, so this is safe until we introduce
+                         * priority inheritance schemes.
+                         */
+                        if (!mutex_trylock(&victim->state_mutex)) {
+                                victim = NULL;
+                                goto restart;
+                        }
+
+                        spu = victim->spu;
+                        if (!spu) {
+                                /*
+                                 * This race can happen because we've dropped
+                                 * the active list mutex.  No a problem, just
+                                 * restart the search.
+                                 */
+                                mutex_unlock(&victim->state_mutex);
+                                victim = NULL;
+                                goto restart;
+                        }
+                        spu_unbind_context(spu, victim);
+                        mutex_unlock(&victim->state_mutex);
+                        return spu;
+                }
+        }
+
+        return NULL;
 }
 
-/* The three externally callable interfaces
- * for the scheduler begin here.
+/**
+ * spu_activate - find a free spu for a context and execute it
+ * @ctx:        spu context to schedule
+ * @flags:      flags (currently ignored)
  *
- *      spu_activate    - bind a context to SPU, waiting as needed.
- *      spu_deactivate  - unbind a context from its SPU.
- *      spu_yield       - yield an SPU if others are waiting.
+ * Tries to find a free spu to run @ctx.  If no free spu is availble
+ * add the context to the runqueue so it gets woken up once an spu
+ * is available.
  */
-
-int spu_activate(struct spu_context *ctx, u64 flags)
+int spu_activate(struct spu_context *ctx, unsigned long flags)
 {
-        struct spu *spu;
-        int ret = 0;
 
-        for (;;) {
-                if (ctx->spu)
+        if (ctx->spu)
+                return 0;
+
+        do {
+                struct spu *spu;
+
+                spu = spu_get_idle(ctx);
+                /*
+                 * If this is a realtime thread we try to get it running by
+                 * preempting a lower priority thread.
+                 */
+                if (!spu && ctx->rt_priority)
+                        spu = find_victim(ctx);
+                if (spu) {
+                        spu_bind_context(spu, ctx);
                         return 0;
-                spu = spu_get(ctx, flags);
-                if (spu != NULL) {
-                        if (ctx->spu != NULL) {
-                                spu_free(spu);
-                                spu_prio_wakeup();
-                                break;
-                        }
-                        bind_context(spu, ctx);
-                        put_active_spu(spu);
-                        break;
                 }
-                spu_prio_wait(ctx, flags);
-                if (signal_pending(current)) {
-                        ret = -ERESTARTSYS;
-                        spu_prio_wakeup();
-                        break;
-                }
-        }
-        return ret;
+
+                spu_add_to_rq(ctx);
+                if (!(flags & SPU_ACTIVATE_NOWAKE))
+                        spu_prio_wait(ctx);
+                spu_del_from_rq(ctx);
+        } while (!signal_pending(current));
+
+        return -ERESTARTSYS;
 }
 
+/**
+ * spu_deactivate - unbind a context from it's physical spu
+ * @ctx:        spu context to unbind
+ *
+ * Unbind @ctx from the physical spu it is running on and schedule
+ * the highest priority context to run on the freed physical spu.
+ */
 void spu_deactivate(struct spu_context *ctx)
 {
-        struct spu *spu;
-        int needs_idle;
+        struct spu *spu = ctx->spu;
 
-        spu = ctx->spu;
-        if (!spu)
-                return;
-        needs_idle = get_active_spu(spu);
-        unbind_context(spu, ctx);
-        if (needs_idle) {
-                spu_free(spu);
-                spu_prio_wakeup();
+        if (spu) {
+                spu_unbind_context(spu, ctx);
+                spu_reschedule(spu);
         }
 }
 
+/**
+ * spu_yield -  yield a physical spu if others are waiting
+ * @ctx:        spu context to yield
+ *
+ * Check if there is a higher priority context waiting and if yes
+ * unbind @ctx from the physical spu and schedule the highest
+ * priority context to run on the freed physical spu instead.
+ */
 void spu_yield(struct spu_context *ctx)
 {
         struct spu *spu;
         int need_yield = 0;
 
-        if (down_write_trylock(&ctx->state_sema)) {
+        if (mutex_trylock(&ctx->state_mutex)) {
                 if ((spu = ctx->spu) != NULL) {
                         int best = sched_find_first_bit(spu_prio->bitmap);
                         if (best < MAX_PRIO) {
                                 pr_debug("%s: yielding SPU %d NODE %d\n",
                                          __FUNCTION__, spu->number, spu->node);
                                 spu_deactivate(ctx);
-                                ctx->state = SPU_STATE_SAVED;
                                 need_yield = 1;
-                        } else {
-                                spu->prio = MAX_PRIO;
                         }
                 }
-                up_write(&ctx->state_sema);
+                mutex_unlock(&ctx->state_mutex);
         }
         if (unlikely(need_yield))
                 yield();
@@ -331,14 +472,19 @@ int __init spu_sched_init(void)
 {
         int i;
 
+        spu_sched_wq = create_singlethread_workqueue("spusched");
+        if (!spu_sched_wq)
+                return 1;
+
         spu_prio = kzalloc(sizeof(struct spu_prio_array), GFP_KERNEL);
         if (!spu_prio) {
                 printk(KERN_WARNING "%s: Unable to allocate priority queue.\n",
                        __FUNCTION__);
+                       destroy_workqueue(spu_sched_wq);
                 return 1;
         }
         for (i = 0; i < MAX_PRIO; i++) {
-                init_waitqueue_head(&spu_prio->waitq[i]);
+                INIT_LIST_HEAD(&spu_prio->runq[i]);
                 __clear_bit(i, spu_prio->bitmap);
         }
         __set_bit(MAX_PRIO, spu_prio->bitmap);
@@ -346,6 +492,7 @@ int __init spu_sched_init(void)
                 mutex_init(&spu_prio->active_mutex[i]);
                 INIT_LIST_HEAD(&spu_prio->active_list[i]);
         }
+        spin_lock_init(&spu_prio->runq_lock);
         return 0;
 }
 
@@ -364,4 +511,5 @@ void __exit spu_sched_exit(void)
                 mutex_unlock(&spu_prio->active_mutex[node]);
         }
         kfree(spu_prio);
+        destroy_workqueue(spu_sched_wq);
 }
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 70fb13395c04..0c437891dfd5 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -23,7 +23,7 @@
 #define SPUFS_H
 
 #include <linux/kref.h>
-#include <linux/rwsem.h>
+#include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/fs.h>
 
@@ -37,11 +37,13 @@ enum {
 };
 
 struct spu_context_ops;
-
-#define SPU_CONTEXT_PREEMPT          0UL
-
 struct spu_gang;
 
+/* ctx->sched_flags */
+enum {
+        SPU_SCHED_WAKE = 0,
+};
+
 struct spu_context {
         struct spu *spu;                  /* pointer to a physical SPU */
         struct spu_state csa;             /* SPU context save area. */
@@ -51,10 +53,12 @@ struct spu_context {
         struct address_space *cntl;        /* 'control' area mappings. */
         struct address_space *signal1;     /* 'signal1' area mappings. */
         struct address_space *signal2;     /* 'signal2' area mappings. */
+        struct address_space *mss;         /* 'mss' area mappings. */
+        struct address_space *psmap;       /* 'psmap' area mappings. */
         u64 object_id;             /* user space pointer for oprofile */
 
         enum { SPU_STATE_RUNNABLE, SPU_STATE_SAVED } state;
-        struct rw_semaphore state_sema;
+        struct mutex state_mutex;
         struct semaphore run_sema;
 
         struct mm_struct *owner;
@@ -75,6 +79,14 @@ struct spu_context {
 
         struct list_head gang_list;
         struct spu_gang *gang;
+
+        /* scheduler fields */
+        struct list_head rq;
+        struct delayed_work sched_work;
+        unsigned long sched_flags;
+        unsigned long rt_priority;
+        int policy;
+        int prio;
 };
 
 struct spu_gang {
@@ -149,7 +161,7 @@ long spufs_run_spu(struct file *file,
                    struct spu_context *ctx, u32 *npc, u32 *status);
 long spufs_create(struct nameidata *nd,
                          unsigned int flags, mode_t mode);
-extern struct file_operations spufs_context_fops;
+extern const struct file_operations spufs_context_fops;
 
 /* gang management */
 struct spu_gang *alloc_spu_gang(void);
@@ -159,6 +171,16 @@ void spu_gang_remove_ctx(struct spu_gang *gang, struct spu_context *ctx);
 void spu_gang_add_ctx(struct spu_gang *gang, struct spu_context *ctx);
 
 /* context management */
+static inline void spu_acquire(struct spu_context *ctx)
+{
+        mutex_lock(&ctx->state_mutex);
+}
+
+static inline void spu_release(struct spu_context *ctx)
+{
+        mutex_unlock(&ctx->state_mutex);
+}
+
 struct spu_context * alloc_spu_context(struct spu_gang *gang);
 void destroy_spu_context(struct kref *kref);
 struct spu_context * get_spu_context(struct spu_context *ctx);
@@ -166,20 +188,18 @@ int put_spu_context(struct spu_context *ctx);
 void spu_unmap_mappings(struct spu_context *ctx);
 
 void spu_forget(struct spu_context *ctx);
-void spu_acquire(struct spu_context *ctx);
-void spu_release(struct spu_context *ctx);
-int spu_acquire_runnable(struct spu_context *ctx);
+int spu_acquire_runnable(struct spu_context *ctx, unsigned long flags);
 void spu_acquire_saved(struct spu_context *ctx);
 int spu_acquire_exclusive(struct spu_context *ctx);
-
-static inline void spu_release_exclusive(struct spu_context *ctx)
-{
-        up_write(&ctx->state_sema);
-}
-
-int spu_activate(struct spu_context *ctx, u64 flags);
+enum {
+        SPU_ACTIVATE_NOWAKE = 1,
+};
+int spu_activate(struct spu_context *ctx, unsigned long flags);
 void spu_deactivate(struct spu_context *ctx);
 void spu_yield(struct spu_context *ctx);
+void spu_start_tick(struct spu_context *ctx);
+void spu_stop_tick(struct spu_context *ctx);
+void spu_sched_tick(struct work_struct *work);
 int __init spu_sched_init(void);
 void __exit spu_sched_exit(void);
 
diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
new file mode 100644
index 000000000000..f4f82520dc4f
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/Makefile
@@ -0,0 +1,8 @@
+obj-y                           += interrupt.o iommu.o setup.o \
+                                   htab.o beat.o pci.o \
+                                   scc_epci.o scc_uhc.o hvCall.o
+
+obj-$(CONFIG_SMP)               += smp.o
+obj-$(CONFIG_PPC_UDBG_BEAT)     += udbg_beat.o
+obj-$(CONFIG_HAS_TXX9_SERIAL)   += scc_sio.o
+obj-$(CONFIG_SPU_BASE)          += spu_priv1.o
diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/celleb/beat.c
new file mode 100644
index 000000000000..99341ce8a697
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/beat.c
@@ -0,0 +1,163 @@
+/*
+ * Simple routines for Celleb/Beat
+ *
+ * (C) Copyright 2006-2007 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/rtc.h>
+
+#include <asm/hvconsole.h>
+#include <asm/time.h>
+
+#include "beat_wrapper.h"
+#include "beat.h"
+
+void beat_restart(char *cmd)
+{
+        beat_shutdown_logical_partition(1);
+}
+
+void beat_power_off(void)
+{
+        beat_shutdown_logical_partition(0);
+}
+
+u64 beat_halt_code = 0x1000000000000000UL;
+
+void beat_halt(void)
+{
+        beat_shutdown_logical_partition(beat_halt_code);
+}
+
+int beat_set_rtc_time(struct rtc_time *rtc_time)
+{
+        u64 tim;
+        tim = mktime(rtc_time->tm_year+1900,
+                     rtc_time->tm_mon+1, rtc_time->tm_mday,
+                     rtc_time->tm_hour, rtc_time->tm_min, rtc_time->tm_sec);
+        if (beat_rtc_write(tim))
+                return -1;
+        return 0;
+}
+
+void beat_get_rtc_time(struct rtc_time *rtc_time)
+{
+        u64 tim;
+
+        if (beat_rtc_read(&tim))
+                tim = 0;
+        to_tm(tim, rtc_time);
+        rtc_time->tm_year -= 1900;
+        rtc_time->tm_mon -= 1;
+}
+
+#define BEAT_NVRAM_SIZE 4096
+
+ssize_t beat_nvram_read(char *buf, size_t count, loff_t *index)
+{
+        unsigned int i;
+        unsigned long len;
+        char *p = buf;
+
+        if (*index >= BEAT_NVRAM_SIZE)
+                return -ENODEV;
+        i = *index;
+        if (i + count > BEAT_NVRAM_SIZE)
+                count = BEAT_NVRAM_SIZE - i;
+
+        for (; count != 0; count -= len) {
+                len = count;
+                if (len > BEAT_NVRW_CNT)
+                        len = BEAT_NVRW_CNT;
+                if (beat_eeprom_read(i, len, p)) {
+                        return -EIO;
+                }
+
+                p += len;
+                i += len;
+        }
+        *index = i;
+        return p - buf;
+}
+
+ssize_t beat_nvram_write(char *buf, size_t count, loff_t *index)
+{
+        unsigned int i;
+        unsigned long len;
+        char *p = buf;
+
+        if (*index >= BEAT_NVRAM_SIZE)
+                return -ENODEV;
+        i = *index;
+        if (i + count > BEAT_NVRAM_SIZE)
+                count = BEAT_NVRAM_SIZE - i;
+
+        for (; count != 0; count -= len) {
+                len = count;
+                if (len > BEAT_NVRW_CNT)
+                        len = BEAT_NVRW_CNT;
+                if (beat_eeprom_write(i, len, p)) {
+                        return -EIO;
+                }
+
+                p += len;
+                i += len;
+        }
+        *index = i;
+        return p - buf;
+}
+
+ssize_t beat_nvram_get_size(void)
+{
+        return BEAT_NVRAM_SIZE;
+}
+
+int beat_set_xdabr(unsigned long dabr)
+{
+        if (beat_set_dabr(dabr, DABRX_KERNEL | DABRX_USER))
+                return -1;
+        return 0;
+}
+
+int64_t beat_get_term_char(u64 vterm, u64 *len, u64 *t1, u64 *t2)
+{
+        u64 db[2];
+        s64 ret;
+
+        ret = beat_get_characters_from_console(vterm, len, (u8*)db);
+        if (ret == 0) {
+                *t1 = db[0];
+                *t2 = db[1];
+        }
+        return ret;
+}
+
+int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
+{
+        u64 db[2];
+
+        db[0] = t1;
+        db[1] = t2;
+        return beat_put_characters_to_console(vterm, len, (u8*)db);
+}
+
+EXPORT_SYMBOL(beat_get_term_char);
+EXPORT_SYMBOL(beat_put_term_char);
+EXPORT_SYMBOL(beat_halt_code);
diff --git a/arch/powerpc/platforms/celleb/beat.h b/arch/powerpc/platforms/celleb/beat.h
new file mode 100644
index 000000000000..2b16bf3bee89
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/beat.h
@@ -0,0 +1,40 @@
+/*
+ * Guest OS Interfaces.
+ *
+ * (C) Copyright 2006 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _CELLEB_BEAT_H
+#define _CELLEB_BEAT_H
+
+#define DABRX_KERNEL            (1UL<<1)
+#define DABRX_USER              (1UL<<0)
+
+int64_t beat_get_term_char(uint64_t,uint64_t*,uint64_t*,uint64_t*);
+int64_t beat_put_term_char(uint64_t,uint64_t,uint64_t,uint64_t);
+int64_t beat_repository_encode(int, const char *, uint64_t[4]);
+void beat_restart(char *);
+void beat_power_off(void);
+void beat_halt(void);
+int beat_set_rtc_time(struct rtc_time *);
+void beat_get_rtc_time(struct rtc_time *);
+ssize_t beat_nvram_get_size(void);
+ssize_t beat_nvram_read(char *, size_t, loff_t *);
+ssize_t beat_nvram_write(char *, size_t, loff_t *);
+int beat_set_xdabr(unsigned long);
+
+#endif /* _CELLEB_BEAT_H */
diff --git a/arch/powerpc/platforms/celleb/beat_syscall.h b/arch/powerpc/platforms/celleb/beat_syscall.h
new file mode 100644
index 000000000000..14e16974773f
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/beat_syscall.h
@@ -0,0 +1,160 @@
+/*
+ * Beat hypervisor call numbers
+ *
+ * (C) Copyright 2004-2007 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef BEAT_BEAT_syscall_H
+#define BEAT_BEAT_syscall_H
+
+#ifdef  __ASSEMBLY__
+#define __BEAT_ADD_VENDOR_ID(__x, __v)  ((__v)<<60|(__x))
+#else
+#define __BEAT_ADD_VENDOR_ID(__x, __v)  ((u64)(__v)<<60|(__x))
+#endif
+#define HV_allocate_memory __BEAT_ADD_VENDOR_ID(0, 0)
+#define HV_construct_virtual_address_space __BEAT_ADD_VENDOR_ID(2, 0)
+#define HV_destruct_virtual_address_space __BEAT_ADD_VENDOR_ID(10, 0)
+#define HV_get_virtual_address_space_id_of_ppe __BEAT_ADD_VENDOR_ID(4, 0)
+#define HV_query_logical_partition_address_region_info                  \
+                                                __BEAT_ADD_VENDOR_ID(6, 0)
+#define HV_release_memory __BEAT_ADD_VENDOR_ID(13, 0)
+#define HV_select_virtual_address_space __BEAT_ADD_VENDOR_ID(7, 0)
+#define HV_load_range_registers __BEAT_ADD_VENDOR_ID(68, 0)
+#define HV_set_ppe_l2cache_rmt_entry __BEAT_ADD_VENDOR_ID(70, 0)
+#define HV_set_ppe_tlb_rmt_entry __BEAT_ADD_VENDOR_ID(71, 0)
+#define HV_set_spe_tlb_rmt_entry __BEAT_ADD_VENDOR_ID(72, 0)
+#define HV_get_io_address_translation_fault_info __BEAT_ADD_VENDOR_ID(14, 0)
+#define HV_get_iopte __BEAT_ADD_VENDOR_ID(16, 0)
+#define HV_preload_iopt_cache __BEAT_ADD_VENDOR_ID(17, 0)
+#define HV_put_iopte __BEAT_ADD_VENDOR_ID(15, 0)
+#define HV_connect_event_ports __BEAT_ADD_VENDOR_ID(21, 0)
+#define HV_construct_event_receive_port __BEAT_ADD_VENDOR_ID(18, 0)
+#define HV_destruct_event_receive_port __BEAT_ADD_VENDOR_ID(19, 0)
+#define HV_destruct_event_send_port __BEAT_ADD_VENDOR_ID(22, 0)
+#define HV_get_state_of_event_send_port __BEAT_ADD_VENDOR_ID(25, 0)
+#define HV_request_to_connect_event_ports __BEAT_ADD_VENDOR_ID(20, 0)
+#define HV_send_event_externally __BEAT_ADD_VENDOR_ID(23, 0)
+#define HV_send_event_locally __BEAT_ADD_VENDOR_ID(24, 0)
+#define HV_construct_and_connect_irq_plug __BEAT_ADD_VENDOR_ID(28, 0)
+#define HV_destruct_irq_plug __BEAT_ADD_VENDOR_ID(29, 0)
+#define HV_detect_pending_interrupts __BEAT_ADD_VENDOR_ID(26, 0)
+#define HV_end_of_interrupt __BEAT_ADD_VENDOR_ID(27, 0)
+#define HV_assign_control_signal_notification_port __BEAT_ADD_VENDOR_ID(45, 0)
+#define HV_end_of_control_signal_processing __BEAT_ADD_VENDOR_ID(48, 0)
+#define HV_get_control_signal __BEAT_ADD_VENDOR_ID(46, 0)
+#define HV_set_irq_mask_for_spe __BEAT_ADD_VENDOR_ID(61, 0)
+#define HV_shutdown_logical_partition __BEAT_ADD_VENDOR_ID(44, 0)
+#define HV_connect_message_ports __BEAT_ADD_VENDOR_ID(35, 0)
+#define HV_destruct_message_port __BEAT_ADD_VENDOR_ID(36, 0)
+#define HV_receive_message __BEAT_ADD_VENDOR_ID(37, 0)
+#define HV_get_message_port_info __BEAT_ADD_VENDOR_ID(34, 0)
+#define HV_request_to_connect_message_ports __BEAT_ADD_VENDOR_ID(33, 0)
+#define HV_send_message __BEAT_ADD_VENDOR_ID(32, 0)
+#define HV_get_logical_ppe_id __BEAT_ADD_VENDOR_ID(69, 0)
+#define HV_pause __BEAT_ADD_VENDOR_ID(9, 0)
+#define HV_destruct_shared_memory_handle __BEAT_ADD_VENDOR_ID(51, 0)
+#define HV_get_shared_memory_info __BEAT_ADD_VENDOR_ID(52, 0)
+#define HV_permit_sharing_memory __BEAT_ADD_VENDOR_ID(50, 0)
+#define HV_request_to_attach_shared_memory __BEAT_ADD_VENDOR_ID(49, 0)
+#define HV_enable_logical_spe_execution __BEAT_ADD_VENDOR_ID(55, 0)
+#define HV_construct_logical_spe __BEAT_ADD_VENDOR_ID(53, 0)
+#define HV_disable_logical_spe_execution __BEAT_ADD_VENDOR_ID(56, 0)
+#define HV_destruct_logical_spe __BEAT_ADD_VENDOR_ID(54, 0)
+#define HV_sense_spe_execution_status __BEAT_ADD_VENDOR_ID(58, 0)
+#define HV_insert_htab_entry __BEAT_ADD_VENDOR_ID(101, 0)
+#define HV_read_htab_entries __BEAT_ADD_VENDOR_ID(95, 0)
+#define HV_write_htab_entry __BEAT_ADD_VENDOR_ID(94, 0)
+#define HV_assign_io_address_translation_fault_port                     \
+                                                __BEAT_ADD_VENDOR_ID(100, 0)
+#define HV_set_interrupt_mask __BEAT_ADD_VENDOR_ID(73, 0)
+#define HV_get_logical_partition_id __BEAT_ADD_VENDOR_ID(74, 0)
+#define HV_create_repository_node2 __BEAT_ADD_VENDOR_ID(90, 0)
+#define HV_create_repository_node __BEAT_ADD_VENDOR_ID(90, 0) /* alias */
+#define HV_get_repository_node_value2 __BEAT_ADD_VENDOR_ID(91, 0)
+#define HV_get_repository_node_value __BEAT_ADD_VENDOR_ID(91, 0) /* alias */
+#define HV_modify_repository_node_value2 __BEAT_ADD_VENDOR_ID(92, 0)
+#define HV_modify_repository_node_value __BEAT_ADD_VENDOR_ID(92, 0) /* alias */
+#define HV_remove_repository_node2 __BEAT_ADD_VENDOR_ID(93, 0)
+#define HV_remove_repository_node __BEAT_ADD_VENDOR_ID(93, 0) /* alias */
+#define HV_cancel_shared_memory __BEAT_ADD_VENDOR_ID(104, 0)
+#define HV_clear_interrupt_status_of_spe __BEAT_ADD_VENDOR_ID(206, 0)
+#define HV_construct_spe_irq_outlet __BEAT_ADD_VENDOR_ID(80, 0)
+#define HV_destruct_spe_irq_outlet __BEAT_ADD_VENDOR_ID(81, 0)
+#define HV_disconnect_ipspc_service __BEAT_ADD_VENDOR_ID(88, 0)
+#define HV_execute_ipspc_command __BEAT_ADD_VENDOR_ID(86, 0)
+#define HV_get_interrupt_status_of_spe __BEAT_ADD_VENDOR_ID(205, 0)
+#define HV_get_spe_privileged_state_1_registers __BEAT_ADD_VENDOR_ID(208, 0)
+#define HV_permit_use_of_ipspc_service __BEAT_ADD_VENDOR_ID(85, 0)
+#define HV_reinitialize_logical_spe __BEAT_ADD_VENDOR_ID(82, 0)
+#define HV_request_ipspc_service __BEAT_ADD_VENDOR_ID(84, 0)
+#define HV_stop_ipspc_command __BEAT_ADD_VENDOR_ID(87, 0)
+#define HV_set_spe_privileged_state_1_registers __BEAT_ADD_VENDOR_ID(204, 0)
+#define HV_get_status_of_ipspc_service __BEAT_ADD_VENDOR_ID(203, 0)
+#define HV_put_characters_to_console __BEAT_ADD_VENDOR_ID(0x101, 1)
+#define HV_get_characters_from_console __BEAT_ADD_VENDOR_ID(0x102, 1)
+#define HV_get_base_clock __BEAT_ADD_VENDOR_ID(0x111, 1)
+#define HV_set_base_clock __BEAT_ADD_VENDOR_ID(0x112, 1)
+#define HV_get_frame_cycle __BEAT_ADD_VENDOR_ID(0x114, 1)
+#define HV_disable_console __BEAT_ADD_VENDOR_ID(0x115, 1)
+#define HV_disable_all_console __BEAT_ADD_VENDOR_ID(0x116, 1)
+#define HV_oneshot_timer __BEAT_ADD_VENDOR_ID(0x117, 1)
+#define HV_set_dabr __BEAT_ADD_VENDOR_ID(0x118, 1)
+#define HV_get_dabr __BEAT_ADD_VENDOR_ID(0x119, 1)
+#define HV_start_hv_stats __BEAT_ADD_VENDOR_ID(0x21c, 1)
+#define HV_stop_hv_stats __BEAT_ADD_VENDOR_ID(0x21d, 1)
+#define HV_get_hv_stats __BEAT_ADD_VENDOR_ID(0x21e, 1)
+#define HV_get_hv_error_stats __BEAT_ADD_VENDOR_ID(0x221, 1)
+#define HV_get_stats __BEAT_ADD_VENDOR_ID(0x224, 1)
+#define HV_get_heap_stats __BEAT_ADD_VENDOR_ID(0x225, 1)
+#define HV_get_memory_stats __BEAT_ADD_VENDOR_ID(0x227, 1)
+#define HV_get_memory_detail __BEAT_ADD_VENDOR_ID(0x228, 1)
+#define HV_set_priority_of_irq_outlet __BEAT_ADD_VENDOR_ID(0x122, 1)
+#define HV_get_physical_spe_by_reservation_id __BEAT_ADD_VENDOR_ID(0x128, 1)
+#define HV_get_spe_context __BEAT_ADD_VENDOR_ID(0x129, 1)
+#define HV_set_spe_context __BEAT_ADD_VENDOR_ID(0x12a, 1)
+#define HV_downcount_of_interrupt __BEAT_ADD_VENDOR_ID(0x12e, 1)
+#define HV_peek_spe_context __BEAT_ADD_VENDOR_ID(0x12f, 1)
+#define HV_read_bpa_register __BEAT_ADD_VENDOR_ID(0x131, 1)
+#define HV_write_bpa_register __BEAT_ADD_VENDOR_ID(0x132, 1)
+#define HV_map_context_table_of_spe __BEAT_ADD_VENDOR_ID(0x137, 1)
+#define HV_get_slb_for_logical_spe __BEAT_ADD_VENDOR_ID(0x138, 1)
+#define HV_set_slb_for_logical_spe __BEAT_ADD_VENDOR_ID(0x139, 1)
+#define HV_init_pm __BEAT_ADD_VENDOR_ID(0x150, 1)
+#define HV_set_pm_signal __BEAT_ADD_VENDOR_ID(0x151, 1)
+#define HV_get_pm_signal __BEAT_ADD_VENDOR_ID(0x152, 1)
+#define HV_set_pm_config __BEAT_ADD_VENDOR_ID(0x153, 1)
+#define HV_get_pm_config __BEAT_ADD_VENDOR_ID(0x154, 1)
+#define HV_get_inner_trace_data __BEAT_ADD_VENDOR_ID(0x155, 1)
+#define HV_set_ext_trace_buffer __BEAT_ADD_VENDOR_ID(0x156, 1)
+#define HV_get_ext_trace_buffer __BEAT_ADD_VENDOR_ID(0x157, 1)
+#define HV_set_pm_interrupt __BEAT_ADD_VENDOR_ID(0x158, 1)
+#define HV_get_pm_interrupt __BEAT_ADD_VENDOR_ID(0x159, 1)
+#define HV_kick_pm __BEAT_ADD_VENDOR_ID(0x160, 1)
+#define HV_construct_pm_context __BEAT_ADD_VENDOR_ID(0x164, 1)
+#define HV_destruct_pm_context __BEAT_ADD_VENDOR_ID(0x165, 1)
+#define HV_be_slow __BEAT_ADD_VENDOR_ID(0x170, 1)
+#define HV_assign_ipspc_server_connection_status_notification_port      \
+                                                __BEAT_ADD_VENDOR_ID(0x173, 1)
+#define HV_get_raid_of_physical_spe __BEAT_ADD_VENDOR_ID(0x174, 1)
+#define HV_set_physical_spe_to_rag __BEAT_ADD_VENDOR_ID(0x175, 1)
+#define HV_release_physical_spe_from_rag __BEAT_ADD_VENDOR_ID(0x176, 1)
+#define HV_rtc_read __BEAT_ADD_VENDOR_ID(0x190, 1)
+#define HV_rtc_write __BEAT_ADD_VENDOR_ID(0x191, 1)
+#define HV_eeprom_read __BEAT_ADD_VENDOR_ID(0x192, 1)
+#define HV_eeprom_write __BEAT_ADD_VENDOR_ID(0x193, 1)
+#endif
diff --git a/arch/powerpc/platforms/celleb/beat_wrapper.h b/arch/powerpc/platforms/celleb/beat_wrapper.h
new file mode 100644
index 000000000000..76ea0a6a9011
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/beat_wrapper.h
@@ -0,0 +1,220 @@
+/*
+ * Beat hypervisor call I/F
+ *
+ * (C) Copyright 2007 TOSHIBA CORPORATION
+ *
+ * This code is based on arch/powerpc/platforms/pseries/plpar_wrapper.h.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef BEAT_HCALL
+#include "beat_syscall.h"
+
+/* defined in hvCall.S */
+extern s64 beat_hcall_norets(u64 opcode, ...);
+extern s64 beat_hcall_norets8(u64 opcode, u64 arg1, u64 arg2, u64 arg3,
+        u64 arg4, u64 arg5, u64 arg6, u64 arg7, u64 arg8);
+extern s64 beat_hcall1(u64 opcode, u64 retbuf[1], ...);
+extern s64 beat_hcall2(u64 opcode, u64 retbuf[2], ...);
+extern s64 beat_hcall3(u64 opcode, u64 retbuf[3], ...);
+extern s64 beat_hcall4(u64 opcode, u64 retbuf[4], ...);
+extern s64 beat_hcall5(u64 opcode, u64 retbuf[5], ...);
+extern s64 beat_hcall6(u64 opcode, u64 retbuf[6], ...);
+
+static inline s64 beat_downcount_of_interrupt(u64 plug_id)
+{
+        return beat_hcall_norets(HV_downcount_of_interrupt, plug_id);
+}
+
+static inline s64 beat_set_interrupt_mask(u64 index,
+        u64 val0, u64 val1, u64 val2, u64 val3)
+{
+        return beat_hcall_norets(HV_set_interrupt_mask, index,
+               val0, val1, val2, val3);
+}
+
+static inline s64 beat_destruct_irq_plug(u64 plug_id)
+{
+        return beat_hcall_norets(HV_destruct_irq_plug, plug_id);
+}
+
+static inline s64 beat_construct_and_connect_irq_plug(u64 plug_id,
+        u64 outlet_id)
+{
+        return beat_hcall_norets(HV_construct_and_connect_irq_plug, plug_id,
+               outlet_id);
+}
+
+static inline s64 beat_detect_pending_interrupts(u64 index, u64 *retbuf)
+{
+        return beat_hcall4(HV_detect_pending_interrupts, retbuf, index);
+}
+
+static inline s64 beat_pause(u64 style)
+{
+        return beat_hcall_norets(HV_pause, style);
+}
+
+static inline s64 beat_read_htab_entries(u64 htab_id, u64 index, u64 *retbuf)
+{
+        return beat_hcall5(HV_read_htab_entries, retbuf, htab_id, index);
+}
+
+static inline s64 beat_insert_htab_entry(u64 htab_id, u64 group,
+        u64 bitmask, u64 hpte_v, u64 hpte_r, u64 *slot)
+{
+        u64 dummy[3];
+        s64 ret;
+
+        ret = beat_hcall3(HV_insert_htab_entry, dummy, htab_id, group,
+                bitmask, hpte_v, hpte_r);
+        *slot = dummy[0];
+        return ret;
+}
+
+static inline s64 beat_write_htab_entry(u64 htab_id, u64 slot,
+        u64 hpte_v, u64 hpte_r, u64 mask_v, u64 mask_r,
+        u64 *ret_v, u64 *ret_r)
+{
+        u64 dummy[2];
+        s64 ret;
+
+        ret = beat_hcall2(HV_write_htab_entry, dummy, htab_id, slot,
+                hpte_v, hpte_r, mask_v, mask_r);
+        *ret_v = dummy[0];
+        *ret_r = dummy[1];
+        return ret;
+}
+
+static inline void beat_shutdown_logical_partition(u64 code)
+{
+        (void)beat_hcall_norets(HV_shutdown_logical_partition, code);
+}
+
+static inline s64 beat_rtc_write(u64 time_from_epoch)
+{
+        return beat_hcall_norets(HV_rtc_write, time_from_epoch);
+}
+
+static inline s64 beat_rtc_read(u64 *time_from_epoch)
+{
+        u64 dummy[1];
+        s64 ret;
+
+        ret = beat_hcall1(HV_rtc_read, dummy);
+        *time_from_epoch = dummy[0];
+        return ret;
+}
+
+#define BEAT_NVRW_CNT   (sizeof(u64) * 6)
+
+static inline s64 beat_eeprom_write(u64 index, u64 length, u8 *buffer)
+{
+        u64     b[6];
+
+        if (length > BEAT_NVRW_CNT)
+                return -1;
+        memcpy(b, buffer, sizeof(b));
+        return beat_hcall_norets8(HV_eeprom_write, index, length,
+                b[0], b[1], b[2], b[3], b[4], b[5]);
+}
+
+static inline s64 beat_eeprom_read(u64 index, u64 length, u8 *buffer)
+{
+        u64     b[6];
+        s64     ret;
+
+        if (length > BEAT_NVRW_CNT)
+                return -1;
+        ret = beat_hcall6(HV_eeprom_read, b, index, length);
+        memcpy(buffer, b, length);
+        return ret;
+}
+
+static inline s64 beat_set_dabr(u64 value, u64 style)
+{
+        return beat_hcall_norets(HV_set_dabr, value, style);
+}
+
+static inline s64 beat_get_characters_from_console(u64 termno, u64 *len,
+        u8 *buffer)
+{
+        u64 dummy[3];
+        s64 ret;
+
+        ret = beat_hcall3(HV_get_characters_from_console, dummy, termno, len);
+        *len = dummy[0];
+        memcpy(buffer, dummy + 1, *len);
+        return ret;
+}
+
+static inline s64 beat_put_characters_to_console(u64 termno, u64 len,
+        u8 *buffer)
+{
+        u64 b[2];
+
+        memcpy(b, buffer, len);
+        return beat_hcall_norets(HV_put_characters_to_console, termno, len,                                      b[0], b[1]);
+}
+
+static inline s64 beat_get_spe_privileged_state_1_registers(
+                u64 id, u64 offsetof, u64 *value)
+{
+        u64 dummy[1];
+        s64 ret;
+
+        ret = beat_hcall1(HV_get_spe_privileged_state_1_registers, dummy, id,
+                offsetof);
+        *value = dummy[0];
+        return ret;
+}
+
+static inline s64 beat_set_irq_mask_for_spe(u64 id, u64 class, u64 mask)
+{
+        return beat_hcall_norets(HV_set_irq_mask_for_spe, id, class, mask);
+}
+
+static inline s64 beat_clear_interrupt_status_of_spe(u64 id, u64 class,
+        u64 mask)
+{
+        return beat_hcall_norets(HV_clear_interrupt_status_of_spe,
+                id, class, mask);
+}
+
+static inline s64 beat_set_spe_privileged_state_1_registers(
+                u64 id, u64 offsetof, u64 value)
+{
+        return beat_hcall_norets(HV_set_spe_privileged_state_1_registers,
+                id, offsetof, value);
+}
+
+static inline s64 beat_get_interrupt_status_of_spe(u64 id, u64 class, u64 *val)
+{
+        u64 dummy[1];
+        s64 ret;
+
+        ret = beat_hcall1(HV_get_interrupt_status_of_spe, dummy, id, class);
+        *val = dummy[0];
+        return ret;
+}
+
+static inline s64 beat_put_iopte(u64 ioas_id, u64 io_addr, u64 real_addr,
+        u64 ioid, u64 flags)
+{
+        return beat_hcall_norets(HV_put_iopte, ioas_id, io_addr, real_addr,
+                ioid, flags);
+}
+
+#endif
diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/celleb/htab.c
new file mode 100644
index 000000000000..279d7339e170
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/htab.c
@@ -0,0 +1,308 @@
+/*
+ * "Cell Reference Set" HTAB support.
+ *
+ * (C) Copyright 2006-2007 TOSHIBA CORPORATION
+ *
+ * This code is based on arch/powerpc/platforms/pseries/lpar.c:
+ *  Copyright (C) 2001 Todd Inglett, 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#undef DEBUG_LOW
+
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+
+#include <asm/mmu.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/machdep.h>
+#include <asm/udbg.h>
+
+#include "beat_wrapper.h"
+
+#ifdef DEBUG_LOW
+#define DBG_LOW(fmt...) do { udbg_printf(fmt); } while(0)
+#else
+#define DBG_LOW(fmt...) do { } while(0)
+#endif
+
+static DEFINE_SPINLOCK(beat_htab_lock);
+
+static inline unsigned int beat_read_mask(unsigned hpte_group)
+{
+        unsigned long hpte_v[5];
+        unsigned long rmask = 0;
+
+        beat_read_htab_entries(0, hpte_group + 0, hpte_v);
+        if (!(hpte_v[0] & HPTE_V_BOLTED))
+                rmask |= 0x8000;
+        if (!(hpte_v[1] & HPTE_V_BOLTED))
+                rmask |= 0x4000;
+        if (!(hpte_v[2] & HPTE_V_BOLTED))
+                rmask |= 0x2000;
+        if (!(hpte_v[3] & HPTE_V_BOLTED))
+                rmask |= 0x1000;
+        beat_read_htab_entries(0, hpte_group + 4, hpte_v);
+        if (!(hpte_v[0] & HPTE_V_BOLTED))
+                rmask |= 0x0800;
+        if (!(hpte_v[1] & HPTE_V_BOLTED))
+                rmask |= 0x0400;
+        if (!(hpte_v[2] & HPTE_V_BOLTED))
+                rmask |= 0x0200;
+        if (!(hpte_v[3] & HPTE_V_BOLTED))
+                rmask |= 0x0100;
+        hpte_group = ~hpte_group & (htab_hash_mask * HPTES_PER_GROUP);
+        beat_read_htab_entries(0, hpte_group + 0, hpte_v);
+        if (!(hpte_v[0] & HPTE_V_BOLTED))
+                rmask |= 0x80;
+        if (!(hpte_v[1] & HPTE_V_BOLTED))
+                rmask |= 0x40;
+        if (!(hpte_v[2] & HPTE_V_BOLTED))
+                rmask |= 0x20;
+        if (!(hpte_v[3] & HPTE_V_BOLTED))
+                rmask |= 0x10;
+        beat_read_htab_entries(0, hpte_group + 4, hpte_v);
+        if (!(hpte_v[0] & HPTE_V_BOLTED))
+                rmask |= 0x08;
+        if (!(hpte_v[1] & HPTE_V_BOLTED))
+                rmask |= 0x04;
+        if (!(hpte_v[2] & HPTE_V_BOLTED))
+                rmask |= 0x02;
+        if (!(hpte_v[3] & HPTE_V_BOLTED))
+                rmask |= 0x01;
+        return rmask;
+}
+
+static long beat_lpar_hpte_insert(unsigned long hpte_group,
+                                  unsigned long va, unsigned long pa,
+                                  unsigned long rflags, unsigned long vflags,
+                                  int psize)
+{
+        unsigned long lpar_rc;
+        unsigned long slot;
+        unsigned long hpte_v, hpte_r;
+
+        /* same as iseries */
+        if (vflags & HPTE_V_SECONDARY)
+                return -1;
+
+        if (!(vflags & HPTE_V_BOLTED))
+                DBG_LOW("hpte_insert(group=%lx, va=%016lx, pa=%016lx, "
+                        "rflags=%lx, vflags=%lx, psize=%d)\n",
+                hpte_group, va, pa, rflags, vflags, psize);
+
+        hpte_v = hpte_encode_v(va, psize) | vflags | HPTE_V_VALID;
+        hpte_r = hpte_encode_r(pa, psize) | rflags;
+
+        if (!(vflags & HPTE_V_BOLTED))
+                DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
+
+        if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
+                hpte_r &= ~_PAGE_COHERENT;
+
+        spin_lock(&beat_htab_lock);
+        if ((lpar_rc = beat_read_mask(hpte_group)) == 0) {
+                if (!(vflags & HPTE_V_BOLTED))
+                        DBG_LOW(" full\n");
+                spin_unlock(&beat_htab_lock);
+                return -1;
+        }
+
+        lpar_rc = beat_insert_htab_entry(0, hpte_group, lpar_rc << 48,
+                hpte_v, hpte_r, &slot);
+        spin_unlock(&beat_htab_lock);
+
+        /*
+         * Since we try and ioremap PHBs we don't own, the pte insert
+         * will fail. However we must catch the failure in hash_page
+         * or we will loop forever, so return -2 in this case.
+         */
+        if (unlikely(lpar_rc != 0)) {
+                if (!(vflags & HPTE_V_BOLTED))
+                        DBG_LOW(" lpar err %lx\n", lpar_rc);
+                return -2;
+        }
+        if (!(vflags & HPTE_V_BOLTED))
+                DBG_LOW(" -> slot: %lx\n", slot);
+
+        /* We have to pass down the secondary bucket bit here as well */
+        return (slot ^ hpte_group) & 15;
+}
+
+static long beat_lpar_hpte_remove(unsigned long hpte_group)
+{
+        DBG_LOW("hpte_remove(group=%lx)\n", hpte_group);
+        return -1;
+}
+
+static unsigned long beat_lpar_hpte_getword0(unsigned long slot)
+{
+        unsigned long dword0, dword[5];
+        unsigned long lpar_rc;
+
+        lpar_rc = beat_read_htab_entries(0, slot & ~3UL, dword);
+
+        dword0 = dword[slot&3];
+
+        BUG_ON(lpar_rc != 0);
+
+        return dword0;
+}
+
+static void beat_lpar_hptab_clear(void)
+{
+        unsigned long size_bytes = 1UL << ppc64_pft_size;
+        unsigned long hpte_count = size_bytes >> 4;
+        int i;
+        unsigned long dummy0, dummy1;
+
+        /* TODO: Use bulk call */
+        for (i = 0; i < hpte_count; i++)
+                beat_write_htab_entry(0, i, 0, 0, -1UL, -1UL, &dummy0, &dummy1);
+}
+
+/*
+ * NOTE: for updatepp ops we are fortunate that the linux "newpp" bits and
+ * the low 3 bits of flags happen to line up.  So no transform is needed.
+ * We can probably optimize here and assume the high bits of newpp are
+ * already zero.  For now I am paranoid.
+ */
+static long beat_lpar_hpte_updatepp(unsigned long slot,
+                                    unsigned long newpp,
+                                    unsigned long va,
+                                    int psize, int local)
+{
+        unsigned long lpar_rc;
+        unsigned long dummy0, dummy1, want_v;
+
+        want_v = hpte_encode_v(va, psize);
+
+        DBG_LOW("    update: "
+                "avpnv=%016lx, slot=%016lx, psize: %d, newpp %016lx ... ",
+                want_v & HPTE_V_AVPN, slot, psize, newpp);
+
+        spin_lock(&beat_htab_lock);
+        dummy0 = beat_lpar_hpte_getword0(slot);
+        if ((dummy0 & ~0x7FUL) != (want_v & ~0x7FUL)) {
+                DBG_LOW("not found !\n");
+                spin_unlock(&beat_htab_lock);
+                return -1;
+        }
+
+        lpar_rc = beat_write_htab_entry(0, slot, 0, newpp, 0, 7, &dummy0,
+                                        &dummy1);
+        spin_unlock(&beat_htab_lock);
+        if (lpar_rc != 0 || dummy0 == 0) {
+                DBG_LOW("not found !\n");
+                return -1;
+        }
+
+        DBG_LOW("ok %lx %lx\n", dummy0, dummy1);
+
+        BUG_ON(lpar_rc != 0);
+
+        return 0;
+}
+
+static long beat_lpar_hpte_find(unsigned long va, int psize)
+{
+        unsigned long hash;
+        unsigned long i, j;
+        long slot;
+        unsigned long want_v, hpte_v;
+
+        hash = hpt_hash(va, mmu_psize_defs[psize].shift);
+        want_v = hpte_encode_v(va, psize);
+
+        for (j = 0; j < 2; j++) {
+                slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
+                for (i = 0; i < HPTES_PER_GROUP; i++) {
+                        hpte_v = beat_lpar_hpte_getword0(slot);
+
+                        if (HPTE_V_COMPARE(hpte_v, want_v)
+                            && (hpte_v & HPTE_V_VALID)
+                            && (!!(hpte_v & HPTE_V_SECONDARY) == j)) {
+                                /* HPTE matches */
+                                if (j)
+                                        slot = -slot;
+                                return slot;
+                        }
+                        ++slot;
+                }
+                hash = ~hash;
+        }
+
+        return -1;
+}
+
+static void beat_lpar_hpte_updateboltedpp(unsigned long newpp,
+                                          unsigned long ea,
+                                          int psize)
+{
+        unsigned long lpar_rc, slot, vsid, va, dummy0, dummy1;
+
+        vsid = get_kernel_vsid(ea);
+        va = (vsid << 28) | (ea & 0x0fffffff);
+
+        spin_lock(&beat_htab_lock);
+        slot = beat_lpar_hpte_find(va, psize);
+        BUG_ON(slot == -1);
+
+        lpar_rc = beat_write_htab_entry(0, slot, 0, newpp, 0, 7,
+                &dummy0, &dummy1);
+        spin_unlock(&beat_htab_lock);
+
+        BUG_ON(lpar_rc != 0);
+}
+
+static void beat_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
+                                         int psize, int local)
+{
+        unsigned long want_v;
+        unsigned long lpar_rc;
+        unsigned long dummy1, dummy2;
+        unsigned long flags;
+
+        DBG_LOW("    inval : slot=%lx, va=%016lx, psize: %d, local: %d\n",
+                slot, va, psize, local);
+        want_v = hpte_encode_v(va, psize);
+
+        spin_lock_irqsave(&beat_htab_lock, flags);
+        dummy1 = beat_lpar_hpte_getword0(slot);
+
+        if ((dummy1 & ~0x7FUL) != (want_v & ~0x7FUL)) {
+                DBG_LOW("not found !\n");
+                spin_unlock_irqrestore(&beat_htab_lock, flags);
+                return;
+        }
+
+        lpar_rc = beat_write_htab_entry(0, slot, 0, 0, HPTE_V_VALID, 0,
+                &dummy1, &dummy2);
+        spin_unlock_irqrestore(&beat_htab_lock, flags);
+
+        BUG_ON(lpar_rc != 0);
+}
+
+void __init hpte_init_beat(void)
+{
+        ppc_md.hpte_invalidate  = beat_lpar_hpte_invalidate;
+        ppc_md.hpte_updatepp    = beat_lpar_hpte_updatepp;
+        ppc_md.hpte_updateboltedpp = beat_lpar_hpte_updateboltedpp;
+        ppc_md.hpte_insert      = beat_lpar_hpte_insert;
+        ppc_md.hpte_remove      = beat_lpar_hpte_remove;
+        ppc_md.hpte_clear_all   = beat_lpar_hptab_clear;
+}
diff --git a/arch/powerpc/platforms/celleb/hvCall.S b/arch/powerpc/platforms/celleb/hvCall.S
new file mode 100644
index 000000000000..74c817448948
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/hvCall.S
@@ -0,0 +1,287 @@
+/*
+ * Beat hypervisor call I/F
+ *
+ * (C) Copyright 2007 TOSHIBA CORPORATION
+ *
+ * This code is based on arch/powerpc/platforms/pseries/hvCall.S.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <asm/ppc_asm.h>
+
+#define STK_PARM(i)     (48 + ((i)-3)*8)
+
+/* Not implemented on Beat, now */
+#define HCALL_INST_PRECALL
+#define HCALL_INST_POSTCALL
+
+        .text
+
+#define HVSC    .long   0x44000022
+
+/* Note: takes only 7 input parameters at maximum */
+_GLOBAL(beat_hcall_norets)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HCALL_INST_PRECALL
+
+        mr      r11,r3
+        mr      r3,r4
+        mr      r4,r5
+        mr      r5,r6
+        mr      r6,r7
+        mr      r7,r8
+        mr      r8,r9
+
+        HVSC                            /* invoke the hypervisor */
+
+        HCALL_INST_POSTCALL
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+/* Note: takes 8 input parameters at maximum */
+_GLOBAL(beat_hcall_norets8)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HCALL_INST_PRECALL
+
+        mr      r11,r3
+        mr      r3,r4
+        mr      r4,r5
+        mr      r5,r6
+        mr      r6,r7
+        mr      r7,r8
+        mr      r8,r9
+        ld      r10,STK_PARM(r10)(r1)
+
+        HVSC                            /* invoke the hypervisor */
+
+        HCALL_INST_POSTCALL
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+/* Note: takes only 6 input parameters, 1 output parameters at maximum */
+_GLOBAL(beat_hcall1)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HCALL_INST_PRECALL
+
+        std     r4,STK_PARM(r4)(r1)     /* save ret buffer */
+
+        mr      r11,r3
+        mr      r3,r5
+        mr      r4,r6
+        mr      r5,r7
+        mr      r6,r8
+        mr      r7,r9
+        mr      r8,r10
+
+        HVSC                            /* invoke the hypervisor */
+
+        HCALL_INST_POSTCALL
+
+        ld      r12,STK_PARM(r4)(r1)
+        std     r4,  0(r12)
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+/* Note: takes only 6 input parameters, 2 output parameters at maximum */
+_GLOBAL(beat_hcall2)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HCALL_INST_PRECALL
+
+        std     r4,STK_PARM(r4)(r1)     /* save ret buffer */
+
+        mr      r11,r3
+        mr      r3,r5
+        mr      r4,r6
+        mr      r5,r7
+        mr      r6,r8
+        mr      r7,r9
+        mr      r8,r10
+
+        HVSC                            /* invoke the hypervisor */
+
+        HCALL_INST_POSTCALL
+
+        ld      r12,STK_PARM(r4)(r1)
+        std     r4,  0(r12)
+        std     r5,  8(r12)
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+/* Note: takes only 6 input parameters, 3 output parameters at maximum */
+_GLOBAL(beat_hcall3)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HCALL_INST_PRECALL
+
+        std     r4,STK_PARM(r4)(r1)     /* save ret buffer */
+
+        mr      r11,r3
+        mr      r3,r5
+        mr      r4,r6
+        mr      r5,r7
+        mr      r6,r8
+        mr      r7,r9
+        mr      r8,r10
+
+        HVSC                            /* invoke the hypervisor */
+
+        HCALL_INST_POSTCALL
+
+        ld      r12,STK_PARM(r4)(r1)
+        std     r4,  0(r12)
+        std     r5,  8(r12)
+        std     r6, 16(r12)
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+/* Note: takes only 6 input parameters, 4 output parameters at maximum */
+_GLOBAL(beat_hcall4)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HCALL_INST_PRECALL
+
+        std     r4,STK_PARM(r4)(r1)     /* save ret buffer */
+
+        mr      r11,r3
+        mr      r3,r5
+        mr      r4,r6
+        mr      r5,r7
+        mr      r6,r8
+        mr      r7,r9
+        mr      r8,r10
+
+        HVSC                            /* invoke the hypervisor */
+
+        HCALL_INST_POSTCALL
+
+        ld      r12,STK_PARM(r4)(r1)
+        std     r4,  0(r12)
+        std     r5,  8(r12)
+        std     r6, 16(r12)
+        std     r7, 24(r12)
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+/* Note: takes only 6 input parameters, 5 output parameters at maximum */
+_GLOBAL(beat_hcall5)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HCALL_INST_PRECALL
+
+        std     r4,STK_PARM(r4)(r1)     /* save ret buffer */
+
+        mr      r11,r3
+        mr      r3,r5
+        mr      r4,r6
+        mr      r5,r7
+        mr      r6,r8
+        mr      r7,r9
+        mr      r8,r10
+
+        HVSC                            /* invoke the hypervisor */
+
+        HCALL_INST_POSTCALL
+
+        ld      r12,STK_PARM(r4)(r1)
+        std     r4,  0(r12)
+        std     r5,  8(r12)
+        std     r6, 16(r12)
+        std     r7, 24(r12)
+        std     r8, 32(r12)
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+/* Note: takes only 6 input parameters, 6 output parameters at maximum */
+_GLOBAL(beat_hcall6)
+        HMT_MEDIUM
+
+        mfcr    r0
+        stw     r0,8(r1)
+
+        HCALL_INST_PRECALL
+
+        std     r4,STK_PARM(r4)(r1)     /* save ret buffer */
+
+        mr      r11,r3
+        mr      r3,r5
+        mr      r4,r6
+        mr      r5,r7
+        mr      r6,r8
+        mr      r7,r9
+        mr      r8,r10
+
+        HVSC                            /* invoke the hypervisor */
+
+        HCALL_INST_POSTCALL
+
+        ld      r12,STK_PARM(r4)(r1)
+        std     r4,  0(r12)
+        std     r5,  8(r12)
+        std     r6, 16(r12)
+        std     r7, 24(r12)
+        std     r8, 32(r12)
+        std     r9, 40(r12)
+
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
diff --git a/arch/powerpc/platforms/celleb/interrupt.c b/arch/powerpc/platforms/celleb/interrupt.c
new file mode 100644
index 000000000000..98e6665681d3
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/interrupt.c
@@ -0,0 +1,274 @@
+/*
+ * Celleb/Beat Interrupt controller
+ *
+ * (C) Copyright 2006-2007 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/percpu.h>
+#include <linux/types.h>
+
+#include <asm/machdep.h>
+
+#include "interrupt.h"
+#include "beat_wrapper.h"
+
+#define MAX_IRQS        NR_IRQS
+static DEFINE_SPINLOCK(beatic_irq_mask_lock);
+static uint64_t beatic_irq_mask_enable[(MAX_IRQS+255)/64];
+static uint64_t beatic_irq_mask_ack[(MAX_IRQS+255)/64];
+
+static struct irq_host *beatic_host = NULL;
+
+/*
+ * In this implementation, "virq" == "IRQ plug number",
+ * "(irq_hw_number_t)hwirq" == "IRQ outlet number".
+ */
+
+/* assumption: locked */
+static inline void beatic_update_irq_mask(unsigned int irq_plug)
+{
+        int off;
+        unsigned long masks[4];
+
+        off = (irq_plug / 256) * 4;
+        masks[0] = beatic_irq_mask_enable[off + 0]
+                   & beatic_irq_mask_ack[off + 0];
+        masks[1] = beatic_irq_mask_enable[off + 1]
+                   & beatic_irq_mask_ack[off + 1];
+        masks[2] = beatic_irq_mask_enable[off + 2]
+                   & beatic_irq_mask_ack[off + 2];
+        masks[3] = beatic_irq_mask_enable[off + 3]
+                   & beatic_irq_mask_ack[off + 3];
+        if (beat_set_interrupt_mask(irq_plug&~255UL,
+                masks[0], masks[1], masks[2], masks[3]) != 0)
+                panic("Failed to set mask IRQ!");
+}
+
+static void beatic_mask_irq(unsigned int irq_plug)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        beatic_irq_mask_enable[irq_plug/64] &= ~(1UL << (63 - (irq_plug%64)));
+        beatic_update_irq_mask(irq_plug);
+        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+}
+
+static void beatic_unmask_irq(unsigned int irq_plug)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        beatic_irq_mask_enable[irq_plug/64] |= 1UL << (63 - (irq_plug%64));
+        beatic_update_irq_mask(irq_plug);
+        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+}
+
+static void beatic_ack_irq(unsigned int irq_plug)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        beatic_irq_mask_ack[irq_plug/64] &= ~(1UL << (63 - (irq_plug%64)));
+        beatic_update_irq_mask(irq_plug);
+        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+}
+
+static void beatic_end_irq(unsigned int irq_plug)
+{
+        s64 err;
+        unsigned long flags;
+
+        if ((err = beat_downcount_of_interrupt(irq_plug)) != 0) {
+                if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
+                        panic("Failed to downcount IRQ! Error = %16lx", err);
+
+                printk(KERN_ERR "IRQ over-downcounted, plug %d\n", irq_plug);
+        }
+        spin_lock_irqsave(&beatic_irq_mask_lock, flags);
+        beatic_irq_mask_ack[irq_plug/64] |= 1UL << (63 - (irq_plug%64));
+        beatic_update_irq_mask(irq_plug);
+        spin_unlock_irqrestore(&beatic_irq_mask_lock, flags);
+}
+
+static struct irq_chip beatic_pic = {
+        .typename = " CELL-BEAT ",
+        .unmask = beatic_unmask_irq,
+        .mask = beatic_mask_irq,
+        .eoi = beatic_end_irq,
+};
+
+/*
+ * Dispose binding hardware IRQ number (hw) and Virtuql IRQ number (virq),
+ * update flags.
+ *
+ * Note that the number (virq) is already assigned at upper layer.
+ */
+static void beatic_pic_host_unmap(struct irq_host *h, unsigned int virq)
+{
+        beat_destruct_irq_plug(virq);
+}
+
+/*
+ * Create or update binding hardware IRQ number (hw) and Virtuql
+ * IRQ number (virq). This is called only once for a given mapping.
+ *
+ * Note that the number (virq) is already assigned at upper layer.
+ */
+static int beatic_pic_host_map(struct irq_host *h, unsigned int virq,
+                               irq_hw_number_t hw)
+{
+        struct irq_desc *desc = get_irq_desc(virq);
+        int64_t err;
+
+        if ((err = beat_construct_and_connect_irq_plug(virq, hw)) < 0)
+                return -EIO;
+
+        desc->status |= IRQ_LEVEL;
+        set_irq_chip_and_handler(virq, &beatic_pic, handle_fasteoi_irq);
+        return 0;
+}
+
+/*
+ * Update binding hardware IRQ number (hw) and Virtuql
+ * IRQ number (virq). This is called only once for a given mapping.
+ */
+static void beatic_pic_host_remap(struct irq_host *h, unsigned int virq,
+                               irq_hw_number_t hw)
+{
+        beat_construct_and_connect_irq_plug(virq, hw);
+}
+
+/*
+ * Translate device-tree interrupt spec to irq_hw_number_t style (ulong),
+ * to pass away to irq_create_mapping().
+ *
+ * Called from irq_create_of_mapping() only.
+ * Note: We have only 1 entry to translate.
+ */
+static int beatic_pic_host_xlate(struct irq_host *h, struct device_node *ct,
+                                 u32 *intspec, unsigned int intsize,
+                                 irq_hw_number_t *out_hwirq,
+                                 unsigned int *out_flags)
+{
+        u64 *intspec2 = (u64 *)intspec;
+
+        *out_hwirq = *intspec2;
+        *out_flags |= IRQ_TYPE_LEVEL_LOW;
+        return 0;
+}
+
+static struct irq_host_ops beatic_pic_host_ops = {
+        .map = beatic_pic_host_map,
+        .remap = beatic_pic_host_remap,
+        .unmap = beatic_pic_host_unmap,
+        .xlate = beatic_pic_host_xlate,
+};
+
+/*
+ * Get an IRQ number
+ * Note: returns VIRQ
+ */
+static inline unsigned int beatic_get_irq_plug(void)
+{
+        int i;
+        uint64_t        pending[4], ub;
+
+        for (i = 0; i < MAX_IRQS; i += 256) {
+                beat_detect_pending_interrupts(i, pending);
+                __asm__ ("cntlzd %0,%1":"=r"(ub):
+                        "r"(pending[0] & beatic_irq_mask_enable[i/64+0]
+                                       & beatic_irq_mask_ack[i/64+0]));
+                if (ub != 64)
+                        return i + ub + 0;
+                __asm__ ("cntlzd %0,%1":"=r"(ub):
+                        "r"(pending[1] & beatic_irq_mask_enable[i/64+1]
+                                       & beatic_irq_mask_ack[i/64+1]));
+                if (ub != 64)
+                        return i + ub + 64;
+                __asm__ ("cntlzd %0,%1":"=r"(ub):
+                        "r"(pending[2] & beatic_irq_mask_enable[i/64+2]
+                                       & beatic_irq_mask_ack[i/64+2]));
+                if (ub != 64)
+                        return i + ub + 128;
+                __asm__ ("cntlzd %0,%1":"=r"(ub):
+                        "r"(pending[3] & beatic_irq_mask_enable[i/64+3]
+                                       & beatic_irq_mask_ack[i/64+3]));
+                if (ub != 64)
+                        return i + ub + 192;
+        }
+
+        return NO_IRQ;
+}
+unsigned int beatic_get_irq(void)
+{
+        unsigned int ret;
+
+        ret = beatic_get_irq_plug();
+        if (ret != NO_IRQ)
+                beatic_ack_irq(ret);
+        return ret;
+}
+
+/*
+ */
+void __init beatic_init_IRQ(void)
+{
+        int     i;
+
+        memset(beatic_irq_mask_enable, 0, sizeof(beatic_irq_mask_enable));
+        memset(beatic_irq_mask_ack, 255, sizeof(beatic_irq_mask_ack));
+        for (i = 0; i < MAX_IRQS; i += 256)
+                beat_set_interrupt_mask(i, 0L, 0L, 0L, 0L);
+
+        /* Set out get_irq function */
+        ppc_md.get_irq = beatic_get_irq;
+
+        /* Allocate an irq host */
+        beatic_host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0,
+                                         &beatic_pic_host_ops,
+                                         0);
+        BUG_ON(beatic_host == NULL);
+        irq_set_default_host(beatic_host);
+}
+
+#ifdef CONFIG_SMP
+
+/* Nullified to compile with SMP mode */
+void beatic_setup_cpu(int cpu)
+{
+}
+
+void beatic_cause_IPI(int cpu, int mesg)
+{
+}
+
+void beatic_request_IPIs(void)
+{
+}
+#endif /* CONFIG_SMP */
+
+void beatic_deinit_IRQ(void)
+{
+        int     i;
+
+        for (i = 1; i < NR_IRQS; i++)
+                beat_destruct_irq_plug(i);
+}
diff --git a/arch/powerpc/platforms/celleb/interrupt.h b/arch/powerpc/platforms/celleb/interrupt.h
new file mode 100644
index 000000000000..b470fd0051f1
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/interrupt.h
@@ -0,0 +1,33 @@
+/*
+ * Celleb/Beat Interrupt controller
+ *
+ * (C) Copyright 2006 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef ASM_BEAT_PIC_H
+#define ASM_BEAT_PIC_H
+#ifdef __KERNEL__
+
+extern void beatic_init_IRQ(void);
+extern unsigned int beatic_get_irq(void);
+extern void beatic_cause_IPI(int cpu, int mesg);
+extern void beatic_request_IPIs(void);
+extern void beatic_setup_cpu(int);
+extern void beatic_deinit_IRQ(void);
+
+#endif
+#endif /* ASM_BEAT_PIC_H */
diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c
new file mode 100644
index 000000000000..f63b94c65353
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/iommu.c
@@ -0,0 +1,104 @@
+/*
+ * Support for IOMMU on Celleb platform.
+ *
+ * (C) Copyright 2006-2007 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/pci.h>
+
+#include <asm/of_platform.h>
+
+#include "beat_wrapper.h"
+
+#define DMA_FLAGS 0xf800000000000000UL  /* r/w permitted, coherency required,
+                                           strongest order */
+
+static int __init find_dma_window(u64 *io_space_id, u64 *ioid,
+                                  u64 *base, u64 *size, u64 *io_page_size)
+{
+        struct device_node *dn;
+        const unsigned long *dma_window;
+
+        for_each_node_by_type(dn, "ioif") {
+                dma_window = get_property(dn, "toshiba,dma-window", NULL);
+                if (dma_window) {
+                        *io_space_id = (dma_window[0] >> 32) & 0xffffffffUL;
+                        *ioid = dma_window[0] & 0x7ffUL;
+                        *base = dma_window[1];
+                        *size = dma_window[2];
+                        *io_page_size = 1 << dma_window[3];
+                        of_node_put(dn);
+                        return 1;
+                }
+        }
+        return 0;
+}
+
+static void __init celleb_init_direct_mapping(void)
+{
+        u64 lpar_addr, io_addr;
+        u64 io_space_id, ioid, dma_base, dma_size, io_page_size;
+
+        if (!find_dma_window(&io_space_id, &ioid, &dma_base, &dma_size,
+                             &io_page_size)) {
+                pr_info("No dma window found !\n");
+                return;
+        }
+
+        for (lpar_addr = 0; lpar_addr < dma_size; lpar_addr += io_page_size) {
+                io_addr = lpar_addr + dma_base;
+                (void)beat_put_iopte(io_space_id, io_addr, lpar_addr,
+                                     ioid, DMA_FLAGS);
+        }
+
+        dma_direct_offset = dma_base;
+}
+
+static int celleb_of_bus_notify(struct notifier_block *nb,
+                                unsigned long action, void *data)
+{
+        struct device *dev = data;
+
+        /* We are only intereted in device addition */
+        if (action != BUS_NOTIFY_ADD_DEVICE)
+                return 0;
+
+        dev->archdata.dma_ops = pci_dma_ops;
+
+        return 0;
+}
+
+static struct notifier_block celleb_of_bus_notifier = {
+        .notifier_call = celleb_of_bus_notify
+};
+
+static int __init celleb_init_iommu(void)
+{
+        if (!machine_is(celleb))
+                return -ENODEV;
+
+        celleb_init_direct_mapping();
+        pci_dma_ops = &dma_direct_ops;
+        bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
+
+        return 0;
+}
+
+arch_initcall(celleb_init_iommu);
diff --git a/arch/powerpc/platforms/celleb/pci.c b/arch/powerpc/platforms/celleb/pci.c
new file mode 100644
index 000000000000..98de836dfed3
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/pci.c
@@ -0,0 +1,481 @@
+/*
+ * Support for PCI on Celleb platform.
+ *
+ * (C) Copyright 2006-2007 TOSHIBA CORPORATION
+ *
+ * This code is based on arch/powerpc/kernel/rtas_pci.c:
+ *  Copyright (C) 2001 Dave Engebretsen, IBM Corporation
+ *  Copyright (C) 2003 Anton Blanchard <anton@au.ibm.com>, IBM
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/threads.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <linux/bootmem.h>
+#include <linux/pci_regs.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
+
+#include "pci.h"
+#include "interrupt.h"
+
+#define MAX_PCI_DEVICES    32
+#define MAX_PCI_FUNCTIONS   8
+#define MAX_PCI_BASE_ADDRS  3 /* use 64 bit address */
+
+/* definition for fake pci configuration area for GbE, .... ,and etc. */
+
+struct celleb_pci_resource {
+        struct resource r[MAX_PCI_BASE_ADDRS];
+};
+
+struct celleb_pci_private {
+        unsigned char *fake_config[MAX_PCI_DEVICES][MAX_PCI_FUNCTIONS];
+        struct celleb_pci_resource *res[MAX_PCI_DEVICES][MAX_PCI_FUNCTIONS];
+};
+
+static inline u8 celleb_fake_config_readb(void *addr)
+{
+        u8 *p = addr;
+        return *p;
+}
+
+static inline u16 celleb_fake_config_readw(void *addr)
+{
+        __le16 *p = addr;
+        return le16_to_cpu(*p);
+}
+
+static inline u32 celleb_fake_config_readl(void *addr)
+{
+        __le32 *p = addr;
+        return le32_to_cpu(*p);
+}
+
+static inline void celleb_fake_config_writeb(u32 val, void *addr)
+{
+        u8 *p = addr;
+        *p = val;
+}
+
+static inline void celleb_fake_config_writew(u32 val, void *addr)
+{
+        __le16 val16;
+        __le16 *p = addr;
+        val16 = cpu_to_le16(val);
+        *p = val16;
+}
+
+static inline void celleb_fake_config_writel(u32 val, void *addr)
+{
+        __le32 val32;
+        __le32 *p = addr;
+        val32 = cpu_to_le32(val);
+        *p = val32;
+}
+
+static unsigned char *get_fake_config_start(struct pci_controller *hose,
+                                            int devno, int fn)
+{
+        struct celleb_pci_private *private = hose->private_data;
+
+        if (private == NULL)
+                return NULL;
+
+        return private->fake_config[devno][fn];
+}
+
+static struct celleb_pci_resource *get_resource_start(
+                                struct pci_controller *hose,
+                                int devno, int fn)
+{
+        struct celleb_pci_private *private = hose->private_data;
+
+        if (private == NULL)
+                return NULL;
+
+        return private->res[devno][fn];
+}
+
+
+static void celleb_config_read_fake(unsigned char *config, int where,
+                                    int size, u32 *val)
+{
+        char *p = config + where;
+
+        switch (size) {
+        case 1:
+                *val = celleb_fake_config_readb(p);
+                break;
+        case 2:
+                *val = celleb_fake_config_readw(p);
+                break;
+        case 4:
+                *val = celleb_fake_config_readl(p);
+                break;
+        }
+
+        return;
+}
+
+static void celleb_config_write_fake(unsigned char *config, int where,
+                                     int size, u32 val)
+{
+        char *p = config + where;
+
+        switch (size) {
+        case 1:
+                celleb_fake_config_writeb(val, p);
+                break;
+        case 2:
+                celleb_fake_config_writew(val, p);
+                break;
+        case 4:
+                celleb_fake_config_writel(val, p);
+                break;
+        }
+        return;
+}
+
+static int celleb_fake_pci_read_config(struct pci_bus *bus,
+                unsigned int devfn, int where, int size, u32 *val)
+{
+        char *config;
+        struct device_node *node;
+        struct pci_controller *hose;
+        unsigned int devno = devfn >> 3;
+        unsigned int fn = devfn & 0x7;
+
+        /* allignment check */
+        BUG_ON(where % size);
+
+        pr_debug("    fake read: bus=0x%x, ", bus->number);
+        node = (struct device_node *)bus->sysdata;
+        hose = pci_find_hose_for_OF_device(node);
+        config = get_fake_config_start(hose, devno, fn);
+
+        pr_debug("devno=0x%x, where=0x%x, size=0x%x, ", devno, where, size);
+        if (!config) {
+                pr_debug("failed\n");
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        }
+
+        celleb_config_read_fake(config, where, size, val);
+        pr_debug("val=0x%x\n", *val);
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+
+static int celleb_fake_pci_write_config(struct pci_bus *bus,
+                 unsigned int devfn, int where, int size, u32 val)
+{
+        char *config;
+        struct device_node *node;
+        struct pci_controller *hose;
+        struct celleb_pci_resource *res;
+        unsigned int devno = devfn >> 3;
+        unsigned int fn = devfn & 0x7;
+
+        /* allignment check */
+        BUG_ON(where % size);
+
+        node = (struct device_node *)bus->sysdata;
+        hose = pci_find_hose_for_OF_device(node);
+        config = get_fake_config_start(hose, devno, fn);
+
+        if (!config)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        if (val == ~0) {
+                int i = (where - PCI_BASE_ADDRESS_0) >> 3;
+
+                switch (where) {
+                case PCI_BASE_ADDRESS_0:
+                case PCI_BASE_ADDRESS_2:
+                        if (size != 4)
+                                return PCIBIOS_DEVICE_NOT_FOUND;
+                        res = get_resource_start(hose, devno, fn);
+                        if (!res)
+                                return PCIBIOS_DEVICE_NOT_FOUND;
+                        celleb_config_write_fake(config, where, size,
+                                        (res->r[i].end - res->r[i].start));
+                        return PCIBIOS_SUCCESSFUL;
+                case PCI_BASE_ADDRESS_1:
+                case PCI_BASE_ADDRESS_3:
+                case PCI_BASE_ADDRESS_4:
+                case PCI_BASE_ADDRESS_5:
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        celleb_config_write_fake(config, where, size, val);
+        pr_debug("    fake write: where=%x, size=%d, val=%x\n",
+                 where, size, val);
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops celleb_fake_pci_ops = {
+        celleb_fake_pci_read_config,
+        celleb_fake_pci_write_config
+};
+
+static inline void celleb_setup_pci_base_addrs(struct pci_controller *hose,
+                                        unsigned int devno, unsigned int fn,
+                                        unsigned int num_base_addr)
+{
+        u32 val;
+        unsigned char *config;
+        struct celleb_pci_resource *res;
+
+        config = get_fake_config_start(hose, devno, fn);
+        res = get_resource_start(hose, devno, fn);
+
+        if (!config || !res)
+                return;
+
+        switch (num_base_addr) {
+        case 3:
+                val = (res->r[2].start & 0xfffffff0)
+                    | PCI_BASE_ADDRESS_MEM_TYPE_64;
+                celleb_config_write_fake(config, PCI_BASE_ADDRESS_4, 4, val);
+                val = res->r[2].start >> 32;
+                celleb_config_write_fake(config, PCI_BASE_ADDRESS_5, 4, val);
+                /* FALLTHROUGH */
+        case 2:
+                val = (res->r[1].start & 0xfffffff0)
+                    | PCI_BASE_ADDRESS_MEM_TYPE_64;
+                celleb_config_write_fake(config, PCI_BASE_ADDRESS_2, 4, val);
+                val = res->r[1].start >> 32;
+                celleb_config_write_fake(config, PCI_BASE_ADDRESS_3, 4, val);
+                /* FALLTHROUGH */
+        case 1:
+                val = (res->r[0].start & 0xfffffff0)
+                    | PCI_BASE_ADDRESS_MEM_TYPE_64;
+                celleb_config_write_fake(config, PCI_BASE_ADDRESS_0, 4, val);
+                val = res->r[0].start >> 32;
+                celleb_config_write_fake(config, PCI_BASE_ADDRESS_1, 4, val);
+                break;
+        }
+
+        val = PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
+        celleb_config_write_fake(config, PCI_COMMAND, 2, val);
+}
+
+static int __devinit celleb_setup_fake_pci_device(struct device_node *node,
+                                                  struct pci_controller *hose)
+{
+        unsigned int rlen;
+        int num_base_addr = 0;
+        u32 val;
+        const u32 *wi0, *wi1, *wi2, *wi3, *wi4;
+        unsigned int devno, fn;
+        struct celleb_pci_private *private = hose->private_data;
+        unsigned char **config = NULL;
+        struct celleb_pci_resource **res = NULL;
+        const char *name;
+        const unsigned long *li;
+        int size, result;
+
+        if (private == NULL) {
+                printk(KERN_ERR "PCI: "
+                       "memory space for pci controller is not assigned\n");
+                goto error;
+        }
+
+        name = get_property(node, "model", &rlen);
+        if (!name) {
+                printk(KERN_ERR "PCI: model property not found.\n");
+                goto error;
+        }
+
+        wi4 = get_property(node, "reg", &rlen);
+        if (wi4 == NULL)
+                goto error;
+
+        devno = ((wi4[0] >> 8) & 0xff) >> 3;
+        fn = (wi4[0] >> 8) & 0x7;
+
+        pr_debug("PCI: celleb_setup_fake_pci() %s devno=%x fn=%x\n", name,
+                 devno, fn);
+
+        size = 256;
+        config = &private->fake_config[devno][fn];
+        if (mem_init_done)
+                *config = kzalloc(size, GFP_KERNEL);
+        else
+                *config = alloc_bootmem(size);
+        if (*config == NULL) {
+                printk(KERN_ERR "PCI: "
+                       "not enough memory for fake configuration space\n");
+                goto error;
+        }
+        pr_debug("PCI: fake config area assigned 0x%016lx\n",
+                 (unsigned long)*config);
+
+        size = sizeof(struct celleb_pci_resource);
+        res = &private->res[devno][fn];
+        if (mem_init_done)
+                *res = kzalloc(size, GFP_KERNEL);
+        else
+                *res = alloc_bootmem(size);
+        if (*res == NULL) {
+                printk(KERN_ERR
+                       "PCI: not enough memory for resource data space\n");
+                goto error;
+        }
+        pr_debug("PCI: res assigned 0x%016lx\n", (unsigned long)*res);
+
+        wi0 = get_property(node, "device-id", NULL);
+        wi1 = get_property(node, "vendor-id", NULL);
+        wi2 = get_property(node, "class-code", NULL);
+        wi3 = get_property(node, "revision-id", NULL);
+
+        celleb_config_write_fake(*config, PCI_DEVICE_ID, 2, wi0[0] & 0xffff);
+        celleb_config_write_fake(*config, PCI_VENDOR_ID, 2, wi1[0] & 0xffff);
+        pr_debug("class-code = 0x%08x\n", wi2[0]);
+
+        celleb_config_write_fake(*config, PCI_CLASS_PROG, 1, wi2[0] & 0xff);
+        celleb_config_write_fake(*config, PCI_CLASS_DEVICE, 2,
+                                 (wi2[0] >> 8) & 0xffff);
+        celleb_config_write_fake(*config, PCI_REVISION_ID, 1, wi3[0]);
+
+        while (num_base_addr < MAX_PCI_BASE_ADDRS) {
+                result = of_address_to_resource(node,
+                                num_base_addr, &(*res)->r[num_base_addr]);
+                if (result)
+                        break;
+                num_base_addr++;
+        }
+
+        celleb_setup_pci_base_addrs(hose, devno, fn, num_base_addr);
+
+        li = get_property(node, "interrupts", &rlen);
+        val = li[0];
+        celleb_config_write_fake(*config, PCI_INTERRUPT_PIN, 1, 1);
+        celleb_config_write_fake(*config, PCI_INTERRUPT_LINE, 1, val);
+
+#ifdef DEBUG
+        pr_debug("PCI: %s irq=%ld\n", name, li[0]);
+        for (i = 0; i < 6; i++) {
+                celleb_config_read_fake(*config,
+                                        PCI_BASE_ADDRESS_0 + 0x4 * i, 4,
+                                        &val);
+                pr_debug("PCI: %s fn=%d base_address_%d=0x%x\n",
+                         name, fn, i, val);
+        }
+#endif
+
+        celleb_config_write_fake(*config, PCI_HEADER_TYPE, 1,
+                                 PCI_HEADER_TYPE_NORMAL);
+
+        return 0;
+
+error:
+        if (mem_init_done) {
+                if (config && *config)
+                        kfree(*config);
+                if (res && *res)
+                        kfree(*res);
+
+        } else {
+                if (config && *config) {
+                        size = 256;
+                        free_bootmem((unsigned long)(*config), size);
+                }
+                if (res && *res) {
+                        size = sizeof(struct celleb_pci_resource);
+                        free_bootmem((unsigned long)(*res), size);
+                }
+        }
+
+        return 1;
+}
+
+static int __devinit phb_set_bus_ranges(struct device_node *dev,
+                                        struct pci_controller *phb)
+{
+        const int *bus_range;
+        unsigned int len;
+
+        bus_range = get_property(dev, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int))
+                return 1;
+
+        phb->first_busno = bus_range[0];
+        phb->last_busno = bus_range[1];
+
+        return 0;
+}
+
+static void __devinit celleb_alloc_private_mem(struct pci_controller *hose)
+{
+        if (mem_init_done)
+                hose->private_data =
+                        kzalloc(sizeof(struct celleb_pci_private), GFP_KERNEL);
+        else
+                hose->private_data =
+                        alloc_bootmem(sizeof(struct celleb_pci_private));
+}
+
+int __devinit celleb_setup_phb(struct pci_controller *phb)
+{
+        const char *name;
+        struct device_node *dev = phb->arch_data;
+        struct device_node *node;
+        unsigned int rlen;
+
+        name = get_property(dev, "name", &rlen);
+        if (!name)
+                return 1;
+
+        pr_debug("PCI: celleb_setup_phb() %s\n", name);
+        phb_set_bus_ranges(dev, phb);
+
+        if (strcmp(name, "epci") == 0) {
+                phb->ops = &celleb_epci_ops;
+                return celleb_setup_epci(dev, phb);
+
+        } else if (strcmp(name, "pci-pseudo") == 0) {
+                phb->ops = &celleb_fake_pci_ops;
+                celleb_alloc_private_mem(phb);
+                for (node = of_get_next_child(dev, NULL);
+                     node != NULL; node = of_get_next_child(dev, node))
+                        celleb_setup_fake_pci_device(node, phb);
+
+        } else
+                return 1;
+
+        return 0;
+}
+
+int celleb_pci_probe_mode(struct pci_bus *bus)
+{
+        return PCI_PROBE_DEVTREE;
+}
diff --git a/arch/powerpc/platforms/celleb/pci.h b/arch/powerpc/platforms/celleb/pci.h
new file mode 100644
index 000000000000..5340e348e297
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/pci.h
@@ -0,0 +1,35 @@
+/*
+ * pci prototypes for Celleb platform
+ *
+ * (C) Copyright 2006-2007 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _CELLEB_PCI_H
+#define _CELLEB_PCI_H
+
+#include <linux/pci.h>
+
+#include <asm/pci-bridge.h>
+#include <asm/prom.h>
+
+extern int celleb_setup_phb(struct pci_controller *);
+extern int celleb_pci_probe_mode(struct pci_bus *);
+
+extern struct pci_ops celleb_epci_ops;
+extern int celleb_setup_epci(struct device_node *, struct pci_controller *);
+
+#endif /* _CELLEB_PCI_H */
diff --git a/arch/powerpc/platforms/celleb/scc.h b/arch/powerpc/platforms/celleb/scc.h
new file mode 100644
index 000000000000..e9ce8a7c1882
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/scc.h
@@ -0,0 +1,145 @@
+/*
+ * SCC (Super Companion Chip) definitions
+ *
+ * (C) Copyright 2004-2006 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _CELLEB_SCC_H
+#define _CELLEB_SCC_H
+
+#define PCI_VENDOR_ID_TOSHIBA_2                 0x102f
+#define PCI_DEVICE_ID_TOSHIBA_SCC_PCIEXC_BRIDGE 0x01b0
+#define PCI_DEVICE_ID_TOSHIBA_SCC_EPCI_BRIDGE   0x01b1
+#define PCI_DEVICE_ID_TOSHIBA_SCC_BRIDGE        0x01b2
+#define PCI_DEVICE_ID_TOSHIBA_SCC_GBE           0x01b3
+#define PCI_DEVICE_ID_TOSHIBA_SCC_ATA           0x01b4
+#define PCI_DEVICE_ID_TOSHIBA_SCC_USB2          0x01b5
+#define PCI_DEVICE_ID_TOSHIBA_SCC_USB           0x01b6
+#define PCI_DEVICE_ID_TOSHIBA_SCC_ENCDEC        0x01b7
+
+#define SCC_EPCI_REG            0x0000d000
+
+/* EPCI registers */
+#define SCC_EPCI_CNF10_REG      0x010
+#define SCC_EPCI_CNF14_REG      0x014
+#define SCC_EPCI_CNF18_REG      0x018
+#define SCC_EPCI_PVBAT          0x100
+#define SCC_EPCI_VPMBAT         0x104
+#define SCC_EPCI_VPIBAT         0x108
+#define SCC_EPCI_VCSR           0x110
+#define SCC_EPCI_VIENAB         0x114
+#define SCC_EPCI_VISTAT         0x118
+#define SCC_EPCI_VRDCOUNT       0x124
+#define SCC_EPCI_BAM0           0x12c
+#define SCC_EPCI_BAM1           0x134
+#define SCC_EPCI_BAM2           0x13c
+#define SCC_EPCI_IADR           0x164
+#define SCC_EPCI_CLKRST         0x800
+#define SCC_EPCI_INTSET         0x804
+#define SCC_EPCI_STATUS         0x808
+#define SCC_EPCI_ABTSET         0x80c
+#define SCC_EPCI_WATRP          0x810
+#define SCC_EPCI_DUMMYRADR      0x814
+#define SCC_EPCI_SWRESP         0x818
+#define SCC_EPCI_CNTOPT         0x81c
+#define SCC_EPCI_ECMODE         0xf00
+#define SCC_EPCI_IOM_AC_NUM     5
+#define SCC_EPCI_IOM_ACTE(n)    (0xf10 + (n) * 4)
+#define SCC_EPCI_IOT_AC_NUM     4
+#define SCC_EPCI_IOT_ACTE(n)    (0xf30 + (n) * 4)
+#define SCC_EPCI_MAEA           0xf50
+#define SCC_EPCI_MAEC           0xf54
+#define SCC_EPCI_CKCTRL         0xff0
+
+/* bits for SCC_EPCI_VCSR */
+#define SCC_EPCI_VCSR_FRE       0x00020000
+#define SCC_EPCI_VCSR_FWE       0x00010000
+#define SCC_EPCI_VCSR_DR        0x00000400
+#define SCC_EPCI_VCSR_SR        0x00000008
+#define SCC_EPCI_VCSR_AT        0x00000004
+
+/* bits for SCC_EPCI_VIENAB/SCC_EPCI_VISTAT */
+#define SCC_EPCI_VISTAT_PMPE    0x00000008
+#define SCC_EPCI_VISTAT_PMFE    0x00000004
+#define SCC_EPCI_VISTAT_PRA     0x00000002
+#define SCC_EPCI_VISTAT_PRD     0x00000001
+#define SCC_EPCI_VISTAT_ALL     0x0000000f
+
+#define SCC_EPCI_VIENAB_PMPEE   0x00000008
+#define SCC_EPCI_VIENAB_PMFEE   0x00000004
+#define SCC_EPCI_VIENAB_PRA     0x00000002
+#define SCC_EPCI_VIENAB_PRD     0x00000001
+#define SCC_EPCI_VIENAB_ALL     0x0000000f
+
+/* bits for SCC_EPCI_CLKRST */
+#define SCC_EPCI_CLKRST_CKS_MASK 0x00030000
+#define SCC_EPCI_CLKRST_CKS_2   0x00000000
+#define SCC_EPCI_CLKRST_CKS_4   0x00010000
+#define SCC_EPCI_CLKRST_CKS_8   0x00020000
+#define SCC_EPCI_CLKRST_PCICRST 0x00000400
+#define SCC_EPCI_CLKRST_BC      0x00000200
+#define SCC_EPCI_CLKRST_PCIRST  0x00000100
+#define SCC_EPCI_CLKRST_PCKEN   0x00000001
+
+/* bits for SCC_EPCI_INTSET/SCC_EPCI_STATUS */
+#define SCC_EPCI_INT_2M         0x01000000
+#define SCC_EPCI_INT_RERR       0x00200000
+#define SCC_EPCI_INT_SERR       0x00100000
+#define SCC_EPCI_INT_PRTER      0x00080000
+#define SCC_EPCI_INT_SER        0x00040000
+#define SCC_EPCI_INT_PER        0x00020000
+#define SCC_EPCI_INT_PAI        0x00010000
+#define SCC_EPCI_INT_1M         0x00000100
+#define SCC_EPCI_INT_PME        0x00000010
+#define SCC_EPCI_INT_INTD       0x00000008
+#define SCC_EPCI_INT_INTC       0x00000004
+#define SCC_EPCI_INT_INTB       0x00000002
+#define SCC_EPCI_INT_INTA       0x00000001
+#define SCC_EPCI_INT_DEVINT     0x0000000f
+#define SCC_EPCI_INT_ALL        0x003f001f
+#define SCC_EPCI_INT_ALLERR     0x003f0000
+
+/* bits for SCC_EPCI_CKCTRL */
+#define SCC_EPCI_CKCTRL_CRST0   0x00010000
+#define SCC_EPCI_CKCTRL_CRST1   0x00020000
+#define SCC_EPCI_CKCTRL_OCLKEN  0x00000100
+#define SCC_EPCI_CKCTRL_LCLKEN  0x00000001
+
+#define SCC_EPCI_IDSEL_AD_TO_SLOT(ad)       ((ad) - 10)
+#define SCC_EPCI_MAX_DEVNU      SCC_EPCI_IDSEL_AD_TO_SLOT(32)
+
+/* bits for SCC_EPCI_CNTOPT */
+#define SCC_EPCI_CNTOPT_O2PMB   0x00000002
+
+/* UHC registers */
+#define SCC_UHC_CKRCTRL         0xff0
+#define SCC_UHC_ECMODE          0xf00
+
+/* bits for SCC_UHC_CKRCTRL */
+#define SCC_UHC_F48MCKLEN       0x00000001
+#define SCC_UHC_P_SUSPEND       0x00000002
+#define SCC_UHC_PHY_SUSPEND_SEL 0x00000004
+#define SCC_UHC_HCLKEN          0x00000100
+#define SCC_UHC_USBEN           0x00010000
+#define SCC_UHC_USBCEN          0x00020000
+#define SCC_UHC_PHYEN           0x00040000
+
+/* bits for SCC_UHC_ECMODE */
+#define SCC_UHC_ECMODE_BY_BYTE  0x00000555
+#define SCC_UHC_ECMODE_BY_WORD  0x00000aaa
+
+#endif /* _CELLEB_SCC_H */
diff --git a/arch/powerpc/platforms/celleb/scc_epci.c b/arch/powerpc/platforms/celleb/scc_epci.c
new file mode 100644
index 000000000000..c11b39c3776a
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/scc_epci.c
@@ -0,0 +1,409 @@
+/*
+ * Support for SCC external PCI
+ *
+ * (C) Copyright 2004-2007 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/threads.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/pci_regs.h>
+#include <linux/bootmem.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
+
+#include "scc.h"
+#include "pci.h"
+#include "interrupt.h"
+
+#define MAX_PCI_DEVICES   32
+#define MAX_PCI_FUNCTIONS  8
+
+#define iob()  __asm__ __volatile__("eieio; sync":::"memory")
+
+
+#if 0 /* test code for epci dummy read */
+static void celleb_epci_dummy_read(struct pci_dev *dev)
+{
+        void __iomem *epci_base;
+        struct device_node *node;
+        struct pci_controller *hose;
+        u32 val;
+
+        node = (struct device_node *)dev->bus->sysdata;
+        hose = pci_find_hose_for_OF_device(node);
+
+        if (!hose)
+                return;
+
+        epci_base = hose->cfg_addr;
+
+        val = in_be32(epci_base + SCC_EPCI_WATRP);
+        iosync();
+
+        return;
+}
+#endif
+
+static inline void clear_and_disable_master_abort_interrupt(
+                                        struct pci_controller *hose)
+{
+        void __iomem *addr;
+        addr = hose->cfg_addr + PCI_COMMAND;
+        out_be32(addr, in_be32(addr) | (PCI_STATUS_REC_MASTER_ABORT << 16));
+}
+
+static int celleb_epci_check_abort(struct pci_controller *hose,
+                                   void __iomem *addr)
+{
+        void __iomem *reg, *epci_base;
+        u32 val;
+
+        iob();
+        epci_base = hose->cfg_addr;
+
+        reg = epci_base + PCI_COMMAND;
+        val = in_be32(reg);
+
+        if (val & (PCI_STATUS_REC_MASTER_ABORT << 16)) {
+                out_be32(reg,
+                         (val & 0xffff) | (PCI_STATUS_REC_MASTER_ABORT << 16));
+
+                /* clear PCI Controller error, FRE, PMFE */
+                reg = epci_base + SCC_EPCI_STATUS;
+                out_be32(reg, SCC_EPCI_INT_PAI);
+
+                reg = epci_base + SCC_EPCI_VCSR;
+                val = in_be32(reg) & 0xffff;
+                val |= SCC_EPCI_VCSR_FRE;
+                out_be32(reg, val);
+
+                reg = epci_base + SCC_EPCI_VISTAT;
+                out_be32(reg, SCC_EPCI_VISTAT_PMFE);
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        }
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static void __iomem *celleb_epci_make_config_addr(struct pci_controller *hose,
+                                        unsigned int devfn, int where)
+{
+        void __iomem *addr;
+        struct pci_bus *bus = hose->bus;
+
+        if (bus->self)
+                addr = hose->cfg_data +
+                       (((bus->number & 0xff) << 16)
+                        | ((devfn & 0xff) << 8)
+                        | (where & 0xff)
+                        | 0x01000000);
+        else
+                addr = hose->cfg_data +
+                       (((devfn & 0xff) << 8) | (where & 0xff));
+
+        pr_debug("EPCI: config_addr = 0x%p\n", addr);
+
+        return addr;
+}
+
+static int celleb_epci_read_config(struct pci_bus *bus,
+                        unsigned int devfn, int where, int size, u32 * val)
+{
+        void __iomem *addr;
+        struct device_node *node;
+        struct pci_controller *hose;
+
+        /* allignment check */
+        BUG_ON(where % size);
+
+        node = (struct device_node *)bus->sysdata;
+        hose = pci_find_hose_for_OF_device(node);
+
+        if (!hose->cfg_data)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        if (bus->number == hose->first_busno && devfn == 0) {
+                /* EPCI controller self */
+
+                addr = hose->cfg_addr + where;
+
+                switch (size) {
+                case 1:
+                        *val = in_8(addr);
+                        break;
+                case 2:
+                        *val = in_be16(addr);
+                        break;
+                case 4:
+                        *val = in_be32(addr);
+                        break;
+                default:
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+                }
+
+        } else {
+
+                clear_and_disable_master_abort_interrupt(hose);
+                addr = celleb_epci_make_config_addr(hose, devfn, where);
+
+                switch (size) {
+                case 1:
+                        *val = in_8(addr);
+                        break;
+                case 2:
+                        *val = in_le16(addr);
+                        break;
+                case 4:
+                        *val = in_le32(addr);
+                        break;
+                default:
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+                }
+        }
+
+        pr_debug("EPCI: "
+                 "addr=0x%lx, devfn=0x%x, where=0x%x, size=0x%x, val=0x%x\n",
+                 addr, devfn, where, size, *val);
+
+        return celleb_epci_check_abort(hose, NULL);
+}
+
+static int celleb_epci_write_config(struct pci_bus *bus,
+                        unsigned int devfn, int where, int size, u32 val)
+{
+        void __iomem *addr;
+        struct device_node *node;
+        struct pci_controller *hose;
+
+        /* allignment check */
+        BUG_ON(where % size);
+
+        node = (struct device_node *)bus->sysdata;
+        hose = pci_find_hose_for_OF_device(node);
+
+        if (!hose->cfg_data)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        if (bus->number == hose->first_busno && devfn == 0) {
+                /* EPCI controller self */
+
+                addr = hose->cfg_addr + where;
+
+                switch (size) {
+                case 1:
+                        out_8(addr, val);
+                        break;
+                case 2:
+                        out_be16(addr, val);
+                        break;
+                case 4:
+                        out_be32(addr, val);
+                        break;
+                default:
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+                }
+
+        } else {
+
+                clear_and_disable_master_abort_interrupt(hose);
+                addr = celleb_epci_make_config_addr(hose, devfn, where);
+
+                switch (size) {
+                case 1:
+                        out_8(addr, val);
+                        break;
+                case 2:
+                        out_le16(addr, val);
+                        break;
+                case 4:
+                        out_le32(addr, val);
+                        break;
+                default:
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+                }
+        }
+
+        return celleb_epci_check_abort(hose, addr);
+}
+
+struct pci_ops celleb_epci_ops = {
+        celleb_epci_read_config,
+        celleb_epci_write_config,
+};
+
+/* to be moved in FW */
+static int __devinit celleb_epci_init(struct pci_controller *hose)
+{
+        u32 val;
+        void __iomem *reg, *epci_base;
+        int hwres = 0;
+
+        epci_base = hose->cfg_addr;
+
+        /* PCI core reset(Internal bus and PCI clock) */
+        reg = epci_base + SCC_EPCI_CKCTRL;
+        val = in_be32(reg);
+        if (val == 0x00030101)
+                hwres = 1;
+        else {
+                val &= ~(SCC_EPCI_CKCTRL_CRST0 | SCC_EPCI_CKCTRL_CRST1);
+                out_be32(reg, val);
+
+                /* set PCI core clock */
+                val = in_be32(reg);
+                val |= (SCC_EPCI_CKCTRL_OCLKEN | SCC_EPCI_CKCTRL_LCLKEN);
+                out_be32(reg, val);
+
+                /* release PCI core reset (internal bus) */
+                val = in_be32(reg);
+                val |= SCC_EPCI_CKCTRL_CRST0;
+                out_be32(reg, val);
+
+                /* set PCI clock select */
+                reg = epci_base + SCC_EPCI_CLKRST;
+                val = in_be32(reg);
+                val &= ~SCC_EPCI_CLKRST_CKS_MASK;
+                val |= SCC_EPCI_CLKRST_CKS_2;
+                out_be32(reg, val);
+
+                /* set arbiter */
+                reg = epci_base + SCC_EPCI_ABTSET;
+                out_be32(reg, 0x0f1f001f);      /* temporary value */
+
+                /* buffer on */
+                reg = epci_base + SCC_EPCI_CLKRST;
+                val = in_be32(reg);
+                val |= SCC_EPCI_CLKRST_BC;
+                out_be32(reg, val);
+
+                /* PCI clock enable */
+                val = in_be32(reg);
+                val |= SCC_EPCI_CLKRST_PCKEN;
+                out_be32(reg, val);
+
+                /* release PCI core reset (all) */
+                reg = epci_base + SCC_EPCI_CKCTRL;
+                val = in_be32(reg);
+                val |= (SCC_EPCI_CKCTRL_CRST0 | SCC_EPCI_CKCTRL_CRST1);
+                out_be32(reg, val);
+
+                /* set base translation registers. (already set by Beat) */
+
+                /* set base address masks. (already set by Beat) */
+        }
+
+        /* release interrupt masks and clear all interrupts */
+        reg = epci_base + SCC_EPCI_INTSET;
+        out_be32(reg, 0x013f011f);      /* all interrupts enable */
+        reg = epci_base + SCC_EPCI_VIENAB;
+        val = SCC_EPCI_VIENAB_PMPEE | SCC_EPCI_VIENAB_PMFEE;
+        out_be32(reg, val);
+        reg = epci_base + SCC_EPCI_STATUS;
+        out_be32(reg, 0xffffffff);
+        reg = epci_base + SCC_EPCI_VISTAT;
+        out_be32(reg, 0xffffffff);
+
+        /* disable PCI->IB address translation */
+        reg = epci_base + SCC_EPCI_VCSR;
+        val = in_be32(reg);
+        val &= ~(SCC_EPCI_VCSR_DR | SCC_EPCI_VCSR_AT);
+        out_be32(reg, val);
+
+        /* set base addresses. (no need to set?) */
+
+        /* memory space, bus master enable */
+        reg = epci_base + PCI_COMMAND;
+        val = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
+        out_be32(reg, val);
+
+        /* endian mode setup */
+        reg = epci_base + SCC_EPCI_ECMODE;
+        val = 0x00550155;
+        out_be32(reg, val);
+
+        /* set control option */
+        reg = epci_base + SCC_EPCI_CNTOPT;
+        val = in_be32(reg);
+        val |= SCC_EPCI_CNTOPT_O2PMB;
+        out_be32(reg, val);
+
+        /* XXX: temporay: set registers for address conversion setup */
+        reg = epci_base + SCC_EPCI_CNF10_REG;
+        out_be32(reg, 0x80000008);
+        reg = epci_base + SCC_EPCI_CNF14_REG;
+        out_be32(reg, 0x40000008);
+
+        reg = epci_base + SCC_EPCI_BAM0;
+        out_be32(reg, 0x80000000);
+        reg = epci_base + SCC_EPCI_BAM1;
+        out_be32(reg, 0xe0000000);
+
+        reg = epci_base + SCC_EPCI_PVBAT;
+        out_be32(reg, 0x80000000);
+
+        if (!hwres) {
+                /* release external PCI reset */
+                reg = epci_base + SCC_EPCI_CLKRST;
+                val = in_be32(reg);
+                val |= SCC_EPCI_CLKRST_PCIRST;
+                out_be32(reg, val);
+        }
+
+        return 0;
+}
+
+int __devinit celleb_setup_epci(struct device_node *node,
+                                struct pci_controller *hose)
+{
+        struct resource r;
+
+        pr_debug("PCI: celleb_setup_epci()\n");
+
+        if (of_address_to_resource(node, 0, &r))
+                goto error;
+        hose->cfg_addr = ioremap(r.start, (r.end - r.start + 1));
+        if (!hose->cfg_addr)
+                goto error;
+        pr_debug("EPCI: cfg_addr map 0x%016lx->0x%016lx + 0x%016lx\n",
+                 r.start, (unsigned long)hose->cfg_addr,
+                (r.end - r.start + 1));
+
+        if (of_address_to_resource(node, 2, &r))
+                goto error;
+        hose->cfg_data = ioremap(r.start, (r.end - r.start + 1));
+        if (!hose->cfg_data)
+                goto error;
+        pr_debug("EPCI: cfg_data map 0x%016lx->0x%016lx + 0x%016lx\n",
+                 r.start, (unsigned long)hose->cfg_data,
+                (r.end - r.start + 1));
+
+        celleb_epci_init(hose);
+
+        return 0;
+
+error:
+        return 1;
+}
diff --git a/arch/powerpc/platforms/celleb/scc_sio.c b/arch/powerpc/platforms/celleb/scc_sio.c
new file mode 100644
index 000000000000..bcd25f54d986
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/scc_sio.c
@@ -0,0 +1,101 @@
+/*
+ * setup serial port in SCC
+ *
+ * (C) Copyright 2006 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/console.h>
+
+#include <asm/io.h>
+#include <asm/prom.h>
+
+/* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
+    mmio=0xfff000-0x1000,0xff2000-0x1000 */
+static int txx9_serial_bitmap = 0;
+
+static struct {
+        uint32_t offset;
+        uint32_t index;
+} txx9_scc_tab[3] = {
+        { 0x300, 0 },   /* 0xFFF300 */
+        { 0x400, 0 },   /* 0xFFF400 */
+        { 0x800, 1 }    /* 0xFF2800 */
+};
+
+static int txx9_serial_init(void)
+{
+        extern int early_serial_txx9_setup(struct uart_port *port);
+        struct device_node *node;
+        int i;
+        struct uart_port req;
+        struct of_irq irq;
+        struct resource res;
+
+        node = of_find_node_by_path("/ioif1/sio");
+        if (!node)
+                return 0;
+
+        for(i = 0; i < sizeof(txx9_scc_tab)/sizeof(txx9_scc_tab[0]); i++) {
+                if (!(txx9_serial_bitmap & (1<<i)))
+                        continue;
+
+                if (of_irq_map_one(node, i, &irq))
+                        continue;
+                if (of_address_to_resource(node, txx9_scc_tab[i].index, &res))
+                        continue;
+
+                memset(&req, 0, sizeof(req));
+                req.line = i;
+                req.iotype = UPIO_MEM;
+                req.mapbase = res.start + txx9_scc_tab[i].offset;
+#ifdef CONFIG_SERIAL_TXX9_CONSOLE
+                req.membase = ioremap(req.mapbase, 0x24);
+#endif
+                req.irq = irq_create_of_mapping(irq.controller,
+                        irq.specifier, irq.size);
+                req.flags |= UPF_IOREMAP | UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
+                req.uartclk = 83300000;
+                early_serial_txx9_setup(&req);
+        }
+
+        of_node_put(node);
+        return 0;
+}
+
+static int txx9_serial_config(char *ptr)
+{
+        int     i;
+
+        for (;;) {
+                switch(get_option(&ptr, &i)) {
+                default:
+                        return 0;
+                case 2:
+                        txx9_serial_bitmap |= 1 << i;
+                        break;
+                case 1:
+                        txx9_serial_bitmap |= 1 << i;
+                        return 0;
+                }
+        }
+}
+__setup("txx9_serial=", txx9_serial_config);
+
+console_initcall(txx9_serial_init);
diff --git a/arch/powerpc/platforms/celleb/scc_uhc.c b/arch/powerpc/platforms/celleb/scc_uhc.c
new file mode 100644
index 000000000000..a7c548bde2e3
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/scc_uhc.c
@@ -0,0 +1,94 @@
+/*
+ * SCC (Super Companion Chip) UHC setup
+ *
+ * (C) Copyright 2006-2007 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+
+#include <asm/delay.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+
+#include "scc.h"
+
+#define UHC_RESET_WAIT_MAX 10000
+
+static inline int uhc_clkctrl_ready(u32 val)
+{
+        const u32 mask = SCC_UHC_USBCEN | SCC_UHC_USBCEN;
+        return((val & mask) == mask);
+}
+
+/*
+ * UHC(usb host controler) enable function.
+ * affect to both of OHCI and EHCI core module.
+ */
+static void enable_scc_uhc(struct pci_dev *dev)
+{
+        void __iomem *uhc_base;
+        u32 __iomem *uhc_clkctrl;
+        u32 __iomem *uhc_ecmode;
+        u32 val = 0;
+        int i;
+
+        if (!machine_is(celleb))
+                return;
+
+        uhc_base = ioremap(pci_resource_start(dev, 0),
+                           pci_resource_len(dev, 0));
+        if (!uhc_base) {
+                printk(KERN_ERR "failed to map UHC register base.\n");
+                return;
+        }
+        uhc_clkctrl = uhc_base + SCC_UHC_CKRCTRL;
+        uhc_ecmode  = uhc_base + SCC_UHC_ECMODE;
+
+        /* setup for normal mode */
+        val |= SCC_UHC_F48MCKLEN;
+        out_be32(uhc_clkctrl, val);
+        val |= SCC_UHC_PHY_SUSPEND_SEL;
+        out_be32(uhc_clkctrl, val);
+        udelay(10);
+        val |= SCC_UHC_PHYEN;
+        out_be32(uhc_clkctrl, val);
+        udelay(50);
+
+        /* disable reset */
+        val |= SCC_UHC_HCLKEN;
+        out_be32(uhc_clkctrl, val);
+        val |= (SCC_UHC_USBCEN | SCC_UHC_USBEN);
+        out_be32(uhc_clkctrl, val);
+        i = 0;
+        while (!uhc_clkctrl_ready(in_be32(uhc_clkctrl))) {
+                udelay(10);
+                if (i++ > UHC_RESET_WAIT_MAX) {
+                        printk(KERN_ERR "Failed to disable UHC reset %x\n",
+                               in_be32(uhc_clkctrl));
+                        break;
+                }
+        }
+
+        /* Endian Conversion Mode for Master ALL area */
+        out_be32(uhc_ecmode, SCC_UHC_ECMODE_BY_BYTE);
+
+        iounmap(uhc_base);
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TOSHIBA_2,
+                 PCI_DEVICE_ID_TOSHIBA_SCC_USB, enable_scc_uhc);
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c
new file mode 100644
index 000000000000..5f4d0d933238
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/setup.c
@@ -0,0 +1,193 @@
+/*
+ * Celleb setup code
+ *
+ * (C) Copyright 2006-2007 TOSHIBA CORPORATION
+ *
+ * This code is based on arch/powerpc/platforms/cell/setup.c:
+ *  Copyright (C) 1995  Linus Torvalds
+ *  Adapted from 'alpha' version by Gary Thomas
+ *  Modified by Cort Dougan (cort@cs.nmt.edu)
+ *  Modified by PPC64 Team, IBM Corp
+ *  Modified by Cell Team, IBM Deutschland Entwicklung GmbH
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#undef DEBUG
+
+#include <linux/cpu.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/stddef.h>
+#include <linux/unistd.h>
+#include <linux/reboot.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/seq_file.h>
+#include <linux/root_dev.h>
+#include <linux/console.h>
+
+#include <asm/mmu.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <asm/kexec.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/cputable.h>
+#include <asm/irq.h>
+#include <asm/spu_priv1.h>
+#include <asm/firmware.h>
+#include <asm/of_platform.h>
+
+#include "interrupt.h"
+#include "beat_wrapper.h"
+#include "beat.h"
+#include "pci.h"
+
+static char celleb_machine_type[128] = "Celleb";
+
+static void celleb_show_cpuinfo(struct seq_file *m)
+{
+        struct device_node *root;
+        const char *model = "";
+
+        root = of_find_node_by_path("/");
+        if (root)
+                model = get_property(root, "model", NULL);
+        /* using "CHRP" is to trick anaconda into installing FCx into Celleb */
+        seq_printf(m, "machine\t\t: %s %s\n", celleb_machine_type, model);
+        of_node_put(root);
+}
+
+static int celleb_machine_type_hack(char *ptr)
+{
+        strncpy(celleb_machine_type, ptr, sizeof(celleb_machine_type));
+        celleb_machine_type[sizeof(celleb_machine_type)-1] = 0;
+        return 0;
+}
+
+__setup("celleb_machine_type_hack", celleb_machine_type_hack);
+
+static void celleb_progress(char *s, unsigned short hex)
+{
+        printk("*** %04x : %s\n", hex, s ? s : "");
+}
+
+static void __init celleb_setup_arch(void)
+{
+#ifdef CONFIG_SPU_BASE
+        spu_priv1_ops = &spu_priv1_beat_ops;
+        spu_management_ops = &spu_management_of_ops;
+#endif
+
+#ifdef CONFIG_SMP
+        smp_init_celleb();
+#endif
+
+        /* init to some ~sane value until calibrate_delay() runs */
+        loops_per_jiffy = 50000000;
+
+        if (ROOT_DEV == 0) {
+                printk("No ramdisk, default root is /dev/hda2\n");
+                ROOT_DEV = Root_HDA2;
+        }
+
+#ifdef CONFIG_DUMMY_CONSOLE
+        conswitchp = &dummy_con;
+#endif
+}
+
+static void beat_power_save(void)
+{
+        beat_pause(0);
+}
+
+static int __init celleb_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "Beat"))
+                return 0;
+
+        powerpc_firmware_features |= FW_FEATURE_CELLEB_POSSIBLE;
+        hpte_init_beat();
+        return 1;
+}
+
+/*
+ * Cell has no legacy IO; anything calling this function has to
+ * fail or bad things will happen
+ */
+static int celleb_check_legacy_ioport(unsigned int baseport)
+{
+        return -ENODEV;
+}
+
+#ifdef CONFIG_KEXEC
+static void celleb_kexec_cpu_down(int crash, int secondary)
+{
+        beatic_deinit_IRQ();
+}
+#endif
+
+static struct of_device_id celleb_bus_ids[] = {
+        { .type = "scc", },
+        { .type = "ioif", },    /* old style */
+        {},
+};
+
+static int __init celleb_publish_devices(void)
+{
+        if (!machine_is(celleb))
+                return 0;
+
+        /* Publish OF platform devices for southbridge IOs */
+        of_platform_bus_probe(NULL, celleb_bus_ids, NULL);
+
+        return 0;
+}
+device_initcall(celleb_publish_devices);
+
+define_machine(celleb) {
+        .name                   = "Cell Reference Set",
+        .probe                  = celleb_probe,
+        .setup_arch             = celleb_setup_arch,
+        .show_cpuinfo           = celleb_show_cpuinfo,
+        .restart                = beat_restart,
+        .power_off              = beat_power_off,
+        .halt                   = beat_halt,
+        .get_rtc_time           = beat_get_rtc_time,
+        .set_rtc_time           = beat_set_rtc_time,
+        .calibrate_decr         = generic_calibrate_decr,
+        .check_legacy_ioport    = celleb_check_legacy_ioport,
+        .progress               = celleb_progress,
+        .power_save             = beat_power_save,
+        .nvram_size             = beat_nvram_get_size,
+        .nvram_read             = beat_nvram_read,
+        .nvram_write            = beat_nvram_write,
+        .set_dabr               = beat_set_xdabr,
+        .init_IRQ               = beatic_init_IRQ,
+        .get_irq                = beatic_get_irq,
+        .pci_probe_mode         = celleb_pci_probe_mode,
+        .pci_setup_phb          = celleb_setup_phb,
+#ifdef CONFIG_KEXEC
+        .kexec_cpu_down         = celleb_kexec_cpu_down,
+        .machine_kexec          = default_machine_kexec,
+        .machine_kexec_prepare  = default_machine_kexec_prepare,
+        .machine_crash_shutdown = default_machine_crash_shutdown,
+#endif
+};
diff --git a/arch/powerpc/platforms/celleb/smp.c b/arch/powerpc/platforms/celleb/smp.c
new file mode 100644
index 000000000000..a7631250aeb4
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/smp.c
@@ -0,0 +1,124 @@
+/*
+ * SMP support for Celleb platform. (Incomplete)
+ *
+ * (C) Copyright 2006 TOSHIBA CORPORATION
+ *
+ * This code is based on arch/powerpc/platforms/cell/smp.c:
+ * Dave Engebretsen, Peter Bergner, and
+ * Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
+ * Plus various changes from other IBM teams...
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/smp.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/threads.h>
+#include <linux/cpu.h>
+
+#include <asm/irq.h>
+#include <asm/smp.h>
+#include <asm/machdep.h>
+#include <asm/udbg.h>
+
+#include "interrupt.h"
+
+#ifdef DEBUG
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...)
+#endif
+
+/*
+ * The primary thread of each non-boot processor is recorded here before
+ * smp init.
+ */
+/* static cpumask_t of_spin_map; */
+
+/**
+ * smp_startup_cpu() - start the given cpu
+ *
+ * At boot time, there is nothing to do for primary threads which were
+ * started from Open Firmware.  For anything else, call RTAS with the
+ * appropriate start location.
+ *
+ * Returns:
+ *      0       - failure
+ *      1       - success
+ */
+static inline int __devinit smp_startup_cpu(unsigned int lcpu)
+{
+        return 0;
+}
+
+static void smp_beatic_message_pass(int target, int msg)
+{
+        unsigned int i;
+
+        if (target < NR_CPUS) {
+                beatic_cause_IPI(target, msg);
+        } else {
+                for_each_online_cpu(i) {
+                        if (target == MSG_ALL_BUT_SELF
+                            && i == smp_processor_id())
+                                continue;
+                        beatic_cause_IPI(i, msg);
+                }
+        }
+}
+
+static int __init smp_beatic_probe(void)
+{
+        return cpus_weight(cpu_possible_map);
+}
+
+static void __devinit smp_beatic_setup_cpu(int cpu)
+{
+        beatic_setup_cpu(cpu);
+}
+
+static void __devinit smp_celleb_kick_cpu(int nr)
+{
+        BUG_ON(nr < 0 || nr >= NR_CPUS);
+
+        if (!smp_startup_cpu(nr))
+                return;
+}
+
+static int smp_celleb_cpu_bootable(unsigned int nr)
+{
+        return 1;
+}
+static struct smp_ops_t bpa_beatic_smp_ops = {
+        .message_pass   = smp_beatic_message_pass,
+        .probe          = smp_beatic_probe,
+        .kick_cpu       = smp_celleb_kick_cpu,
+        .setup_cpu      = smp_beatic_setup_cpu,
+        .cpu_bootable   = smp_celleb_cpu_bootable,
+};
+
+/* This is called very early */
+void __init smp_init_celleb(void)
+{
+        DBG(" -> smp_init_celleb()\n");
+
+        smp_ops = &bpa_beatic_smp_ops;
+
+        DBG(" <- smp_init_celleb()\n");
+}
diff --git a/arch/powerpc/platforms/celleb/spu_priv1.c b/arch/powerpc/platforms/celleb/spu_priv1.c
new file mode 100644
index 000000000000..2bf6700f747a
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/spu_priv1.c
@@ -0,0 +1,208 @@
+/*
+ * spu hypervisor abstraction for Beat
+ *
+ * (C) Copyright 2006-2007 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/module.h>
+
+#include <asm/types.h>
+#include <asm/spu.h>
+#include <asm/spu_priv1.h>
+
+#include "beat_wrapper.h"
+
+static inline void _int_mask_set(struct spu *spu, int class, u64 mask)
+{
+        spu->shadow_int_mask_RW[class] = mask;
+        beat_set_irq_mask_for_spe(spu->spe_id, class, mask);
+}
+
+static inline u64 _int_mask_get(struct spu *spu, int class)
+{
+        return spu->shadow_int_mask_RW[class];
+}
+
+static void int_mask_set(struct spu *spu, int class, u64 mask)
+{
+        _int_mask_set(spu, class, mask);
+}
+
+static u64 int_mask_get(struct spu *spu, int class)
+{
+        return _int_mask_get(spu, class);
+}
+
+static void int_mask_and(struct spu *spu, int class, u64 mask)
+{
+        u64 old_mask;
+        old_mask = _int_mask_get(spu, class);
+        _int_mask_set(spu, class, old_mask & mask);
+}
+
+static void int_mask_or(struct spu *spu, int class, u64 mask)
+{
+        u64 old_mask;
+        old_mask = _int_mask_get(spu, class);
+        _int_mask_set(spu, class, old_mask | mask);
+}
+
+static void int_stat_clear(struct spu *spu, int class, u64 stat)
+{
+        beat_clear_interrupt_status_of_spe(spu->spe_id, class, stat);
+}
+
+static u64 int_stat_get(struct spu *spu, int class)
+{
+        u64 int_stat;
+        beat_get_interrupt_status_of_spe(spu->spe_id, class, &int_stat);
+        return int_stat;
+}
+
+static void cpu_affinity_set(struct spu *spu, int cpu)
+{
+        return;
+}
+
+static u64 mfc_dar_get(struct spu *spu)
+{
+        u64 dar;
+        beat_get_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, mfc_dar_RW), &dar);
+        return dar;
+}
+
+static u64 mfc_dsisr_get(struct spu *spu)
+{
+        u64 dsisr;
+        beat_get_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, mfc_dsisr_RW), &dsisr);
+        return dsisr;
+}
+
+static void mfc_dsisr_set(struct spu *spu, u64 dsisr)
+{
+        beat_set_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, mfc_dsisr_RW), dsisr);
+}
+
+static void mfc_sdr_setup(struct spu *spu)
+{
+        return;
+}
+
+static void mfc_sr1_set(struct spu *spu, u64 sr1)
+{
+        beat_set_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, mfc_sr1_RW), sr1);
+}
+
+static u64 mfc_sr1_get(struct spu *spu)
+{
+        u64 sr1;
+        beat_get_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, mfc_sr1_RW), &sr1);
+        return sr1;
+}
+
+static void mfc_tclass_id_set(struct spu *spu, u64 tclass_id)
+{
+        beat_set_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, mfc_tclass_id_RW), tclass_id);
+}
+
+static u64 mfc_tclass_id_get(struct spu *spu)
+{
+        u64 tclass_id;
+        beat_get_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, mfc_tclass_id_RW), &tclass_id);
+        return tclass_id;
+}
+
+static void tlb_invalidate(struct spu *spu)
+{
+        beat_set_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, tlb_invalidate_entry_W), 0ul);
+}
+
+static void resource_allocation_groupID_set(struct spu *spu, u64 id)
+{
+        beat_set_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, resource_allocation_groupID_RW),
+                id);
+}
+
+static u64 resource_allocation_groupID_get(struct spu *spu)
+{
+        u64 id;
+        beat_get_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, resource_allocation_groupID_RW),
+                &id);
+        return id;
+}
+
+static void resource_allocation_enable_set(struct spu *spu, u64 enable)
+{
+        beat_set_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, resource_allocation_enable_RW),
+                enable);
+}
+
+static u64 resource_allocation_enable_get(struct spu *spu)
+{
+        u64 enable;
+        beat_get_spe_privileged_state_1_registers(
+                spu->spe_id,
+                offsetof(struct spu_priv1, resource_allocation_enable_RW),
+                &enable);
+        return enable;
+}
+
+const struct spu_priv1_ops spu_priv1_beat_ops =
+{
+        .int_mask_and = int_mask_and,
+        .int_mask_or = int_mask_or,
+        .int_mask_set = int_mask_set,
+        .int_mask_get = int_mask_get,
+        .int_stat_clear = int_stat_clear,
+        .int_stat_get = int_stat_get,
+        .cpu_affinity_set = cpu_affinity_set,
+        .mfc_dar_get = mfc_dar_get,
+        .mfc_dsisr_get = mfc_dsisr_get,
+        .mfc_dsisr_set = mfc_dsisr_set,
+        .mfc_sdr_setup = mfc_sdr_setup,
+        .mfc_sr1_set = mfc_sr1_set,
+        .mfc_sr1_get = mfc_sr1_get,
+        .mfc_tclass_id_set = mfc_tclass_id_set,
+        .mfc_tclass_id_get = mfc_tclass_id_get,
+        .tlb_invalidate = tlb_invalidate,
+        .resource_allocation_groupID_set = resource_allocation_groupID_set,
+        .resource_allocation_groupID_get = resource_allocation_groupID_get,
+        .resource_allocation_enable_set = resource_allocation_enable_set,
+        .resource_allocation_enable_get = resource_allocation_enable_get,
+};
diff --git a/arch/powerpc/platforms/celleb/udbg_beat.c b/arch/powerpc/platforms/celleb/udbg_beat.c
new file mode 100644
index 000000000000..d888c4674c62
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/udbg_beat.c
@@ -0,0 +1,97 @@
+/*
+ * udbg function for Beat
+ *
+ * (C) Copyright 2006 TOSHIBA 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/console.h>
+
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+
+#include "beat.h"
+
+#define celleb_vtermno  0
+
+static void udbg_putc_beat(char c)
+{
+        unsigned long rc;
+
+        if (c == '\n')
+                udbg_putc_beat('\r');
+
+        rc = beat_put_term_char(celleb_vtermno, 1, (uint64_t)c << 56, 0);
+}
+
+/* Buffered chars getc */
+static long inbuflen;
+static long inbuf[2];   /* must be 2 longs */
+
+static int udbg_getc_poll_beat(void)
+{
+        /* The interface is tricky because it may return up to 16 chars.
+         * We save them statically for future calls to udbg_getc().
+         */
+        char ch, *buf = (char *)inbuf;
+        int i;
+        long rc;
+        if (inbuflen == 0) {
+                /* get some more chars. */
+                inbuflen = 0;
+                rc = beat_get_term_char(celleb_vtermno, &inbuflen, inbuf+0, inbuf+1);
+                if (rc != 0)
+                        inbuflen = 0;   /* otherwise inbuflen is garbage */
+        }
+        if (inbuflen <= 0 || inbuflen > 16) {
+                /* Catch error case as well as other oddities (corruption) */
+                inbuflen = 0;
+                return -1;
+        }
+        ch = buf[0];
+        for (i = 1; i < inbuflen; i++)  /* shuffle them down. */
+                buf[i-1] = buf[i];
+        inbuflen--;
+        return ch;
+}
+
+static int udbg_getc_beat(void)
+{
+        int ch;
+        for (;;) {
+                ch = udbg_getc_poll_beat();
+                if (ch == -1) {
+                        /* This shouldn't be needed...but... */
+                        volatile unsigned long delay;
+                        for (delay=0; delay < 2000000; delay++)
+                                ;
+                } else {
+                        return ch;
+                }
+        }
+}
+
+/* call this from early_init() for a working debug console on
+ * vterm capable LPAR machines
+ */
+void __init udbg_init_debug_beat(void)
+{
+        udbg_putc = udbg_putc_beat;
+        udbg_getc = udbg_getc_beat;
+        udbg_getc_poll = udbg_getc_poll_beat;
+}
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index e1f51d455984..117c9a0055bd 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -75,7 +75,7 @@ extern irqreturn_t xmon_irq(int, void *);
 extern unsigned long loops_per_jiffy;
 
 /* To be replaced by RTAS when available */
-static unsigned int *briq_SPOR;
+static unsigned int __iomem *briq_SPOR;
 
 #ifdef CONFIG_SMP
 extern struct smp_ops_t chrp_smp_ops;
@@ -267,7 +267,7 @@ void __init chrp_setup_arch(void)
         } else if (machine && strncmp(machine, "TotalImpact,BRIQ-1", 18) == 0) {
                 _chrp_type = _CHRP_briq;
                 /* Map the SPOR register on briq and change the restart hook */
-                briq_SPOR = (unsigned int *)ioremap(0xff0000e8, 4);
+                briq_SPOR = ioremap(0xff0000e8, 4);
                 ppc_md.restart = briq_restart;
         } else {
                 /* Let's assume it is an IBM chrp if all else fails */
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index b3c2ce4cb7a8..886c522d78e9 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -104,15 +104,6 @@ config RADSTONE_PPC7D
 config PAL4
         bool "SBS-Palomar4"
 
-config GEMINI
-        bool "Synergy-Gemini"
-        select PPC_INDIRECT_PCI
-        depends on BROKEN
-        help
-          Select Gemini if configuring for a Synergy Microsystems' Gemini
-          series Single Board Computer.  More information is available at:
-          <http://www.synergymicro.com/PressRel/97_10_15.html>.
-
 config EST8260
         bool "EST8260"
         ---help---
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 61599d919ea8..3f6c4114f908 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/initrd.h>
-#include <linux/root_dev.h>
 #include <linux/mtd/physmap.h>
 
 #include <asm/time.h>
@@ -91,17 +90,6 @@ static void __init linkstation_setup_arch(void)
                                ARRAY_SIZE(linkstation_physmap_partitions));
 #endif
 
-#ifdef CONFIG_BLK_DEV_INITRD
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-#ifdef  CONFIG_ROOT_NFS
-                ROOT_DEV = Root_NFS;
-#else
-                ROOT_DEV = Root_HDA1;
-#endif
-
         /* Lookup PCI host bridges */
         for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
                 add_bridge(np);
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index c1f4502a3c6a..91df52a1899a 100644
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -308,7 +308,7 @@ static int proc_lpevents_open(struct inode *inode, struct file *file)
         return single_open(file, proc_lpevents_show, NULL);
 }
 
-static struct file_operations proc_lpevents_operations = {
+static const struct file_operations proc_lpevents_operations = {
         .open           = proc_lpevents_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 1ad0e4aaad1a..b1187d95e3b2 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -1224,7 +1224,7 @@ out:
         return rc;
 }
 
-static struct file_operations proc_vmlinux_operations = {
+static const struct file_operations proc_vmlinux_operations = {
         .write          = proc_mf_change_vmlinux,
 };
 
@@ -1253,7 +1253,6 @@ static int __init mf_proc_init(void)
                 ent = create_proc_entry("cmdline", S_IFREG|S_IRUSR|S_IWUSR, mf);
                 if (!ent)
                         return 1;
-                ent->nlink = 1;
                 ent->data = (void *)(long)i;
                 ent->read_proc = proc_mf_dump_cmdline;
                 ent->write_proc = proc_mf_change_cmdline;
@@ -1264,7 +1263,6 @@ static int __init mf_proc_init(void)
                 ent = create_proc_entry("vmlinux", S_IFREG|S_IWUSR, mf);
                 if (!ent)
                         return 1;
-                ent->nlink = 1;
                 ent->data = (void *)(long)i;
                 ent->proc_fops = &proc_vmlinux_operations;
         }
@@ -1272,7 +1270,6 @@ static int __init mf_proc_init(void)
         ent = create_proc_entry("side", S_IFREG|S_IRUSR|S_IWUSR, mf_proc_root);
         if (!ent)
                 return 1;
-        ent->nlink = 1;
         ent->data = (void *)0;
         ent->read_proc = proc_mf_dump_side;
         ent->write_proc = proc_mf_change_side;
@@ -1280,7 +1277,6 @@ static int __init mf_proc_init(void)
         ent = create_proc_entry("src", S_IFREG|S_IRUSR|S_IWUSR, mf_proc_root);
         if (!ent)
                 return 1;
-        ent->nlink = 1;
         ent->data = (void *)0;
         ent->read_proc = proc_mf_dump_src;
         ent->write_proc = proc_mf_change_src;
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index b54e37101e69..f2cde4180204 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -101,7 +101,7 @@ static int proc_titantod_open(struct inode *inode, struct file *file)
         return single_open(file, proc_titantod_show, NULL);
 }
 
-static struct file_operations proc_titantod_operations = {
+static const struct file_operations proc_titantod_operations = {
         .open           = proc_titantod_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index a6799ed34a66..e2100ece9c65 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -173,7 +173,7 @@ static int proc_viopath_open(struct inode *inode, struct file *file)
         return single_open(file, proc_viopath_show, NULL);
 }
 
-static struct file_operations proc_viopath_operations = {
+static const struct file_operations proc_viopath_operations = {
         .open           = proc_viopath_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 3f6a69f67195..73c59904697f 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -425,14 +425,6 @@ static void __init setup_u4_pcie(struct pci_controller* hose)
         hose->cfg_addr = ioremap(0xf0000000 + 0x800000, 0x1000);
         hose->cfg_data = ioremap(0xf0000000 + 0xc00000, 0x1000);
 
-        /* The bus contains a bridge from root -> device, we need to
-         * make it visible on bus 0 so that we pick the right type
-         * of config cycles. If we didn't, we would have to force all
-         * config cycles to be type 1. So we override the "bus-range"
-         * property here
-         */
-        hose->first_busno = 0x00;
-        hose->last_busno = 0xff;
         u4_pcie = hose;
 }
 
@@ -560,13 +552,16 @@ void __init maple_pci_init(void)
                 return;
         }
         for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) {
-                if (np->name == NULL)
+                if (!np->type)
                         continue;
-                if (!strcmp(np->name, "pci") || !strcmp(np->name, "pcie")) {
-                        if (add_bridge(np) == 0)
-                                of_node_get(np);
-                }
-                if (strcmp(np->name, "ht") == 0) {
+                if (strcmp(np->type, "pci") && strcmp(np->type, "ht"))
+                        continue;
+                if ((device_is_compatible(np, "u4-pcie") ||
+                     device_is_compatible(np, "u3-agp")) &&
+                    add_bridge(np) == 0)
+                        of_node_get(np);
+
+                if (device_is_compatible(np, "u3-ht")) {
                         of_node_get(np);
                         ht = np;
                 }
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 50855d4fd5a0..82d3f9e28d7c 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -62,6 +62,7 @@
 #include <asm/mpic.h>
 #include <asm/rtas.h>
 #include <asm/udbg.h>
+#include <asm/nvram.h>
 
 #include "maple.h"
 
@@ -195,6 +196,8 @@ void __init maple_setup_arch(void)
         maple_use_rtas_reboot_and_halt_if_present();
 
         printk(KERN_DEBUG "Using native/NAP idle loop\n");
+
+        mmio_nvram_init();
 }
 
 /* 
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
new file mode 100644
index 000000000000..68dc529dfd2f
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -0,0 +1,10 @@
+menu "PA Semi PWRficient options"
+        depends on PPC_PASEMI
+
+config PPC_PASEMI_IOMMU
+        bool "PA Semi IOMMU support"
+        depends on PPC_PASEMI
+        help
+          IOMMU support for PA6T-1682M
+
+endmenu
diff --git a/arch/powerpc/platforms/pasemi/Makefile b/arch/powerpc/platforms/pasemi/Makefile
index 1be1a993c5f5..e657ccae90a9 100644
--- a/arch/powerpc/platforms/pasemi/Makefile
+++ b/arch/powerpc/platforms/pasemi/Makefile
@@ -1 +1,2 @@
-obj-y   += setup.o pci.o time.o
+obj-y   += setup.o pci.o time.o idle.o powersave.o iommu.o
+
diff --git a/arch/powerpc/platforms/pasemi/idle.c b/arch/powerpc/platforms/pasemi/idle.c
new file mode 100644
index 000000000000..1ca3ff381591
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/idle.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2006-2007 PA Semi, Inc
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * 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
+ *
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/string.h>
+
+#include <asm/machdep.h>
+#include <asm/reg.h>
+
+#include "pasemi.h"
+
+struct sleep_mode {
+        char *name;
+        void (*entry)(void);
+};
+
+static struct sleep_mode modes[] = {
+        { .name = "spin", .entry = &idle_spin },
+        { .name = "doze", .entry = &idle_doze },
+};
+
+static int current_mode = 0;
+
+static int pasemi_system_reset_exception(struct pt_regs *regs)
+{
+        /* If we were woken up from power savings, we need to return
+         * to the calling function, since nip is not saved across
+         * all modes.
+         */
+
+        if (regs->msr & SRR1_WAKEMASK)
+                regs->nip = regs->link;
+
+        switch (regs->msr & SRR1_WAKEMASK) {
+        case SRR1_WAKEEE:
+                do_IRQ(regs);
+                break;
+        case SRR1_WAKEDEC:
+                timer_interrupt(regs);
+                break;
+        default:
+                /* do system reset */
+                return 0;
+        }
+        /* everything handled */
+        regs->msr |= MSR_RI;
+        return 1;
+}
+
+void __init pasemi_idle_init(void)
+{
+        ppc_md.system_reset_exception = pasemi_system_reset_exception;
+        ppc_md.power_save = modes[current_mode].entry;
+        printk(KERN_INFO "Using PA6T idle loop (%s)\n", modes[current_mode].name);
+}
+
+static int __init idle_param(char *p)
+{
+        int i;
+        for (i = 0; i < sizeof(modes)/sizeof(struct sleep_mode); i++) {
+                if (!strcmp(modes[i].name, p)) {
+                        current_mode = i;
+                        break;
+                }
+        }
+        return 0;
+}
+
+early_param("idle", idle_param);
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
new file mode 100644
index 000000000000..459a53b7d24d
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2005-2007, PA Semi, Inc
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * 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
+ */
+
+#undef DEBUG
+
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <linux/pci.h>
+#include <asm/iommu.h>
+#include <asm/machdep.h>
+#include <asm/abs_addr.h>
+
+
+#define IOBMAP_PAGE_SHIFT       12
+#define IOBMAP_PAGE_SIZE        (1 << IOBMAP_PAGE_SHIFT)
+#define IOBMAP_PAGE_MASK        (IOBMAP_PAGE_SIZE - 1)
+
+#define IOBMAP_PAGE_FACTOR      (PAGE_SHIFT - IOBMAP_PAGE_SHIFT)
+
+#define IOB_BASE                0xe0000000
+#define IOB_SIZE                0x3000
+/* Configuration registers */
+#define IOBCAP_REG              0x10
+#define IOBCOM_REG              0x40
+/* Enable IOB address translation */
+#define IOBCOM_ATEN             0x00000100
+
+/* Address decode configuration register */
+#define IOB_AD_REG              0x53
+/* IOBCOM_AD_REG fields */
+#define IOB_AD_VGPRT            0x00000e00
+#define IOB_AD_VGAEN            0x00000100
+/* Direct mapping settings */
+#define IOB_AD_MPSEL_MASK       0x00000030
+#define IOB_AD_MPSEL_B38        0x00000000
+#define IOB_AD_MPSEL_B40        0x00000010
+#define IOB_AD_MPSEL_B42        0x00000020
+/* Translation window size / enable */
+#define IOB_AD_TRNG_MASK        0x00000003
+#define IOB_AD_TRNG_256M        0x00000000
+#define IOB_AD_TRNG_2G          0x00000001
+#define IOB_AD_TRNG_128G        0x00000003
+
+#define IOB_TABLEBASE_REG       0x55
+
+/* Base of the 64 4-byte L1 registers */
+#define IOB_XLT_L1_REGBASE      0xac0
+
+/* Register to invalidate TLB entries */
+#define IOB_AT_INVAL_TLB_REG    0xb40
+
+/* The top two bits of the level 1 entry contains valid and type flags */
+#define IOBMAP_L1E_V            0x40000000
+#define IOBMAP_L1E_V_B          0x80000000
+
+/* For big page entries, the bottom two bits contains flags */
+#define IOBMAP_L1E_BIG_CACHED   0x00000002
+#define IOBMAP_L1E_BIG_PRIORITY 0x00000001
+
+/* For regular level 2 entries, top 2 bits contain valid and cache flags */
+#define IOBMAP_L2E_V            0x80000000
+#define IOBMAP_L2E_V_CACHED     0xc0000000
+
+static u32 *iob;
+static u32 iob_l1_emptyval;
+static u32 iob_l2_emptyval;
+static u32 *iob_l2_base;
+
+static struct iommu_table iommu_table_iobmap;
+static int iommu_table_iobmap_inited;
+
+static void iobmap_build(struct iommu_table *tbl, long index,
+                         long npages, unsigned long uaddr,
+                         enum dma_data_direction direction)
+{
+        u32 *ip;
+        u32 rpn;
+        unsigned long bus_addr;
+
+        pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr);
+
+        bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
+
+        npages <<= IOBMAP_PAGE_FACTOR;
+        index <<= IOBMAP_PAGE_FACTOR;
+
+        ip = ((u32 *)tbl->it_base) + index;
+
+        while (npages--) {
+                rpn = virt_to_abs(uaddr) >> IOBMAP_PAGE_SHIFT;
+
+                *(ip++) = IOBMAP_L2E_V | rpn;
+                /* invalidate tlb, can be optimized more */
+                out_le32(iob+IOB_AT_INVAL_TLB_REG, bus_addr >> 14);
+
+                uaddr += IOBMAP_PAGE_SIZE;
+                bus_addr += IOBMAP_PAGE_SIZE;
+        }
+}
+
+
+static void iobmap_free(struct iommu_table *tbl, long index,
+                        long npages)
+{
+        u32 *ip;
+        unsigned long bus_addr;
+
+        pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
+
+        bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
+
+        npages <<= IOBMAP_PAGE_FACTOR;
+        index <<= IOBMAP_PAGE_FACTOR;
+
+        ip = ((u32 *)tbl->it_base) + index;
+
+        while (npages--) {
+                *(ip++) = iob_l2_emptyval;
+                /* invalidate tlb, can be optimized more */
+                out_le32(iob+IOB_AT_INVAL_TLB_REG, bus_addr >> 14);
+                bus_addr += IOBMAP_PAGE_SIZE;
+        }
+}
+
+
+static void iommu_table_iobmap_setup(void)
+{
+        pr_debug(" -> %s\n", __func__);
+        iommu_table_iobmap.it_busno = 0;
+        iommu_table_iobmap.it_offset = 0;
+        /* it_size is in number of entries */
+        iommu_table_iobmap.it_size = 0x80000000 >> PAGE_SHIFT;
+
+        /* Initialize the common IOMMU code */
+        iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;
+        iommu_table_iobmap.it_index = 0;
+        /* XXXOJN tune this to avoid IOB cache invals.
+         * Should probably be 8 (64 bytes)
+         */
+        iommu_table_iobmap.it_blocksize = 4;
+        iommu_init_table(&iommu_table_iobmap, 0);
+        pr_debug(" <- %s\n", __func__);
+}
+
+
+
+static void pci_dma_bus_setup_pasemi(struct pci_bus *bus)
+{
+        struct device_node *dn;
+
+        pr_debug("pci_dma_bus_setup, bus %p, bus->self %p\n", bus, bus->self);
+
+        if (!iommu_table_iobmap_inited) {
+                iommu_table_iobmap_inited = 1;
+                iommu_table_iobmap_setup();
+        }
+
+        dn = pci_bus_to_OF_node(bus);
+
+        if (dn)
+                PCI_DN(dn)->iommu_table = &iommu_table_iobmap;
+
+}
+
+
+static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
+{
+        pr_debug("pci_dma_dev_setup, dev %p (%s)\n", dev, pci_name(dev));
+
+        /* DMA device is untranslated, but all other PCI-e goes through
+         * the IOMMU
+         */
+        if (dev->vendor == 0x1959 && dev->device == 0xa007)
+                dev->dev.archdata.dma_ops = &dma_direct_ops;
+        else
+                dev->dev.archdata.dma_data = &iommu_table_iobmap;
+}
+
+static void pci_dma_bus_setup_null(struct pci_bus *b) { }
+static void pci_dma_dev_setup_null(struct pci_dev *d) { }
+
+int iob_init(struct device_node *dn)
+{
+        unsigned long tmp;
+        u32 regword;
+        int i;
+
+        pr_debug(" -> %s\n", __func__);
+
+        /* Allocate a spare page to map all invalid IOTLB pages. */
+        tmp = lmb_alloc(IOBMAP_PAGE_SIZE, IOBMAP_PAGE_SIZE);
+        if (!tmp)
+                panic("IOBMAP: Cannot allocate spare page!");
+        /* Empty l1 is marked invalid */
+        iob_l1_emptyval = 0;
+        /* Empty l2 is mapped to dummy page */
+        iob_l2_emptyval = IOBMAP_L2E_V | (tmp >> IOBMAP_PAGE_SHIFT);
+
+        iob = ioremap(IOB_BASE, IOB_SIZE);
+        if (!iob)
+                panic("IOBMAP: Cannot map registers!");
+
+        /* setup direct mapping of the L1 entries */
+        for (i = 0; i < 64; i++) {
+                /* Each L1 covers 32MB, i.e. 8K entries = 32K of ram */
+                regword = IOBMAP_L1E_V | (__pa(iob_l2_base + i*0x2000) >> 12);
+                out_le32(iob+IOB_XLT_L1_REGBASE+i, regword);
+        }
+
+        /* set 2GB translation window, based at 0 */
+        regword = in_le32(iob+IOB_AD_REG);
+        regword &= ~IOB_AD_TRNG_MASK;
+        regword |= IOB_AD_TRNG_2G;
+        out_le32(iob+IOB_AD_REG, regword);
+
+        /* Enable translation */
+        regword = in_le32(iob+IOBCOM_REG);
+        regword |= IOBCOM_ATEN;
+        out_le32(iob+IOBCOM_REG, regword);
+
+        pr_debug(" <- %s\n", __func__);
+
+        return 0;
+}
+
+
+/* These are called very early. */
+void iommu_init_early_pasemi(void)
+{
+        int iommu_off;
+
+#ifndef CONFIG_PPC_PASEMI_IOMMU
+        iommu_off = 1;
+#else
+        iommu_off = of_chosen &&
+                        get_property(of_chosen, "linux,iommu-off", NULL);
+#endif
+        if (iommu_off) {
+                /* Direct I/O, IOMMU off */
+                ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_null;
+                ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_null;
+                pci_dma_ops = &dma_direct_ops;
+
+                return;
+        }
+
+        iob_init(NULL);
+
+        ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_pasemi;
+        ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_pasemi;
+        ppc_md.tce_build = iobmap_build;
+        ppc_md.tce_free  = iobmap_free;
+        pci_dma_ops = &dma_iommu_ops;
+}
+
+void __init alloc_iobmap_l2(void)
+{
+#ifndef CONFIG_PPC_PASEMI_IOMMU
+        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));
+
+        printk(KERN_INFO "IOBMAP L2 allocated at: %p\n", iob_l2_base);
+}
diff --git a/arch/powerpc/platforms/pasemi/pasemi.h b/arch/powerpc/platforms/pasemi/pasemi.h
index 51c2a2397ecf..2d3927e6edb0 100644
--- a/arch/powerpc/platforms/pasemi/pasemi.h
+++ b/arch/powerpc/platforms/pasemi/pasemi.h
@@ -3,5 +3,17 @@
 
 extern unsigned long pas_get_boot_time(void);
 extern void pas_pci_init(void);
+extern void __devinit pas_pci_irq_fixup(struct pci_dev *dev);
+extern void __devinit pas_pci_dma_dev_setup(struct pci_dev *dev);
+
+extern void __init alloc_iobmap_l2(void);
+
+extern void __init pasemi_idle_init(void);
+
+/* Power savings modes, implemented in asm */
+extern void idle_spin(void);
+extern void idle_doze(void);
+
+
 
 #endif /* _PASEMI_PASEMI_H */
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
index faa618e04047..7ecb2ba24db9 100644
--- a/arch/powerpc/platforms/pasemi/pci.c
+++ b/arch/powerpc/platforms/pasemi/pci.c
@@ -163,6 +163,19 @@ static void __init pas_fixup_phb_resources(void)
 }
 
 
+void __devinit pas_pci_irq_fixup(struct pci_dev *dev)
+{
+        /* DMA is special, 84 interrupts (128 -> 211), all but 128
+         * need to be mapped by hand here.
+         */
+        if (dev->vendor == 0x1959 && dev->device == 0xa007) {
+                int i;
+                for (i = 129; i < 212; i++)
+                        irq_create_mapping(NULL, i);
+        }
+}
+
+
 void __init pas_pci_init(void)
 {
         struct device_node *np, *root;
diff --git a/arch/powerpc/platforms/pasemi/powersave.S b/arch/powerpc/platforms/pasemi/powersave.S
new file mode 100644
index 000000000000..6d0fba6aab17
--- /dev/null
+++ b/arch/powerpc/platforms/pasemi/powersave.S
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2006-2007 PA Semi, Inc
+ *
+ * Maintained by: Olof Johansson <olof@lixom.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * 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 <asm/processor.h>
+#include <asm/page.h>
+#include <asm/ppc_asm.h>
+#include <asm/cputable.h>
+#include <asm/cache.h>
+#include <asm/thread_info.h>
+#include <asm/asm-offsets.h>
+
+/* Power savings opcodes since not all binutils have them at this time */
+#define DOZE    .long   0x4c000324
+#define NAP     .long   0x4c000364
+#define SLEEP   .long   0x4c0003a4
+#define RVW     .long   0x4c0003e4
+
+/* Common sequence to do before going to any of the
+ * powersavings modes.
+ */
+
+#define PRE_SLEEP_SEQUENCE      \
+        std     r3,8(r1);       \
+        ptesync ;               \
+        ld      r3,8(r1);       \
+1:      cmpd    r3,r3;          \
+        bne     1b
+
+_doze:
+        PRE_SLEEP_SEQUENCE
+        DOZE
+        b       .
+
+
+_GLOBAL(idle_spin)
+        blr
+
+_GLOBAL(idle_doze)
+        LOAD_REG_ADDR(r3, _doze)
+        b       sleep_common
+
+/* Add more modes here later */
+
+sleep_common:
+        mflr    r0
+        std     r0, 16(r1)
+        stdu    r1,-64(r1)
+
+        LOAD_REG_IMMEDIATE(r6,MSR_DR|MSR_IR|MSR_ME|MSR_EE)
+        mfmsr   r4
+        andc    r5,r4,r6
+        mtmsrd  r5,0
+
+        mtctr   r3
+        bctrl
+
+        mtmsrd  r4,0
+
+        addi    r1,r1,64
+        ld      r0,16(r1)
+        mtlr    r0
+        blr
+
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index bea7d1bb1a3b..449cf1a08291 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 PA Semi, Inc
+ * Copyright (C) 2006-2007 PA Semi, Inc
  *
  * Authors: Kip Walker, PA Semi
  *          Olof Johansson, PA Semi
@@ -38,31 +38,46 @@
 
 #include "pasemi.h"
 
+static void __iomem *reset_reg;
+
 static void pas_restart(char *cmd)
 {
-        printk("restart unimplemented, looping...\n");
-        for (;;) ;
+        printk("Restarting...\n");
+        while (1)
+                out_le32(reset_reg, 0x6000000);
 }
 
-static void pas_power_off(void)
+#ifdef CONFIG_SMP
+static DEFINE_SPINLOCK(timebase_lock);
+
+static void __devinit pas_give_timebase(void)
 {
-        printk("power off unimplemented, looping...\n");
-        for (;;) ;
+        unsigned long tb;
+
+        spin_lock(&timebase_lock);
+        mtspr(SPRN_TBCTL, TBCTL_FREEZE);
+        tb = mftb();
+        mtspr(SPRN_TBCTL, TBCTL_UPDATE_LOWER | (tb & 0xffffffff));
+        mtspr(SPRN_TBCTL, TBCTL_UPDATE_UPPER | (tb >> 32));
+        mtspr(SPRN_TBCTL, TBCTL_RESTART);
+        spin_unlock(&timebase_lock);
+        pr_debug("pas_give_timebase: cpu %d gave tb %lx\n",
+                 smp_processor_id(), tb);
 }
 
-static void pas_halt(void)
+static void __devinit pas_take_timebase(void)
 {
-        pas_power_off();
+        pr_debug("pas_take_timebase: cpu %d has tb %lx\n",
+                 smp_processor_id(), mftb());
 }
 
-#ifdef CONFIG_SMP
 struct smp_ops_t pas_smp_ops = {
         .probe          = smp_mpic_probe,
         .message_pass   = smp_mpic_message_pass,
         .kick_cpu       = smp_generic_kick_cpu,
         .setup_cpu      = smp_mpic_setup_cpu,
-        .give_timebase  = smp_generic_give_timebase,
-        .take_timebase  = smp_generic_take_timebase,
+        .give_timebase  = pas_give_timebase,
+        .take_timebase  = pas_take_timebase,
 };
 #endif /* CONFIG_SMP */
 
@@ -72,9 +87,6 @@ void __init pas_setup_arch(void)
         /* Setup SMP callback */
         smp_ops = &pas_smp_ops;
 #endif
-        /* no iommu yet */
-        pci_dma_ops = &dma_direct_ops;
-
         /* Lookup PCI hosts */
         pas_pci_init();
 
@@ -82,7 +94,11 @@ void __init pas_setup_arch(void)
         conswitchp = &dummy_con;
 #endif
 
-        printk(KERN_DEBUG "Using default idle loop\n");
+        /* Remap SDC register for doing reset */
+        /* XXXOJN This should maybe come out of the device tree */
+        reset_reg = ioremap(0xfc101100, 4);
+
+        pasemi_idle_init();
 }
 
 /* No legacy IO on our parts */
@@ -130,8 +146,9 @@ static __init void pas_init_IRQ(void)
         openpic_addr = of_read_number(opprop, naddr);
         printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
 
-        mpic = mpic_alloc(mpic_node, openpic_addr, MPIC_PRIMARY, 0, 0,
-                          " PAS-OPIC  ");
+        mpic = mpic_alloc(mpic_node, openpic_addr,
+                          MPIC_PRIMARY|MPIC_LARGE_VECTORS,
+                          0, 0, " PAS-OPIC  ");
         BUG_ON(!mpic);
 
         mpic_assign_isu(mpic, 0, openpic_addr + 0x10000);
@@ -146,6 +163,53 @@ static void __init pas_progress(char *s, unsigned short hex)
 }
 
 
+static int pas_machine_check_handler(struct pt_regs *regs)
+{
+        int cpu = smp_processor_id();
+        unsigned long srr0, srr1, dsisr;
+
+        srr0 = regs->nip;
+        srr1 = regs->msr;
+        dsisr = mfspr(SPRN_DSISR);
+        printk(KERN_ERR "Machine Check on CPU %d\n", cpu);
+        printk(KERN_ERR "SRR0 0x%016lx SRR1 0x%016lx\n", srr0, srr1);
+        printk(KERN_ERR "DSISR 0x%016lx DAR 0x%016lx\n", dsisr, regs->dar);
+        printk(KERN_ERR "Cause:\n");
+
+        if (srr1 & 0x200000)
+                printk(KERN_ERR "Signalled by SDC\n");
+        if (srr1 & 0x100000) {
+                printk(KERN_ERR "Load/Store detected error:\n");
+                if (dsisr & 0x8000)
+                        printk(KERN_ERR "D-cache ECC double-bit error or bus error\n");
+                if (dsisr & 0x4000)
+                        printk(KERN_ERR "LSU snoop response error\n");
+                if (dsisr & 0x2000)
+                        printk(KERN_ERR "MMU SLB multi-hit or invalid B field\n");
+                if (dsisr & 0x1000)
+                        printk(KERN_ERR "Recoverable Duptags\n");
+                if (dsisr & 0x800)
+                        printk(KERN_ERR "Recoverable D-cache parity error count overflow\n");
+                if (dsisr & 0x400)
+                        printk(KERN_ERR "TLB parity error count overflow\n");
+        }
+        if (srr1 & 0x80000)
+                printk(KERN_ERR "Bus Error\n");
+        if (srr1 & 0x40000)
+                printk(KERN_ERR "I-side SLB multiple hit\n");
+        if (srr1 & 0x20000)
+                printk(KERN_ERR "I-cache parity error hit\n");
+
+        /* SRR1[62] is from MSR[62] if recoverable, so pass that back */
+        return !!(srr1 & 0x2);
+}
+
+static void __init pas_init_early(void)
+{
+        iommu_init_early_pasemi();
+}
+
+
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
@@ -158,6 +222,8 @@ static int __init pas_probe(void)
 
         hpte_init_native();
 
+        alloc_iobmap_l2();
+
         return 1;
 }
 
@@ -165,13 +231,14 @@ define_machine(pas) {
         .name                   = "PA Semi PA6T-1682M",
         .probe                  = pas_probe,
         .setup_arch             = pas_setup_arch,
+        .init_early             = pas_init_early,
         .init_IRQ               = pas_init_IRQ,
         .get_irq                = mpic_get_irq,
         .restart                = pas_restart,
-        .power_off              = pas_power_off,
-        .halt                   = pas_halt,
         .get_boot_time          = pas_get_boot_time,
         .calibrate_decr         = generic_calibrate_decr,
         .check_legacy_ioport    = pas_check_legacy_ioport,
         .progress               = pas_progress,
+        .machine_check_exception = pas_machine_check_handler,
+        .pci_irq_fixup          = pas_pci_irq_fixup,
 };
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 39db12890214..5e5c0e4add91 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -305,8 +305,6 @@ static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
         level = !!(level_mask[hw >> 5] & (1UL << (hw & 0x1f)));
         if (level)
                 desc->status |= IRQ_LEVEL;
-        else
-                desc->status |= IRQ_DELAYED_DISABLE;
         set_irq_chip_and_handler(virq, &pmac_pic, level ?
                                  handle_level_irq : handle_edge_irq);
         return 0;
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index d949e9df41ef..651fa424ea06 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -506,8 +506,8 @@ void note_bootable_part(dev_t dev, int part, int goodness)
         if ((goodness <= current_root_goodness) &&
             ROOT_DEV != DEFAULT_ROOT_DEVICE)
                 return;
-        p = strstr(saved_command_line, "root=");
-        if (p != NULL && (p == saved_command_line || p[-1] == ' '))
+        p = strstr(boot_command_line, "root=");
+        if (p != NULL && (p == boot_command_line || p[-1] == ' '))
                 return;
 
         if (!found_boot) {
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index eeb2ae5ffc58..d73fb73802bb 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -795,7 +795,6 @@ static void __devinit smp_core99_kick_cpu(int nr)
                 ppc_md.progress("smp_core99_kick_cpu", 0x346);
 
         local_irq_save(flags);
-        local_irq_disable();
 
         /* Save reset vector */
         save_vector = *vector;
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index de52ec4e9e58..d270a1e374d5 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -51,4 +51,25 @@ config PS3_VUART
           including the System Manager and AV Settings.  In
           general, all users will say Y.
 
+config PS3_PS3AV
+        tristate "PS3 AV settings driver"
+        depends on PPC_PS3
+        select PS3_VUART
+        default y
+        help
+          Include support for the PS3 AV Settings driver.
+
+          This support is required for graphics and sound. In
+          general, all users will say Y or M.
+
+config PS3_SYS_MANAGER
+        bool "PS3 System Manager driver"
+        select PS3_VUART
+        default y
+        help
+          Include support for the PS3 System Manager.
+
+          This support is required for system control.  In
+          general, all users will say Y.
+
 endmenu
diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile
index 1994904f580f..a0048fcf0866 100644
--- a/arch/powerpc/platforms/ps3/Makefile
+++ b/arch/powerpc/platforms/ps3/Makefile
@@ -1,5 +1,6 @@
 obj-y += setup.o mm.o time.o hvcall.o htab.o repository.o
 obj-y += interrupt.o exports.o os-area.o
+obj-y += system-bus.o
 
 obj-$(CONFIG_SMP) += smp.o
 obj-$(CONFIG_SPU_BASE) += spu.o
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 8fe1769655a3..e12e59fea13a 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -2,7 +2,7 @@
  *  PS3 pagetable management routines.
  *
  *  Copyright (C) 2006 Sony Computer Entertainment Inc.
- *  Copyright 2006 Sony Corp.
+ *  Copyright 2006, 2007 Sony 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
@@ -23,8 +23,8 @@
 #include <asm/machdep.h>
 #include <asm/lmb.h>
 #include <asm/udbg.h>
-#include <asm/ps3.h>
 #include <asm/lv1call.h>
+#include <asm/ps3fb.h>
 
 #include "platform.h"
 
@@ -234,6 +234,9 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long va,
 
 static void ps3_hpte_clear(void)
 {
+        /* Make sure to clean up the frame buffer device first */
+        ps3fb_cleanup();
+
         lv1_unmap_htab(htab_addr);
 }
 
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 6f5de438b980..631c30095617 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -24,7 +24,6 @@
 
 #include <asm/machdep.h>
 #include <asm/udbg.h>
-#include <asm/ps3.h>
 #include <asm/lv1call.h>
 
 #include "platform.h"
@@ -36,15 +35,148 @@
 #endif
 
 /**
+ * struct ps3_bmp - a per cpu irq status and mask bitmap structure
+ * @status: 256 bit status bitmap indexed by plug
+ * @unused_1:
+ * @mask: 256 bit mask bitmap indexed by plug
+ * @unused_2:
+ * @lock:
+ * @ipi_debug_brk_mask:
+ *
+ * The HV mantains per SMT thread mappings of HV outlet to HV plug on
+ * behalf of the guest.  These mappings are implemented as 256 bit guest
+ * supplied bitmaps indexed by plug number.  The addresses of the bitmaps
+ * are registered with the HV through lv1_configure_irq_state_bitmap().
+ * The HV requires that the 512 bits of status + mask not cross a page
+ * boundary.  PS3_BMP_MINALIGN is used to define this minimal 64 byte
+ * alignment.
+ *
+ * The HV supports 256 plugs per thread, assigned as {0..255}, for a total
+ * of 512 plugs supported on a processor.  To simplify the logic this
+ * implementation equates HV plug value to Linux virq value, constrains each
+ * interrupt to have a system wide unique plug number, and limits the range
+ * of the plug values to map into the first dword of the bitmaps.  This
+ * gives a usable range of plug values of  {NUM_ISA_INTERRUPTS..63}.  Note
+ * that there is no constraint on how many in this set an individual thread
+ * can acquire.
+ */
+
+#define PS3_BMP_MINALIGN 64
+
+struct ps3_bmp {
+        struct {
+                u64 status;
+                u64 unused_1[3];
+                u64 mask;
+                u64 unused_2[3];
+        };
+        u64 ipi_debug_brk_mask;
+        spinlock_t lock;
+};
+
+/**
+ * struct ps3_private - a per cpu data structure
+ * @bmp: ps3_bmp structure
+ * @node: HV logical_ppe_id
+ * @cpu: HV thread_id
+ */
+
+struct ps3_private {
+        struct ps3_bmp bmp __attribute__ ((aligned (PS3_BMP_MINALIGN)));
+        u64 node;
+        unsigned int cpu;
+};
+
+static DEFINE_PER_CPU(struct ps3_private, ps3_private);
+
+int ps3_alloc_irq(enum ps3_cpu_binding cpu, unsigned long outlet,
+        unsigned int *virq)
+{
+        int result;
+        struct ps3_private *pd;
+
+        /* This defines the default interrupt distribution policy. */
+
+        if (cpu == PS3_BINDING_CPU_ANY)
+                cpu = 0;
+
+        pd = &per_cpu(ps3_private, cpu);
+
+        *virq = irq_create_mapping(NULL, outlet);
+
+        if (*virq == NO_IRQ) {
+                pr_debug("%s:%d: irq_create_mapping failed: outlet %lu\n",
+                        __func__, __LINE__, outlet);
+                result = -ENOMEM;
+                goto fail_create;
+        }
+
+        /* Binds outlet to cpu + virq. */
+
+        result = lv1_connect_irq_plug_ext(pd->node, pd->cpu, *virq, outlet, 0);
+
+        if (result) {
+                pr_info("%s:%d: lv1_connect_irq_plug_ext failed: %s\n",
+                __func__, __LINE__, ps3_result(result));
+                result = -EPERM;
+                goto fail_connect;
+        }
+
+        pr_debug("%s:%d: outlet %lu => cpu %u, virq %u\n", __func__, __LINE__,
+                outlet, cpu, *virq);
+
+        result = set_irq_chip_data(*virq, pd);
+
+        if (result) {
+                pr_debug("%s:%d: set_irq_chip_data failed\n",
+                        __func__, __LINE__);
+                goto fail_set;
+        }
+
+        return result;
+
+fail_set:
+        lv1_disconnect_irq_plug_ext(pd->node, pd->cpu, *virq);
+fail_connect:
+        irq_dispose_mapping(*virq);
+fail_create:
+        return result;
+}
+EXPORT_SYMBOL_GPL(ps3_alloc_irq);
+
+int ps3_free_irq(unsigned int virq)
+{
+        int result;
+        const struct ps3_private *pd = get_irq_chip_data(virq);
+
+        pr_debug("%s:%d: node %lu, cpu %d, virq %u\n", __func__, __LINE__,
+                pd->node, pd->cpu, virq);
+
+        result = lv1_disconnect_irq_plug_ext(pd->node, pd->cpu, virq);
+
+        if (result)
+                pr_info("%s:%d: lv1_disconnect_irq_plug_ext failed: %s\n",
+                __func__, __LINE__, ps3_result(result));
+
+        set_irq_chip_data(virq, NULL);
+        irq_dispose_mapping(virq);
+        return result;
+}
+EXPORT_SYMBOL_GPL(ps3_free_irq);
+
+/**
  * ps3_alloc_io_irq - Assign a virq to a system bus device.
- * interrupt_id: The device interrupt id read from the system repository.
+ * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
+ * serviced on.
+ * @interrupt_id: The device interrupt id read from the system repository.
  * @virq: The assigned Linux virq.
  *
  * An io irq represents a non-virtualized device interrupt.  interrupt_id
  * coresponds to the interrupt number of the interrupt controller.
  */
 
-int ps3_alloc_io_irq(unsigned int interrupt_id, unsigned int *virq)
+int ps3_alloc_io_irq(enum ps3_cpu_binding cpu, unsigned int interrupt_id,
+        unsigned int *virq)
 {
         int result;
         unsigned long outlet;
@@ -57,13 +189,12 @@ int ps3_alloc_io_irq(unsigned int interrupt_id, unsigned int *virq)
                 return result;
         }
 
-        *virq = irq_create_mapping(NULL, outlet);
-
-        pr_debug("%s:%d: interrupt_id %u => outlet %lu, virq %u\n",
-                __func__, __LINE__, interrupt_id, outlet, *virq);
+        result = ps3_alloc_irq(cpu, outlet, virq);
+        BUG_ON(result);
 
-        return 0;
+        return result;
 }
+EXPORT_SYMBOL_GPL(ps3_alloc_io_irq);
 
 int ps3_free_io_irq(unsigned int virq)
 {
@@ -75,13 +206,16 @@ int ps3_free_io_irq(unsigned int virq)
                 pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
 
-        irq_dispose_mapping(virq);
+        ps3_free_irq(virq);
 
         return result;
 }
+EXPORT_SYMBOL_GPL(ps3_free_io_irq);
 
 /**
  * ps3_alloc_event_irq - Allocate a virq for use with a system event.
+ * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
+ * serviced on.
  * @virq: The assigned Linux virq.
  *
  * The virq can be used with lv1_connect_interrupt_event_receive_port() to
@@ -89,7 +223,7 @@ int ps3_free_io_irq(unsigned int virq)
  * events.
  */
 
-int ps3_alloc_event_irq(unsigned int *virq)
+int ps3_alloc_event_irq(enum ps3_cpu_binding cpu, unsigned int *virq)
 {
         int result;
         unsigned long outlet;
@@ -103,12 +237,10 @@ int ps3_alloc_event_irq(unsigned int *virq)
                 return result;
         }
 
-        *virq = irq_create_mapping(NULL, outlet);
-
-        pr_debug("%s:%d: outlet %lu, virq %u\n", __func__, __LINE__, outlet,
-                *virq);
+        result = ps3_alloc_irq(cpu, outlet, virq);
+        BUG_ON(result);
 
-        return 0;
+        return result;
 }
 
 int ps3_free_event_irq(unsigned int virq)
@@ -123,7 +255,7 @@ int ps3_free_event_irq(unsigned int virq)
                 pr_debug("%s:%d: lv1_destruct_event_receive_port failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
 
-        irq_dispose_mapping(virq);
+        ps3_free_irq(virq);
 
         pr_debug(" <- %s:%d\n", __func__, __LINE__);
         return result;
@@ -136,6 +268,8 @@ int ps3_send_event_locally(unsigned int virq)
 
 /**
  * ps3_connect_event_irq - Assign a virq to a system bus device.
+ * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
+ * serviced on.
  * @did: The HV device identifier read from the system repository.
  * @interrupt_id: The device interrupt id read from the system repository.
  * @virq: The assigned Linux virq.
@@ -144,12 +278,13 @@ int ps3_send_event_locally(unsigned int virq)
  * coresponds to the software interrupt number.
  */
 
-int ps3_connect_event_irq(const struct ps3_device_id *did,
-        unsigned int interrupt_id, unsigned int *virq)
+int ps3_connect_event_irq(enum ps3_cpu_binding cpu,
+        const struct ps3_device_id *did, unsigned int interrupt_id,
+        unsigned int *virq)
 {
         int result;
 
-        result = ps3_alloc_event_irq(virq);
+        result = ps3_alloc_event_irq(cpu, virq);
 
         if (result)
                 return result;
@@ -196,6 +331,8 @@ int ps3_disconnect_event_irq(const struct ps3_device_id *did,
 
 /**
  * ps3_alloc_vuart_irq - Configure the system virtual uart virq.
+ * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
+ * serviced on.
  * @virt_addr_bmp: The caller supplied virtual uart interrupt bitmap.
  * @virq: The assigned Linux virq.
  *
@@ -203,13 +340,14 @@ int ps3_disconnect_event_irq(const struct ps3_device_id *did,
  * freeing the interrupt will return a wrong state error.
  */
 
-int ps3_alloc_vuart_irq(void* virt_addr_bmp, unsigned int *virq)
+int ps3_alloc_vuart_irq(enum ps3_cpu_binding cpu, void* virt_addr_bmp,
+        unsigned int *virq)
 {
         int result;
         unsigned long outlet;
-        unsigned long lpar_addr;
+        u64 lpar_addr;
 
-        BUG_ON(!is_kernel_addr((unsigned long)virt_addr_bmp));
+        BUG_ON(!is_kernel_addr((u64)virt_addr_bmp));
 
         lpar_addr = ps3_mm_phys_to_lpar(__pa(virt_addr_bmp));
 
@@ -221,12 +359,10 @@ int ps3_alloc_vuart_irq(void* virt_addr_bmp, unsigned int *virq)
                 return result;
         }
 
-        *virq = irq_create_mapping(NULL, outlet);
-
-        pr_debug("%s:%d: outlet %lu, virq %u\n", __func__, __LINE__,
-                outlet, *virq);
+        result = ps3_alloc_irq(cpu, outlet, virq);
+        BUG_ON(result);
 
-        return 0;
+        return result;
 }
 
 int ps3_free_vuart_irq(unsigned int virq)
@@ -241,21 +377,23 @@ int ps3_free_vuart_irq(unsigned int virq)
                 return result;
         }
 
-        irq_dispose_mapping(virq);
+        ps3_free_irq(virq);
 
         return result;
 }
 
 /**
  * ps3_alloc_spe_irq - Configure an spe virq.
+ * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
+ * serviced on.
  * @spe_id: The spe_id returned from lv1_construct_logical_spe().
  * @class: The spe interrupt class {0,1,2}.
  * @virq: The assigned Linux virq.
  *
  */
 
-int ps3_alloc_spe_irq(unsigned long spe_id, unsigned int class,
-        unsigned int *virq)
+int ps3_alloc_spe_irq(enum ps3_cpu_binding cpu, unsigned long spe_id,
+        unsigned int class, unsigned int *virq)
 {
         int result;
         unsigned long outlet;
@@ -270,73 +408,24 @@ int ps3_alloc_spe_irq(unsigned long spe_id, unsigned int class,
                 return result;
         }
 
-        *virq = irq_create_mapping(NULL, outlet);
-
-        pr_debug("%s:%d: spe_id %lu, class %u, outlet %lu, virq %u\n",
-                __func__, __LINE__, spe_id, class, outlet, *virq);
+        result = ps3_alloc_irq(cpu, outlet, virq);
+        BUG_ON(result);
 
-        return 0;
+        return result;
 }
 
 int ps3_free_spe_irq(unsigned int virq)
 {
-        irq_dispose_mapping(virq);
+        ps3_free_irq(virq);
         return 0;
 }
 
+
 #define PS3_INVALID_OUTLET ((irq_hw_number_t)-1)
 #define PS3_PLUG_MAX 63
 
-/**
- * struct bmp - a per cpu irq status and mask bitmap structure
- * @status: 256 bit status bitmap indexed by plug
- * @unused_1:
- * @mask: 256 bit mask bitmap indexed by plug
- * @unused_2:
- * @lock:
- * @ipi_debug_brk_mask:
- *
- * The HV mantains per SMT thread mappings of HV outlet to HV plug on
- * behalf of the guest.  These mappings are implemented as 256 bit guest
- * supplied bitmaps indexed by plug number.  The address of the bitmaps are
- * registered with the HV through lv1_configure_irq_state_bitmap().
- *
- * The HV supports 256 plugs per thread, assigned as {0..255}, for a total
- * of 512 plugs supported on a processor.  To simplify the logic this
- * implementation equates HV plug value to linux virq value, constrains each
- * interrupt to have a system wide unique plug number, and limits the range
- * of the plug values to map into the first dword of the bitmaps.  This
- * gives a usable range of plug values of  {NUM_ISA_INTERRUPTS..63}.  Note
- * that there is no constraint on how many in this set an individual thread
- * can aquire.
- */
-
-struct bmp {
-        struct {
-                unsigned long status;
-                unsigned long unused_1[3];
-                unsigned long mask;
-                unsigned long unused_2[3];
-        } __attribute__ ((packed));
-        spinlock_t lock;
-        unsigned long ipi_debug_brk_mask;
-};
-
-/**
- * struct private - a per cpu data structure
- * @node: HV node id
- * @cpu: HV thread id
- * @bmp: an HV bmp structure
- */
-
-struct private {
-        unsigned long node;
-        unsigned int cpu;
-        struct bmp bmp;
-};
-
 #if defined(DEBUG)
-static void _dump_64_bmp(const char *header, const unsigned long *p, unsigned cpu,
+static void _dump_64_bmp(const char *header, const u64 *p, unsigned cpu,
         const char* func, int line)
 {
         pr_debug("%s:%d: %s %u {%04lx_%04lx_%04lx_%04lx}\n",
@@ -346,14 +435,14 @@ static void _dump_64_bmp(const char *header, const unsigned long *p, unsigned cp
 }
 
 static void __attribute__ ((unused)) _dump_256_bmp(const char *header,
-        const unsigned long *p, unsigned cpu, const char* func, int line)
+        const u64 *p, unsigned cpu, const char* func, int line)
 {
         pr_debug("%s:%d: %s %u {%016lx:%016lx:%016lx:%016lx}\n",
                 func, line, header, cpu, p[0], p[1], p[2], p[3]);
 }
 
 #define dump_bmp(_x) _dump_bmp(_x, __func__, __LINE__)
-static void _dump_bmp(struct private* pd, const char* func, int line)
+static void _dump_bmp(struct ps3_private* pd, const char* func, int line)
 {
         unsigned long flags;
 
@@ -364,7 +453,7 @@ static void _dump_bmp(struct private* pd, const char* func, int line)
 }
 
 #define dump_mask(_x) _dump_mask(_x, __func__, __LINE__)
-static void __attribute__ ((unused)) _dump_mask(struct private* pd,
+static void __attribute__ ((unused)) _dump_mask(struct ps3_private* pd,
         const char* func, int line)
 {
         unsigned long flags;
@@ -374,109 +463,94 @@ static void __attribute__ ((unused)) _dump_mask(struct private* pd,
         spin_unlock_irqrestore(&pd->bmp.lock, flags);
 }
 #else
-static void dump_bmp(struct private* pd) {};
+static void dump_bmp(struct ps3_private* pd) {};
 #endif /* defined(DEBUG) */
 
-static void chip_mask(unsigned int virq)
+static void ps3_chip_mask(unsigned int virq)
 {
+        struct ps3_private *pd = get_irq_chip_data(virq);
+        u64 bit = 0x8000000000000000UL >> virq;
+        u64 *p = &pd->bmp.mask;
+        u64 old;
         unsigned long flags;
-        struct private *pd = get_irq_chip_data(virq);
 
         pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
 
-        BUG_ON(virq < NUM_ISA_INTERRUPTS);
-        BUG_ON(virq > PS3_PLUG_MAX);
-
-        spin_lock_irqsave(&pd->bmp.lock, flags);
-        pd->bmp.mask &= ~(0x8000000000000000UL >> virq);
-        spin_unlock_irqrestore(&pd->bmp.lock, flags);
+        local_irq_save(flags);
+        asm volatile(
+                     "1:        ldarx %0,0,%3\n"
+                     "andc      %0,%0,%2\n"
+                     "stdcx.    %0,0,%3\n"
+                     "bne-      1b"
+                     : "=&r" (old), "+m" (*p)
+                     : "r" (bit), "r" (p)
+                     : "cc" );
 
         lv1_did_update_interrupt_mask(pd->node, pd->cpu);
+        local_irq_restore(flags);
 }
 
-static void chip_unmask(unsigned int virq)
+static void ps3_chip_unmask(unsigned int virq)
 {
+        struct ps3_private *pd = get_irq_chip_data(virq);
+        u64 bit = 0x8000000000000000UL >> virq;
+        u64 *p = &pd->bmp.mask;
+        u64 old;
         unsigned long flags;
-        struct private *pd = get_irq_chip_data(virq);
 
         pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
 
-        BUG_ON(virq < NUM_ISA_INTERRUPTS);
-        BUG_ON(virq > PS3_PLUG_MAX);
-
-        spin_lock_irqsave(&pd->bmp.lock, flags);
-        pd->bmp.mask |= (0x8000000000000000UL >> virq);
-        spin_unlock_irqrestore(&pd->bmp.lock, flags);
+        local_irq_save(flags);
+        asm volatile(
+                     "1:        ldarx %0,0,%3\n"
+                     "or        %0,%0,%2\n"
+                     "stdcx.    %0,0,%3\n"
+                     "bne-      1b"
+                     : "=&r" (old), "+m" (*p)
+                     : "r" (bit), "r" (p)
+                     : "cc" );
 
         lv1_did_update_interrupt_mask(pd->node, pd->cpu);
+        local_irq_restore(flags);
 }
 
-static void chip_eoi(unsigned int virq)
+static void ps3_chip_eoi(unsigned int virq)
 {
-        lv1_end_of_interrupt(virq);
+        const struct ps3_private *pd = get_irq_chip_data(virq);
+        lv1_end_of_interrupt_ext(pd->node, pd->cpu, virq);
 }
 
 static struct irq_chip irq_chip = {
         .typename = "ps3",
-        .mask = chip_mask,
-        .unmask = chip_unmask,
-        .eoi = chip_eoi,
+        .mask = ps3_chip_mask,
+        .unmask = ps3_chip_unmask,
+        .eoi = ps3_chip_eoi,
 };
 
-static void host_unmap(struct irq_host *h, unsigned int virq)
+static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
 {
-        int result;
-
-        pr_debug("%s:%d: virq %d\n", __func__, __LINE__, virq);
-
-        lv1_disconnect_irq_plug(virq);
-
-        result = set_irq_chip_data(virq, NULL);
-        BUG_ON(result);
+        set_irq_chip_data(virq, NULL);
 }
 
-static DEFINE_PER_CPU(struct private, private);
-
-static int host_map(struct irq_host *h, unsigned int virq,
+static int ps3_host_map(struct irq_host *h, unsigned int virq,
         irq_hw_number_t hwirq)
 {
-        int result;
-        unsigned int cpu;
-
-        pr_debug(" -> %s:%d\n", __func__, __LINE__);
-        pr_debug("%s:%d: hwirq %lu => virq %u\n", __func__, __LINE__, hwirq,
+        pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
                 virq);
 
-        /* bind this virq to a cpu */
-
-        preempt_disable();
-        cpu = smp_processor_id();
-        result = lv1_connect_irq_plug(virq, hwirq);
-        preempt_enable();
-
-        if (result) {
-                pr_info("%s:%d: lv1_connect_irq_plug failed:"
-                        " %s\n", __func__, __LINE__, ps3_result(result));
-                return -EPERM;
-        }
-
-        result = set_irq_chip_data(virq, &per_cpu(private, cpu));
-        BUG_ON(result);
-
         set_irq_chip_and_handler(virq, &irq_chip, handle_fasteoi_irq);
 
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
-        return result;
+        return 0;
 }
 
-static struct irq_host_ops host_ops = {
-        .map = host_map,
-        .unmap = host_unmap,
+static struct irq_host_ops ps3_host_ops = {
+        .map = ps3_host_map,
+        .unmap = ps3_host_unmap,
 };
 
 void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)
 {
-        struct private *pd = &per_cpu(private, cpu);
+        struct ps3_private *pd = &per_cpu(ps3_private, cpu);
 
         pd->bmp.ipi_debug_brk_mask = 0x8000000000000000UL >> virq;
 
@@ -484,57 +558,32 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)
                 cpu, virq, pd->bmp.ipi_debug_brk_mask);
 }
 
-static int bmp_get_and_clear_status_bit(struct bmp *m)
+unsigned int ps3_get_irq(void)
 {
-        unsigned long flags;
-        unsigned int bit;
-        unsigned long x;
-
-        spin_lock_irqsave(&m->lock, flags);
+        struct ps3_private *pd = &__get_cpu_var(ps3_private);
+        u64 x = (pd->bmp.status & pd->bmp.mask);
+        unsigned int plug;
 
         /* check for ipi break first to stop this cpu ASAP */
 
-        if (m->status & m->ipi_debug_brk_mask) {
-                m->status &= ~m->ipi_debug_brk_mask;
-                spin_unlock_irqrestore(&m->lock, flags);
-                return __ilog2(m->ipi_debug_brk_mask);
-        }
-
-        x = (m->status & m->mask);
+        if (x & pd->bmp.ipi_debug_brk_mask)
+                x &= pd->bmp.ipi_debug_brk_mask;
 
-        for (bit = NUM_ISA_INTERRUPTS, x <<= bit; x; bit++, x <<= 1)
-                if (x & 0x8000000000000000UL) {
-                        m->status &= ~(0x8000000000000000UL >> bit);
-                        spin_unlock_irqrestore(&m->lock, flags);
-                        return bit;
-                }
+        asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
+        plug &= 0x3f;
 
-        spin_unlock_irqrestore(&m->lock, flags);
-
-        pr_debug("%s:%d: not found\n", __func__, __LINE__);
-        return -1;
-}
-
-unsigned int ps3_get_irq(void)
-{
-        int plug;
-
-        struct private *pd = &__get_cpu_var(private);
-
-        plug = bmp_get_and_clear_status_bit(&pd->bmp);
-
-        if (plug < 1) {
+        if (unlikely(plug) == NO_IRQ) {
                 pr_debug("%s:%d: no plug found: cpu %u\n", __func__, __LINE__,
                         pd->cpu);
-                dump_bmp(&per_cpu(private, 0));
-                dump_bmp(&per_cpu(private, 1));
+                dump_bmp(&per_cpu(ps3_private, 0));
+                dump_bmp(&per_cpu(ps3_private, 1));
                 return NO_IRQ;
         }
 
 #if defined(DEBUG)
-        if (plug < NUM_ISA_INTERRUPTS || plug > PS3_PLUG_MAX) {
-                dump_bmp(&per_cpu(private, 0));
-                dump_bmp(&per_cpu(private, 1));
+        if (unlikely(plug < NUM_ISA_INTERRUPTS || plug > PS3_PLUG_MAX)) {
+                dump_bmp(&per_cpu(ps3_private, 0));
+                dump_bmp(&per_cpu(ps3_private, 1));
                 BUG();
         }
 #endif
@@ -544,26 +593,27 @@ unsigned int ps3_get_irq(void)
 void __init ps3_init_IRQ(void)
 {
         int result;
-        unsigned long node;
         unsigned cpu;
         struct irq_host *host;
 
-        lv1_get_logical_ppe_id(&node);
-
-        host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0, &host_ops,
+        host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0, &ps3_host_ops,
                 PS3_INVALID_OUTLET);
         irq_set_default_host(host);
         irq_set_virq_count(PS3_PLUG_MAX + 1);
 
         for_each_possible_cpu(cpu) {
-                struct private *pd = &per_cpu(private, cpu);
+                struct ps3_private *pd = &per_cpu(ps3_private, cpu);
 
-                pd->node = node;
-                pd->cpu = cpu;
+                lv1_get_logical_ppe_id(&pd->node);
+                pd->cpu = get_hard_smp_processor_id(cpu);
                 spin_lock_init(&pd->bmp.lock);
 
-                result = lv1_configure_irq_state_bitmap(node, cpu,
-                        ps3_mm_phys_to_lpar(__pa(&pd->bmp.status)));
+                pr_debug("%s:%d: node %lu, cpu %d, bmp %lxh\n", __func__,
+                        __LINE__, pd->node, pd->cpu,
+                        ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
+
+                result = lv1_configure_irq_state_bitmap(pd->node, pd->cpu,
+                        ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
 
                 if (result)
                         pr_debug("%s:%d: lv1_configure_irq_state_bitmap failed:"
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 49c0d010d491..42354de3f557 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -25,7 +25,6 @@
 #include <asm/firmware.h>
 #include <asm/lmb.h>
 #include <asm/udbg.h>
-#include <asm/ps3.h>
 #include <asm/lv1call.h>
 
 #include "platform.h"
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 58358305dc10..5c3da08bc0c4 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -22,7 +22,6 @@
 #include <linux/io.h>
 
 #include <asm/lmb.h>
-#include <asm/ps3.h>
 
 #include "platform.h"
 
@@ -59,7 +58,7 @@ struct os_area_header {
         u32 ldr_format;
         u32 ldr_size;
         u32 _reserved_2[6];
-} __attribute__ ((packed));
+};
 
 enum {
         PARAM_BOOT_FLAG_GAME_OS = 0,
@@ -67,13 +66,6 @@ enum {
 };
 
 enum {
-        PARAM_AV_MULTI_OUT_NTSC = 0,
-        PARAM_AV_MULTI_OUT_PAL_RGB = 1,
-        PARAM_AV_MULTI_OUT_PAL_YCBCR = 2,
-        PARAM_AV_MULTI_OUT_SECAM = 3,
-};
-
-enum {
         PARAM_CTRL_BUTTON_O_IS_YES = 0,
         PARAM_CTRL_BUTTON_X_IS_YES = 1,
 };
@@ -114,7 +106,7 @@ struct os_area_params {
         u8 dns_primary[4];
         u8 dns_secondary[4];
         u8 _reserved_5[8];
-} __attribute__ ((packed));
+};
 
 /**
  * struct saved_params - Static working copies of data from the 'Other OS' area.
@@ -257,3 +249,13 @@ u64 ps3_os_area_rtc_diff(void)
 {
         return saved_params.rtc_diff ? saved_params.rtc_diff : 946684800UL;
 }
+
+/**
+ * ps3_os_area_get_av_multi_out - Returns the default video mode.
+ */
+
+enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void)
+{
+    return saved_params.av_multi_out;
+}
+EXPORT_SYMBOL_GPL(ps3_os_area_get_av_multi_out);
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 23b111bea9d0..ca04f03305c7 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -22,6 +22,9 @@
 #define _PS3_PLATFORM_H
 
 #include <linux/rtc.h>
+#include <scsi/scsi.h>
+
+#include <asm/ps3.h>
 
 /* htab */
 
@@ -65,4 +68,152 @@ void ps3_spu_set_platform (void);
 static inline void ps3_spu_set_platform (void) {}
 #endif
 
+/* repository bus info */
+
+enum ps3_bus_type {
+        PS3_BUS_TYPE_SB = 4,
+        PS3_BUS_TYPE_STORAGE = 5,
+};
+
+enum ps3_dev_type {
+        PS3_DEV_TYPE_STOR_DISK = TYPE_DISK,     /* 0 */
+        PS3_DEV_TYPE_SB_GELIC = 3,
+        PS3_DEV_TYPE_SB_USB = 4,
+        PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
+        PS3_DEV_TYPE_SB_GPIO = 6,
+        PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,     /* 14 */
+};
+
+int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
+        u64 *value);
+int ps3_repository_read_bus_id(unsigned int bus_index, unsigned int *bus_id);
+int ps3_repository_read_bus_type(unsigned int bus_index,
+        enum ps3_bus_type *bus_type);
+int ps3_repository_read_bus_num_dev(unsigned int bus_index,
+        unsigned int *num_dev);
+
+/* repository bus device info */
+
+enum ps3_interrupt_type {
+        PS3_INTERRUPT_TYPE_EVENT_PORT = 2,
+        PS3_INTERRUPT_TYPE_SB_OHCI = 3,
+        PS3_INTERRUPT_TYPE_SB_EHCI = 4,
+        PS3_INTERRUPT_TYPE_OTHER = 5,
+};
+
+enum ps3_reg_type {
+        PS3_REG_TYPE_SB_OHCI = 3,
+        PS3_REG_TYPE_SB_EHCI = 4,
+        PS3_REG_TYPE_SB_GPIO = 5,
+};
+
+int ps3_repository_read_dev_str(unsigned int bus_index,
+        unsigned int dev_index, const char *dev_str, u64 *value);
+int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
+        unsigned int *dev_id);
+int ps3_repository_read_dev_type(unsigned int bus_index,
+        unsigned int dev_index, enum ps3_dev_type *dev_type);
+int ps3_repository_read_dev_intr(unsigned int bus_index,
+        unsigned int dev_index, unsigned int intr_index,
+        enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id);
+int ps3_repository_read_dev_reg_type(unsigned int bus_index,
+        unsigned int dev_index, unsigned int reg_index,
+        enum ps3_reg_type *reg_type);
+int ps3_repository_read_dev_reg_addr(unsigned int bus_index,
+        unsigned int dev_index, unsigned int reg_index, u64 *bus_addr,
+        u64 *len);
+int ps3_repository_read_dev_reg(unsigned int bus_index,
+        unsigned int dev_index, unsigned int reg_index,
+        enum ps3_reg_type *reg_type, u64 *bus_addr, u64 *len);
+
+/* repository bus enumerators */
+
+struct ps3_repository_device {
+        unsigned int bus_index;
+        unsigned int dev_index;
+        struct ps3_device_id did;
+};
+
+int ps3_repository_find_device(enum ps3_bus_type bus_type,
+        enum ps3_dev_type dev_type,
+        const struct ps3_repository_device *start_dev,
+        struct ps3_repository_device *dev);
+static inline int ps3_repository_find_first_device(
+        enum ps3_bus_type bus_type, enum ps3_dev_type dev_type,
+        struct ps3_repository_device *dev)
+{
+        return ps3_repository_find_device(bus_type, dev_type, NULL, dev);
+}
+int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
+        enum ps3_interrupt_type intr_type, unsigned int *interrupt_id);
+int ps3_repository_find_reg(const struct ps3_repository_device *dev,
+        enum ps3_reg_type reg_type, u64 *bus_addr, u64 *len);
+
+/* repository block device info */
+
+int ps3_repository_read_stor_dev_port(unsigned int bus_index,
+        unsigned int dev_index, u64 *port);
+int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
+        unsigned int dev_index, u64 *blk_size);
+int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
+        unsigned int dev_index, u64 *num_blocks);
+int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
+        unsigned int dev_index, unsigned int *num_regions);
+int ps3_repository_read_stor_dev_region_id(unsigned int bus_index,
+        unsigned int dev_index, unsigned int region_index,
+        unsigned int *region_id);
+int ps3_repository_read_stor_dev_region_size(unsigned int bus_index,
+        unsigned int dev_index, unsigned int region_index, u64 *region_size);
+int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
+        unsigned int dev_index, unsigned int region_index, u64 *region_start);
+int ps3_repository_read_stor_dev_info(unsigned int bus_index,
+        unsigned int dev_index, u64 *port, u64 *blk_size,
+        u64 *num_blocks, unsigned int *num_regions);
+int ps3_repository_read_stor_dev_region(unsigned int bus_index,
+        unsigned int dev_index, unsigned int region_index,
+        unsigned int *region_id, u64 *region_start, u64 *region_size);
+
+/* repository pu and memory info */
+
+int ps3_repository_read_num_pu(unsigned int *num_pu);
+int ps3_repository_read_ppe_id(unsigned int *pu_index, unsigned int *ppe_id);
+int ps3_repository_read_rm_base(unsigned int ppe_id, u64 *rm_base);
+int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size);
+int ps3_repository_read_region_total(u64 *region_total);
+int ps3_repository_read_mm_info(u64 *rm_base, u64 *rm_size,
+        u64 *region_total);
+
+/* repository pme info */
+
+int ps3_repository_read_num_be(unsigned int *num_be);
+int ps3_repository_read_be_node_id(unsigned int be_index, u64 *node_id);
+int ps3_repository_read_tb_freq(u64 node_id, u64 *tb_freq);
+int ps3_repository_read_be_tb_freq(unsigned int be_index, u64 *tb_freq);
+
+/* repository 'Other OS' area */
+
+int ps3_repository_read_boot_dat_addr(u64 *lpar_addr);
+int ps3_repository_read_boot_dat_size(unsigned int *size);
+int ps3_repository_read_boot_dat_info(u64 *lpar_addr, unsigned int *size);
+
+/* repository spu info */
+
+/**
+ * enum spu_resource_type - Type of spu resource.
+ * @spu_resource_type_shared: Logical spu is shared with other partions.
+ * @spu_resource_type_exclusive: Logical spu is not shared with other partions.
+ *
+ * Returned by ps3_repository_read_spu_resource_id().
+ */
+
+enum ps3_spu_resource_type {
+        PS3_SPU_RESOURCE_TYPE_SHARED = 0,
+        PS3_SPU_RESOURCE_TYPE_EXCLUSIVE = 0x8000000000000000UL,
+};
+
+int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved);
+int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id);
+int ps3_repository_read_spu_resource_id(unsigned int res_index,
+        enum ps3_spu_resource_type* resource_type, unsigned int *resource_id);
+
 #endif
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 273a0d621bdd..ae586a0e5d3f 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -18,9 +18,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <asm/ps3.h>
 #include <asm/lv1call.h>
 
+#include "platform.h"
+
 enum ps3_vendor_id {
         PS3_VENDOR_ID_NONE = 0,
         PS3_VENDOR_ID_SONY = 0x8000000000000000UL,
@@ -257,7 +258,7 @@ int ps3_repository_read_dev_type(unsigned int bus_index,
 
 int ps3_repository_read_dev_intr(unsigned int bus_index,
         unsigned int dev_index, unsigned int intr_index,
-        unsigned int *intr_type, unsigned int* interrupt_id)
+        enum ps3_interrupt_type *intr_type, unsigned int* interrupt_id)
 {
         int result;
         u64 v1;
@@ -275,7 +276,8 @@ int ps3_repository_read_dev_intr(unsigned int bus_index,
 }
 
 int ps3_repository_read_dev_reg_type(unsigned int bus_index,
-        unsigned int dev_index, unsigned int reg_index, unsigned int *reg_type)
+        unsigned int dev_index, unsigned int reg_index,
+        enum ps3_reg_type *reg_type)
 {
         int result;
         u64 v1;
@@ -302,8 +304,8 @@ int ps3_repository_read_dev_reg_addr(unsigned int bus_index,
 }
 
 int ps3_repository_read_dev_reg(unsigned int bus_index,
-        unsigned int dev_index, unsigned int reg_index, unsigned int *reg_type,
-        u64 *bus_addr, u64 *len)
+        unsigned int dev_index, unsigned int reg_index,
+        enum ps3_reg_type *reg_type, u64 *bus_addr, u64 *len)
 {
         int result = ps3_repository_read_dev_reg_type(bus_index, dev_index,
                 reg_index, reg_type);
@@ -343,7 +345,7 @@ int ps3_repository_dump_resource_info(unsigned int bus_index,
         }
 
         for (res_index = 0; res_index < 10; res_index++) {
-                enum ps3_region_type reg_type;
+                enum ps3_reg_type reg_type;
                 u64 bus_addr;
                 u64 len;
 
@@ -367,7 +369,55 @@ int ps3_repository_dump_resource_info(unsigned int bus_index,
         return result;
 }
 
-static int dump_device_info(unsigned int bus_index, unsigned int num_dev)
+static int dump_stor_dev_info(unsigned int bus_index, unsigned int dev_index)
+{
+        int result = 0;
+        unsigned int num_regions, region_index;
+        u64 port, blk_size, num_blocks;
+
+        pr_debug(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
+                bus_index, dev_index);
+
+        result = ps3_repository_read_stor_dev_info(bus_index, dev_index, &port,
+                &blk_size, &num_blocks, &num_regions);
+        if (result) {
+                pr_debug("%s:%d ps3_repository_read_stor_dev_info"
+                        " (%u:%u) failed\n", __func__, __LINE__,
+                        bus_index, dev_index);
+                goto out;
+        }
+
+        pr_debug("%s:%d  (%u:%u): port %lu, blk_size %lu, num_blocks "
+                 "%lu, num_regions %u\n",
+                 __func__, __LINE__, bus_index, dev_index, port,
+                 blk_size, num_blocks, num_regions);
+
+        for (region_index = 0; region_index < num_regions; region_index++) {
+                unsigned int region_id;
+                u64 region_start, region_size;
+
+                result = ps3_repository_read_stor_dev_region(bus_index,
+                        dev_index, region_index, &region_id, &region_start,
+                        &region_size);
+                if (result) {
+                         pr_debug("%s:%d ps3_repository_read_stor_dev_region"
+                                  " (%u:%u) failed\n", __func__, __LINE__,
+                                  bus_index, dev_index);
+                        break;
+                }
+
+                pr_debug("%s:%d (%u:%u) region_id %u, start %lxh, size %lxh\n",
+                         __func__, __LINE__, bus_index, dev_index, region_id,
+                         region_start, region_size);
+        }
+
+out:
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        return result;
+}
+
+static int dump_device_info(unsigned int bus_index, enum ps3_bus_type bus_type,
+                            unsigned int num_dev)
 {
         int result = 0;
         unsigned int dev_index;
@@ -402,6 +452,9 @@ static int dump_device_info(unsigned int bus_index, unsigned int num_dev)
                         __LINE__, bus_index, dev_index, dev_type, dev_id);
 
                 ps3_repository_dump_resource_info(bus_index, dev_index);
+
+                if (bus_type == PS3_BUS_TYPE_STORAGE)
+                        dump_stor_dev_info(bus_index, dev_index);
         }
 
         pr_debug(" <- %s:%d\n", __func__, __LINE__);
@@ -452,7 +505,7 @@ int ps3_repository_dump_bus_info(void)
                         __func__, __LINE__, bus_index, bus_type, bus_id,
                         num_dev);
 
-                dump_device_info(bus_index, num_dev);
+                dump_device_info(bus_index, bus_type, num_dev);
         }
 
         pr_debug(" <- %s:%d\n", __func__, __LINE__);
@@ -487,7 +540,8 @@ static int find_device(unsigned int bus_index, unsigned int num_dev,
                         break;
         }
 
-        BUG_ON(dev_index == num_dev);
+        if (dev_index == num_dev)
+                return -1;
 
         pr_debug("%s:%d: found dev_type %u at dev_index %u\n",
                 __func__, __LINE__, dev_type, dev_index);
@@ -521,7 +575,7 @@ int ps3_repository_find_device (enum ps3_bus_type bus_type,
         pr_debug("%s:%d: find bus_type %u, dev_type %u\n", __func__, __LINE__,
                 bus_type, dev_type);
 
-        dev->bus_index = UINT_MAX;
+        BUG_ON(start_dev && start_dev->bus_index > 10);
 
         for (bus_index = start_dev ? start_dev->bus_index : 0; bus_index < 10;
                 bus_index++) {
@@ -532,13 +586,15 @@ int ps3_repository_find_device (enum ps3_bus_type bus_type,
                 if (result) {
                         pr_debug("%s:%d read_bus_type failed\n",
                                 __func__, __LINE__);
+                        dev->bus_index = UINT_MAX;
                         return result;
                 }
                 if (x == bus_type)
                         break;
         }
 
-        BUG_ON(bus_index == 10);
+        if (bus_index >= 10)
+                return -ENODEV;
 
         pr_debug("%s:%d: found bus_type %u at bus_index %u\n",
                 __func__, __LINE__, bus_type, bus_index);
@@ -604,7 +660,8 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
                 }
         }
 
-        BUG_ON(res_index == 10);
+        if (res_index == 10)
+                return -ENODEV;
 
         pr_debug("%s:%d: found intr_type %u at res_index %u\n",
                 __func__, __LINE__, intr_type, res_index);
@@ -612,8 +669,8 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *dev,
         return result;
 }
 
-int ps3_repository_find_region(const struct ps3_repository_device *dev,
-        enum ps3_region_type reg_type, u64 *bus_addr, u64 *len)
+int ps3_repository_find_reg(const struct ps3_repository_device *dev,
+        enum ps3_reg_type reg_type, u64 *bus_addr, u64 *len)
 {
         int result = 0;
         unsigned int res_index;
@@ -623,7 +680,7 @@ int ps3_repository_find_region(const struct ps3_repository_device *dev,
         *bus_addr = *len = 0;
 
         for (res_index = 0; res_index < 10; res_index++) {
-                enum ps3_region_type t;
+                enum ps3_reg_type t;
                 u64 a;
                 u64 l;
 
@@ -643,7 +700,8 @@ int ps3_repository_find_region(const struct ps3_repository_device *dev,
                 }
         }
 
-        BUG_ON(res_index == 10);
+        if (res_index == 10)
+                return -ENODEV;
 
         pr_debug("%s:%d: found reg_type %u at res_index %u\n",
                 __func__, __LINE__, reg_type, res_index);
@@ -651,6 +709,136 @@ int ps3_repository_find_region(const struct ps3_repository_device *dev,
         return result;
 }
 
+int ps3_repository_read_stor_dev_port(unsigned int bus_index,
+        unsigned int dev_index, u64 *port)
+{
+        return read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("port", 0),
+                0, port, 0);
+}
+
+int ps3_repository_read_stor_dev_blk_size(unsigned int bus_index,
+        unsigned int dev_index, u64 *blk_size)
+{
+        return read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("blk_size", 0),
+                0, blk_size, 0);
+}
+
+int ps3_repository_read_stor_dev_num_blocks(unsigned int bus_index,
+        unsigned int dev_index, u64 *num_blocks)
+{
+        return read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("n_blocks", 0),
+                0, num_blocks, 0);
+}
+
+int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
+        unsigned int dev_index, unsigned int *num_regions)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_PME,
+                make_first_field("bus", bus_index),
+                make_field("dev", dev_index),
+                make_field("n_regs", 0),
+                0, &v1, 0);
+        *num_regions = v1;
+        return result;
+}
+
+int ps3_repository_read_stor_dev_region_id(unsigned int bus_index,
+        unsigned int dev_index, unsigned int region_index,
+        unsigned int *region_id)
+{
+        int result;
+        u64 v1;
+
+        result = read_node(PS3_LPAR_ID_PME,
+            make_first_field("bus", bus_index),
+            make_field("dev", dev_index),
+            make_field("region", region_index),
+            make_field("id", 0),
+            &v1, 0);
+        *region_id = v1;
+        return result;
+}
+
+int ps3_repository_read_stor_dev_region_size(unsigned int bus_index,
+        unsigned int dev_index, unsigned int region_index, u64 *region_size)
+{
+        return read_node(PS3_LPAR_ID_PME,
+            make_first_field("bus", bus_index),
+            make_field("dev", dev_index),
+            make_field("region", region_index),
+            make_field("size", 0),
+            region_size, 0);
+}
+
+int ps3_repository_read_stor_dev_region_start(unsigned int bus_index,
+        unsigned int dev_index, unsigned int region_index, u64 *region_start)
+{
+        return read_node(PS3_LPAR_ID_PME,
+            make_first_field("bus", bus_index),
+            make_field("dev", dev_index),
+            make_field("region", region_index),
+            make_field("start", 0),
+            region_start, 0);
+}
+
+int ps3_repository_read_stor_dev_info(unsigned int bus_index,
+        unsigned int dev_index, u64 *port, u64 *blk_size,
+        u64 *num_blocks, unsigned int *num_regions)
+{
+        int result;
+
+        result = ps3_repository_read_stor_dev_port(bus_index, dev_index, port);
+        if (result)
+            return result;
+
+        result = ps3_repository_read_stor_dev_blk_size(bus_index, dev_index,
+                blk_size);
+        if (result)
+            return result;
+
+        result = ps3_repository_read_stor_dev_num_blocks(bus_index, dev_index,
+                num_blocks);
+        if (result)
+            return result;
+
+        result = ps3_repository_read_stor_dev_num_regions(bus_index, dev_index,
+                num_regions);
+        return result;
+}
+
+int ps3_repository_read_stor_dev_region(unsigned int bus_index,
+        unsigned int dev_index, unsigned int region_index,
+        unsigned int *region_id, u64 *region_start, u64 *region_size)
+{
+        int result;
+
+        result = ps3_repository_read_stor_dev_region_id(bus_index, dev_index,
+                region_index, region_id);
+        if (result)
+            return result;
+
+        result = ps3_repository_read_stor_dev_region_start(bus_index, dev_index,
+                region_index, region_start);
+        if (result)
+            return result;
+
+        result = ps3_repository_read_stor_dev_region_size(bus_index, dev_index,
+                region_index, region_size);
+        return result;
+}
+
 int ps3_repository_read_rm_size(unsigned int ppe_id, u64 *rm_size)
 {
         return read_node(PS3_LPAR_ID_CURRENT,
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index d8b5cadbe80e..ac5df9688dcb 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -24,6 +24,7 @@
 #include <linux/root_dev.h>
 #include <linux/console.h>
 #include <linux/kexec.h>
+#include <linux/bootmem.h>
 
 #include <asm/machdep.h>
 #include <asm/firmware.h>
@@ -41,10 +42,22 @@
 #define DBG(fmt...) do{if(0)printk(fmt);}while(0)
 #endif
 
-static void ps3_show_cpuinfo(struct seq_file *m)
+#if !defined(CONFIG_SMP)
+static void smp_send_stop(void) {}
+#endif
+
+int ps3_get_firmware_version(union ps3_firmware_version *v)
 {
-        seq_printf(m, "machine\t\t: %s\n", ppc_md.name);
+        int result = lv1_get_version_info(&v->raw);
+
+        if (result) {
+                v->raw = 0;
+                return -1;
+        }
+
+        return result;
 }
+EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
 
 static void ps3_power_save(void)
 {
@@ -57,25 +70,84 @@ static void ps3_power_save(void)
         lv1_pause(0);
 }
 
+static void ps3_restart(char *cmd)
+{
+        DBG("%s:%d cmd '%s'\n", __func__, __LINE__, cmd);
+
+        smp_send_stop();
+        ps3_sys_manager_restart(); /* never returns */
+}
+
+static void ps3_power_off(void)
+{
+        DBG("%s:%d\n", __func__, __LINE__);
+
+        smp_send_stop();
+        ps3_sys_manager_power_off(); /* never returns */
+}
+
 static void ps3_panic(char *str)
 {
         DBG("%s:%d %s\n", __func__, __LINE__, str);
 
-#ifdef CONFIG_SMP
         smp_send_stop();
-#endif
         printk("\n");
         printk("   System does not reboot automatically.\n");
         printk("   Please press POWER button.\n");
         printk("\n");
 
-        for (;;) ;
+        while(1);
+}
+
+static void prealloc(struct ps3_prealloc *p)
+{
+        if (!p->size)
+                return;
+
+        p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
+        if (!p->address) {
+                printk(KERN_ERR "%s: Cannot allocate %s\n", __FUNCTION__,
+                       p->name);
+                return;
+        }
+
+        printk(KERN_INFO "%s: %lu bytes at %p\n", p->name, p->size,
+               p->address);
 }
 
+#ifdef CONFIG_FB_PS3
+struct ps3_prealloc ps3fb_videomemory = {
+    .name = "ps3fb videomemory",
+    .size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
+    .align = 1024*1024                  /* the GPU requires 1 MiB alignment */
+};
+#define prealloc_ps3fb_videomemory()    prealloc(&ps3fb_videomemory)
+
+static int __init early_parse_ps3fb(char *p)
+{
+        if (!p)
+                return 1;
+
+        ps3fb_videomemory.size = _ALIGN_UP(memparse(p, &p),
+                                           ps3fb_videomemory.align);
+        return 0;
+}
+early_param("ps3fb", early_parse_ps3fb);
+#else
+#define prealloc_ps3fb_videomemory()    do { } while (0)
+#endif
+
+
 static void __init ps3_setup_arch(void)
 {
+        union ps3_firmware_version v;
+
         DBG(" -> %s:%d\n", __func__, __LINE__);
 
+        ps3_get_firmware_version(&v);
+        printk(KERN_INFO "PS3 firmware version %u.%u.%u\n", v.major, v.minor,
+                v.rev);
+
         ps3_spu_set_platform();
         ps3_map_htab();
 
@@ -87,6 +159,7 @@ static void __init ps3_setup_arch(void)
         conswitchp = &dummy_con;
 #endif
 
+        prealloc_ps3fb_videomemory();
         ppc_md.power_save = ps3_power_save;
 
         DBG(" <- %s:%d\n", __func__, __LINE__);
@@ -156,7 +229,6 @@ define_machine(ps3) {
         .name                           = "PS3",
         .probe                          = ps3_probe,
         .setup_arch                     = ps3_setup_arch,
-        .show_cpuinfo                   = ps3_show_cpuinfo,
         .init_IRQ                       = ps3_init_IRQ,
         .panic                          = ps3_panic,
         .get_boot_time                  = ps3_get_boot_time,
@@ -164,6 +236,8 @@ define_machine(ps3) {
         .get_rtc_time                   = ps3_get_rtc_time,
         .calibrate_decr                 = ps3_calibrate_decr,
         .progress                       = ps3_progress,
+        .restart                        = ps3_restart,
+        .power_off                      = ps3_power_off,
 #if defined(CONFIG_KEXEC)
         .kexec_cpu_down                 = ps3_kexec_cpu_down,
         .machine_kexec                  = ps3_machine_kexec,
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index 11d2080607ed..6fb887961a6d 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -23,7 +23,6 @@
 
 #include <asm/machdep.h>
 #include <asm/udbg.h>
-#include <asm/ps3.h>
 
 #include "platform.h"
 
@@ -111,7 +110,7 @@ static void __init ps3_smp_setup_cpu(int cpu)
         BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK != 3);
 
         for (i = 0; i < MSG_COUNT; i++) {
-                result = ps3_alloc_event_irq(&virqs[i]);
+                result = ps3_alloc_event_irq(cpu, &virqs[i]);
 
                 if (result)
                         continue;
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 644532c3b7c4..a397e4e17c13 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -26,9 +26,10 @@
 
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
-#include <asm/ps3.h>
 #include <asm/lv1call.h>
 
+#include "platform.h"
+
 /* spu_management_ops */
 
 /**
@@ -50,7 +51,7 @@ enum spe_type {
  */
 
 struct spe_shadow {
-        u8 padding_0000[0x0140];
+        u8 padding_0140[0x0140];
         u64 int_status_class0_RW;       /* 0x0140 */
         u64 int_status_class1_RW;       /* 0x0148 */
         u64 int_status_class2_RW;       /* 0x0150 */
@@ -67,8 +68,7 @@ struct spe_shadow {
         u8 padding_0c08[0x0f00-0x0c08];
         u64 spe_execution_status;       /* 0x0f00 */
         u8 padding_0f08[0x1000-0x0f08];
-} __attribute__ ((packed));
-
+};
 
 /**
  * enum spe_ex_state - Logical spe execution state.
@@ -170,31 +170,6 @@ static int __init construct_spu(struct spu *spu)
         return result;
 }
 
-static int __init add_spu_pages(unsigned long start_addr, unsigned long size)
-{
-        int result;
-        unsigned long start_pfn;
-        unsigned long nr_pages;
-        struct pglist_data *pgdata;
-        struct zone *zone;
-
-        BUG_ON(!mem_init_done);
-
-        start_pfn = start_addr >> PAGE_SHIFT;
-        nr_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
-
-        pgdata = NODE_DATA(0);
-        zone = pgdata->node_zones;
-
-        result = __add_pages(zone, start_pfn, nr_pages);
-
-        if (result)
-                pr_debug("%s:%d: __add_pages failed: (%d)\n",
-                        __func__, __LINE__, result);
-
-        return result;
-}
-
 static void spu_unmap(struct spu *spu)
 {
         iounmap(spu->priv2);
@@ -206,19 +181,6 @@ static void spu_unmap(struct spu *spu)
 static int __init setup_areas(struct spu *spu)
 {
         struct table {char* name; unsigned long addr; unsigned long size;};
-        int result;
-
-        /* setup pages */
-
-        result = add_spu_pages(spu->local_store_phys, LS_SIZE);
-        if (result)
-                goto fail_add;
-
-        result = add_spu_pages(spu->problem_phys, sizeof(struct spu_problem));
-        if (result)
-                goto fail_add;
-
-        /* ioremap */
 
         spu_pdata(spu)->shadow = __ioremap(
                 spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
@@ -260,28 +222,28 @@ static int __init setup_areas(struct spu *spu)
 
 fail_ioremap:
         spu_unmap(spu);
-fail_add:
-        return result;
+
+        return -ENOMEM;
 }
 
 static int __init setup_interrupts(struct spu *spu)
 {
         int result;
 
-        result = ps3_alloc_spe_irq(spu_pdata(spu)->spe_id, 0,
-                &spu->irqs[0]);
+        result = ps3_alloc_spe_irq(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+                0, &spu->irqs[0]);
 
         if (result)
                 goto fail_alloc_0;
 
-        result = ps3_alloc_spe_irq(spu_pdata(spu)->spe_id, 1,
-                &spu->irqs[1]);
+        result = ps3_alloc_spe_irq(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+                1, &spu->irqs[1]);
 
         if (result)
                 goto fail_alloc_1;
 
-        result = ps3_alloc_spe_irq(spu_pdata(spu)->spe_id, 2,
-                &spu->irqs[2]);
+        result = ps3_alloc_spe_irq(PS3_BINDING_CPU_ANY, spu_pdata(spu)->spe_id,
+                2, &spu->irqs[2]);
 
         if (result)
                 goto fail_alloc_2;
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
new file mode 100644
index 000000000000..a9f7e4a39a2a
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -0,0 +1,384 @@
+/*
+ *  PS3 system bus driver.
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  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; version 2 of the License.
+ *
+ *  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/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/dma-mapping.h>
+#include <linux/err.h>
+
+#include <asm/udbg.h>
+#include <asm/lv1call.h>
+#include <asm/firmware.h>
+
+#include "platform.h"
+
+#define dump_mmio_region(_a) _dump_mmio_region(_a, __func__, __LINE__)
+static void _dump_mmio_region(const struct ps3_mmio_region* r,
+        const char* func, int line)
+{
+        pr_debug("%s:%d: dev       %u:%u\n", func, line, r->did.bus_id,
+                r->did.dev_id);
+        pr_debug("%s:%d: bus_addr  %lxh\n", func, line, r->bus_addr);
+        pr_debug("%s:%d: len       %lxh\n", func, line, r->len);
+        pr_debug("%s:%d: lpar_addr %lxh\n", func, line, r->lpar_addr);
+}
+
+int ps3_mmio_region_create(struct ps3_mmio_region *r)
+{
+        int result;
+
+        result = lv1_map_device_mmio_region(r->did.bus_id, r->did.dev_id,
+                r->bus_addr, r->len, r->page_size, &r->lpar_addr);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_map_device_mmio_region failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+                r->lpar_addr = 0;
+        }
+
+        dump_mmio_region(r);
+        return result;
+}
+EXPORT_SYMBOL_GPL(ps3_mmio_region_create);
+
+int ps3_free_mmio_region(struct ps3_mmio_region *r)
+{
+        int result;
+
+        result = lv1_unmap_device_mmio_region(r->did.bus_id, r->did.dev_id,
+                r->lpar_addr);
+
+        if (result)
+                pr_debug("%s:%d: lv1_unmap_device_mmio_region failed: %s\n",
+                        __func__, __LINE__, ps3_result(result));
+
+        r->lpar_addr = 0;
+        return result;
+}
+EXPORT_SYMBOL_GPL(ps3_free_mmio_region);
+
+static int ps3_system_bus_match(struct device *_dev,
+        struct device_driver *_drv)
+{
+        int result;
+        struct ps3_system_bus_driver *drv = to_ps3_system_bus_driver(_drv);
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+
+        result = dev->match_id == drv->match_id;
+
+        pr_info("%s:%d: dev=%u(%s), drv=%u(%s): %s\n", __func__, __LINE__,
+                dev->match_id, dev->core.bus_id, drv->match_id, drv->core.name,
+                (result ? "match" : "miss"));
+        return result;
+}
+
+static int ps3_system_bus_probe(struct device *_dev)
+{
+        int result;
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_driver *drv =
+                to_ps3_system_bus_driver(_dev->driver);
+
+        result = lv1_open_device(dev->did.bus_id, dev->did.dev_id, 0);
+
+        if (result) {
+                pr_debug("%s:%d: lv1_open_device failed (%d)\n",
+                        __func__, __LINE__, result);
+                result = -EACCES;
+                goto clean_none;
+        }
+
+        if (dev->d_region->did.bus_id) {
+                result = ps3_dma_region_create(dev->d_region);
+
+                if (result) {
+                        pr_debug("%s:%d: ps3_dma_region_create failed (%d)\n",
+                                __func__, __LINE__, result);
+                        BUG_ON("check region type");
+                        result = -EINVAL;
+                        goto clean_device;
+                }
+        }
+
+        BUG_ON(!drv);
+
+        if (drv->probe)
+                result = drv->probe(dev);
+        else
+                pr_info("%s:%d: %s no probe method\n", __func__, __LINE__,
+                        dev->core.bus_id);
+
+        if (result) {
+                pr_debug("%s:%d: drv->probe failed\n", __func__, __LINE__);
+                goto clean_dma;
+        }
+
+        return result;
+
+clean_dma:
+        ps3_dma_region_free(dev->d_region);
+clean_device:
+        lv1_close_device(dev->did.bus_id, dev->did.dev_id);
+clean_none:
+        return result;
+}
+
+static int ps3_system_bus_remove(struct device *_dev)
+{
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        struct ps3_system_bus_driver *drv =
+                to_ps3_system_bus_driver(_dev->driver);
+
+        if (drv->remove)
+                drv->remove(dev);
+        else
+                pr_info("%s:%d: %s no remove method\n", __func__, __LINE__,
+                        dev->core.bus_id);
+
+        ps3_dma_region_free(dev->d_region);
+        ps3_free_mmio_region(dev->m_region);
+        lv1_close_device(dev->did.bus_id, dev->did.dev_id);
+
+        return 0;
+}
+
+struct bus_type ps3_system_bus_type = {
+        .name = "ps3_system_bus",
+        .match = ps3_system_bus_match,
+        .probe = ps3_system_bus_probe,
+        .remove = ps3_system_bus_remove,
+};
+
+int __init ps3_system_bus_init(void)
+{
+        int result;
+
+        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
+                return 0;
+
+        result = bus_register(&ps3_system_bus_type);
+        BUG_ON(result);
+        return result;
+}
+
+core_initcall(ps3_system_bus_init);
+
+/* Allocates a contiguous real buffer and creates mappings over it.
+ * Returns the virtual address of the buffer and sets dma_handle
+ * to the dma address (mapping) of the first page.
+ */
+
+static void * ps3_alloc_coherent(struct device *_dev, size_t size,
+        dma_addr_t *dma_handle, gfp_t flag)
+{
+        int result;
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        unsigned long virt_addr;
+
+        BUG_ON(!dev->d_region->bus_addr);
+
+        flag &= ~(__GFP_DMA | __GFP_HIGHMEM);
+        flag |= __GFP_ZERO;
+
+        virt_addr = __get_free_pages(flag, get_order(size));
+
+        if (!virt_addr) {
+                pr_debug("%s:%d: get_free_pages failed\n", __func__, __LINE__);
+                goto clean_none;
+        }
+
+        result = ps3_dma_map(dev->d_region, virt_addr, size, dma_handle);
+
+        if (result) {
+                pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
+                        __func__, __LINE__, result);
+                BUG_ON("check region type");
+                goto clean_alloc;
+        }
+
+        return (void*)virt_addr;
+
+clean_alloc:
+        free_pages(virt_addr, get_order(size));
+clean_none:
+        dma_handle = NULL;
+        return NULL;
+}
+
+static void ps3_free_coherent(struct device *_dev, size_t size, void *vaddr,
+        dma_addr_t dma_handle)
+{
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+
+        ps3_dma_unmap(dev->d_region, dma_handle, size);
+        free_pages((unsigned long)vaddr, get_order(size));
+}
+
+/* Creates TCEs for a user provided buffer.  The user buffer must be
+ * contiguous real kernel storage (not vmalloc).  The address of the buffer
+ * passed here is the kernel (virtual) address of the buffer.  The buffer
+ * need not be page aligned, the dma_addr_t returned will point to the same
+ * byte within the page as vaddr.
+ */
+
+static dma_addr_t ps3_map_single(struct device *_dev, void *ptr, size_t size,
+        enum dma_data_direction direction)
+{
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        int result;
+        unsigned long bus_addr;
+
+        result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,
+                &bus_addr);
+
+        if (result) {
+                pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
+                        __func__, __LINE__, result);
+        }
+
+        return bus_addr;
+}
+
+static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr,
+        size_t size, enum dma_data_direction direction)
+{
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        int result;
+
+        result = ps3_dma_unmap(dev->d_region, dma_addr, size);
+
+        if (result) {
+                pr_debug("%s:%d: ps3_dma_unmap failed (%d)\n",
+                        __func__, __LINE__, result);
+        }
+}
+
+static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents,
+        enum dma_data_direction direction)
+{
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        int i;
+
+#if defined(CONFIG_PS3_DYNAMIC_DMA)
+        BUG_ON("do");
+        return -EPERM;
+#else
+        for (i = 0; i < nents; i++, sg++) {
+                int result = ps3_dma_map(dev->d_region,
+                        page_to_phys(sg->page) + sg->offset, sg->length,
+                        &sg->dma_address);
+
+                if (result) {
+                        pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
+                                __func__, __LINE__, result);
+                        return -EINVAL;
+                }
+
+                sg->dma_length = sg->length;
+        }
+
+        return nents;
+#endif
+}
+
+static void ps3_unmap_sg(struct device *_dev, struct scatterlist *sg,
+        int nents, enum dma_data_direction direction)
+{
+#if defined(CONFIG_PS3_DYNAMIC_DMA)
+        BUG_ON("do");
+#endif
+}
+
+static int ps3_dma_supported(struct device *_dev, u64 mask)
+{
+        return mask >= DMA_32BIT_MASK;
+}
+
+static struct dma_mapping_ops ps3_dma_ops = {
+        .alloc_coherent = ps3_alloc_coherent,
+        .free_coherent = ps3_free_coherent,
+        .map_single = ps3_map_single,
+        .unmap_single = ps3_unmap_single,
+        .map_sg = ps3_map_sg,
+        .unmap_sg = ps3_unmap_sg,
+        .dma_supported = ps3_dma_supported
+};
+
+/**
+ * ps3_system_bus_release_device - remove a device from the system bus
+ */
+
+static void ps3_system_bus_release_device(struct device *_dev)
+{
+        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        kfree(dev);
+}
+
+/**
+ * ps3_system_bus_device_register - add a device to the system bus
+ *
+ * ps3_system_bus_device_register() expects the dev object to be allocated
+ * dynamically by the caller.  The system bus takes ownership of the dev
+ * object and frees the object in ps3_system_bus_release_device().
+ */
+
+int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)
+{
+        int result;
+        static unsigned int dev_count = 1;
+
+        dev->core.parent = NULL;
+        dev->core.bus = &ps3_system_bus_type;
+        dev->core.release = ps3_system_bus_release_device;
+
+        dev->core.archdata.of_node = NULL;
+        dev->core.archdata.dma_ops = &ps3_dma_ops;
+        dev->core.archdata.numa_node = 0;
+
+        snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), "sb_%02x",
+                dev_count++);
+
+        pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id);
+
+        result = device_register(&dev->core);
+        return result;
+}
+
+EXPORT_SYMBOL_GPL(ps3_system_bus_device_register);
+
+int ps3_system_bus_driver_register(struct ps3_system_bus_driver *drv)
+{
+        int result;
+
+        drv->core.bus = &ps3_system_bus_type;
+
+        result = driver_register(&drv->core);
+        return result;
+}
+
+EXPORT_SYMBOL_GPL(ps3_system_bus_driver_register);
+
+void ps3_system_bus_driver_unregister(struct ps3_system_bus_driver *drv)
+{
+        driver_unregister(&drv->core);
+}
+
+EXPORT_SYMBOL_GPL(ps3_system_bus_driver_unregister);
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 69590fbf83da..2dfd05095a25 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -4,11 +4,12 @@ endif
 
 obj-y                   := pci.o lpar.o hvCall.o nvram.o reconfig.o \
                            setup.o iommu.o ras.o rtasd.o pci_dlpar.o \
-                           firmware.o
+                           firmware.o power.o
 obj-$(CONFIG_SMP)       += smp.o
 obj-$(CONFIG_XICS)      += xics.o
 obj-$(CONFIG_SCANLOG)   += scanlog.o
 obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o
+obj-$(CONFIG_KEXEC)     += kexec.o
 
 obj-$(CONFIG_HOTPLUG_CPU)       += hotplug-cpu.o
 
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index da6e5362e7cd..6cedbc002e0f 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -747,6 +747,7 @@ struct eeh_early_enable_info {
 /* Enable eeh for the given device node. */
 static void *early_enable_eeh(struct device_node *dn, void *data)
 {
+        unsigned int rets[3];
         struct eeh_early_enable_info *info = data;
         int ret;
         const char *status = get_property(dn, "status", NULL);
@@ -803,16 +804,14 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
                                 regs[0], info->buid_hi, info->buid_lo,
                                 EEH_ENABLE);
 
+                enable = 0;
                 if (ret == 0) {
-                        eeh_subsystem_enabled = 1;
-                        pdn->eeh_mode |= EEH_MODE_SUPPORTED;
                         pdn->eeh_config_addr = regs[0];
 
                         /* If the newer, better, ibm,get-config-addr-info is supported, 
                          * then use that instead. */
                         pdn->eeh_pe_config_addr = 0;
                         if (ibm_get_config_addr_info != RTAS_UNKNOWN_SERVICE) {
-                                unsigned int rets[2];
                                 ret = rtas_call (ibm_get_config_addr_info, 4, 2, rets, 
                                         pdn->eeh_config_addr, 
                                         info->buid_hi, info->buid_lo,
@@ -820,6 +819,20 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
                                 if (ret == 0)
                                         pdn->eeh_pe_config_addr = rets[0];
                         }
+
+                        /* Some older systems (Power4) allow the
+                         * ibm,set-eeh-option call to succeed even on nodes
+                         * where EEH is not supported. Verify support
+                         * explicitly. */
+                        ret = read_slot_reset_state(pdn, rets);
+                        if ((ret == 0) && (rets[1] == 1))
+                                enable = 1;
+                }
+
+                if (enable) {
+                        eeh_subsystem_enabled = 1;
+                        pdn->eeh_mode |= EEH_MODE_SUPPORTED;
+
 #ifdef DEBUG
                         printk(KERN_DEBUG "EEH: %s: eeh enabled, config=%x pe_config=%x\n",
                                dn->full_name, pdn->eeh_config_addr, pdn->eeh_pe_config_addr);
@@ -1065,7 +1078,7 @@ static int proc_eeh_open(struct inode *inode, struct file *file)
         return single_open(file, proc_eeh_show, NULL);
 }
 
-static struct file_operations proc_eeh_operations = {
+static const struct file_operations proc_eeh_operations = {
         .open      = proc_eeh_open,
         .read      = seq_read,
         .llseek    = seq_lseek,
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index cbd6b0711ab4..a4c0bf84ef2e 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -446,7 +446,8 @@ excess_failures:
          */
         printk(KERN_ERR
            "EEH: PCI device at location=%s driver=%s pci addr=%s \n"
-                "has failed %d times and has been permanently disabled. \n"
+                "has failed %d times in the last hour "
+                "and has been permanently disabled. \n"
                 "Please try reseating this device or replacing it.\n",
                 location, drv_str, pci_str, frozen_pdn->eeh_freeze_count);
         goto perm_error;
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 1c7b2baa5f73..90522e3c9d46 100644
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -59,6 +59,7 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = {
         {FW_FEATURE_XDABR,              "hcall-xdabr"},
         {FW_FEATURE_MULTITCE,           "hcall-multi-tce"},
         {FW_FEATURE_SPLPAR,             "hcall-splpar"},
+        {FW_FEATURE_BULK_REMOVE,        "hcall-bulk"},
 };
 
 /* Build up the firmware features bitmask using the contents of
diff --git a/arch/powerpc/platforms/pseries/firmware.h b/arch/powerpc/platforms/pseries/firmware.h
deleted file mode 100644
index 714f56f55362..000000000000
--- a/arch/powerpc/platforms/pseries/firmware.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2006 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.
- */
-
-#ifndef _PSERIES_FIRMWARE_H
-#define _PSERIES_FIRMWARE_H
-
-#include <asm/firmware.h>
-
-extern void __init fw_feature_init(void);
-
-#endif /* _PSERIES_FIRMWARE_H */
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
index 3ddc04925d50..eae51ef9af24 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -90,7 +90,7 @@ static int hcall_inst_seq_open(struct inode *inode, struct file *file)
         return rc;
 }
 
-static struct file_operations hcall_inst_seq_fops = {
+static const struct file_operations hcall_inst_seq_fops = {
         .open = hcall_inst_seq_open,
         .read = seq_read,
         .llseek = seq_lseek,
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
new file mode 100644
index 000000000000..af2685607458
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -0,0 +1,72 @@
+/*
+ *  Copyright 2006 Michael Ellerman, 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.
+ */
+
+#include <asm/machdep.h>
+#include <asm/page.h>
+#include <asm/firmware.h>
+#include <asm/kexec.h>
+#include <asm/mpic.h>
+
+#include "pseries.h"
+#include "xics.h"
+#include "plpar_wrappers.h"
+
+static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
+{
+        /* Don't risk a hypervisor call if we're crashing */
+        if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) {
+                unsigned long addr;
+
+                addr = __pa(get_slb_shadow());
+                if (unregister_slb_shadow(hard_smp_processor_id(), addr))
+                        printk("SLB shadow buffer deregistration of "
+                               "cpu %u (hw_cpu_id %d) failed\n",
+                               smp_processor_id(),
+                               hard_smp_processor_id());
+
+                addr = __pa(get_lppaca());
+                if (unregister_vpa(hard_smp_processor_id(), addr)) {
+                        printk("VPA deregistration of cpu %u (hw_cpu_id %d) "
+                                        "failed\n", smp_processor_id(),
+                                        hard_smp_processor_id());
+                }
+        }
+}
+
+static void pseries_kexec_cpu_down_mpic(int crash_shutdown, int secondary)
+{
+        pseries_kexec_cpu_down(crash_shutdown, secondary);
+        mpic_teardown_this_cpu(secondary);
+}
+
+void __init setup_kexec_cpu_down_mpic(void)
+{
+        ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_mpic;
+}
+
+static void pseries_kexec_cpu_down_xics(int crash_shutdown, int secondary)
+{
+        pseries_kexec_cpu_down(crash_shutdown, secondary);
+        xics_teardown_cpu(secondary);
+}
+
+void __init setup_kexec_cpu_down_xics(void)
+{
+        ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics;
+}
+
+static int __init pseries_kexec_setup(void)
+{
+        ppc_md.machine_kexec = default_machine_kexec;
+        ppc_md.machine_kexec_prepare = default_machine_kexec_prepare;
+        ppc_md.machine_crash_shutdown = default_machine_crash_shutdown;
+
+        return 0;
+}
+__initcall(pseries_kexec_setup);
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 721436db3ef0..7496005566ef 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -502,23 +502,70 @@ static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
         BUG_ON(lpar_rc != H_SUCCESS);
 }
 
+/* Flag bits for H_BULK_REMOVE */
+#define HBR_REQUEST     0x4000000000000000UL
+#define HBR_RESPONSE    0x8000000000000000UL
+#define HBR_END         0xc000000000000000UL
+#define HBR_AVPN        0x0200000000000000UL
+#define HBR_ANDCOND     0x0100000000000000UL
+
 /*
  * Take a spinlock around flushes to avoid bouncing the hypervisor tlbie
  * lock.
  */
 static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
 {
-        int i;
+        unsigned long i, pix, rc;
         unsigned long flags = 0;
         struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
         int lock_tlbie = !cpu_has_feature(CPU_FTR_LOCKLESS_TLBIE);
+        unsigned long param[9];
+        unsigned long va;
+        unsigned long hash, index, shift, hidx, slot;
+        real_pte_t pte;
+        int psize;
 
         if (lock_tlbie)
                 spin_lock_irqsave(&pSeries_lpar_tlbie_lock, flags);
 
-        for (i = 0; i < number; i++)
-                flush_hash_page(batch->vaddr[i], batch->pte[i],
-                                batch->psize, local);
+        psize = batch->psize;
+        pix = 0;
+        for (i = 0; i < number; i++) {
+                va = batch->vaddr[i];
+                pte = batch->pte[i];
+                pte_iterate_hashed_subpages(pte, psize, va, index, shift) {
+                        hash = hpt_hash(va, shift);
+                        hidx = __rpte_to_hidx(pte, index);
+                        if (hidx & _PTEIDX_SECONDARY)
+                                hash = ~hash;
+                        slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
+                        slot += hidx & _PTEIDX_GROUP_IX;
+                        if (!firmware_has_feature(FW_FEATURE_BULK_REMOVE)) {
+                                pSeries_lpar_hpte_invalidate(slot, va, psize,
+                                                             local);
+                        } else {
+                                param[pix] = HBR_REQUEST | HBR_AVPN | slot;
+                                param[pix+1] = hpte_encode_v(va, psize) &
+                                        HPTE_V_AVPN;
+                                pix += 2;
+                                if (pix == 8) {
+                                        rc = plpar_hcall9(H_BULK_REMOVE, param,
+                                                param[0], param[1], param[2],
+                                                param[3], param[4], param[5],
+                                                param[6], param[7]);
+                                        BUG_ON(rc != H_SUCCESS);
+                                        pix = 0;
+                                }
+                        }
+                } pte_iterate_hashed_end();
+        }
+        if (pix) {
+                param[pix] = HBR_END;
+                rc = plpar_hcall9(H_BULK_REMOVE, param, param[0], param[1],
+                                  param[2], param[3], param[4], param[5],
+                                  param[6], param[7]);
+                BUG_ON(rc != H_SUCCESS);
+        }
 
         if (lock_tlbie)
                 spin_unlock_irqrestore(&pSeries_lpar_tlbie_lock, flags);
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 715db5c89908..fa59124ce3fe 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -77,7 +77,7 @@ void __init pSeries_final_fixup(void)
 
 /*
  * Assume the winbond 82c105 is the IDE controller on a
- * p610.  We should probably be more careful in case
+ * p610/p615/p630. We should probably be more careful in case
  * someone tries to plug in a similar adapter.
  */
 static void fixup_winbond_82c105(struct pci_dev* dev)
@@ -98,6 +98,10 @@ static void fixup_winbond_82c105(struct pci_dev* dev)
                 if (dev->resource[i].flags & IORESOURCE_IO
                     && dev->bus->number == 0 && dev->devfn == 0x81)
                         dev->resource[i].flags &= ~IORESOURCE_IO;
+                if (dev->resource[i].start == 0 && dev->resource[i].end) {
+                        dev->resource[i].flags = 0;
+                        dev->resource[i].end = 0;
+                }
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
diff --git a/arch/powerpc/platforms/pseries/power.c b/arch/powerpc/platforms/pseries/power.c
new file mode 100644
index 000000000000..2624b71df73d
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/power.c
@@ -0,0 +1,87 @@
+/*
+ *  Interface for power-management for ppc64 compliant platform
+ *
+ *  Manish Ahuja <mahuja@us.ibm.com>
+ *
+ *  Feb 2007
+ *
+ *  Copyright (C) 2007 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; version 2 of the License.
+ *
+ *  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/kobject.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+
+unsigned long rtas_poweron_auto; /* default and normal state is 0 */
+
+static ssize_t auto_poweron_show(struct subsystem *subsys, char *buf)
+{
+        return sprintf(buf, "%lu\n", rtas_poweron_auto);
+}
+
+static ssize_t
+auto_poweron_store(struct subsystem *subsys, const char *buf, size_t n)
+{
+        int ret;
+        unsigned long ups_restart;
+        ret = sscanf(buf, "%lu", &ups_restart);
+
+        if ((ret == 1) && ((ups_restart == 1) || (ups_restart == 0))){
+                rtas_poweron_auto = ups_restart;
+                return n;
+        }
+        return -EINVAL;
+}
+
+static struct subsys_attribute auto_poweron_attr = {
+        .attr   = {
+                .name = __stringify(auto_poweron),
+                .mode = 0644,
+        },
+        .show   = auto_poweron_show,
+        .store  = auto_poweron_store,
+};
+
+#ifndef CONFIG_PM
+decl_subsys(power,NULL,NULL);
+
+static struct attribute *g[] = {
+        &auto_poweron_attr.attr,
+        NULL,
+};
+
+static struct attribute_group attr_group = {
+        .attrs = g,
+};
+
+static int __init pm_init(void)
+{
+        int error = subsystem_register(&power_subsys);
+        if (!error)
+                error = sysfs_create_group(&power_subsys.kset.kobj,&attr_group);
+        return error;
+}
+core_initcall(pm_init);
+#else
+extern struct subsystem power_subsys;
+
+static int __init apo_pm_init(void)
+{
+        return (subsys_create_file(&power_subsys, &auto_poweron_attr));
+}
+__initcall(apo_pm_init);
+#endif
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
new file mode 100644
index 000000000000..22bc01989749
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2006 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.
+ */
+
+#ifndef _PSERIES_PSERIES_H
+#define _PSERIES_PSERIES_H
+
+extern void __init fw_feature_init(void);
+
+struct pt_regs;
+
+extern int pSeries_system_reset_exception(struct pt_regs *regs);
+extern int pSeries_machine_check_exception(struct pt_regs *regs);
+
+#ifdef CONFIG_SMP
+extern void smp_init_pseries_mpic(void);
+extern void smp_init_pseries_xics(void);
+#else
+static inline smp_init_pseries_mpic(void) { };
+static inline smp_init_pseries_xics(void) { };
+#endif
+
+#ifdef CONFIG_KEXEC
+extern void setup_kexec_cpu_down_xics(void);
+extern void setup_kexec_cpu_down_mpic(void);
+#else
+static inline void setup_kexec_cpu_down_xics(void) { }
+static inline void setup_kexec_cpu_down_mpic(void) { }
+#endif
+
+/* Poweron flag used for enabling auto ups restart */
+extern unsigned long rtas_poweron_auto;
+
+#endif /* _PSERIES_PSERIES_H */
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index b1d3d161249e..edc038873113 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -51,7 +51,7 @@
 #include <asm/udbg.h>
 #include <asm/firmware.h>
 
-#include "ras.h"
+#include "pseries.h"
 
 static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX];
 static DEFINE_SPINLOCK(ras_log_buf_lock);
diff --git a/arch/powerpc/platforms/pseries/ras.h b/arch/powerpc/platforms/pseries/ras.h
deleted file mode 100644
index 0e66b0da55e2..000000000000
--- a/arch/powerpc/platforms/pseries/ras.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _PSERIES_RAS_H
-#define _PSERIES_RAS_H
-
-struct pt_regs;
-
-extern int pSeries_system_reset_exception(struct pt_regs *regs);
-extern int pSeries_machine_check_exception(struct pt_regs *regs);
-
-#endif /* _PSERIES_RAS_H */
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 4ad33e41b008..5aa97aff3391 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -499,7 +499,7 @@ out:
         return rv ? rv : count;
 }
 
-static struct file_operations ofdt_fops = {
+static const struct file_operations ofdt_fops = {
         .write = ofdt_write
 };
 
@@ -513,7 +513,6 @@ static int proc_ppc64_create_ofdt(void)
 
         ent = create_proc_entry("ppc64/ofdt", S_IWUSR, NULL);
         if (ent) {
-                ent->nlink = 1;
                 ent->data = NULL;
                 ent->size = 0;
                 ent->proc_fops = &ofdt_fops;
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 8ca2612221d6..77d0937d5c07 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -331,7 +331,7 @@ static unsigned int rtas_log_poll(struct file *file, poll_table * wait)
         return 0;
 }
 
-struct file_operations proc_rtas_log_operations = {
+const struct file_operations proc_rtas_log_operations = {
         .read =         rtas_log_read,
         .poll =         rtas_log_poll,
         .open =         rtas_log_open,
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index 45368a57d7dd..8e1ef168e2dd 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -184,7 +184,7 @@ static int scanlog_release(struct inode * inode, struct file * file)
         return 0;
 }
 
-struct file_operations scanlog_fops = {
+const struct file_operations scanlog_fops = {
         .owner          = THIS_MODULE,
         .read           = scanlog_read,
         .write          = scanlog_write,
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 042ecae107ac..34aff47b1f55 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -55,7 +55,6 @@
 #include <asm/dma.h>
 #include <asm/machdep.h>
 #include <asm/irq.h>
-#include <asm/kexec.h>
 #include <asm/time.h>
 #include <asm/nvram.h>
 #include "xics.h"
@@ -65,10 +64,10 @@
 #include <asm/i8259.h>
 #include <asm/udbg.h>
 #include <asm/smp.h>
+#include <asm/firmware.h>
 
 #include "plpar_wrappers.h"
-#include "ras.h"
-#include "firmware.h"
+#include "pseries.h"
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -77,8 +76,6 @@
 #endif
 
 /* move those away to a .h */
-extern void smp_init_pseries_mpic(void);
-extern void smp_init_pseries_xics(void);
 extern void find_udbg_vterm(void);
 
 int fwnmi_active;  /* TRUE if an FWNMI handler is present */
@@ -221,42 +218,6 @@ static void pseries_lpar_enable_pmcs(void)
                 get_lppaca()->pmcregs_in_use = 1;
 }
 
-#ifdef CONFIG_KEXEC
-static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
-{
-        /* Don't risk a hypervisor call if we're crashing */
-        if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) {
-                unsigned long addr;
-
-                addr = __pa(get_slb_shadow());
-                if (unregister_slb_shadow(hard_smp_processor_id(), addr))
-                        printk("SLB shadow buffer deregistration of "
-                               "cpu %u (hw_cpu_id %d) failed\n",
-                               smp_processor_id(),
-                               hard_smp_processor_id());
-
-                addr = __pa(get_lppaca());
-                if (unregister_vpa(hard_smp_processor_id(), addr)) {
-                        printk("VPA deregistration of cpu %u (hw_cpu_id %d) "
-                                        "failed\n", smp_processor_id(),
-                                        hard_smp_processor_id());
-                }
-        }
-}
-
-static void pseries_kexec_cpu_down_mpic(int crash_shutdown, int secondary)
-{
-        pseries_kexec_cpu_down(crash_shutdown, secondary);
-        mpic_teardown_this_cpu(secondary);
-}
-
-static void pseries_kexec_cpu_down_xics(int crash_shutdown, int secondary)
-{
-        pseries_kexec_cpu_down(crash_shutdown, secondary);
-        xics_teardown_cpu(secondary);
-}
-#endif /* CONFIG_KEXEC */
-
 static void __init pseries_discover_pic(void)
 {
         struct device_node *np;
@@ -269,21 +230,13 @@ static void __init pseries_discover_pic(void)
                         pSeries_mpic_node = of_node_get(np);
                         ppc_md.init_IRQ       = pseries_mpic_init_IRQ;
                         ppc_md.get_irq        = mpic_get_irq;
-#ifdef CONFIG_KEXEC
-                        ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_mpic;
-#endif
-#ifdef CONFIG_SMP
+                        setup_kexec_cpu_down_mpic();
                         smp_init_pseries_mpic();
-#endif
                         return;
                 } else if (strstr(typep, "ppc-xicp")) {
                         ppc_md.init_IRQ       = xics_init_IRQ;
-#ifdef CONFIG_KEXEC
-                        ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics;
-#endif
-#ifdef CONFIG_SMP
+                        setup_kexec_cpu_down_xics();
                         smp_init_pseries_xics();
-#endif
                         return;
                 }
         }
@@ -533,6 +486,34 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus)
         return PCI_PROBE_NORMAL;
 }
 
+/**
+ * pSeries_power_off - tell firmware about how to power off the system.
+ *
+ * This function calls either the power-off rtas token in normal cases
+ * or the ibm,power-off-ups token (if present & requested) in case of
+ * a power failure. If power-off token is used, power on will only be
+ * possible with power button press. If ibm,power-off-ups token is used
+ * it will allow auto poweron after power is restored.
+ */
+void pSeries_power_off(void)
+{
+        int rc;
+        int rtas_poweroff_ups_token = rtas_token("ibm,power-off-ups");
+
+        if (rtas_flash_term_hook)
+                rtas_flash_term_hook(SYS_POWER_OFF);
+
+        if (rtas_poweron_auto == 0 ||
+                rtas_poweroff_ups_token == RTAS_UNKNOWN_SERVICE) {
+                rc = rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1);
+                printk(KERN_INFO "RTAS power-off returned %d\n", rc);
+        } else {
+                rc = rtas_call(rtas_poweroff_ups_token, 0, 1, NULL);
+                printk(KERN_INFO "RTAS ibm,power-off-ups returned %d\n", rc);
+        }
+        for (;;);
+}
+
 define_machine(pseries) {
         .name                   = "pSeries",
         .probe                  = pSeries_probe,
@@ -543,7 +524,7 @@ define_machine(pseries) {
         .pcibios_fixup          = pSeries_final_fixup,
         .pci_probe_mode         = pSeries_pci_probe_mode,
         .restart                = rtas_restart,
-        .power_off              = rtas_power_off,
+        .power_off              = pSeries_power_off,
         .halt                   = rtas_halt,
         .panic                  = rtas_os_term,
         .get_boot_time          = rtas_get_boot_time,
@@ -554,9 +535,4 @@ define_machine(pseries) {
         .check_legacy_ioport    = pSeries_check_legacy_ioport,
         .system_reset_exception = pSeries_system_reset_exception,
         .machine_check_exception = pSeries_machine_check_exception,
-#ifdef CONFIG_KEXEC
-        .machine_kexec          = default_machine_kexec,
-        .machine_kexec_prepare  = default_machine_kexec_prepare,
-        .machine_crash_shutdown = default_machine_crash_shutdown,
-#endif
 };
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 4408518eaebe..116305b22a2b 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -48,6 +48,7 @@
 #include <asm/vdso_datapage.h>
 
 #include "plpar_wrappers.h"
+#include "pseries.h"
 
 #ifdef DEBUG
 #include <asm/udbg.h>