Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

101 files changed, 2943 insertions, 551 deletions

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 3496bc05058e..bf5c7ff2e6e5 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -118,6 +118,17 @@ config GLACIER
         help
           This option enables support for the AMCC PPC460GT evaluation board.
 
+config REDWOOD
+        bool "Redwood"
+        depends on 44x
+        default n
+        select PPC44x_SIMPLE
+        select 460SX
+        select PCI
+        select PPC4xx_PCI_EXPRESS
+        help
+          This option enables support for the AMCC PPC460SX Redwood board.
+
 config YOSEMITE
         bool "Yosemite"
         depends on 44x
@@ -220,6 +231,14 @@ config 460EX
         select IBM_NEW_EMAC_EMAC4
         select IBM_NEW_EMAC_TAH
 
+config 460SX
+        bool
+        select PPC_FPU
+        select IBM_NEW_EMAC_EMAC4
+        select IBM_NEW_EMAC_RGMII
+        select IBM_NEW_EMAC_ZMII
+        select IBM_NEW_EMAC_TAH
+
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
         bool
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c
index 76fdc51dac8b..5bcd441885e8 100644
--- a/arch/powerpc/platforms/44x/ppc44x_simple.c
+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
@@ -57,6 +57,7 @@ static char *board[] __initdata = {
         "ibm,ebony",
         "amcc,katmai",
         "amcc,rainier",
+        "amcc,redwood",
         "amcc,sequoia",
         "amcc,taishan",
         "amcc,yosemite"
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index 326852c78b8f..4dac9b0525a4 100644
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -12,7 +12,7 @@ config PPC_MPC5121
 
 config MPC5121_ADS
         bool "Freescale MPC5121E ADS"
-        depends on PPC_MULTIPLATFORM && PPC32
+        depends on 6xx
         select DEFAULT_UIMAGE
         select PPC_MPC5121
         select MPC5121_ADS_CPLD
@@ -21,7 +21,7 @@ config MPC5121_ADS
 
 config MPC5121_GENERIC
         bool "Generic support for simple MPC5121 based boards"
-        depends on PPC_MULTIPLATFORM && PPC32
+        depends on 6xx
         select DEFAULT_UIMAGE
         select PPC_MPC5121
         help
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index 696a5ee4962d..8b8e9560a315 100644
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -1,6 +1,6 @@
 config PPC_MPC52xx
         bool "52xx-based boards"
-        depends on PPC_MULTIPLATFORM && PPC32
+        depends on 6xx
         select PPC_CLOCK
         select PPC_PCI_CHOICE
 
@@ -21,7 +21,13 @@ config PPC_MPC5200_SIMPLE
             and if there is a PCI bus node defined in the device tree.
 
           Boards that are compatible with this generic platform support
-          are: 'tqc,tqm5200', 'promess,motionpro', 'schindler,cm5200'.
+          are:
+             intercontrol,digsy-mtc
+             phytec,pcm030
+             phytec,pcm032
+             promess,motionpro
+             schindler,cm5200
+             tqc,tqm5200
 
 config PPC_EFIKA
         bool "bPlan Efika 5k2. MPC5200B based computer"
@@ -35,6 +41,11 @@ config PPC_LITE5200
         depends on PPC_MPC52xx
         select DEFAULT_UIMAGE
 
+config PPC_MEDIA5200
+        bool "Freescale Media5200 Eval Board"
+        depends on PPC_MPC52xx
+        select DEFAULT_UIMAGE
+
 config PPC_MPC5200_BUGFIX
         bool "MPC5200 (L25R) bugfix support"
         depends on PPC_MPC52xx
diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
index b8a52062738a..bfd4f52cf3dd 100644
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -1,12 +1,13 @@
 #
 # Makefile for 52xx based boards
 #
-obj-y                           += mpc52xx_pic.o mpc52xx_common.o
+obj-y                           += mpc52xx_pic.o mpc52xx_common.o mpc52xx_gpt.o
 obj-$(CONFIG_PCI)               += mpc52xx_pci.o
 
 obj-$(CONFIG_PPC_MPC5200_SIMPLE) += mpc5200_simple.o
 obj-$(CONFIG_PPC_EFIKA)         += efika.o
 obj-$(CONFIG_PPC_LITE5200)      += lite5200.o
+obj-$(CONFIG_PPC_MEDIA5200)     += media5200.o
 
 obj-$(CONFIG_PM)                += mpc52xx_sleep.o mpc52xx_pm.o
 ifeq ($(CONFIG_PPC_LITE5200),y)
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
new file mode 100644
index 000000000000..68e4f1696d14
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -0,0 +1,273 @@
+/*
+ * Support for 'media5200-platform' compatible boards.
+ *
+ * Copyright (C) 2008 Secret Lab Technologies Ltd.
+ *
+ * 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.
+ *
+ * Description:
+ * This code implements support for the Freescape Media5200 platform
+ * (built around the MPC5200 SoC).
+ *
+ * Notable characteristic of the Media5200 is the presence of an FPGA
+ * that has all external IRQ lines routed through it.  This file implements
+ * a cascaded interrupt controller driver which attaches itself to the
+ * Virtual IRQ subsystem after the primary mpc5200 interrupt controller
+ * is initialized.
+ *
+ */
+
+#undef DEBUG
+
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <asm/time.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/mpc52xx.h>
+
+static struct of_device_id mpc5200_gpio_ids[] __initdata = {
+        { .compatible = "fsl,mpc5200-gpio", },
+        { .compatible = "mpc5200-gpio", },
+        {}
+};
+
+/* FPGA register set */
+#define MEDIA5200_IRQ_ENABLE (0x40c)
+#define MEDIA5200_IRQ_STATUS (0x410)
+#define MEDIA5200_NUM_IRQS   (6)
+#define MEDIA5200_IRQ_SHIFT  (32 - MEDIA5200_NUM_IRQS)
+
+struct media5200_irq {
+        void __iomem *regs;
+        spinlock_t lock;
+        struct irq_host *irqhost;
+};
+struct media5200_irq media5200_irq;
+
+static void media5200_irq_unmask(unsigned int virq)
+{
+        unsigned long flags;
+        u32 val;
+
+        spin_lock_irqsave(&media5200_irq.lock, flags);
+        val = in_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE);
+        val |= 1 << (MEDIA5200_IRQ_SHIFT + irq_map[virq].hwirq);
+        out_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE, val);
+        spin_unlock_irqrestore(&media5200_irq.lock, flags);
+}
+
+static void media5200_irq_mask(unsigned int virq)
+{
+        unsigned long flags;
+        u32 val;
+
+        spin_lock_irqsave(&media5200_irq.lock, flags);
+        val = in_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE);
+        val &= ~(1 << (MEDIA5200_IRQ_SHIFT + irq_map[virq].hwirq));
+        out_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE, val);
+        spin_unlock_irqrestore(&media5200_irq.lock, flags);
+}
+
+static struct irq_chip media5200_irq_chip = {
+        .typename = "Media5200 FPGA",
+        .unmask = media5200_irq_unmask,
+        .mask = media5200_irq_mask,
+        .mask_ack = media5200_irq_mask,
+};
+
+void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
+{
+        int sub_virq, val;
+        u32 status, enable;
+
+        /* Mask off the cascaded IRQ */
+        spin_lock(&desc->lock);
+        desc->chip->mask(virq);
+        spin_unlock(&desc->lock);
+
+        /* Ask the FPGA for IRQ status.  If 'val' is 0, then no irqs
+         * are pending.  'ffs()' is 1 based */
+        status = in_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE);
+        enable = in_be32(media5200_irq.regs + MEDIA5200_IRQ_STATUS);
+        val = ffs((status & enable) >> MEDIA5200_IRQ_SHIFT);
+        if (val) {
+                sub_virq = irq_linear_revmap(media5200_irq.irqhost, val - 1);
+                /* pr_debug("%s: virq=%i s=%.8x e=%.8x hwirq=%i subvirq=%i\n",
+                 *          __func__, virq, status, enable, val - 1, sub_virq);
+                 */
+                generic_handle_irq(sub_virq);
+        }
+
+        /* Processing done; can reenable the cascade now */
+        spin_lock(&desc->lock);
+        desc->chip->ack(virq);
+        if (!(desc->status & IRQ_DISABLED))
+                desc->chip->unmask(virq);
+        spin_unlock(&desc->lock);
+}
+
+static int media5200_irq_map(struct irq_host *h, unsigned int virq,
+                             irq_hw_number_t hw)
+{
+        struct irq_desc *desc = get_irq_desc(virq);
+
+        pr_debug("%s: h=%p, virq=%i, hwirq=%i\n", __func__, h, virq, (int)hw);
+        set_irq_chip_data(virq, &media5200_irq);
+        set_irq_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq);
+        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
+        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
+        desc->status |= IRQ_TYPE_LEVEL_LOW | IRQ_LEVEL;
+
+        return 0;
+}
+
+static int media5200_irq_xlate(struct irq_host *h, struct device_node *ct,
+                                 u32 *intspec, unsigned int intsize,
+                                 irq_hw_number_t *out_hwirq,
+                                 unsigned int *out_flags)
+{
+        if (intsize != 2)
+                return -1;
+
+        pr_debug("%s: bank=%i, number=%i\n", __func__, intspec[0], intspec[1]);
+        *out_hwirq = intspec[1];
+        *out_flags = IRQ_TYPE_NONE;
+        return 0;
+}
+
+static struct irq_host_ops media5200_irq_ops = {
+        .map = media5200_irq_map,
+        .xlate = media5200_irq_xlate,
+};
+
+/*
+ * Setup Media5200 IRQ mapping
+ */
+static void __init media5200_init_irq(void)
+{
+        struct device_node *fpga_np;
+        int cascade_virq;
+
+        /* First setup the regular MPC5200 interrupt controller */
+        mpc52xx_init_irq();
+
+        /* Now find the FPGA IRQ */
+        fpga_np = of_find_compatible_node(NULL, NULL, "fsl,media5200-fpga");
+        if (!fpga_np)
+                goto out;
+        pr_debug("%s: found fpga node: %s\n", __func__, fpga_np->full_name);
+
+        media5200_irq.regs = of_iomap(fpga_np, 0);
+        if (!media5200_irq.regs)
+                goto out;
+        pr_debug("%s: mapped to %p\n", __func__, media5200_irq.regs);
+
+        cascade_virq = irq_of_parse_and_map(fpga_np, 0);
+        if (!cascade_virq)
+                goto out;
+        pr_debug("%s: cascaded on virq=%i\n", __func__, cascade_virq);
+
+        /* Disable all FPGA IRQs */
+        out_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE, 0);
+
+        spin_lock_init(&media5200_irq.lock);
+
+        media5200_irq.irqhost = irq_alloc_host(fpga_np, IRQ_HOST_MAP_LINEAR,
+                                               MEDIA5200_NUM_IRQS,
+                                               &media5200_irq_ops, -1);
+        if (!media5200_irq.irqhost)
+                goto out;
+        pr_debug("%s: allocated irqhost\n", __func__);
+
+        media5200_irq.irqhost->host_data = &media5200_irq;
+
+        set_irq_data(cascade_virq, &media5200_irq);
+        set_irq_chained_handler(cascade_virq, media5200_irq_cascade);
+
+        return;
+
+ out:
+        pr_err("Could not find Media5200 FPGA; PCI interrupts will not work\n");
+}
+
+/*
+ * Setup the architecture
+ */
+static void __init media5200_setup_arch(void)
+{
+
+        struct device_node *np;
+        struct mpc52xx_gpio __iomem *gpio;
+        u32 port_config;
+
+        if (ppc_md.progress)
+                ppc_md.progress("media5200_setup_arch()", 0);
+
+        /* Map important registers from the internal memory map */
+        mpc52xx_map_common_devices();
+
+        /* Some mpc5200 & mpc5200b related configuration */
+        mpc5200_setup_xlb_arbiter();
+
+        mpc52xx_setup_pci();
+
+        np = of_find_matching_node(NULL, mpc5200_gpio_ids);
+        gpio = of_iomap(np, 0);
+        of_node_put(np);
+        if (!gpio) {
+                printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
+                       __func__);
+                return;
+        }
+
+        /* Set port config */
+        port_config = in_be32(&gpio->port_config);
+
+        port_config &= ~0x03000000;     /* ATA CS is on csb_4/5         */
+        port_config |=  0x01000000;
+
+        out_be32(&gpio->port_config, port_config);
+
+        /* Unmap zone */
+        iounmap(gpio);
+
+}
+
+/* list of the supported boards */
+static char *board[] __initdata = {
+        "fsl,media5200",
+        NULL
+};
+
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init media5200_probe(void)
+{
+        unsigned long node = of_get_flat_dt_root();
+        int i = 0;
+
+        while (board[i]) {
+                if (of_flat_dt_is_compatible(node, board[i]))
+                        break;
+                i++;
+        }
+
+        return (board[i] != NULL);
+}
+
+define_machine(media5200_platform) {
+        .name           = "media5200-platform",
+        .probe          = media5200_probe,
+        .setup_arch     = media5200_setup_arch,
+        .init           = mpc52xx_declare_of_platform_devices,
+        .init_IRQ       = media5200_init_irq,
+        .get_irq        = mpc52xx_get_irq,
+        .restart        = mpc52xx_restart,
+        .calibrate_decr = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index a3bda0b9f1ff..c31e5b534f0a 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -50,8 +50,10 @@ static void __init mpc5200_simple_setup_arch(void)
 
 /* list of the supported boards */
 static char *board[] __initdata = {
-        "promess,motionpro",
+        "intercontrol,digsy-mtc",
         "phytec,pcm030",
+        "phytec,pcm032",
+        "promess,motionpro",
         "schindler,cm5200",
         "tqc,tqm5200",
         NULL
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index 98367a0255f3..8e3dd5a0f228 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -28,9 +28,10 @@ static struct of_device_id mpc52xx_xlb_ids[] __initdata = {
 static struct of_device_id mpc52xx_bus_ids[] __initdata = {
         { .compatible = "fsl,mpc5200-immr", },
         { .compatible = "fsl,mpc5200b-immr", },
-        { .compatible = "fsl,lpb", },
+        { .compatible = "simple-bus", },
 
         /* depreciated matches; shouldn't be used in new device trees */
+        { .compatible = "fsl,lpb", },
         { .type = "builtin", .compatible = "mpc5200", }, /* efika */
         { .type = "soc", .compatible = "mpc5200", }, /* lite5200 */
         {}
@@ -205,6 +206,43 @@ int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
 EXPORT_SYMBOL(mpc52xx_set_psc_clkdiv);
 
 /**
+ * mpc52xx_get_xtal_freq - Get SYS_XTAL_IN frequency for a device
+ *
+ * @node: device node
+ *
+ * Returns the frequency of the external oscillator clock connected
+ * to the SYS_XTAL_IN pin, or 0 if it cannot be determined.
+ */
+unsigned int mpc52xx_get_xtal_freq(struct device_node *node)
+{
+        u32 val;
+        unsigned int freq;
+
+        if (!mpc52xx_cdm)
+                return 0;
+
+        freq = mpc52xx_find_ipb_freq(node);
+        if (!freq)
+                return 0;
+
+        if (in_8(&mpc52xx_cdm->ipb_clk_sel) & 0x1)
+                freq *= 2;
+
+        val  = in_be32(&mpc52xx_cdm->rstcfg);
+        if (val & (1 << 5))
+                freq *= 8;
+        else
+                freq *= 4;
+        if (val & (1 << 6))
+                freq /= 12;
+        else
+                freq /= 16;
+
+        return freq;
+}
+EXPORT_SYMBOL(mpc52xx_get_xtal_freq);
+
+/**
  * mpc52xx_restart: ppc_md->restart hook for mpc5200 using the watchdog timer
  */
 void
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
index 07f89ae46d04..2b8d8ef32e4e 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
@@ -354,88 +354,6 @@ static struct of_platform_driver mpc52xx_simple_gpiochip_driver = {
         .remove = mpc52xx_gpiochip_remove,
 };
 
-/*
- * GPIO LIB API implementation for gpt GPIOs.
- *
- * Each gpt only has a single GPIO.
- */
-static int mpc52xx_gpt_gpio_get(struct gpio_chip *gc, unsigned int gpio)
-{
-        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-        struct mpc52xx_gpt __iomem *regs = mm_gc->regs;
-
-        return (in_be32(&regs->status) & (1 << (31 - 23))) ? 1 : 0;
-}
-
-static void
-mpc52xx_gpt_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
-{
-        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-        struct mpc52xx_gpt __iomem *regs = mm_gc->regs;
-
-        if (val)
-                out_be32(&regs->mode, 0x34);
-        else
-                out_be32(&regs->mode, 0x24);
-
-        pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
-}
-
-static int mpc52xx_gpt_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
-{
-        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-        struct mpc52xx_gpt __iomem *regs = mm_gc->regs;
-
-        out_be32(&regs->mode, 0x04);
-
-        return 0;
-}
-
-static int
-mpc52xx_gpt_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
-{
-        mpc52xx_gpt_gpio_set(gc, gpio, val);
-        pr_debug("%s: gpio: %d val: %d\n", __func__, gpio, val);
-
-        return 0;
-}
-
-static int __devinit mpc52xx_gpt_gpiochip_probe(struct of_device *ofdev,
-                                        const struct of_device_id *match)
-{
-        struct of_mm_gpio_chip *mmchip;
-        struct of_gpio_chip *chip;
-
-        mmchip = kzalloc(sizeof(*mmchip), GFP_KERNEL);
-        if (!mmchip)
-                return -ENOMEM;
-
-        chip = &mmchip->of_gc;
-
-        chip->gpio_cells          = 2;
-        chip->gc.ngpio            = 1;
-        chip->gc.direction_input  = mpc52xx_gpt_gpio_dir_in;
-        chip->gc.direction_output = mpc52xx_gpt_gpio_dir_out;
-        chip->gc.get              = mpc52xx_gpt_gpio_get;
-        chip->gc.set              = mpc52xx_gpt_gpio_set;
-
-        return of_mm_gpiochip_add(ofdev->node, mmchip);
-}
-
-static const struct of_device_id mpc52xx_gpt_gpiochip_match[] = {
-        {
-                .compatible = "fsl,mpc5200-gpt-gpio",
-        },
-        {}
-};
-
-static struct of_platform_driver mpc52xx_gpt_gpiochip_driver = {
-        .name = "gpio_gpt",
-        .match_table = mpc52xx_gpt_gpiochip_match,
-        .probe = mpc52xx_gpt_gpiochip_probe,
-        .remove = mpc52xx_gpiochip_remove,
-};
-
 static int __init mpc52xx_gpio_init(void)
 {
         if (of_register_platform_driver(&mpc52xx_wkup_gpiochip_driver))
@@ -444,9 +362,6 @@ static int __init mpc52xx_gpio_init(void)
         if (of_register_platform_driver(&mpc52xx_simple_gpiochip_driver))
                 printk(KERN_ERR "Unable to register simple GPIO driver\n");
 
-        if (of_register_platform_driver(&mpc52xx_gpt_gpiochip_driver))
-                printk(KERN_ERR "Unable to register gpt GPIO driver\n");
-
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
new file mode 100644
index 000000000000..bfbcd418e690
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -0,0 +1,396 @@
+/*
+ * MPC5200 General Purpose Timer device driver
+ *
+ * Copyright (c) 2009 Secret Lab Technologies Ltd.
+ * Copyright (c) 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+ *
+ * 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 file is a driver for the the General Purpose Timer (gpt) devices
+ * found on the MPC5200 SoC.  Each timer has an IO pin which can be used
+ * for GPIO or can be used to raise interrupts.  The timer function can
+ * be used independently from the IO pin, or it can be used to control
+ * output signals or measure input signals.
+ *
+ * This driver supports the GPIO and IRQ controller functions of the GPT
+ * device.  Timer functions are not yet supported, nor is the watchdog
+ * timer.
+ *
+ * To use the GPIO function, the following two properties must be added
+ * to the device tree node for the gpt device (typically in the .dts file
+ * for the board):
+ *      gpio-controller;
+ *      #gpio-cells = < 2 >;
+ * This driver will register the GPIO pin if it finds the gpio-controller
+ * property in the device tree.
+ *
+ * To use the IRQ controller function, the following two properties must
+ * be added to the device tree node for the gpt device:
+ *      interrupt-controller;
+ *      #interrupt-cells = < 1 >;
+ * The IRQ controller binding only uses one cell to specify the interrupt,
+ * and the IRQ flags are encoded in the cell.  A cell is not used to encode
+ * the IRQ number because the GPT only has a single IRQ source.  For flags,
+ * a value of '1' means rising edge sensitive and '2' means falling edge.
+ *
+ * The GPIO and the IRQ controller functions can be used at the same time,
+ * but in this use case the IO line will only work as an input.  Trying to
+ * use it as a GPIO output will not work.
+ *
+ * When using the GPIO line as an output, it can either be driven as normal
+ * IO, or it can be an Open Collector (OC) output.  At the moment it is the
+ * responsibility of either the bootloader or the platform setup code to set
+ * the output mode.  This driver does not change the output mode setting.
+ */
+
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
+#include <linux/kernel.h>
+#include <asm/mpc52xx.h>
+
+MODULE_DESCRIPTION("Freescale MPC52xx gpt driver");
+MODULE_AUTHOR("Sascha Hauer, Grant Likely");
+MODULE_LICENSE("GPL");
+
+/**
+ * struct mpc52xx_gpt - Private data structure for MPC52xx GPT driver
+ * @dev: pointer to device structure
+ * @regs: virtual address of GPT registers
+ * @lock: spinlock to coordinate between different functions.
+ * @of_gc: of_gpio_chip instance structure; used when GPIO is enabled
+ * @irqhost: Pointer to irq_host instance; used when IRQ mode is supported
+ */
+struct mpc52xx_gpt_priv {
+        struct device *dev;
+        struct mpc52xx_gpt __iomem *regs;
+        spinlock_t lock;
+        struct irq_host *irqhost;
+
+#if defined(CONFIG_GPIOLIB)
+        struct of_gpio_chip of_gc;
+#endif
+};
+
+#define MPC52xx_GPT_MODE_MS_MASK        (0x07)
+#define MPC52xx_GPT_MODE_MS_IC          (0x01)
+#define MPC52xx_GPT_MODE_MS_OC          (0x02)
+#define MPC52xx_GPT_MODE_MS_PWM         (0x03)
+#define MPC52xx_GPT_MODE_MS_GPIO        (0x04)
+
+#define MPC52xx_GPT_MODE_GPIO_MASK      (0x30)
+#define MPC52xx_GPT_MODE_GPIO_OUT_LOW   (0x20)
+#define MPC52xx_GPT_MODE_GPIO_OUT_HIGH  (0x30)
+
+#define MPC52xx_GPT_MODE_IRQ_EN         (0x0100)
+
+#define MPC52xx_GPT_MODE_ICT_MASK       (0x030000)
+#define MPC52xx_GPT_MODE_ICT_RISING     (0x010000)
+#define MPC52xx_GPT_MODE_ICT_FALLING    (0x020000)
+#define MPC52xx_GPT_MODE_ICT_TOGGLE     (0x030000)
+
+#define MPC52xx_GPT_STATUS_IRQMASK      (0x000f)
+
+/* ---------------------------------------------------------------------
+ * Cascaded interrupt controller hooks
+ */
+
+static void mpc52xx_gpt_irq_unmask(unsigned int virq)
+{
+        struct mpc52xx_gpt_priv *gpt = get_irq_chip_data(virq);
+        unsigned long flags;
+
+        spin_lock_irqsave(&gpt->lock, flags);
+        setbits32(&gpt->regs->mode, MPC52xx_GPT_MODE_IRQ_EN);
+        spin_unlock_irqrestore(&gpt->lock, flags);
+}
+
+static void mpc52xx_gpt_irq_mask(unsigned int virq)
+{
+        struct mpc52xx_gpt_priv *gpt = get_irq_chip_data(virq);
+        unsigned long flags;
+
+        spin_lock_irqsave(&gpt->lock, flags);
+        clrbits32(&gpt->regs->mode, MPC52xx_GPT_MODE_IRQ_EN);
+        spin_unlock_irqrestore(&gpt->lock, flags);
+}
+
+static void mpc52xx_gpt_irq_ack(unsigned int virq)
+{
+        struct mpc52xx_gpt_priv *gpt = get_irq_chip_data(virq);
+
+        out_be32(&gpt->regs->status, MPC52xx_GPT_STATUS_IRQMASK);
+}
+
+static int mpc52xx_gpt_irq_set_type(unsigned int virq, unsigned int flow_type)
+{
+        struct mpc52xx_gpt_priv *gpt = get_irq_chip_data(virq);
+        unsigned long flags;
+        u32 reg;
+
+        dev_dbg(gpt->dev, "%s: virq=%i type=%x\n", __func__, virq, flow_type);
+
+        spin_lock_irqsave(&gpt->lock, flags);
+        reg = in_be32(&gpt->regs->mode) & ~MPC52xx_GPT_MODE_ICT_MASK;
+        if (flow_type & IRQF_TRIGGER_RISING)
+                reg |= MPC52xx_GPT_MODE_ICT_RISING;
+        if (flow_type & IRQF_TRIGGER_FALLING)
+                reg |= MPC52xx_GPT_MODE_ICT_FALLING;
+        out_be32(&gpt->regs->mode, reg);
+        spin_unlock_irqrestore(&gpt->lock, flags);
+
+        return 0;
+}
+
+static struct irq_chip mpc52xx_gpt_irq_chip = {
+        .typename = "MPC52xx GPT",
+        .unmask = mpc52xx_gpt_irq_unmask,
+        .mask = mpc52xx_gpt_irq_mask,
+        .ack = mpc52xx_gpt_irq_ack,
+        .set_type = mpc52xx_gpt_irq_set_type,
+};
+
+void mpc52xx_gpt_irq_cascade(unsigned int virq, struct irq_desc *desc)
+{
+        struct mpc52xx_gpt_priv *gpt = get_irq_data(virq);
+        int sub_virq;
+        u32 status;
+
+        status = in_be32(&gpt->regs->status) & MPC52xx_GPT_STATUS_IRQMASK;
+        if (status) {
+                sub_virq = irq_linear_revmap(gpt->irqhost, 0);
+                generic_handle_irq(sub_virq);
+        }
+}
+
+static int mpc52xx_gpt_irq_map(struct irq_host *h, unsigned int virq,
+                               irq_hw_number_t hw)
+{
+        struct mpc52xx_gpt_priv *gpt = h->host_data;
+
+        dev_dbg(gpt->dev, "%s: h=%p, virq=%i\n", __func__, h, virq);
+        set_irq_chip_data(virq, gpt);
+        set_irq_chip_and_handler(virq, &mpc52xx_gpt_irq_chip, handle_edge_irq);
+
+        return 0;
+}
+
+static int mpc52xx_gpt_irq_xlate(struct irq_host *h, struct device_node *ct,
+                                 u32 *intspec, unsigned int intsize,
+                                 irq_hw_number_t *out_hwirq,
+                                 unsigned int *out_flags)
+{
+        struct mpc52xx_gpt_priv *gpt = h->host_data;
+
+        dev_dbg(gpt->dev, "%s: flags=%i\n", __func__, intspec[0]);
+
+        if ((intsize < 1) || (intspec[0] < 1) || (intspec[0] > 3)) {
+                dev_err(gpt->dev, "bad irq specifier in %s\n", ct->full_name);
+                return -EINVAL;
+        }
+
+        *out_hwirq = 0; /* The GPT only has 1 IRQ line */
+        *out_flags = intspec[0];
+
+        return 0;
+}
+
+static struct irq_host_ops mpc52xx_gpt_irq_ops = {
+        .map = mpc52xx_gpt_irq_map,
+        .xlate = mpc52xx_gpt_irq_xlate,
+};
+
+static void
+mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
+{
+        int cascade_virq;
+        unsigned long flags;
+
+        /* Only setup cascaded IRQ if device tree claims the GPT is
+         * an interrupt controller */
+        if (!of_find_property(node, "interrupt-controller", NULL))
+                return;
+
+        cascade_virq = irq_of_parse_and_map(node, 0);
+
+        gpt->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, 1,
+                                      &mpc52xx_gpt_irq_ops, -1);
+        if (!gpt->irqhost) {
+                dev_err(gpt->dev, "irq_alloc_host() failed\n");
+                return;
+        }
+
+        gpt->irqhost->host_data = gpt;
+
+        set_irq_data(cascade_virq, gpt);
+        set_irq_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);
+
+        /* Set to Input Capture mode */
+        spin_lock_irqsave(&gpt->lock, flags);
+        clrsetbits_be32(&gpt->regs->mode, MPC52xx_GPT_MODE_MS_MASK,
+                        MPC52xx_GPT_MODE_MS_IC);
+        spin_unlock_irqrestore(&gpt->lock, flags);
+
+        dev_dbg(gpt->dev, "%s() complete. virq=%i\n", __func__, cascade_virq);
+}
+
+
+/* ---------------------------------------------------------------------
+ * GPIOLIB hooks
+ */
+#if defined(CONFIG_GPIOLIB)
+static inline struct mpc52xx_gpt_priv *gc_to_mpc52xx_gpt(struct gpio_chip *gc)
+{
+        return container_of(to_of_gpio_chip(gc), struct mpc52xx_gpt_priv,of_gc);
+}
+
+static int mpc52xx_gpt_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct mpc52xx_gpt_priv *gpt = gc_to_mpc52xx_gpt(gc);
+
+        return (in_be32(&gpt->regs->status) >> 8) & 1;
+}
+
+static void
+mpc52xx_gpt_gpio_set(struct gpio_chip *gc, unsigned int gpio, int v)
+{
+        struct mpc52xx_gpt_priv *gpt = gc_to_mpc52xx_gpt(gc);
+        unsigned long flags;
+        u32 r;
+
+        dev_dbg(gpt->dev, "%s: gpio:%d v:%d\n", __func__, gpio, v);
+        r = v ? MPC52xx_GPT_MODE_GPIO_OUT_HIGH : MPC52xx_GPT_MODE_GPIO_OUT_LOW;
+
+        spin_lock_irqsave(&gpt->lock, flags);
+        clrsetbits_be32(&gpt->regs->mode, MPC52xx_GPT_MODE_GPIO_MASK, r);
+        spin_unlock_irqrestore(&gpt->lock, flags);
+}
+
+static int mpc52xx_gpt_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct mpc52xx_gpt_priv *gpt = gc_to_mpc52xx_gpt(gc);
+        unsigned long flags;
+
+        dev_dbg(gpt->dev, "%s: gpio:%d\n", __func__, gpio);
+
+        spin_lock_irqsave(&gpt->lock, flags);
+        clrbits32(&gpt->regs->mode, MPC52xx_GPT_MODE_GPIO_MASK);
+        spin_unlock_irqrestore(&gpt->lock, flags);
+
+        return 0;
+}
+
+static int
+mpc52xx_gpt_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        mpc52xx_gpt_gpio_set(gc, gpio, val);
+        return 0;
+}
+
+static void
+mpc52xx_gpt_gpio_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
+{
+        int rc;
+
+        /* Only setup GPIO if the device tree claims the GPT is
+         * a GPIO controller */
+        if (!of_find_property(node, "gpio-controller", NULL))
+                return;
+
+        gpt->of_gc.gc.label = kstrdup(node->full_name, GFP_KERNEL);
+        if (!gpt->of_gc.gc.label) {
+                dev_err(gpt->dev, "out of memory\n");
+                return;
+        }
+
+        gpt->of_gc.gpio_cells = 2;
+        gpt->of_gc.gc.ngpio = 1;
+        gpt->of_gc.gc.direction_input  = mpc52xx_gpt_gpio_dir_in;
+        gpt->of_gc.gc.direction_output = mpc52xx_gpt_gpio_dir_out;
+        gpt->of_gc.gc.get = mpc52xx_gpt_gpio_get;
+        gpt->of_gc.gc.set = mpc52xx_gpt_gpio_set;
+        gpt->of_gc.gc.base = -1;
+        gpt->of_gc.xlate = of_gpio_simple_xlate;
+        node->data = &gpt->of_gc;
+        of_node_get(node);
+
+        /* Setup external pin in GPIO mode */
+        clrsetbits_be32(&gpt->regs->mode, MPC52xx_GPT_MODE_MS_MASK,
+                        MPC52xx_GPT_MODE_MS_GPIO);
+
+        rc = gpiochip_add(&gpt->of_gc.gc);
+        if (rc)
+                dev_err(gpt->dev, "gpiochip_add() failed; rc=%i\n", rc);
+
+        dev_dbg(gpt->dev, "%s() complete.\n", __func__);
+}
+#else /* defined(CONFIG_GPIOLIB) */
+static void
+mpc52xx_gpt_gpio_setup(struct mpc52xx_gpt_priv *p, struct device_node *np) { }
+#endif /* defined(CONFIG_GPIOLIB) */
+
+/* ---------------------------------------------------------------------
+ * of_platform bus binding code
+ */
+static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,
+                                       const struct of_device_id *match)
+{
+        struct mpc52xx_gpt_priv *gpt;
+
+        gpt = kzalloc(sizeof *gpt, GFP_KERNEL);
+        if (!gpt)
+                return -ENOMEM;
+
+        spin_lock_init(&gpt->lock);
+        gpt->dev = &ofdev->dev;
+        gpt->regs = of_iomap(ofdev->node, 0);
+        if (!gpt->regs) {
+                kfree(gpt);
+                return -ENOMEM;
+        }
+
+        dev_set_drvdata(&ofdev->dev, gpt);
+
+        mpc52xx_gpt_gpio_setup(gpt, ofdev->node);
+        mpc52xx_gpt_irq_setup(gpt, ofdev->node);
+
+        return 0;
+}
+
+static int mpc52xx_gpt_remove(struct of_device *ofdev)
+{
+        return -EBUSY;
+}
+
+static const struct of_device_id mpc52xx_gpt_match[] = {
+        { .compatible = "fsl,mpc5200-gpt", },
+
+        /* Depreciated compatible values; don't use for new dts files */
+        { .compatible = "fsl,mpc5200-gpt-gpio", },
+        { .compatible = "mpc5200-gpt", },
+        {}
+};
+
+static struct of_platform_driver mpc52xx_gpt_driver = {
+        .name = "mpc52xx-gpt",
+        .match_table = mpc52xx_gpt_match,
+        .probe = mpc52xx_gpt_probe,
+        .remove = mpc52xx_gpt_remove,
+};
+
+static int __init mpc52xx_gpt_init(void)
+{
+        if (of_register_platform_driver(&mpc52xx_gpt_driver))
+                pr_err("error registering MPC52xx GPT driver\n");
+
+        return 0;
+}
+
+/* Make sure GPIOs and IRQs get set up before anyone tries to use them */
+subsys_initcall(mpc52xx_gpt_init);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 0a093f03c758..480f806fd0a9 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -163,8 +163,6 @@ static void mpc52xx_extirq_mask(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_clrbit(&intr->ctrl, 11 - l2irq);
 }
 
@@ -176,8 +174,6 @@ static void mpc52xx_extirq_unmask(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_setbit(&intr->ctrl, 11 - l2irq);
 }
 
@@ -189,17 +185,15 @@ static void mpc52xx_extirq_ack(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_setbit(&intr->ctrl, 27-l2irq);
 }
 
 static int mpc52xx_extirq_set_type(unsigned int virq, unsigned int flow_type)
 {
-        struct irq_desc *desc = get_irq_desc(virq);
         u32 ctrl_reg, type;
         int irq;
         int l2irq;
+        void *handler = handle_level_irq;
 
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
@@ -207,32 +201,21 @@ static int mpc52xx_extirq_set_type(unsigned int virq, unsigned int flow_type)
         pr_debug("%s: irq=%x. l2=%d flow_type=%d\n", __func__, irq, l2irq, flow_type);
 
         switch (flow_type) {
-        case IRQF_TRIGGER_HIGH:
-                type = 0;
-                break;
-        case IRQF_TRIGGER_RISING:
-                type = 1;
-                break;
-        case IRQF_TRIGGER_FALLING:
-                type = 2;
-                break;
-        case IRQF_TRIGGER_LOW:
-                type = 3;
-                break;
+        case IRQF_TRIGGER_HIGH: type = 0; break;
+        case IRQF_TRIGGER_RISING: type = 1; handler = handle_edge_irq; break;
+        case IRQF_TRIGGER_FALLING: type = 2; handler = handle_edge_irq; break;
+        case IRQF_TRIGGER_LOW: type = 3; break;
         default:
                 type = 0;
         }
 
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
-        if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
-                desc->status |= IRQ_LEVEL;
-
         ctrl_reg = in_be32(&intr->ctrl);
         ctrl_reg &= ~(0x3 << (22 - (l2irq * 2)));
         ctrl_reg |= (type << (22 - (l2irq * 2)));
         out_be32(&intr->ctrl, ctrl_reg);
 
+        __set_irq_handler_unlocked(virq, handler);
+
         return 0;
 }
 
@@ -247,6 +230,11 @@ static struct irq_chip mpc52xx_extirq_irqchip = {
 /*
  * Main interrupt irq_chip
  */
+static int mpc52xx_null_set_type(unsigned int virq, unsigned int flow_type)
+{
+        return 0; /* Do nothing so that the sense mask will get updated */
+}
+
 static void mpc52xx_main_mask(unsigned int virq)
 {
         int irq;
@@ -255,8 +243,6 @@ static void mpc52xx_main_mask(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_setbit(&intr->main_mask, 16 - l2irq);
 }
 
@@ -268,8 +254,6 @@ static void mpc52xx_main_unmask(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_clrbit(&intr->main_mask, 16 - l2irq);
 }
 
@@ -278,6 +262,7 @@ static struct irq_chip mpc52xx_main_irqchip = {
         .mask = mpc52xx_main_mask,
         .mask_ack = mpc52xx_main_mask,
         .unmask = mpc52xx_main_unmask,
+        .set_type = mpc52xx_null_set_type,
 };
 
 /*
@@ -291,8 +276,6 @@ static void mpc52xx_periph_mask(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_setbit(&intr->per_mask, 31 - l2irq);
 }
 
@@ -304,8 +287,6 @@ static void mpc52xx_periph_unmask(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_clrbit(&intr->per_mask, 31 - l2irq);
 }
 
@@ -314,6 +295,7 @@ static struct irq_chip mpc52xx_periph_irqchip = {
         .mask = mpc52xx_periph_mask,
         .mask_ack = mpc52xx_periph_mask,
         .unmask = mpc52xx_periph_unmask,
+        .set_type = mpc52xx_null_set_type,
 };
 
 /*
@@ -327,8 +309,6 @@ static void mpc52xx_sdma_mask(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_setbit(&sdma->IntMask, l2irq);
 }
 
@@ -340,8 +320,6 @@ static void mpc52xx_sdma_unmask(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         io_be_clrbit(&sdma->IntMask, l2irq);
 }
 
@@ -353,8 +331,6 @@ static void mpc52xx_sdma_ack(unsigned int virq)
         irq = irq_map[virq].hwirq;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
-
         out_be32(&sdma->IntPend, 1 << l2irq);
 }
 
@@ -363,9 +339,19 @@ static struct irq_chip mpc52xx_sdma_irqchip = {
         .mask = mpc52xx_sdma_mask,
         .unmask = mpc52xx_sdma_unmask,
         .ack = mpc52xx_sdma_ack,
+        .set_type = mpc52xx_null_set_type,
 };
 
 /**
+ * mpc52xx_is_extirq - Returns true if hwirq number is for an external IRQ
+ */
+static int mpc52xx_is_extirq(int l1, int l2)
+{
+        return ((l1 == 0) && (l2 == 0)) ||
+               ((l1 == 1) && (l2 >= 1) && (l2 <= 3));
+}
+
+/**
  * mpc52xx_irqhost_xlate - translate virq# from device tree interrupts property
  */
 static int mpc52xx_irqhost_xlate(struct irq_host *h, struct device_node *ct,
@@ -383,38 +369,23 @@ static int mpc52xx_irqhost_xlate(struct irq_host *h, struct device_node *ct,
 
         intrvect_l1 = (int)intspec[0];
         intrvect_l2 = (int)intspec[1];
-        intrvect_type = (int)intspec[2];
+        intrvect_type = (int)intspec[2] & 0x3;
 
         intrvect_linux = (intrvect_l1 << MPC52xx_IRQ_L1_OFFSET) &
                          MPC52xx_IRQ_L1_MASK;
         intrvect_linux |= intrvect_l2 & MPC52xx_IRQ_L2_MASK;
 
-        pr_debug("return %x, l1=%d, l2=%d\n", intrvect_linux, intrvect_l1,
-                 intrvect_l2);
-
         *out_hwirq = intrvect_linux;
-        *out_flags = mpc52xx_map_senses[intrvect_type];
+        *out_flags = IRQ_TYPE_LEVEL_LOW;
+        if (mpc52xx_is_extirq(intrvect_l1, intrvect_l2))
+                *out_flags = mpc52xx_map_senses[intrvect_type];
 
+        pr_debug("return %x, l1=%d, l2=%d\n", intrvect_linux, intrvect_l1,
+                 intrvect_l2);
         return 0;
 }
 
 /**
- * mpc52xx_irqx_gettype - determine the IRQ sense type (level/edge)
- *
- * Only external IRQs need this.
- */
-static int mpc52xx_irqx_gettype(int irq)
-{
-        int type;
-        u32 ctrl_reg;
-
-        ctrl_reg = in_be32(&intr->ctrl);
-        type = (ctrl_reg >> (22 - irq * 2)) & 0x3;
-
-        return mpc52xx_map_senses[type];
-}
-
-/**
  * mpc52xx_irqhost_map - Hook to map from virq to an irq_chip structure
  */
 static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
@@ -422,68 +393,46 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
 {
         int l1irq;
         int l2irq;
-        struct irq_chip *good_irqchip;
-        void *good_handle;
+        struct irq_chip *irqchip;
+        void *hndlr;
         int type;
+        u32 reg;
 
         l1irq = (irq & MPC52xx_IRQ_L1_MASK) >> MPC52xx_IRQ_L1_OFFSET;
         l2irq = irq & MPC52xx_IRQ_L2_MASK;
 
         /*
-         * Most of ours IRQs will be level low
-         * Only external IRQs on some platform may be others
+         * External IRQs are handled differently by the hardware so they are
+         * handled by a dedicated irq_chip structure.
          */
-        type = IRQ_TYPE_LEVEL_LOW;
+        if (mpc52xx_is_extirq(l1irq, l2irq)) {
+                reg = in_be32(&intr->ctrl);
+                type = mpc52xx_map_senses[(reg >> (22 - l2irq * 2)) & 0x3];
+                if ((type == IRQ_TYPE_EDGE_FALLING) ||
+                    (type == IRQ_TYPE_EDGE_RISING))
+                        hndlr = handle_edge_irq;
+                else
+                        hndlr = handle_level_irq;
+
+                set_irq_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr);
+                pr_debug("%s: External IRQ%i virq=%x, hw=%x. type=%x\n",
+                         __func__, l2irq, virq, (int)irq, type);
+                return 0;
+        }
 
+        /* It is an internal SOC irq.  Choose the correct irq_chip */
         switch (l1irq) {
-        case MPC52xx_IRQ_L1_CRIT:
-                pr_debug("%s: Critical. l2=%x\n", __func__, l2irq);
-
-                BUG_ON(l2irq != 0);
-
-                type = mpc52xx_irqx_gettype(l2irq);
-                good_irqchip = &mpc52xx_extirq_irqchip;
-                break;
-
-        case MPC52xx_IRQ_L1_MAIN:
-                pr_debug("%s: Main IRQ[1-3] l2=%x\n", __func__, l2irq);
-
-                if ((l2irq >= 1) && (l2irq <= 3)) {
-                        type = mpc52xx_irqx_gettype(l2irq);
-                        good_irqchip = &mpc52xx_extirq_irqchip;
-                } else {
-                        good_irqchip = &mpc52xx_main_irqchip;
-                }
-                break;
-
-        case MPC52xx_IRQ_L1_PERP:
-                pr_debug("%s: Peripherals. l2=%x\n", __func__, l2irq);
-                good_irqchip = &mpc52xx_periph_irqchip;
-                break;
-
-        case MPC52xx_IRQ_L1_SDMA:
-                pr_debug("%s: SDMA. l2=%x\n", __func__, l2irq);
-                good_irqchip = &mpc52xx_sdma_irqchip;
-                break;
-
+        case MPC52xx_IRQ_L1_MAIN: irqchip = &mpc52xx_main_irqchip; break;
+        case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
+        case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
         default:
-                pr_err("%s: invalid virq requested (0x%x)\n", __func__, virq);
+                pr_err("%s: invalid irq: virq=%i, l1=%i, l2=%i\n",
+                       __func__, virq, l1irq, l2irq);
                 return -EINVAL;
         }
 
-        switch (type) {
-        case IRQ_TYPE_EDGE_FALLING:
-        case IRQ_TYPE_EDGE_RISING:
-                good_handle = handle_edge_irq;
-                break;
-        default:
-                good_handle = handle_level_irq;
-        }
-
-        set_irq_chip_and_handler(virq, good_irqchip, good_handle);
-
-        pr_debug("%s: virq=%x, hw=%x. type=%x\n", __func__, virq,
-                 (int)irq, type);
+        set_irq_chip_and_handler(virq, irqchip, handle_level_irq);
+        pr_debug("%s: virq=%x, l1=%i, l2=%i\n", __func__, virq, l1irq, l2irq);
 
         return 0;
 }
@@ -522,6 +471,8 @@ void __init mpc52xx_init_irq(void)
                 panic(__FILE__  ": find_and_map failed on 'mpc5200-bestcomm'. "
                                 "Check node !");
 
+        pr_debug("MPC5200 IRQ controller mapped to 0x%p\n", intr);
+
         /* Disable all interrupt sources. */
         out_be32(&sdma->IntPend, 0xffffffff);   /* 1 means clear pending */
         out_be32(&sdma->IntMask, 0xffffffff);   /* 1 means disabled */
@@ -613,8 +564,5 @@ unsigned int mpc52xx_get_irq(void)
                 }
         }
 
-        pr_debug("%s: irq=%x. virq=%d\n", __func__, irq,
-                 irq_linear_revmap(mpc52xx_irqhost, irq));
-
         return irq_linear_revmap(mpc52xx_irqhost, irq);
 }
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 30f008b2f92e..7c7df4003820 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,6 +1,6 @@
 menuconfig PPC_82xx
         bool "82xx-based boards (PQ II)"
-        depends on 6xx && PPC_MULTIPLATFORM
+        depends on 6xx
 
 if PPC_82xx
 
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 83c664afc897..437d29a59d72 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,6 +1,6 @@
 menuconfig PPC_83xx
         bool "83xx-based boards"
-        depends on 6xx && PPC_MULTIPLATFORM
+        depends on 6xx
         select PPC_UDBG_16550
         select PPC_PCI_CHOICE
         select FSL_PCI if PCI
diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c
index bb30d67ad0a2..aa0d84d22585 100644
--- a/arch/powerpc/platforms/83xx/asp834x.c
+++ b/arch/powerpc/platforms/83xx/asp834x.c
@@ -58,6 +58,7 @@ static struct __initdata of_device_id asp8347_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index 91a2c80b9d72..0b4f883b20eb 100644
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -38,6 +38,8 @@ static void __init mpc831x_rdb_setup_arch(void)
 #ifdef CONFIG_PCI
         for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
+        for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie")
+                mpc83xx_add_bridge(np);
 #endif
         mpc831x_usb_cfg();
 }
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index 2a1295f19832..567ded7c3b9b 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -20,6 +20,7 @@
 #include <linux/spi/mmc_spi.h>
 #include <linux/mmc/host.h>
 #include <linux/of_platform.h>
+#include <linux/fsl_devices.h>
 
 #include <asm/time.h>
 #include <asm/ipic.h>
@@ -39,16 +40,116 @@
 #endif
 
 #ifdef CONFIG_QUICC_ENGINE
-static void mpc83xx_spi_activate_cs(u8 cs, u8 polarity)
+static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
+                                   struct spi_board_info *board_infos,
+                                   unsigned int num_board_infos,
+                                   void (*cs_control)(struct spi_device *dev,
+                                                      bool on))
 {
-        pr_debug("%s %d %d\n", __func__, cs, polarity);
-        par_io_data_set(3, 13, polarity);
+        struct device_node *np;
+        unsigned int i = 0;
+
+        for_each_compatible_node(np, type, compatible) {
+                int ret;
+                unsigned int j;
+                const void *prop;
+                struct resource res[2];
+                struct platform_device *pdev;
+                struct fsl_spi_platform_data pdata = {
+                        .cs_control = cs_control,
+                };
+
+                memset(res, 0, sizeof(res));
+
+                pdata.sysclk = sysclk;
+
+                prop = of_get_property(np, "reg", NULL);
+                if (!prop)
+                        goto err;
+                pdata.bus_num = *(u32 *)prop;
+
+                prop = of_get_property(np, "cell-index", NULL);
+                if (prop)
+                        i = *(u32 *)prop;
+
+                prop = of_get_property(np, "mode", NULL);
+                if (prop && !strcmp(prop, "cpu-qe"))
+                        pdata.qe_mode = 1;
+
+                for (j = 0; j < num_board_infos; j++) {
+                        if (board_infos[j].bus_num == pdata.bus_num)
+                                pdata.max_chipselect++;
+                }
+
+                if (!pdata.max_chipselect)
+                        continue;
+
+                ret = of_address_to_resource(np, 0, &res[0]);
+                if (ret)
+                        goto err;
+
+                ret = of_irq_to_resource(np, 0, &res[1]);
+                if (ret == NO_IRQ)
+                        goto err;
+
+                pdev = platform_device_alloc("mpc83xx_spi", i);
+                if (!pdev)
+                        goto err;
+
+                ret = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+                if (ret)
+                        goto unreg;
+
+                ret = platform_device_add_resources(pdev, res,
+                                                    ARRAY_SIZE(res));
+                if (ret)
+                        goto unreg;
+
+                ret = platform_device_add(pdev);
+                if (ret)
+                        goto unreg;
+
+                goto next;
+unreg:
+                platform_device_del(pdev);
+err:
+                pr_err("%s: registration failed\n", np->full_name);
+next:
+                i++;
+        }
+
+        return i;
 }
 
-static void mpc83xx_spi_deactivate_cs(u8 cs, u8 polarity)
+static int __init fsl_spi_init(struct spi_board_info *board_infos,
+                               unsigned int num_board_infos,
+                               void (*cs_control)(struct spi_device *spi,
+                                                  bool on))
 {
-        pr_debug("%s %d %d\n", __func__, cs, polarity);
-        par_io_data_set(3, 13, !polarity);
+        u32 sysclk = -1;
+        int ret;
+
+        /* SPI controller is either clocked from QE or SoC clock */
+        sysclk = get_brgfreq();
+        if (sysclk == -1) {
+                sysclk = fsl_get_sys_freq();
+                if (sysclk == -1)
+                        return -ENODEV;
+        }
+
+        ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
+                               num_board_infos, cs_control);
+        if (!ret)
+                of_fsl_spi_probe("spi", "fsl_spi", sysclk, board_infos,
+                                 num_board_infos, cs_control);
+
+        return spi_register_board_info(board_infos, num_board_infos);
+}
+
+static void mpc83xx_spi_cs_control(struct spi_device *spi, bool on)
+{
+        pr_debug("%s %d %d\n", __func__, spi->chip_select, on);
+        par_io_data_set(3, 13, on);
 }
 
 static struct mmc_spi_platform_data mpc832x_mmc_pdata = {
@@ -74,9 +175,13 @@ static int __init mpc832x_spi_init(void)
         par_io_config_pin(3, 14, 2, 0, 0, 0); /* SD_INSERT, I */
         par_io_config_pin(3, 15, 2, 0, 0, 0); /* SD_PROTECT,I */
 
-        return fsl_spi_init(&mpc832x_spi_boardinfo, 1,
-                            mpc83xx_spi_activate_cs,
-                            mpc83xx_spi_deactivate_cs);
+        /*
+         * Don't bother with legacy stuff when device tree contains
+         * mmc-spi-slot node.
+         */
+        if (of_find_compatible_node(NULL, NULL, "mmc-spi-slot"))
+                return 0;
+        return fsl_spi_init(&mpc832x_spi_boardinfo, 1, mpc83xx_spi_cs_control);
 }
 machine_device_initcall(mpc832x_rdb, mpc832x_spi_init);
 #endif /* CONFIG_QUICC_ENGINE */
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 76092d37c7d9..81e44fa1c644 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -42,6 +42,7 @@
 static struct of_device_id __initdata mpc834x_itx_ids[] = {
         { .compatible = "fsl,pq2pro-localbus", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index fc3f2ed1f3e9..d0a634b056ca 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -112,6 +112,7 @@ static struct of_device_id mpc834x_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c
index 530ef990ca7c..51df7e754698 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c
@@ -84,14 +84,10 @@ static void __init mpc837x_mds_setup_arch(void)
                 ppc_md.progress("mpc837x_mds_setup_arch()", 0);
 
 #ifdef CONFIG_PCI
-        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") {
-                if (!of_device_is_available(np)) {
-                        pr_warning("%s: disabled by the firmware.\n",
-                                   np->full_name);
-                        continue;
-                }
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
+                mpc83xx_add_bridge(np);
+        for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie")
                 mpc83xx_add_bridge(np);
-        }
 #endif
         mpc837xmds_usb_cfg();
 }
@@ -100,6 +96,7 @@ static struct of_device_id mpc837x_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
index 1d096545322b..76f3b32a155e 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -38,6 +38,8 @@ static void __init mpc837x_rdb_setup_arch(void)
 #ifdef CONFIG_PCI
         for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
+        for_each_compatible_node(np, "pci", "fsl,mpc8314-pcie")
+                mpc83xx_add_bridge(np);
 #endif
         mpc837x_usb_cfg();
 }
@@ -46,6 +48,7 @@ static struct of_device_id mpc837x_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/83xx/sbc834x.c b/arch/powerpc/platforms/83xx/sbc834x.c
index 156c4e218009..49023dbe1576 100644
--- a/arch/powerpc/platforms/83xx/sbc834x.c
+++ b/arch/powerpc/platforms/83xx/sbc834x.c
@@ -84,6 +84,7 @@ static struct __initdata of_device_id sbc834x_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index cc99c280aad9..11e1fac17c7f 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -14,6 +14,7 @@
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
+#include <linux/of.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -210,7 +211,7 @@ int mpc837x_usb_cfg(void)
         int ret = 0;
 
         np = of_find_compatible_node(NULL, NULL, "fsl-usb2-dr");
-        if (!np)
+        if (!np || !of_device_is_available(np))
                 return -ENODEV;
         prop = of_get_property(np, "phy_type", NULL);
 
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index b79dc710ed34..7f066adc068c 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -51,6 +51,12 @@ config MPC85xx_DS
         help
           This option enables support for the MPC85xx DS (MPC8544 DS) board
 
+config SOCRATES
+        bool "Socrates"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the Socrates board.
+
 config KSI8560
         bool "Emerson KSI8560"
         select DEFAULT_UIMAGE
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index f0798c09980f..a857b35b9828 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -13,4 +13,5 @@ obj-$(CONFIG_STX_GP3)	  += stx_gp3.o
 obj-$(CONFIG_TQM85xx)     += tqm85xx.o
 obj-$(CONFIG_SBC8560)     += sbc8560.o
 obj-$(CONFIG_SBC8548)     += sbc8548.o
+obj-$(CONFIG_SOCRATES)    += socrates.o socrates_fpga_pic.o
 obj-$(CONFIG_KSI8560)     += ksi8560.o
diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c
index 81cee7bbf2d2..f4d36b5a2e00 100644
--- a/arch/powerpc/platforms/85xx/ksi8560.c
+++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -106,8 +106,6 @@ static void __init ksi8560_pic_init(void)
         cpm2_pic_init(np);
         of_node_put(np);
         set_irq_chained_handler(irq, cpm2_cascade);
-
-        setup_irq(0, NULL);
 #endif
 }
 
@@ -221,6 +219,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
         { .type = "simple-bus", },
         { .name = "cpm", },
         { .name = "localbus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c
index 1bf5aefdfeb1..63efca20d7bd 100644
--- a/arch/powerpc/platforms/85xx/mpc8536_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c
@@ -92,6 +92,7 @@ static struct of_device_id __initdata mpc8536_ds_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 21f009023e26..9438a892afc4 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -226,6 +226,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
         { .name = "cpm", },
         { .name = "localbus", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index aeb6a5bc5522..458d91fba91d 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -179,7 +179,6 @@ static irqreturn_t mpc85xx_8259_cascade_action(int irq, void *dev_id)
 static struct irqaction mpc85xxcds_8259_irqaction = {
         .handler = mpc85xx_8259_cascade_action,
         .flags = IRQF_SHARED,
-        .mask = CPU_MASK_NONE,
         .name = "8259 cascade",
 };
 #endif /* PPC_I8259 */
@@ -336,6 +335,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 7326d904202c..de66de7a9ca2 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -204,6 +204,7 @@ static struct of_device_id __initdata mpc85xxds_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 658a36fab3ab..7dd029034aec 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -265,6 +265,7 @@ static struct of_device_id mpc85xx_ids[] = {
         { .compatible = "simple-bus", },
         { .type = "qe", },
         { .compatible = "fsl,qe", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c
index 7ec77ce12dad..ecdd8c09e4ed 100644
--- a/arch/powerpc/platforms/85xx/sbc8548.c
+++ b/arch/powerpc/platforms/85xx/sbc8548.c
@@ -154,6 +154,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
         { .name = "soc", },
         { .type = "soc", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c
index 472f254a19d2..cc27807a8b64 100644
--- a/arch/powerpc/platforms/85xx/sbc8560.c
+++ b/arch/powerpc/platforms/85xx/sbc8560.c
@@ -213,6 +213,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
         { .name = "cpm", },
         { .name = "localbus", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 79a0df17078b..cc0b0db8a6f3 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -21,6 +21,7 @@
 #include <asm/page.h>
 #include <asm/mpic.h>
 #include <asm/cacheflush.h>
+#include <asm/dbell.h>
 
 #include <sysdev/fsl_soc.h>
 
@@ -80,10 +81,8 @@ smp_85xx_kick_cpu(int nr)
 }
 
 static void __init
-smp_85xx_setup_cpu(int cpu_nr)
+smp_85xx_basic_setup(int cpu_nr)
 {
-        mpic_setup_this_cpu();
-
         /* Clear any pending timer interrupts */
         mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS);
 
@@ -91,15 +90,43 @@ smp_85xx_setup_cpu(int cpu_nr)
         mtspr(SPRN_TCR, TCR_DIE);
 }
 
+static void __init
+smp_85xx_setup_cpu(int cpu_nr)
+{
+        mpic_setup_this_cpu();
+
+        smp_85xx_basic_setup(cpu_nr);
+}
+
 struct smp_ops_t smp_85xx_ops = {
-        .message_pass = smp_mpic_message_pass,
-        .probe = smp_mpic_probe,
         .kick_cpu = smp_85xx_kick_cpu,
-        .setup_cpu = smp_85xx_setup_cpu,
 };
 
-void __init
-mpc85xx_smp_init(void)
+static int __init smp_dummy_probe(void)
 {
+        return NR_CPUS;
+}
+
+void __init mpc85xx_smp_init(void)
+{
+        struct device_node *np;
+
+        smp_85xx_ops.message_pass = NULL;
+
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (np) {
+                smp_85xx_ops.probe = smp_mpic_probe;
+                smp_85xx_ops.setup_cpu = smp_85xx_setup_cpu;
+                smp_85xx_ops.message_pass = smp_mpic_message_pass;
+        } else {
+                smp_85xx_ops.probe = smp_dummy_probe;
+                smp_85xx_ops.setup_cpu = smp_85xx_basic_setup;
+        }
+
+        if (cpu_has_feature(CPU_FTR_DBELL))
+                smp_85xx_ops.message_pass = smp_dbell_message_pass;
+
+        BUG_ON(!smp_85xx_ops.message_pass);
+
         smp_ops = &smp_85xx_ops;
 }
diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c
new file mode 100644
index 000000000000..d0e8443b12c6
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/socrates.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2008 Emcraft Systems
+ * Sergei Poselenov <sposelenov@emcraft.com>
+ *
+ * Based on MPC8560 ADS and arch/ppc tqm85xx ports
+ *
+ * Maintained by Kumar Gala (see MAINTAINERS for contact information)
+ *
+ * Copyright 2008 Freescale Semiconductor Inc.
+ *
+ * Copyright (c) 2005-2006 DENX Software Engineering
+ * Stefan Roese <sr@denx.de>
+ *
+ * Based on original work by
+ *      Kumar Gala <kumar.gala@freescale.com>
+ *      Copyright 2004 Freescale Semiconductor Inc.
+ *
+ * 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/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/of_platform.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/mpic.h>
+#include <asm/prom.h>
+#include <mm/mmu_decl.h>
+#include <asm/udbg.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+#include "socrates_fpga_pic.h"
+
+static void __init socrates_pic_init(void)
+{
+        struct mpic *mpic;
+        struct resource r;
+        struct device_node *np;
+
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (!np) {
+                printk(KERN_ERR "Could not find open-pic node\n");
+                return;
+        }
+
+        if (of_address_to_resource(np, 0, &r)) {
+                printk(KERN_ERR "Could not map mpic register space\n");
+                of_node_put(np);
+                return;
+        }
+
+        mpic = mpic_alloc(np, r.start,
+                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+                        0, 256, " OpenPIC  ");
+        BUG_ON(mpic == NULL);
+        of_node_put(np);
+
+        mpic_init(mpic);
+
+        np = of_find_compatible_node(NULL, NULL, "abb,socrates-fpga-pic");
+        if (!np) {
+                printk(KERN_ERR "Could not find socrates-fpga-pic node\n");
+                return;
+        }
+        socrates_fpga_pic_init(np);
+        of_node_put(np);
+}
+
+/*
+ * Setup the architecture
+ */
+static void __init socrates_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+        struct device_node *np;
+#endif
+
+        if (ppc_md.progress)
+                ppc_md.progress("socrates_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for_each_compatible_node(np, "pci", "fsl,mpc8540-pci")
+                fsl_add_bridge(np, 1);
+#endif
+}
+
+static struct of_device_id __initdata socrates_of_bus_ids[] = {
+        { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
+        {},
+};
+
+static void __init socrates_init(void)
+{
+        of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL);
+}
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init socrates_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "abb,socrates"))
+                return 1;
+
+        return 0;
+}
+
+define_machine(socrates) {
+        .name                   = "Socrates",
+        .probe                  = socrates_probe,
+        .setup_arch             = socrates_setup_arch,
+        .init                   = socrates_init,
+        .init_IRQ               = socrates_pic_init,
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
new file mode 100644
index 000000000000..60edf63d0157
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -0,0 +1,327 @@
+/*
+ *  Copyright (C) 2008 Ilya Yanok, Emcraft Systems
+ *
+ *
+ * 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.
+ *
+ */
+
+#include <linux/irq.h>
+#include <linux/of_platform.h>
+#include <linux/io.h>
+
+/*
+ * The FPGA supports 9 interrupt sources, which can be routed to 3
+ * interrupt request lines of the MPIC. The line to be used can be
+ * specified through the third cell of FDT property  "interrupts".
+ */
+
+#define SOCRATES_FPGA_NUM_IRQS  9
+
+#define FPGA_PIC_IRQCFG         (0x0)
+#define FPGA_PIC_IRQMASK(n)     (0x4 + 0x4 * (n))
+
+#define SOCRATES_FPGA_IRQ_MASK  ((1 << SOCRATES_FPGA_NUM_IRQS) - 1)
+
+struct socrates_fpga_irq_info {
+        unsigned int irq_line;
+        int type;
+};
+
+/*
+ * Interrupt routing and type table
+ *
+ * IRQ_TYPE_NONE means the interrupt type is configurable,
+ * otherwise it's fixed to the specified value.
+ */
+static struct socrates_fpga_irq_info fpga_irqs[SOCRATES_FPGA_NUM_IRQS] = {
+        [0] = {0, IRQ_TYPE_NONE},
+        [1] = {0, IRQ_TYPE_LEVEL_HIGH},
+        [2] = {0, IRQ_TYPE_LEVEL_LOW},
+        [3] = {0, IRQ_TYPE_NONE},
+        [4] = {0, IRQ_TYPE_NONE},
+        [5] = {0, IRQ_TYPE_NONE},
+        [6] = {0, IRQ_TYPE_NONE},
+        [7] = {0, IRQ_TYPE_NONE},
+        [8] = {0, IRQ_TYPE_LEVEL_HIGH},
+};
+
+#define socrates_fpga_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
+
+static DEFINE_SPINLOCK(socrates_fpga_pic_lock);
+
+static void __iomem *socrates_fpga_pic_iobase;
+static struct irq_host *socrates_fpga_pic_irq_host;
+static unsigned int socrates_fpga_irqs[3];
+
+static inline uint32_t socrates_fpga_pic_read(int reg)
+{
+        return in_be32(socrates_fpga_pic_iobase + reg);
+}
+
+static inline void socrates_fpga_pic_write(int reg, uint32_t val)
+{
+        out_be32(socrates_fpga_pic_iobase + reg, val);
+}
+
+static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq)
+{
+        uint32_t cause;
+        unsigned long flags;
+        int i;
+
+        /* Check irq line routed to the MPIC */
+        for (i = 0; i < 3; i++) {
+                if (irq == socrates_fpga_irqs[i])
+                        break;
+        }
+        if (i == 3)
+                return NO_IRQ;
+
+        spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
+        cause = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(i));
+        spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
+        for (i = SOCRATES_FPGA_NUM_IRQS - 1; i >= 0; i--) {
+                if (cause >> (i + 16))
+                        break;
+        }
+        return irq_linear_revmap(socrates_fpga_pic_irq_host,
+                        (irq_hw_number_t)i);
+}
+
+void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        unsigned int cascade_irq;
+
+        /*
+         * See if we actually have an interrupt, call generic handling code if
+         * we do.
+         */
+        cascade_irq = socrates_fpga_pic_get_irq(irq);
+
+        if (cascade_irq != NO_IRQ)
+                generic_handle_irq(cascade_irq);
+        desc->chip->eoi(irq);
+
+}
+
+static void socrates_fpga_pic_ack(unsigned int virq)
+{
+        unsigned long flags;
+        unsigned int hwirq, irq_line;
+        uint32_t mask;
+
+        hwirq = socrates_fpga_irq_to_hw(virq);
+
+        irq_line = fpga_irqs[hwirq].irq_line;
+        spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
+        mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
+                & SOCRATES_FPGA_IRQ_MASK;
+        mask |= (1 << (hwirq + 16));
+        socrates_fpga_pic_write(FPGA_PIC_IRQMASK(irq_line), mask);
+        spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
+}
+
+static void socrates_fpga_pic_mask(unsigned int virq)
+{
+        unsigned long flags;
+        unsigned int hwirq;
+        int irq_line;
+        u32 mask;
+
+        hwirq = socrates_fpga_irq_to_hw(virq);
+
+        irq_line = fpga_irqs[hwirq].irq_line;
+        spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
+        mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
+                & SOCRATES_FPGA_IRQ_MASK;
+        mask &= ~(1 << hwirq);
+        socrates_fpga_pic_write(FPGA_PIC_IRQMASK(irq_line), mask);
+        spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
+}
+
+static void socrates_fpga_pic_mask_ack(unsigned int virq)
+{
+        unsigned long flags;
+        unsigned int hwirq;
+        int irq_line;
+        u32 mask;
+
+        hwirq = socrates_fpga_irq_to_hw(virq);
+
+        irq_line = fpga_irqs[hwirq].irq_line;
+        spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
+        mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
+                & SOCRATES_FPGA_IRQ_MASK;
+        mask &= ~(1 << hwirq);
+        mask |= (1 << (hwirq + 16));
+        socrates_fpga_pic_write(FPGA_PIC_IRQMASK(irq_line), mask);
+        spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
+}
+
+static void socrates_fpga_pic_unmask(unsigned int virq)
+{
+        unsigned long flags;
+        unsigned int hwirq;
+        int irq_line;
+        u32 mask;
+
+        hwirq = socrates_fpga_irq_to_hw(virq);
+
+        irq_line = fpga_irqs[hwirq].irq_line;
+        spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
+        mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
+                & SOCRATES_FPGA_IRQ_MASK;
+        mask |= (1 << hwirq);
+        socrates_fpga_pic_write(FPGA_PIC_IRQMASK(irq_line), mask);
+        spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
+}
+
+static void socrates_fpga_pic_eoi(unsigned int virq)
+{
+        unsigned long flags;
+        unsigned int hwirq;
+        int irq_line;
+        u32 mask;
+
+        hwirq = socrates_fpga_irq_to_hw(virq);
+
+        irq_line = fpga_irqs[hwirq].irq_line;
+        spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
+        mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
+                & SOCRATES_FPGA_IRQ_MASK;
+        mask |= (1 << (hwirq + 16));
+        socrates_fpga_pic_write(FPGA_PIC_IRQMASK(irq_line), mask);
+        spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
+}
+
+static int socrates_fpga_pic_set_type(unsigned int virq,
+                unsigned int flow_type)
+{
+        unsigned long flags;
+        unsigned int hwirq;
+        int polarity;
+        u32 mask;
+
+        hwirq = socrates_fpga_irq_to_hw(virq);
+
+        if (fpga_irqs[hwirq].type != IRQ_TYPE_NONE)
+                return -EINVAL;
+
+        switch (flow_type & IRQ_TYPE_SENSE_MASK) {
+        case IRQ_TYPE_LEVEL_HIGH:
+                polarity = 1;
+                break;
+        case IRQ_TYPE_LEVEL_LOW:
+                polarity = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+        spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
+        mask = socrates_fpga_pic_read(FPGA_PIC_IRQCFG);
+        if (polarity)
+                mask |= (1 << hwirq);
+        else
+                mask &= ~(1 << hwirq);
+        socrates_fpga_pic_write(FPGA_PIC_IRQCFG, mask);
+        spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
+        return 0;
+}
+
+static struct irq_chip socrates_fpga_pic_chip = {
+        .typename       = " FPGA-PIC ",
+        .ack            = socrates_fpga_pic_ack,
+        .mask           = socrates_fpga_pic_mask,
+        .mask_ack       = socrates_fpga_pic_mask_ack,
+        .unmask         = socrates_fpga_pic_unmask,
+        .eoi            = socrates_fpga_pic_eoi,
+        .set_type       = socrates_fpga_pic_set_type,
+};
+
+static int socrates_fpga_pic_host_map(struct irq_host *h, unsigned int virq,
+                irq_hw_number_t hwirq)
+{
+        /* All interrupts are LEVEL sensitive */
+        get_irq_desc(virq)->status |= IRQ_LEVEL;
+        set_irq_chip_and_handler(virq, &socrates_fpga_pic_chip,
+                        handle_fasteoi_irq);
+
+        return 0;
+}
+
+static int socrates_fpga_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)
+{
+        struct socrates_fpga_irq_info *fpga_irq = &fpga_irqs[intspec[0]];
+
+        *out_hwirq = intspec[0];
+        if  (fpga_irq->type == IRQ_TYPE_NONE) {
+                /* type is configurable */
+                if (intspec[1] != IRQ_TYPE_LEVEL_LOW &&
+                    intspec[1] != IRQ_TYPE_LEVEL_HIGH) {
+                        pr_warning("FPGA PIC: invalid irq type, "
+                                   "setting default active low\n");
+                        *out_flags = IRQ_TYPE_LEVEL_LOW;
+                } else {
+                        *out_flags = intspec[1];
+                }
+        } else {
+                /* type is fixed */
+                *out_flags = fpga_irq->type;
+        }
+
+        /* Use specified interrupt routing */
+        if (intspec[2] <= 2)
+                fpga_irq->irq_line = intspec[2];
+        else
+                pr_warning("FPGA PIC: invalid irq routing\n");
+
+        return 0;
+}
+
+static struct irq_host_ops socrates_fpga_pic_host_ops = {
+        .map    = socrates_fpga_pic_host_map,
+        .xlate  = socrates_fpga_pic_host_xlate,
+};
+
+void socrates_fpga_pic_init(struct device_node *pic)
+{
+        unsigned long flags;
+        int i;
+
+        /* Setup an irq_host structure */
+        socrates_fpga_pic_irq_host = irq_alloc_host(pic, IRQ_HOST_MAP_LINEAR,
+                        SOCRATES_FPGA_NUM_IRQS, &socrates_fpga_pic_host_ops,
+                        SOCRATES_FPGA_NUM_IRQS);
+        if (socrates_fpga_pic_irq_host == NULL) {
+                pr_err("FPGA PIC: Unable to allocate host\n");
+                return;
+        }
+
+        for (i = 0; i < 3; i++) {
+                socrates_fpga_irqs[i] = irq_of_parse_and_map(pic, i);
+                if (socrates_fpga_irqs[i] == NO_IRQ) {
+                        pr_warning("FPGA PIC: can't get irq%d.\n", i);
+                        continue;
+                }
+                set_irq_chained_handler(socrates_fpga_irqs[i],
+                                socrates_fpga_pic_cascade);
+        }
+
+        socrates_fpga_pic_iobase = of_iomap(pic, 0);
+
+        spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
+        socrates_fpga_pic_write(FPGA_PIC_IRQMASK(0),
+                        SOCRATES_FPGA_IRQ_MASK << 16);
+        socrates_fpga_pic_write(FPGA_PIC_IRQMASK(1),
+                        SOCRATES_FPGA_IRQ_MASK << 16);
+        socrates_fpga_pic_write(FPGA_PIC_IRQMASK(2),
+                        SOCRATES_FPGA_IRQ_MASK << 16);
+        spin_unlock_irqrestore(&socrates_fpga_pic_lock, flags);
+
+        pr_info("FPGA PIC: Setting up Socrates FPGA PIC\n");
+}
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.h b/arch/powerpc/platforms/85xx/socrates_fpga_pic.h
new file mode 100644
index 000000000000..21d7d8e42199
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.h
@@ -0,0 +1,16 @@
+/*
+ *  Copyright (C) 2008 Ilya Yanok, Emcraft Systems
+ *
+ *
+ * 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.
+ *
+ */
+
+#ifndef SOCRATES_FPGA_PIC_H
+#define SOCRATES_FPGA_PIC_H
+
+void socrates_fpga_pic_init(struct device_node *pic);
+
+#endif
diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index 0cca8f5cb272..f559918f3c6f 100644
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -145,6 +145,7 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)
 
 static struct of_device_id __initdata of_bus_ids[] = {
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 2933a8e827d9..5b0ab9966e90 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -153,6 +153,7 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m)
 
 static struct of_device_id __initdata of_bus_ids[] = {
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 8e5693935975..fdaf4ddaa955 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,7 +1,7 @@
 config PPC_86xx
 menuconfig PPC_86xx
         bool "86xx-based boards"
-        depends on 6xx && PPC_MULTIPLATFORM
+        depends on 6xx
         select FSL_SOC
         select ALTIVEC
         help
@@ -31,6 +31,22 @@ config MPC8610_HPCD
         help
           This option enables support for the MPC8610 HPCD board.
 
+config GEF_PPC9A
+        bool "GE Fanuc PPC9A"
+        select DEFAULT_UIMAGE
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        help
+          This option enables support for GE Fanuc's PPC9A.
+
+config GEF_SBC310
+        bool "GE Fanuc SBC310"
+        select DEFAULT_UIMAGE
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        help
+          This option enables support for GE Fanuc's SBC310.
+
 config GEF_SBC610
         bool "GE Fanuc SBC610"
         select DEFAULT_UIMAGE
@@ -48,7 +64,7 @@ config MPC8641
         select FSL_PCI if PCI
         select PPC_UDBG_16550
         select MPIC
-        default y if MPC8641_HPCN || SBC8641D || GEF_SBC610
+        default y if MPC8641_HPCN || SBC8641D || GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
 
 config MPC8610
         bool
diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 31e540c2ebbc..4b0d7b1aa005 100644
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -9,3 +9,5 @@ obj-$(CONFIG_SBC8641D)		+= sbc8641d.o
 obj-$(CONFIG_MPC8610_HPCD)      += mpc8610_hpcd.o
 gef-gpio-$(CONFIG_GPIOLIB)      += gef_gpio.o
 obj-$(CONFIG_GEF_SBC610)        += gef_sbc610.o gef_pic.o $(gef-gpio-y)
+obj-$(CONFIG_GEF_SBC310)        += gef_sbc310.o gef_pic.o $(gef-gpio-y)
+obj-$(CONFIG_GEF_PPC9A)         += gef_ppc9a.o gef_pic.o $(gef-gpio-y)
diff --git a/arch/powerpc/platforms/86xx/gef_gpio.c b/arch/powerpc/platforms/86xx/gef_gpio.c
index 85b2800f4cb7..b2ea8875adba 100644
--- a/arch/powerpc/platforms/86xx/gef_gpio.c
+++ b/arch/powerpc/platforms/86xx/gef_gpio.c
@@ -37,8 +37,6 @@
 #define GEF_GPIO_OVERRUN        0x1C
 #define GEF_GPIO_MODE           0x20
 
-#define NUM_GPIO 19
-
 static void _gef_gpio_set(void __iomem *reg, unsigned int offset, int value)
 {
         unsigned int data;
@@ -103,10 +101,10 @@ static void gef_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 static int __init gef_gpio_init(void)
 {
         struct device_node *np;
+        int retval;
+        struct of_mm_gpio_chip *gef_gpio_chip;
 
         for_each_compatible_node(np, NULL, "gef,sbc610-gpio") {
-                int retval;
-                struct of_mm_gpio_chip *gef_gpio_chip;
 
                 pr_debug("%s: Initialising GEF GPIO\n", np->full_name);
 
@@ -120,7 +118,35 @@ static int __init gef_gpio_init(void)
 
                 /* Setup pointers to chip functions */
                 gef_gpio_chip->of_gc.gpio_cells = 2;
-                gef_gpio_chip->of_gc.gc.ngpio = NUM_GPIO;
+                gef_gpio_chip->of_gc.gc.ngpio = 19;
+                gef_gpio_chip->of_gc.gc.direction_input = gef_gpio_dir_in;
+                gef_gpio_chip->of_gc.gc.direction_output = gef_gpio_dir_out;
+                gef_gpio_chip->of_gc.gc.get = gef_gpio_get;
+                gef_gpio_chip->of_gc.gc.set = gef_gpio_set;
+
+                /* This function adds a memory mapped GPIO chip */
+                retval = of_mm_gpiochip_add(np, gef_gpio_chip);
+                if (retval) {
+                        kfree(gef_gpio_chip);
+                        pr_err("%s: Unable to add GPIO\n", np->full_name);
+                }
+        }
+
+        for_each_compatible_node(np, NULL, "gef,sbc310-gpio") {
+
+                pr_debug("%s: Initialising GEF GPIO\n", np->full_name);
+
+                /* Allocate chip structure */
+                gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL);
+                if (!gef_gpio_chip) {
+                        pr_err("%s: Unable to allocate structure\n",
+                                np->full_name);
+                        continue;
+                }
+
+                /* Setup pointers to chip functions */
+                gef_gpio_chip->of_gc.gpio_cells = 2;
+                gef_gpio_chip->of_gc.gc.ngpio = 6;
                 gef_gpio_chip->of_gc.gc.direction_input = gef_gpio_dir_in;
                 gef_gpio_chip->of_gc.gc.direction_output = gef_gpio_dir_out;
                 gef_gpio_chip->of_gc.gc.get = gef_gpio_get;
diff --git a/arch/powerpc/platforms/86xx/gef_ppc9a.c b/arch/powerpc/platforms/86xx/gef_ppc9a.c
new file mode 100644
index 000000000000..d79104669cdc
--- /dev/null
+++ b/arch/powerpc/platforms/86xx/gef_ppc9a.c
@@ -0,0 +1,224 @@
+/*
+ * GE Fanuc PPC9A board support
+ *
+ * Author: Martyn Welch <martyn.welch@gefanuc.com>
+ *
+ * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+ *
+ * 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.
+ *
+ * Based on: mpc86xx_hpcn.c (MPC86xx HPCN board specific routines)
+ * Copyright 2006 Freescale Semiconductor Inc.
+ *
+ * NEC fixup adapted from arch/mips/pci/fixup-lm2e.c
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/of_platform.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/mpc86xx.h>
+#include <asm/prom.h>
+#include <mm/mmu_decl.h>
+#include <asm/udbg.h>
+
+#include <asm/mpic.h>
+
+#include <sysdev/fsl_pci.h>
+#include <sysdev/fsl_soc.h>
+
+#include "mpc86xx.h"
+#include "gef_pic.h"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG (fmt...) do { printk(KERN_ERR "PPC9A: " fmt); } while (0)
+#else
+#define DBG (fmt...) do { } while (0)
+#endif
+
+void __iomem *ppc9a_regs;
+
+static void __init gef_ppc9a_init_irq(void)
+{
+        struct device_node *cascade_node = NULL;
+
+        mpc86xx_init_irq();
+
+        /*
+         * There is a simple interrupt handler in the main FPGA, this needs
+         * to be cascaded into the MPIC
+         */
+        cascade_node = of_find_compatible_node(NULL, NULL, "gef,fpga-pic-1.00");
+        if (!cascade_node) {
+                printk(KERN_WARNING "PPC9A: No FPGA PIC\n");
+                return;
+        }
+
+        gef_pic_init(cascade_node);
+        of_node_put(cascade_node);
+}
+
+static void __init gef_ppc9a_setup_arch(void)
+{
+        struct device_node *regs;
+#ifdef CONFIG_PCI
+        struct device_node *np;
+
+        for_each_compatible_node(np, "pci", "fsl,mpc8641-pcie") {
+                fsl_add_bridge(np, 1);
+        }
+#endif
+
+        printk(KERN_INFO "GE Fanuc Intelligent Platforms PPC9A 6U VME SBC\n");
+
+#ifdef CONFIG_SMP
+        mpc86xx_smp_init();
+#endif
+
+        /* Remap basic board registers */
+        regs = of_find_compatible_node(NULL, NULL, "gef,ppc9a-fpga-regs");
+        if (regs) {
+                ppc9a_regs = of_iomap(regs, 0);
+                if (ppc9a_regs == NULL)
+                        printk(KERN_WARNING "Unable to map board registers\n");
+                of_node_put(regs);
+        }
+}
+
+/* Return the PCB revision */
+static unsigned int gef_ppc9a_get_pcb_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(ppc9a_regs);
+        return (reg >> 8) & 0xff;
+}
+
+/* Return the board (software) revision */
+static unsigned int gef_ppc9a_get_board_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(ppc9a_regs);
+        return (reg >> 16) & 0xff;
+}
+
+/* Return the FPGA revision */
+static unsigned int gef_ppc9a_get_fpga_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(ppc9a_regs);
+        return (reg >> 24) & 0xf;
+}
+
+static void gef_ppc9a_show_cpuinfo(struct seq_file *m)
+{
+        uint svid = mfspr(SPRN_SVR);
+
+        seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
+
+        seq_printf(m, "Revision\t: %u%c\n", gef_ppc9a_get_pcb_rev(),
+                ('A' + gef_ppc9a_get_board_rev() - 1));
+        seq_printf(m, "FPGA Revision\t: %u\n", gef_ppc9a_get_fpga_rev());
+
+        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
+}
+
+static void __init gef_ppc9a_nec_fixup(struct pci_dev *pdev)
+{
+        unsigned int val;
+
+        /* Do not do the fixup on other platforms! */
+        if (!machine_is(gef_ppc9a))
+                return;
+
+        printk(KERN_INFO "Running NEC uPD720101 Fixup\n");
+
+        /* Ensure ports 1, 2, 3, 4 & 5 are enabled */
+        pci_read_config_dword(pdev, 0xe0, &val);
+        pci_write_config_dword(pdev, 0xe0, (val & ~7) | 0x5);
+
+        /* System clock is 48-MHz Oscillator and EHCI Enabled. */
+        pci_write_config_dword(pdev, 0xe4, 1 << 5);
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,
+        gef_ppc9a_nec_fixup);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ *
+ * This function is called to determine whether the BSP is compatible with the
+ * supplied device-tree, which is assumed to be the correct one for the actual
+ * board. It is expected thati, in the future, a kernel may support multiple
+ * boards.
+ */
+static int __init gef_ppc9a_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "gef,ppc9a"))
+                return 1;
+
+        return 0;
+}
+
+static long __init mpc86xx_time_init(void)
+{
+        unsigned int temp;
+
+        /* Set the time base to zero */
+        mtspr(SPRN_TBWL, 0);
+        mtspr(SPRN_TBWU, 0);
+
+        temp = mfspr(SPRN_HID0);
+        temp |= HID0_TBEN;
+        mtspr(SPRN_HID0, temp);
+        asm volatile("isync");
+
+        return 0;
+}
+
+static __initdata struct of_device_id of_bus_ids[] = {
+        { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        printk(KERN_DEBUG "Probe platform devices\n");
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(gef_ppc9a, declare_of_platform_devices);
+
+define_machine(gef_ppc9a) {
+        .name                   = "GE Fanuc PPC9A",
+        .probe                  = gef_ppc9a_probe,
+        .setup_arch             = gef_ppc9a_setup_arch,
+        .init_IRQ               = gef_ppc9a_init_irq,
+        .show_cpuinfo           = gef_ppc9a_show_cpuinfo,
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .time_init              = mpc86xx_time_init,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+};
diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c
new file mode 100644
index 000000000000..af14f852d747
--- /dev/null
+++ b/arch/powerpc/platforms/86xx/gef_sbc310.c
@@ -0,0 +1,235 @@
+/*
+ * GE Fanuc SBC310 board support
+ *
+ * Author: Martyn Welch <martyn.welch@gefanuc.com>
+ *
+ * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+ *
+ * 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.
+ *
+ * Based on: mpc86xx_hpcn.c (MPC86xx HPCN board specific routines)
+ * Copyright 2006 Freescale Semiconductor Inc.
+ *
+ * NEC fixup adapted from arch/mips/pci/fixup-lm2e.c
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/of_platform.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/mpc86xx.h>
+#include <asm/prom.h>
+#include <mm/mmu_decl.h>
+#include <asm/udbg.h>
+
+#include <asm/mpic.h>
+
+#include <sysdev/fsl_pci.h>
+#include <sysdev/fsl_soc.h>
+
+#include "mpc86xx.h"
+#include "gef_pic.h"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG (fmt...) do { printk(KERN_ERR "SBC310: " fmt); } while (0)
+#else
+#define DBG (fmt...) do { } while (0)
+#endif
+
+void __iomem *sbc310_regs;
+
+static void __init gef_sbc310_init_irq(void)
+{
+        struct device_node *cascade_node = NULL;
+
+        mpc86xx_init_irq();
+
+        /*
+         * There is a simple interrupt handler in the main FPGA, this needs
+         * to be cascaded into the MPIC
+         */
+        cascade_node = of_find_compatible_node(NULL, NULL, "gef,fpga-pic");
+        if (!cascade_node) {
+                printk(KERN_WARNING "SBC310: No FPGA PIC\n");
+                return;
+        }
+
+        gef_pic_init(cascade_node);
+        of_node_put(cascade_node);
+}
+
+static void __init gef_sbc310_setup_arch(void)
+{
+        struct device_node *regs;
+#ifdef CONFIG_PCI
+        struct device_node *np;
+
+        for_each_compatible_node(np, "pci", "fsl,mpc8641-pcie") {
+                fsl_add_bridge(np, 1);
+        }
+#endif
+
+        printk(KERN_INFO "GE Fanuc Intelligent Platforms SBC310 6U VPX SBC\n");
+
+#ifdef CONFIG_SMP
+        mpc86xx_smp_init();
+#endif
+
+        /* Remap basic board registers */
+        regs = of_find_compatible_node(NULL, NULL, "gef,fpga-regs");
+        if (regs) {
+                sbc310_regs = of_iomap(regs, 0);
+                if (sbc310_regs == NULL)
+                        printk(KERN_WARNING "Unable to map board registers\n");
+                of_node_put(regs);
+        }
+}
+
+/* Return the PCB revision */
+static unsigned int gef_sbc310_get_board_id(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(sbc310_regs);
+        return reg & 0xff;
+}
+
+/* Return the PCB revision */
+static unsigned int gef_sbc310_get_pcb_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(sbc310_regs);
+        return (reg >> 8) & 0xff;
+}
+
+/* Return the board (software) revision */
+static unsigned int gef_sbc310_get_board_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(sbc310_regs);
+        return (reg >> 16) & 0xff;
+}
+
+/* Return the FPGA revision */
+static unsigned int gef_sbc310_get_fpga_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(sbc310_regs);
+        return (reg >> 24) & 0xf;
+}
+
+static void gef_sbc310_show_cpuinfo(struct seq_file *m)
+{
+        uint svid = mfspr(SPRN_SVR);
+
+        seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
+
+        seq_printf(m, "Board ID\t: 0x%2.2x\n", gef_sbc310_get_board_id());
+        seq_printf(m, "Revision\t: %u%c\n", gef_sbc310_get_pcb_rev(),
+                ('A' + gef_sbc310_get_board_rev() - 1));
+        seq_printf(m, "FPGA Revision\t: %u\n", gef_sbc310_get_fpga_rev());
+
+        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
+
+}
+
+static void __init gef_sbc310_nec_fixup(struct pci_dev *pdev)
+{
+        unsigned int val;
+
+        /* Do not do the fixup on other platforms! */
+        if (!machine_is(gef_sbc310))
+                return;
+
+        printk(KERN_INFO "Running NEC uPD720101 Fixup\n");
+
+        /* Ensure only ports 1 & 2 are enabled */
+        pci_read_config_dword(pdev, 0xe0, &val);
+        pci_write_config_dword(pdev, 0xe0, (val & ~7) | 0x2);
+
+        /* System clock is 48-MHz Oscillator and EHCI Enabled. */
+        pci_write_config_dword(pdev, 0xe4, 1 << 5);
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,
+        gef_sbc310_nec_fixup);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ *
+ * This function is called to determine whether the BSP is compatible with the
+ * supplied device-tree, which is assumed to be the correct one for the actual
+ * board. It is expected thati, in the future, a kernel may support multiple
+ * boards.
+ */
+static int __init gef_sbc310_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "gef,sbc310"))
+                return 1;
+
+        return 0;
+}
+
+static long __init mpc86xx_time_init(void)
+{
+        unsigned int temp;
+
+        /* Set the time base to zero */
+        mtspr(SPRN_TBWL, 0);
+        mtspr(SPRN_TBWU, 0);
+
+        temp = mfspr(SPRN_HID0);
+        temp |= HID0_TBEN;
+        mtspr(SPRN_HID0, temp);
+        asm volatile("isync");
+
+        return 0;
+}
+
+static __initdata struct of_device_id of_bus_ids[] = {
+        { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        printk(KERN_DEBUG "Probe platform devices\n");
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(gef_sbc310, declare_of_platform_devices);
+
+define_machine(gef_sbc310) {
+        .name                   = "GE Fanuc SBC310",
+        .probe                  = gef_sbc310_probe,
+        .setup_arch             = gef_sbc310_setup_arch,
+        .init_IRQ               = gef_sbc310_init_irq,
+        .show_cpuinfo           = gef_sbc310_show_cpuinfo,
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .time_init              = mpc86xx_time_init,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+};
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index fb371f5ce132..ea2360639652 100644
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -142,6 +142,10 @@ static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev)
 {
         unsigned int val;
 
+        /* Do not do the fixup on other platforms! */
+        if (!machine_is(gef_sbc610))
+                return;
+
         printk(KERN_INFO "Running NEC uPD720101 Fixup\n");
 
         /* Ensure ports 1, 2, 3, 4 & 5 are enabled */
@@ -190,6 +194,7 @@ static long __init mpc86xx_time_init(void)
 
 static __initdata struct of_device_id of_bus_ids[] = {
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index e8d54ac5292c..3f49a6f893a3 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -46,6 +46,7 @@ static unsigned char *pixis_bdcfg0, *pixis_arch;
 static struct of_device_id __initdata mpc8610_ids[] = {
         { .compatible = "fsl,mpc8610-immr", },
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {}
 };
 
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 27e0e682d8e1..c4ec49b5f7f8 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -148,6 +148,7 @@ mpc86xx_time_init(void)
 static __initdata struct of_device_id of_bus_ids[] = {
         { .compatible = "simple-bus", },
         { .compatible = "fsl,rapidio-delta", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index 5fd7ed40986f..2886a36fc085 100644
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -103,6 +103,7 @@ mpc86xx_time_init(void)
 
 static __initdata struct of_device_id of_bus_ids[] = {
         { .compatible = "simple-bus", },
+        { .compatible = "gianfar", },
         {},
 };
 
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 0d9f75c74f8c..385acfc48397 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -44,7 +44,6 @@ static irqreturn_t timebase_interrupt(int irq, void *dev)
 
 static struct irqaction tbint_irqaction = {
         .handler = timebase_interrupt,
-        .mask = CPU_MASK_NONE,
         .name = "tbint",
 };
 
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 200b9cb900ea..e3e87078d03f 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,14 +1,5 @@
 menu "Platform support"
 
-config PPC_MULTIPLATFORM
-        bool
-        depends on PPC64 || 6xx
-        default y
-
-config CLASSIC32
-        def_bool y
-        depends on 6xx && PPC_MULTIPLATFORM
-
 source "arch/powerpc/platforms/pseries/Kconfig"
 source "arch/powerpc/platforms/iseries/Kconfig"
 source "arch/powerpc/platforms/chrp/Kconfig"
@@ -28,15 +19,28 @@ source "arch/powerpc/platforms/86xx/Kconfig"
 source "arch/powerpc/platforms/embedded6xx/Kconfig"
 source "arch/powerpc/platforms/44x/Kconfig"
 source "arch/powerpc/platforms/40x/Kconfig"
+source "arch/powerpc/platforms/amigaone/Kconfig"
 
 config PPC_NATIVE
         bool
-        depends on PPC_MULTIPLATFORM
+        depends on 6xx || PPC64
         help
           Support for running natively on the hardware, i.e. without
           a hypervisor. This option is not user-selectable but should
           be selected by all platforms that need it.
 
+config PPC_OF_BOOT_TRAMPOLINE
+        bool "Support booting from Open Firmware or yaboot"
+        depends on 6xx || PPC64
+        default y
+        help
+          Support from booting from Open Firmware or yaboot using an
+          Open Firmware client interface. This enables the kernel to
+          communicate with open firmware to retrieve system informations
+          such as the device tree.
+
+          In case of doubt, say Y
+
 config UDBG_RTAS_CONSOLE
         bool "RTAS based debug console"
         depends on PPC_RTAS
@@ -70,7 +74,7 @@ config PPC_I8259
 
 config U3_DART
         bool
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64
         default n
 
 config PPC_RTAS
@@ -91,15 +95,6 @@ config RTAS_FLASH
         tristate "Firmware flash interface"
         depends on PPC64 && RTAS_PROC
 
-config PPC_PMI
-        tristate "Support for PMI"
-        depends on PPC_IBM_CELL_BLADE
-        help
-          PMI (Platform Management Interrupt) is a way to
-          communicate with the BMC (Baseboard Management Controller).
-          It is used in some IBM Cell blades.
-        default m
-
 config MMIO_NVRAM
         bool
         default n
@@ -196,7 +191,7 @@ config PPC601_SYNC_FIX
 
 config TAU
         bool "On-chip CPU temperature sensor support"
-        depends on CLASSIC32
+        depends on 6xx
         help
           G3 and G4 processors have an on-chip temperature sensor called the
           'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die
@@ -274,7 +269,7 @@ config CPM2
 
 config AXON_RAM
         tristate "Axon DDR2 memory device driver"
-        depends on PPC_IBM_CELL_BLADE
+        depends on PPC_IBM_CELL_BLADE && BLOCK
         default m
         help
           It registers one block device per Axon's DDR2 memory bank found
@@ -298,7 +293,7 @@ config CPM
 config OF_RTC
         bool
         help
-          Uses information from the OF or flattened device tree to instatiate
+          Uses information from the OF or flattened device tree to instantiate
           platform devices for direct mapped RTC chips like the DS1742 or DS1743.
 
 source "arch/powerpc/sysdev/bestcomm/Kconfig"
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index dc0f3c933518..732ee93a8e98 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -58,9 +58,17 @@ config E200
 
 endchoice
 
+# Until we have a choice of exclusive CPU types on 64-bit, we always
+# use PPC_BOOK3S. On 32-bit, this is equivalent to 6xx which is
+# "classic" MMU
+
+config PPC_BOOK3S
+       def_bool y
+       depends on PPC64 || 6xx
+
 config POWER4_ONLY
         bool "Optimize for POWER4"
-        depends on PPC64
+        depends on PPC64 && PPC_BOOK3S
         default n
         ---help---
           Cause the compiler to optimize for POWER4/POWER5/PPC970 processors.
@@ -69,16 +77,16 @@ config POWER4_ONLY
 
 config POWER3
         bool
-        depends on PPC64
+        depends on PPC64 && PPC_BOOK3S
         default y if !POWER4_ONLY
 
 config POWER4
-        depends on PPC64
+        depends on PPC64 && PPC_BOOK3S
         def_bool y
 
 config TUNE_CELL
         bool "Optimize for Cell Broadband Engine"
-        depends on PPC64
+        depends on PPC64 && PPC_BOOK3S
         help
           Cause the compiler to optimize for the PPE of the Cell Broadband
           Engine. This will make the code run considerably faster on Cell
@@ -148,7 +156,7 @@ config PHYS_64BIT
 
 config ALTIVEC
         bool "AltiVec Support"
-        depends on CLASSIC32 || POWER4
+        depends on 6xx || POWER4
         ---help---
           This option enables kernel support for the Altivec extensions to the
           PowerPC processor. The kernel currently supports saving and restoring
@@ -211,6 +219,10 @@ config PPC_MMU_NOHASH
         def_bool y
         depends on !PPC_STD_MMU
 
+config PPC_BOOK3E_MMU
+        def_bool y
+        depends on FSL_BOOKE
+
 config PPC_MM_SLICES
         bool
         default y if HUGETLB_PAGE || (PPC_STD_MMU_64 && PPC_64K_PAGES)
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 8079e0b4fd69..f7419198e635 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_PPC_PASEMI)	+= pasemi/
 obj-$(CONFIG_PPC_CELL)          += cell/
 obj-$(CONFIG_PPC_PS3)           += ps3/
 obj-$(CONFIG_EMBEDDED6xx)       += embedded6xx/
+obj-$(CONFIG_AMIGAONE)          += amigaone/
diff --git a/arch/powerpc/platforms/amigaone/Kconfig b/arch/powerpc/platforms/amigaone/Kconfig
new file mode 100644
index 000000000000..022476717718
--- /dev/null
+++ b/arch/powerpc/platforms/amigaone/Kconfig
@@ -0,0 +1,18 @@
+config AMIGAONE
+        bool "Eyetech AmigaOne/MAI Teron"
+        depends on 6xx && BROKEN_ON_SMP
+        select PPC_I8259
+        select PPC_INDIRECT_PCI
+        select PPC_UDBG_16550
+        select PCI
+        select NOT_COHERENT_CACHE
+        select CHECK_CACHE_COHERENCY
+        select DEFAULT_UIMAGE
+        select PCSPKR_PLATFORM
+        help
+        Select AmigaOne for the following machines:
+        - AmigaOne SE/Teron CX (G3 only)
+        - AmigaOne XE/Teron PX
+        - uA1/Teron mini
+          More information is available at:
+          <http://amigaone-linux.sourceforge.net/>.
diff --git a/arch/powerpc/platforms/amigaone/Makefile b/arch/powerpc/platforms/amigaone/Makefile
new file mode 100644
index 000000000000..e6885b3b2ee7
--- /dev/null
+++ b/arch/powerpc/platforms/amigaone/Makefile
@@ -0,0 +1 @@
+obj-y   += setup.o
diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
new file mode 100644
index 000000000000..443035366c12
--- /dev/null
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -0,0 +1,170 @@
+/*
+ * AmigaOne platform setup
+ *
+ * Copyright 2008 Gerhard Pircher (gerhard_pircher@gmx.net)
+ *
+ *   Based on original amigaone_setup.c source code
+ * Copyright 2003 by Hans-Joerg Frieden and Thomas Frieden
+ *
+ * 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/kernel.h>
+#include <linux/seq_file.h>
+#include <linux/utsrelease.h>
+
+#include <asm/machdep.h>
+#include <asm/cputable.h>
+#include <asm/prom.h>
+#include <asm/pci-bridge.h>
+#include <asm/i8259.h>
+#include <asm/time.h>
+#include <asm/udbg.h>
+
+extern void __flush_disable_L1(void);
+
+void amigaone_show_cpuinfo(struct seq_file *m)
+{
+        seq_printf(m, "vendor\t\t: Eyetech Ltd.\n");
+}
+
+static int __init amigaone_add_bridge(struct device_node *dev)
+{
+        const u32 *cfg_addr, *cfg_data;
+        int len;
+        const int *bus_range;
+        struct pci_controller *hose;
+
+        printk(KERN_INFO "Adding PCI host bridge %s\n", dev->full_name);
+
+        cfg_addr = of_get_address(dev, 0, NULL, NULL);
+        cfg_data = of_get_address(dev, 1, NULL, NULL);
+        if ((cfg_addr == NULL) || (cfg_data == NULL))
+                return -ENODEV;
+
+        bus_range = of_get_property(dev, "bus-range", &len);
+        if ((bus_range == NULL) || (len < 2 * sizeof(int)))
+                printk(KERN_WARNING "Can't get bus-range for %s, assume"
+                       " bus 0\n", dev->full_name);
+
+        hose = pcibios_alloc_controller(dev);
+        if (hose == NULL)
+                return -ENOMEM;
+
+        hose->first_busno = bus_range ? bus_range[0] : 0;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+
+        setup_indirect_pci(hose, cfg_addr[0], cfg_data[0], 0);
+
+        /* Interpret the "ranges" property */
+        /* This also maps the I/O region and sets isa_io/mem_base */
+        pci_process_bridge_OF_ranges(hose, dev, 1);
+
+        return 0;
+}
+
+void __init amigaone_setup_arch(void)
+{
+        struct device_node *np;
+        int phb = -ENODEV;
+
+        /* Lookup PCI host bridges. */
+        for_each_compatible_node(np, "pci", "mai-logic,articia-s")
+                phb = amigaone_add_bridge(np);
+
+        BUG_ON(phb != 0);
+
+        if (ppc_md.progress)
+                ppc_md.progress("Linux/PPC "UTS_RELEASE"\n", 0);
+}
+
+void __init amigaone_init_IRQ(void)
+{
+        struct device_node *pic, *np = NULL;
+        const unsigned long *prop = NULL;
+        unsigned long int_ack = 0;
+
+        /* Search for ISA interrupt controller. */
+        pic = of_find_compatible_node(NULL, "interrupt-controller",
+                                      "pnpPNP,000");
+        BUG_ON(pic == NULL);
+
+        /* Look for interrupt acknowledge address in the PCI root node. */
+        np = of_find_compatible_node(NULL, "pci", "mai-logic,articia-s");
+        if (np) {
+                prop = of_get_property(np, "8259-interrupt-acknowledge", NULL);
+                if (prop)
+                        int_ack = prop[0];
+                of_node_put(np);
+        }
+
+        if (int_ack == 0)
+                printk(KERN_WARNING "Cannot find PCI interrupt acknowledge"
+                       " address, polling\n");
+
+        i8259_init(pic, int_ack);
+        ppc_md.get_irq = i8259_irq;
+        irq_set_default_host(i8259_get_host());
+}
+
+void __init amigaone_init(void)
+{
+        request_region(0x00, 0x20, "dma1");
+        request_region(0x40, 0x20, "timer");
+        request_region(0x80, 0x10, "dma page reg");
+        request_region(0xc0, 0x20, "dma2");
+}
+
+void amigaone_restart(char *cmd)
+{
+        local_irq_disable();
+
+        /* Flush and disable caches. */
+        __flush_disable_L1();
+
+        /* Set SRR0 to the reset vector and turn on MSR_IP. */
+        mtspr(SPRN_SRR0, 0xfff00100);
+        mtspr(SPRN_SRR1, MSR_IP);
+
+        /* Do an rfi to jump back to firmware. */
+        __asm__ __volatile__("rfi" : : : "memory");
+
+        /* Not reached. */
+        while (1);
+}
+
+static int __init amigaone_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "eyetech,amigaone")) {
+                /*
+                 * Coherent memory access cause complete system lockup! Thus
+                 * disable this CPU feature, even if the CPU needs it.
+                 */
+                cur_cpu_spec->cpu_features &= ~CPU_FTR_NEED_COHERENT;
+
+                ISA_DMA_THRESHOLD = 0x00ffffff;
+                DMA_MODE_READ = 0x44;
+                DMA_MODE_WRITE = 0x48;
+
+                return 1;
+        }
+
+        return 0;
+}
+
+define_machine(amigaone) {
+        .name                   = "AmigaOne",
+        .probe                  = amigaone_probe,
+        .setup_arch             = amigaone_setup_arch,
+        .init                   = amigaone_init,
+        .show_cpuinfo           = amigaone_show_cpuinfo,
+        .init_IRQ               = amigaone_init_IRQ,
+        .restart                = amigaone_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 5cc3279559a4..40e24c39ad06 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -23,7 +23,7 @@ config PPC_CELL_NATIVE
 
 config PPC_IBM_CELL_BLADE
         bool "IBM Cell Blade"
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         select PPC_CELL_NATIVE
         select MMIO_NVRAM
         select PPC_UDBG_16550
@@ -31,7 +31,7 @@ config PPC_IBM_CELL_BLADE
 
 config PPC_CELLEB
         bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         select PPC_CELL_NATIVE
         select HAS_TXX9_SERIAL
         select PPC_UDBG_BEAT
@@ -40,9 +40,14 @@ config PPC_CELLEB
 
 config PPC_CELL_QPACE
         bool "IBM Cell - QPACE"
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         select PPC_CELL_COMMON
 
+config AXON_MSI
+        bool
+        depends on PPC_IBM_CELL_BLADE && PCI_MSI
+        default y
+
 menu "Cell Broadband Engine options"
         depends on PPC_CELL
 
@@ -98,7 +103,7 @@ config PPC_IBM_CELL_RESETBUTTON
 
 config PPC_IBM_CELL_POWERBUTTON
         tristate "IBM Cell Blade power button"
-        depends on PPC_IBM_CELL_BLADE && PPC_PMI && INPUT_EVDEV
+        depends on PPC_IBM_CELL_BLADE && INPUT_EVDEV
         default y
         help
           Support Powerbutton on IBM Cell blades.
@@ -118,9 +123,9 @@ config CBE_CPUFREQ
           For details, take a look at <file:Documentation/cpu-freq/>.
           If you don't have such processor, say N
 
-config CBE_CPUFREQ_PMI
-        tristate "CBE frequency scaling using PMI interface"
-        depends on CBE_CPUFREQ && PPC_PMI && EXPERIMENTAL
+config CBE_CPUFREQ_PMI_ENABLE
+        bool "CBE frequency scaling using PMI interface"
+        depends on CBE_CPUFREQ && EXPERIMENTAL
         default n
         help
           Select this, if you want to use the PMI interface
@@ -128,6 +133,20 @@ config CBE_CPUFREQ_PMI
           processor will not only be able to run at lower speed,
           but also at lower core voltage.
 
+config CBE_CPUFREQ_PMI
+        tristate
+        depends on CBE_CPUFREQ_PMI_ENABLE
+        default CBE_CPUFREQ
+
+config PPC_PMI
+        tristate
+        default y
+        depends on CBE_CPUFREQ_PMI || PPC_IBM_CELL_POWERBUTTON
+        help
+          PMI (Platform Management Interrupt) is a way to
+          communicate with the BMC (Baseboard Management Controller).
+          It is used in some IBM Cell blades.
+
 config CBE_CPUFREQ_SPU_GOVERNOR
         tristate "CBE frequency scaling based on SPU usage"
         depends on SPU_FS && CPU_FREQ
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 43eccb270301..83fafe922641 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_SPU_BASE)			+= spu_callbacks.o spu_base.o \
                                            $(spu-manage-y) \
                                            spufs/
 
-obj-$(CONFIG_PCI_MSI)                   += axon_msi.o
+obj-$(CONFIG_AXON_MSI)                  += axon_msi.o
 
 # qpace setup
 obj-$(CONFIG_PPC_CELL_QPACE)            += qpace_setup.o
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 28c04dab2633..882e47080e74 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -237,8 +237,6 @@ extern int noirqdebug;
 
 static void handle_iic_irq(unsigned int irq, struct irq_desc *desc)
 {
-        const unsigned int cpu = smp_processor_id();
-
         spin_lock(&desc->lock);
 
         desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
@@ -254,7 +252,7 @@ static void handle_iic_irq(unsigned int irq, struct irq_desc *desc)
                 goto out_eoi;
         }
 
-        kstat_cpu(cpu).irqs[irq]++;
+        kstat_incr_irqs_this_cpu(irq, desc);
 
         /* Mark the IRQ currently in progress.*/
         desc->status |= IRQ_INPROGRESS;
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c
index 059cad6c3f69..5c1118e31940 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
@@ -131,10 +131,10 @@ static const struct ppc_pci_io __devinitconst iowa_pci_io = {
 };
 
 static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,
-                                                unsigned long flags)
+                                  unsigned long flags, void *caller)
 {
         struct iowa_bus *bus;
-        void __iomem *res = __ioremap(addr, size, flags);
+        void __iomem *res = __ioremap_caller(addr, size, flags, caller);
         int busno;
 
         bus = iowa_pci_find(0, (unsigned long)addr);
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index ee5033eddf01..5744527a7f2a 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -74,7 +74,7 @@
 #define IOC_IO_ExcpStat_V               0x8000000000000000ul
 #define IOC_IO_ExcpStat_SPF_Mask        0x6000000000000000ul
 #define IOC_IO_ExcpStat_SPF_S           0x6000000000000000ul
-#define IOC_IO_ExcpStat_SPF_P           0x4000000000000000ul
+#define IOC_IO_ExcpStat_SPF_P           0x2000000000000000ul
 #define IOC_IO_ExcpStat_ADDR_Mask       0x00000007fffff000ul
 #define IOC_IO_ExcpStat_RW_Mask         0x0000000000000800ul
 #define IOC_IO_ExcpStat_IOID_Mask       0x00000000000007fful
@@ -247,17 +247,18 @@ static void tce_free_cell(struct iommu_table *tbl, long index, long npages)
 
 static irqreturn_t ioc_interrupt(int irq, void *data)
 {
-        unsigned long stat;
+        unsigned long stat, spf;
         struct cbe_iommu *iommu = data;
 
         stat = in_be64(iommu->xlate_regs + IOC_IO_ExcpStat);
+        spf = stat & IOC_IO_ExcpStat_SPF_Mask;
 
         /* Might want to rate limit it */
         printk(KERN_ERR "iommu: DMA exception 0x%016lx\n", stat);
         printk(KERN_ERR "  V=%d, SPF=[%c%c], RW=%s, IOID=0x%04x\n",
                !!(stat & IOC_IO_ExcpStat_V),
-               (stat & IOC_IO_ExcpStat_SPF_S) ? 'S' : ' ',
-               (stat & IOC_IO_ExcpStat_SPF_P) ? 'P' : ' ',
+               (spf == IOC_IO_ExcpStat_SPF_S) ? 'S' : ' ',
+               (spf == IOC_IO_ExcpStat_SPF_P) ? 'P' : ' ',
                (stat & IOC_IO_ExcpStat_RW_Mask) ? "Read" : "Write",
                (unsigned int)(stat & IOC_IO_ExcpStat_IOID_Mask));
         printk(KERN_ERR "  page=0x%016lx\n",
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
index be84e6a16b30..c5ce02e84c8e 100644
--- a/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -81,16 +81,6 @@ static int __init qpace_publish_devices(void)
 }
 machine_subsys_initcall(qpace, qpace_publish_devices);
 
-extern int qpace_notify(struct device *dev)
-{
-        /* set dma_ops for of_platform bus */
-        if (dev->bus && dev->bus->name
-                        && !strcmp(dev->bus->name, "of_platform"))
-                set_dma_ops(dev, &dma_direct_ops);
-
-        return 0;
-}
-
 static void __init qpace_setup_arch(void)
 {
 #ifdef CONFIG_SPU_BASE
@@ -115,9 +105,6 @@ static void __init qpace_setup_arch(void)
 #ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;
 #endif
-
-        /* set notifier function */
-        platform_notify = &qpace_notify;
 }
 
 static int __init qpace_probe(void)
@@ -141,6 +128,8 @@ define_machine(qpace) {
         .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
         .get_boot_time          = rtas_get_boot_time,
+        .get_rtc_time           = rtas_get_rtc_time,
+        .set_rtc_time           = rtas_set_rtc_time,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = qpace_progress,
         .init_IRQ               = iic_init_IRQ,
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index e487ad68ac11..9abd210d87c1 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -114,7 +114,7 @@ static inline void mm_needs_global_tlbie(struct mm_struct *mm)
         int nr = (NR_CPUS > 1) ? NR_CPUS : NR_CPUS + 1;
 
         /* Global TLBIE broadcast required with SPEs. */
-        __cpus_setall(&mm->cpu_vm_mask, nr);
+        bitmap_fill(cpumask_bits(mm_cpumask(mm)), nr);
 }
 
 void spu_associate_mm(struct spu *spu, struct mm_struct *mm)
diff --git a/arch/powerpc/platforms/cell/spu_fault.c b/arch/powerpc/platforms/cell/spu_fault.c
index c8b1cd42905d..95d8dadf2d87 100644
--- a/arch/powerpc/platforms/cell/spu_fault.c
+++ b/arch/powerpc/platforms/cell/spu_fault.c
@@ -39,60 +39,56 @@ int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea,
         unsigned long is_write;
         int ret;
 
-#if 0
-        if (!IS_VALID_EA(ea)) {
+        if (mm == NULL)
                 return -EFAULT;
-        }
-#endif /* XXX */
-        if (mm == NULL) {
-                return -EFAULT;
-        }
-        if (mm->pgd == NULL) {
+
+        if (mm->pgd == NULL)
                 return -EFAULT;
-        }
 
         down_read(&mm->mmap_sem);
+        ret = -EFAULT;
         vma = find_vma(mm, ea);
         if (!vma)
-                goto bad_area;
-        if (vma->vm_start <= ea)
-                goto good_area;
-        if (!(vma->vm_flags & VM_GROWSDOWN))
-                goto bad_area;
-        if (expand_stack(vma, ea))
-                goto bad_area;
-good_area:
+                goto out_unlock;
+
+        if (ea < vma->vm_start) {
+                if (!(vma->vm_flags & VM_GROWSDOWN))
+                        goto out_unlock;
+                if (expand_stack(vma, ea))
+                        goto out_unlock;
+        }
+
         is_write = dsisr & MFC_DSISR_ACCESS_PUT;
         if (is_write) {
                 if (!(vma->vm_flags & VM_WRITE))
-                        goto bad_area;
+                        goto out_unlock;
         } else {
                 if (dsisr & MFC_DSISR_ACCESS_DENIED)
-                        goto bad_area;
+                        goto out_unlock;
                 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
-                        goto bad_area;
+                        goto out_unlock;
         }
+
         ret = 0;
         *flt = handle_mm_fault(mm, vma, ea, is_write);
         if (unlikely(*flt & VM_FAULT_ERROR)) {
                 if (*flt & VM_FAULT_OOM) {
                         ret = -ENOMEM;
-                        goto bad_area;
+                        goto out_unlock;
                 } else if (*flt & VM_FAULT_SIGBUS) {
                         ret = -EFAULT;
-                        goto bad_area;
+                        goto out_unlock;
                 }
                 BUG();
         }
+
         if (*flt & VM_FAULT_MAJOR)
                 current->maj_flt++;
         else
                 current->min_flt++;
-        up_read(&mm->mmap_sem);
-        return ret;
 
-bad_area:
+out_unlock:
         up_read(&mm->mmap_sem);
-        return -EFAULT;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(spu_handle_mm_fault);
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 6653ddbed048..db5398c0339f 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -35,6 +35,8 @@ atomic_t nr_spu_contexts = ATOMIC_INIT(0);
 struct spu_context *alloc_spu_context(struct spu_gang *gang)
 {
         struct spu_context *ctx;
+        struct timespec ts;
+
         ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
         if (!ctx)
                 goto out;
@@ -64,6 +66,8 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
         __spu_update_sched_info(ctx);
         spu_set_timeslice(ctx);
         ctx->stats.util_state = SPU_UTIL_IDLE_LOADED;
+        ktime_get_ts(&ts);
+        ctx->stats.tstamp = timespec_to_ns(&ts);
 
         atomic_inc(&nr_spu_contexts);
         goto out;
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 0da7f2bf5ee1..d6a519e6e1c1 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -568,16 +568,17 @@ spufs_regs_write(struct file *file, const char __user *buffer,
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
         int ret;
 
-        size = min_t(ssize_t, sizeof lscsa->gprs - *pos, size);
-        if (size <= 0)
+        if (*pos >= sizeof(lscsa->gprs))
                 return -EFBIG;
+
+        size = min_t(ssize_t, sizeof(lscsa->gprs) - *pos, size);
         *pos += size;
 
         ret = spu_acquire_saved(ctx);
         if (ret)
                 return ret;
 
-        ret = copy_from_user(lscsa->gprs + *pos - size,
+        ret = copy_from_user((char *)lscsa->gprs + *pos - size,
                              buffer, size) ? -EFAULT : size;
 
         spu_release_saved(ctx);
@@ -623,10 +624,11 @@ spufs_fpcr_write(struct file *file, const char __user * buffer,
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
         int ret;
 
-        size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
-        if (size <= 0)
+        if (*pos >= sizeof(lscsa->fpcr))
                 return -EFBIG;
 
+        size = min_t(ssize_t, sizeof(lscsa->fpcr) - *pos, size);
+
         ret = spu_acquire_saved(ctx);
         if (ret)
                 return ret;
@@ -2665,7 +2667,7 @@ static const struct file_operations spufs_ctx_fops = {
         .release        = single_release,
 };
 
-struct spufs_tree_descr spufs_dir_contents[] = {
+const struct spufs_tree_descr spufs_dir_contents[] = {
         { "capabilities", &spufs_caps_fops, 0444, },
         { "mem",  &spufs_mem_fops,  0666, LS_SIZE, },
         { "regs", &spufs_regs_fops,  0666, sizeof(struct spu_reg128[128]), },
@@ -2706,7 +2708,7 @@ struct spufs_tree_descr spufs_dir_contents[] = {
         {},
 };
 
-struct spufs_tree_descr spufs_dir_nosched_contents[] = {
+const struct spufs_tree_descr spufs_dir_nosched_contents[] = {
         { "capabilities", &spufs_caps_fops, 0444, },
         { "mem",  &spufs_mem_fops,  0666, LS_SIZE, },
         { "mbox", &spufs_mbox_fops, 0444, },
@@ -2731,12 +2733,12 @@ struct spufs_tree_descr spufs_dir_nosched_contents[] = {
         {},
 };
 
-struct spufs_tree_descr spufs_dir_debug_contents[] = {
+const struct spufs_tree_descr spufs_dir_debug_contents[] = {
         { ".ctx", &spufs_ctx_fops, 0444, },
         {},
 };
 
-struct spufs_coredump_reader spufs_coredump_read[] = {
+const struct spufs_coredump_reader spufs_coredump_read[] = {
         { "regs", __spufs_regs_read, NULL, sizeof(struct spu_reg128[128])},
         { "fpcr", __spufs_fpcr_read, NULL, sizeof(struct spu_reg128) },
         { "lslr", NULL, spufs_lslr_get, 19 },
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index e309ef70a531..706eb5c7e2ee 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -186,8 +186,9 @@ static int spufs_rmdir(struct inode *parent, struct dentry *dir)
         return simple_rmdir(parent, dir);
 }
 
-static int spufs_fill_dir(struct dentry *dir, struct spufs_tree_descr *files,
-                          int mode, struct spu_context *ctx)
+static int spufs_fill_dir(struct dentry *dir,
+                const struct spufs_tree_descr *files, int mode,
+                struct spu_context *ctx)
 {
         struct dentry *dentry, *tmp;
         int ret;
@@ -634,7 +635,7 @@ long spufs_create(struct nameidata *nd, unsigned int flags, mode_t mode,
         if (dentry->d_inode)
                 goto out_dput;
 
-        mode &= ~current->fs->umask;
+        mode &= ~current_umask();
 
         if (flags & SPU_CREATE_GANG)
                 ret = spufs_create_gang(nd->path.dentry->d_inode,
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index c58bd36b0c5b..4ddf769a64e5 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -117,6 +117,9 @@ static int spu_setup_isolated(struct spu_context *ctx)
                 cond_resched();
         }
 
+        /* clear purge status */
+        out_be64(mfc_cntl, 0);
+
         /* put the SPE in kernel mode to allow access to the loader */
         sr1 = spu_mfc_sr1_get(ctx->spu);
         sr1 &= ~MFC_STATE1_PROBLEM_STATE_MASK;
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 6a0ad196aeb3..f085369301b1 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -508,7 +508,7 @@ static void __spu_add_to_rq(struct spu_context *ctx)
                 list_add_tail(&ctx->rq, &spu_prio->runq[ctx->prio]);
                 set_bit(ctx->prio, spu_prio->bitmap);
                 if (!spu_prio->nr_waiting++)
-                        __mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);
+                        mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);
         }
 }
 
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 3bf908e2873a..ae31573bea4a 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -241,9 +241,9 @@ struct spufs_tree_descr {
         size_t size;
 };
 
-extern struct spufs_tree_descr spufs_dir_contents[];
-extern struct spufs_tree_descr spufs_dir_nosched_contents[];
-extern struct spufs_tree_descr spufs_dir_debug_contents[];
+extern const struct spufs_tree_descr spufs_dir_contents[];
+extern const struct spufs_tree_descr spufs_dir_nosched_contents[];
+extern const struct spufs_tree_descr spufs_dir_debug_contents[];
 
 /* system call implementation */
 extern struct spufs_calls spufs_calls;
@@ -358,7 +358,7 @@ struct spufs_coredump_reader {
         u64 (*get)(struct spu_context *ctx);
         size_t size;
 };
-extern struct spufs_coredump_reader spufs_coredump_read[];
+extern const struct spufs_coredump_reader spufs_coredump_read[];
 extern int spufs_coredump_num_notes;
 
 extern int spu_init_csa(struct spu_state *csa);
diff --git a/arch/powerpc/platforms/chrp/Kconfig b/arch/powerpc/platforms/chrp/Kconfig
index 22b4b4e3b6f0..37d438bd5b7a 100644
--- a/arch/powerpc/platforms/chrp/Kconfig
+++ b/arch/powerpc/platforms/chrp/Kconfig
@@ -1,6 +1,6 @@
 config PPC_CHRP
         bool "Common Hardware Reference Platform (CHRP) based machines"
-        depends on PPC_MULTIPLATFORM && PPC32
+        depends on 6xx
         select MPIC
         select PPC_I8259
         select PPC_INDIRECT_PCI
diff --git a/arch/powerpc/platforms/chrp/pegasos_eth.c b/arch/powerpc/platforms/chrp/pegasos_eth.c
index 130ff72d99dd..039fc8e82199 100644
--- a/arch/powerpc/platforms/chrp/pegasos_eth.c
+++ b/arch/powerpc/platforms/chrp/pegasos_eth.c
@@ -21,8 +21,8 @@
 #define PEGASOS2_SRAM_BASE                      (0xf2000000)
 #define PEGASOS2_SRAM_SIZE                      (256*1024)
 
-#define PEGASOS2_SRAM_BASE_ETH0                 (PEGASOS2_SRAM_BASE)
-#define PEGASOS2_SRAM_BASE_ETH1                 (PEGASOS2_SRAM_BASE_ETH0 + (PEGASOS2_SRAM_SIZE / 2) )
+#define PEGASOS2_SRAM_BASE_ETH_PORT0                    (PEGASOS2_SRAM_BASE)
+#define PEGASOS2_SRAM_BASE_ETH_PORT1                    (PEGASOS2_SRAM_BASE_ETH_PORT0 + (PEGASOS2_SRAM_SIZE / 2) )
 
 
 #define PEGASOS2_SRAM_RXRING_SIZE               (PEGASOS2_SRAM_SIZE/4)
@@ -47,75 +47,42 @@ static struct platform_device mv643xx_eth_shared_device = {
         .resource       = mv643xx_eth_shared_resources,
 };
 
-static struct resource mv643xx_eth0_resources[] = {
+static struct resource mv643xx_eth_port1_resources[] = {
         [0] = {
-                .name   = "eth0 irq",
+                .name   = "eth port1 irq",
                 .start  = 9,
                 .end    = 9,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
-
-static struct mv643xx_eth_platform_data eth0_pd = {
-        .shared         = &mv643xx_eth_shared_device,
-        .port_number    = 0,
-
-        .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH0,
-        .tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,
-        .tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,
-
-        .rx_sram_addr = PEGASOS2_SRAM_BASE_ETH0 + PEGASOS2_SRAM_TXRING_SIZE,
-        .rx_sram_size = PEGASOS2_SRAM_RXRING_SIZE,
-        .rx_queue_size = PEGASOS2_SRAM_RXRING_SIZE/16,
-};
-
-static struct platform_device eth0_device = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(mv643xx_eth0_resources),
-        .resource       = mv643xx_eth0_resources,
-        .dev = {
-                .platform_data = &eth0_pd,
-        },
-};
-
-static struct resource mv643xx_eth1_resources[] = {
-        [0] = {
-                .name   = "eth1 irq",
-                .start  = 9,
-                .end    = 9,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv643xx_eth_platform_data eth1_pd = {
+static struct mv643xx_eth_platform_data eth_port1_pd = {
         .shared         = &mv643xx_eth_shared_device,
         .port_number    = 1,
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(7),
 
-        .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH1,
+        .tx_sram_addr = PEGASOS2_SRAM_BASE_ETH_PORT1,
         .tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,
         .tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,
 
-        .rx_sram_addr = PEGASOS2_SRAM_BASE_ETH1 + PEGASOS2_SRAM_TXRING_SIZE,
+        .rx_sram_addr = PEGASOS2_SRAM_BASE_ETH_PORT1 + PEGASOS2_SRAM_TXRING_SIZE,
         .rx_sram_size = PEGASOS2_SRAM_RXRING_SIZE,
         .rx_queue_size = PEGASOS2_SRAM_RXRING_SIZE/16,
 };
 
-static struct platform_device eth1_device = {
+static struct platform_device eth_port1_device = {
         .name           = MV643XX_ETH_NAME,
         .id             = 1,
-        .num_resources  = ARRAY_SIZE(mv643xx_eth1_resources),
-        .resource       = mv643xx_eth1_resources,
+        .num_resources  = ARRAY_SIZE(mv643xx_eth_port1_resources),
+        .resource       = mv643xx_eth_port1_resources,
         .dev = {
-                .platform_data = &eth1_pd,
+                .platform_data = &eth_port1_pd,
         },
 };
 
 static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
         &mv643xx_eth_shared_device,
-        &eth0_device,
-        &eth1_device,
+        &eth_port1_device,
 };
 
 /***********/
@@ -191,15 +158,10 @@ static int __init mv643xx_eth_add_pds(void)
 
                 if ( Enable_SRAM() < 0)
                 {
-                        eth0_pd.tx_sram_addr = 0;
-                        eth0_pd.tx_sram_size = 0;
-                        eth0_pd.rx_sram_addr = 0;
-                        eth0_pd.rx_sram_size = 0;
-
-                        eth1_pd.tx_sram_addr = 0;
-                        eth1_pd.tx_sram_size = 0;
-                        eth1_pd.rx_sram_addr = 0;
-                        eth1_pd.rx_sram_size = 0;
+                        eth_port1_pd.tx_sram_addr = 0;
+                        eth_port1_pd.tx_sram_size = 0;
+                        eth_port1_pd.rx_sram_addr = 0;
+                        eth_port1_pd.rx_sram_size = 0;
 
 #ifdef BE_VERBOSE
                         printk("Pegasos II/Marvell MV64361: Can't enable the "
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 272d79a8d289..cd4ad9aea760 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -472,7 +472,6 @@ static void __init chrp_find_openpic(void)
 #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_XMON)
 static struct irqaction xmon_irqaction = {
         .handler = xmon_irq,
-        .mask = CPU_MASK_NONE,
         .name = "XMON break",
 };
 #endif
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 4f9f8184d164..291ac9d8cbee 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -1,6 +1,6 @@
 config EMBEDDED6xx
         bool "Embedded 6xx/7xx/7xxx-based boards"
-        depends on PPC32 && BROKEN_ON_SMP && PPC_MULTIPLATFORM
+        depends on 6xx && BROKEN_ON_SMP
 
 config LINKSTATION
         bool "Linkstation / Kurobox(HG) from Buffalo"
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 2ca7be65c2d2..244f997de791 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -12,7 +12,6 @@
 
 #include <linux/kernel.h>
 #include <linux/initrd.h>
-#include <linux/mtd/physmap.h>
 #include <linux/of_platform.h>
 
 #include <asm/time.h>
@@ -22,39 +21,6 @@
 
 #include "mpc10x.h"
 
-static struct mtd_partition linkstation_physmap_partitions[] = {
-        {
-                .name   = "mtd_firmimg",
-                .offset = 0x000000,
-                .size   = 0x300000,
-        },
-        {
-                .name   = "mtd_bootcode",
-                .offset = 0x300000,
-                .size   = 0x070000,
-        },
-        {
-                .name   = "mtd_status",
-                .offset = 0x370000,
-                .size   = 0x010000,
-        },
-        {
-                .name   = "mtd_conf",
-                .offset = 0x380000,
-                .size   = 0x080000,
-        },
-        {
-                .name   = "mtd_allflash",
-                .offset = 0x000000,
-                .size   = 0x400000,
-        },
-        {
-                .name   = "mtd_data",
-                .offset = 0x310000,
-                .size   = 0x0f0000,
-        },
-};
-
 static __initdata struct of_device_id of_bus_ids[] = {
         { .type = "soc", },
         { .compatible = "simple-bus", },
@@ -99,10 +65,6 @@ static int __init linkstation_add_bridge(struct device_node *dev)
 static void __init linkstation_setup_arch(void)
 {
         struct device_node *np;
-#ifdef CONFIG_MTD_PHYSMAP
-        physmap_set_partitions(linkstation_physmap_partitions,
-                               ARRAY_SIZE(linkstation_physmap_partitions));
-#endif
 
         /* Lookup PCI host bridges */
         for_each_compatible_node(np, "pci", "mpc10x-pci")
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index 8864e4884980..613070e9ddbe 100644
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/initrd.h>
-#include <linux/mtd/physmap.h>
 #include <linux/of_platform.h>
 
 #include <asm/system.h>
@@ -26,32 +25,6 @@
 #include "mpc10x.h"
 
 
-#ifdef CONFIG_MTD_PHYSMAP
-static struct mtd_partition storcenter_physmap_partitions[] = {
-        {
-                .name   = "kernel",
-                .offset = 0x000000,
-                .size   = 0x170000,
-        },
-        {
-                .name   = "rootfs",
-                .offset = 0x170000,
-                .size   = 0x590000,
-        },
-        {
-                .name   = "uboot",
-                .offset = 0x700000,
-                .size   = 0x040000,
-        },
-        {
-                .name   = "config",
-                .offset = 0x740000,
-                .size   = 0x0c0000,
-        },
-};
-#endif
-
-
 static __initdata struct of_device_id storcenter_of_bus[] = {
         { .name = "soc", },
         {},
@@ -96,11 +69,6 @@ static void __init storcenter_setup_arch(void)
 {
         struct device_node *np;
 
-#ifdef CONFIG_MTD_PHYSMAP
-        physmap_set_partitions(storcenter_physmap_partitions,
-                               ARRAY_SIZE(storcenter_physmap_partitions));
-#endif
-
         /* Lookup PCI host bridges */
         for_each_compatible_node(np, "pci", "mpc10x-pci")
                 storcenter_add_bridge(np);
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 7ddd0a2c8027..647e87787437 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -1,6 +1,6 @@
 config PPC_ISERIES
         bool "IBM Legacy iSeries"
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         select PPC_INDIRECT_IO
         select PPC_PCI_CHOICE if EMBEDDED
 
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 701d9297c207..94f444758836 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -214,7 +214,7 @@ void __init iSeries_activate_IRQs()
         unsigned long flags;
 
         for_each_irq (irq) {
-                irq_desc_t *desc = get_irq_desc(irq);
+                struct irq_desc *desc = get_irq_desc(irq);
 
                 if (desc && desc->chip && desc->chip->startup) {
                         spin_lock_irqsave(&desc->lock, flags);
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 24519b96d6ad..a6cd3394feaa 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -617,7 +617,7 @@ static void iseries_dedicated_idle(void)
 }
 
 static void __iomem *iseries_ioremap(phys_addr_t address, unsigned long size,
-                                     unsigned long flags)
+                                     unsigned long flags, void *caller)
 {
         return (void __iomem *)address;
 }
diff --git a/arch/powerpc/platforms/maple/Kconfig b/arch/powerpc/platforms/maple/Kconfig
index a6467a5591fa..1ea621a94c3b 100644
--- a/arch/powerpc/platforms/maple/Kconfig
+++ b/arch/powerpc/platforms/maple/Kconfig
@@ -1,5 +1,5 @@
 config PPC_MAPLE
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         bool "Maple 970FX Evaluation Board"
         select PCI
         select MPIC
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index 348e0619e3e5..a2aeb327d185 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -1,5 +1,5 @@
 config PPC_PASEMI
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         bool "PA Semi SoC-based platforms"
         default n
         select MPIC
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
index 055990ca8ce6..1e1a0873e1dd 100644
--- a/arch/powerpc/platforms/powermac/Kconfig
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -1,6 +1,6 @@
 config PPC_PMAC
         bool "Apple PowerMac based machines"
-        depends on PPC_MULTIPLATFORM
+        depends on PPC_BOOK3S
         select MPIC
         select PCI
         select PPC_INDIRECT_PCI if PPC32
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index beb38333b6d2..22ecfbe7183d 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -86,6 +86,7 @@ static int (*g5_query_freq)(void);
 
 static DEFINE_MUTEX(g5_switch_mutex);
 
+static unsigned long transition_latency;
 
 #ifdef CONFIG_PMAC_SMU
 
@@ -357,7 +358,7 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu)
 
 static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+        policy->cpuinfo.transition_latency = transition_latency;
         policy->cur = g5_cpu_freqs[g5_query_freq()].frequency;
         /* secondary CPUs are tied to the primary one by the
          * cpufreq core if in the secondary policy we tell it that
@@ -500,6 +501,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         g5_cpu_freqs[1].frequency = max_freq/2;
 
         /* Set callbacks */
+        transition_latency = 12000;
         g5_switch_freq = g5_scom_switch_freq;
         g5_query_freq = g5_scom_query_freq;
         freq_method = "SCOM";
@@ -675,6 +677,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
         g5_cpu_freqs[1].frequency = min_freq;
 
         /* Set callbacks */
+        transition_latency = CPUFREQ_ETERNAL;
         g5_switch_volt = g5_pfunc_switch_volt;
         g5_switch_freq = g5_pfunc_switch_freq;
         g5_query_freq = g5_pfunc_query_freq;
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 6d149ae8ffa7..7039d8f1d3ba 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -266,7 +266,6 @@ static unsigned int pmac_pic_get_irq(void)
 static struct irqaction xmon_action = {
         .handler        = xmon_irq,
         .flags          = 0,
-        .mask           = CPU_MASK_NONE,
         .name           = "NMI - XMON"
 };
 #endif
@@ -274,7 +273,6 @@ static struct irqaction xmon_action = {
 static struct irqaction gatwick_cascade_action = {
         .handler        = gatwick_action,
         .flags          = IRQF_DISABLED,
-        .mask           = CPU_MASK_NONE,
         .name           = "cascade",
 };
 
diff --git a/arch/powerpc/platforms/powermac/pic.h b/arch/powerpc/platforms/powermac/pic.h
index c44c89f5e532..d622a8345aaa 100644
--- a/arch/powerpc/platforms/powermac/pic.h
+++ b/arch/powerpc/platforms/powermac/pic.h
@@ -3,7 +3,7 @@
 
 #include <linux/irq.h>
 
-extern struct hw_interrupt_type pmac_pic;
+extern struct irq_chip pmac_pic;
 
 extern void pmac_pic_init(void);
 extern int pmac_get_irq(void);
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 9b78f5300c24..45936c9ed0ec 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -746,4 +746,7 @@ define_machine(powermac) {
 #if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC64)
         .cpu_die                = pmac_cpu_die,
 #endif
+#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC32)
+        .cpu_die                = generic_mach_cpu_die,
+#endif
 };
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index bd8817b00fa4..cf1dbe758890 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -385,7 +385,6 @@ static void __init psurge_dual_sync_tb(int cpu_nr)
 static struct irqaction psurge_irqaction = {
         .handler = psurge_primary_intr,
         .flags = IRQF_DISABLED,
-        .mask = CPU_MASK_NONE,
         .name = "primary IPI",
 };
 
diff --git a/arch/powerpc/platforms/prep/Kconfig b/arch/powerpc/platforms/prep/Kconfig
index 29d411279b0c..bf8330ef2e76 100644
--- a/arch/powerpc/platforms/prep/Kconfig
+++ b/arch/powerpc/platforms/prep/Kconfig
@@ -1,6 +1,6 @@
 config PPC_PREP
         bool "PowerPC Reference Platform (PReP) based machines"
-        depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
+        depends on 6xx && BROKEN
         select MPIC
         select PPC_I8259
         select PPC_INDIRECT_PCI
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index 920cf7a454b1..dfe316b161a9 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -1,6 +1,6 @@
 config PPC_PS3
         bool "Sony PS3"
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         select PPC_CELL
         select USB_ARCH_HAS_OHCI
         select USB_OHCI_LITTLE_ENDIAN
@@ -128,6 +128,13 @@ config PS3_FLASH
           be disabled on the kernel command line using "ps3flash=off", to
           not allocate this fixed buffer.
 
+config PS3_VRAM
+        tristate "PS3 Video RAM Storage Driver"
+        depends on FB_PS3=y && BLOCK && m
+        help
+          This driver allows you to use excess PS3 video RAM as volatile
+          storage or system swap.
+
 config PS3_LPM
         tristate "PS3 Logical Performance Monitor support"
         depends on PPC_PS3
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index d281cc0bca71..9a2b6d948610 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -311,7 +311,7 @@ static int __init ps3_mm_add_memory(void)
         result = add_memory(0, start_addr, map.r1.size);
 
         if (result) {
-                DBG("%s:%d: add_memory failed: (%d)\n",
+                pr_err("%s:%d: add_memory failed: (%d)\n",
                         __func__, __LINE__, result);
                 return result;
         }
@@ -322,7 +322,7 @@ static int __init ps3_mm_add_memory(void)
         result = online_pages(start_pfn, nr_pages);
 
         if (result)
-                DBG("%s:%d: online_pages failed: (%d)\n",
+                pr_err("%s:%d: online_pages failed: (%d)\n",
                         __func__, __LINE__, result);
 
         return result;
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index e1c83c23b435..86e392b1b049 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -808,6 +808,7 @@ u64 ps3_os_area_get_rtc_diff(void)
 {
         return saved_params.rtc_diff;
 }
+EXPORT_SYMBOL(ps3_os_area_get_rtc_diff);
 
 /**
  * ps3_os_area_set_rtc_diff - Set the rtc diff value.
@@ -823,6 +824,7 @@ void ps3_os_area_set_rtc_diff(u64 rtc_diff)
                 os_area_queue_work();
         }
 }
+EXPORT_SYMBOL(ps3_os_area_set_rtc_diff);
 
 /**
  * ps3_os_area_get_av_multi_out - Returns the default video mode.
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 235c13ebacd9..136aa0637d9c 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -64,8 +64,6 @@ int ps3_set_rtc_time(struct rtc_time *time);
 
 void __init ps3_os_area_save_params(void);
 void __init ps3_os_area_init(void);
-u64 ps3_os_area_get_rtc_diff(void);
-void ps3_os_area_set_rtc_diff(u64 rtc_diff);
 
 /* spu */
 
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 3331ccbb8d38..66181821322a 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -270,8 +270,6 @@ define_machine(ps3) {
         .init_IRQ                       = ps3_init_IRQ,
         .panic                          = ps3_panic,
         .get_boot_time                  = ps3_get_boot_time,
-        .set_rtc_time                   = ps3_set_rtc_time,
-        .get_rtc_time                   = ps3_get_rtc_time,
         .set_dabr                       = ps3_set_dabr,
         .calibrate_decr                 = ps3_calibrate_decr,
         .progress                       = ps3_progress,
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 58311a867851..a705fffbb498 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -376,7 +376,7 @@ static int ps3_system_bus_probe(struct device *_dev)
         struct ps3_system_bus_driver *drv;
 
         BUG_ON(!dev);
-        pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
+        dev_dbg(_dev, "%s:%d\n", __func__, __LINE__);
 
         drv = ps3_system_bus_dev_to_system_bus_drv(dev);
         BUG_ON(!drv);
@@ -398,7 +398,7 @@ static int ps3_system_bus_remove(struct device *_dev)
         struct ps3_system_bus_driver *drv;
 
         BUG_ON(!dev);
-        pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
+        dev_dbg(_dev, "%s:%d\n", __func__, __LINE__);
 
         drv = ps3_system_bus_dev_to_system_bus_drv(dev);
         BUG_ON(!drv);
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index d0daf7d6d3b2..b178a1e66c91 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/platform_device.h>
 
 #include <asm/rtc.h>
 #include <asm/lv1call.h>
@@ -74,23 +75,20 @@ static u64 read_rtc(void)
         return rtc_val;
 }
 
-int ps3_set_rtc_time(struct rtc_time *tm)
+unsigned long __init ps3_get_boot_time(void)
 {
-        u64 now = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-                tm->tm_hour, tm->tm_min, tm->tm_sec);
-
-        ps3_os_area_set_rtc_diff(now - read_rtc());
-        return 0;
+        return read_rtc() + ps3_os_area_get_rtc_diff();
 }
 
-void ps3_get_rtc_time(struct rtc_time *tm)
+static int __init ps3_rtc_init(void)
 {
-        to_tm(read_rtc() + ps3_os_area_get_rtc_diff(), tm);
-        tm->tm_year -= 1900;
-        tm->tm_mon -= 1;
-}
+        struct platform_device *pdev;
 
-unsigned long __init ps3_get_boot_time(void)
-{
-        return read_rtc() + ps3_os_area_get_rtc_diff();
+        pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0);
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
+
+        return 0;
 }
+
+module_init(ps3_rtc_init);
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index ddc2a307cd50..f0e6f28427bd 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -1,5 +1,5 @@
 config PPC_PSERIES
-        depends on PPC_MULTIPLATFORM && PPC64
+        depends on PPC64 && PPC_BOOK3S
         bool "IBM pSeries & new (POWER5-based) iSeries"
         select MPIC
         select PPC_I8259
@@ -25,6 +25,11 @@ config EEH
         depends on PPC_PSERIES && PCI
         default y if !EMBEDDED
 
+config PSERIES_MSI
+       bool
+       depends on PCI_MSI && EEH
+       default y
+
 config SCANLOG
         tristate "Scanlog dump interface"
         depends on RTAS_PROC && PPC_PSERIES
@@ -63,3 +68,13 @@ config CMM
           makes sense for a system running in an LPAR where the unused pages
           will be reused for other LPARs. The interface allows firmware to
           balance memory across many LPARs.
+
+config DTL
+        bool "Dispatch Trace Log"
+        depends on PPC_SPLPAR && DEBUG_FS
+        help
+          SPLPAR machines can log hypervisor preempt & dispatch events to a
+          kernel buffer. Saying Y here will enable logging these events,
+          which are accessible through a debugfs file.
+
+          Say N if you are unsure.
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index dfe574af2dc0..790c0b872d4f 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_SCANLOG)	+= scanlog.o
 obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o eeh_sysfs.o
 obj-$(CONFIG_KEXEC)     += kexec.o
 obj-$(CONFIG_PCI)       += pci.o pci_dlpar.o
-obj-$(CONFIG_PCI_MSI)   += msi.o
+obj-$(CONFIG_PSERIES_MSI)       += msi.o
 
 obj-$(CONFIG_HOTPLUG_CPU)       += hotplug-cpu.o
 obj-$(CONFIG_MEMORY_HOTPLUG)    += hotplug-memory.o
@@ -25,3 +25,4 @@ obj-$(CONFIG_HVCS)		+= hvcserver.o
 obj-$(CONFIG_HCALL_STATS)       += hvCall_inst.o
 obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o
 obj-$(CONFIG_CMM)               += cmm.o
+obj-$(CONFIG_DTL)               += dtl.o
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
new file mode 100644
index 000000000000..fafcaa0e81ef
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -0,0 +1,278 @@
+/*
+ * Virtual Processor Dispatch Trace Log
+ *
+ * (C) Copyright IBM Corporation 2009
+ *
+ * Author: Jeremy Kerr <jk@ozlabs.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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/debugfs.h>
+#include <asm/smp.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
+
+#include "plpar_wrappers.h"
+
+/*
+ * Layout of entries in the hypervisor's DTL buffer. Although we don't
+ * actually access the internals of an entry (we only need to know the size),
+ * we might as well define it here for reference.
+ */
+struct dtl_entry {
+        u8      dispatch_reason;
+        u8      preempt_reason;
+        u16     processor_id;
+        u32     enqueue_to_dispatch_time;
+        u32     ready_to_enqueue_time;
+        u32     waiting_to_ready_time;
+        u64     timebase;
+        u64     fault_addr;
+        u64     srr0;
+        u64     srr1;
+};
+
+struct dtl {
+        struct dtl_entry        *buf;
+        struct dentry           *file;
+        int                     cpu;
+        int                     buf_entries;
+        u64                     last_idx;
+};
+static DEFINE_PER_CPU(struct dtl, dtl);
+
+/*
+ * Dispatch trace log event mask:
+ * 0x7: 0x1: voluntary virtual processor waits
+ *      0x2: time-slice preempts
+ *      0x4: virtual partition memory page faults
+ */
+static u8 dtl_event_mask = 0x7;
+
+
+/*
+ * Size of per-cpu log buffers. Default is just under 16 pages worth.
+ */
+static int dtl_buf_entries = (16 * 85);
+
+
+static int dtl_enable(struct dtl *dtl)
+{
+        unsigned long addr;
+        int ret, hwcpu;
+
+        /* only allow one reader */
+        if (dtl->buf)
+                return -EBUSY;
+
+        /* we need to store the original allocation size for use during read */
+        dtl->buf_entries = dtl_buf_entries;
+
+        dtl->buf = kmalloc_node(dtl->buf_entries * sizeof(struct dtl_entry),
+                        GFP_KERNEL, cpu_to_node(dtl->cpu));
+        if (!dtl->buf) {
+                printk(KERN_WARNING "%s: buffer alloc failed for cpu %d\n",
+                                __func__, dtl->cpu);
+                return -ENOMEM;
+        }
+
+        /* Register our dtl buffer with the hypervisor. The HV expects the
+         * buffer size to be passed in the second word of the buffer */
+        ((u32 *)dtl->buf)[1] = dtl->buf_entries * sizeof(struct dtl_entry);
+
+        hwcpu = get_hard_smp_processor_id(dtl->cpu);
+        addr = __pa(dtl->buf);
+        ret = register_dtl(hwcpu, addr);
+        if (ret) {
+                printk(KERN_WARNING "%s: DTL registration for cpu %d (hw %d) "
+                       "failed with %d\n", __func__, dtl->cpu, hwcpu, ret);
+                kfree(dtl->buf);
+                return -EIO;
+        }
+
+        /* set our initial buffer indices */
+        dtl->last_idx = lppaca[dtl->cpu].dtl_idx = 0;
+
+        /* ensure that our updates to the lppaca fields have occurred before
+         * we actually enable the logging */
+        smp_wmb();
+
+        /* enable event logging */
+        lppaca[dtl->cpu].dtl_enable_mask = dtl_event_mask;
+
+        return 0;
+}
+
+static void dtl_disable(struct dtl *dtl)
+{
+        int hwcpu = get_hard_smp_processor_id(dtl->cpu);
+
+        lppaca[dtl->cpu].dtl_enable_mask = 0x0;
+
+        unregister_dtl(hwcpu, __pa(dtl->buf));
+
+        kfree(dtl->buf);
+        dtl->buf = NULL;
+        dtl->buf_entries = 0;
+}
+
+/* file interface */
+
+static int dtl_file_open(struct inode *inode, struct file *filp)
+{
+        struct dtl *dtl = inode->i_private;
+        int rc;
+
+        rc = dtl_enable(dtl);
+        if (rc)
+                return rc;
+
+        filp->private_data = dtl;
+        return 0;
+}
+
+static int dtl_file_release(struct inode *inode, struct file *filp)
+{
+        struct dtl *dtl = inode->i_private;
+        dtl_disable(dtl);
+        return 0;
+}
+
+static ssize_t dtl_file_read(struct file *filp, char __user *buf, size_t len,
+                loff_t *pos)
+{
+        int rc, cur_idx, last_idx, n_read, n_req, read_size;
+        struct dtl *dtl;
+
+        if ((len % sizeof(struct dtl_entry)) != 0)
+                return -EINVAL;
+
+        dtl = filp->private_data;
+
+        /* requested number of entries to read */
+        n_req = len / sizeof(struct dtl_entry);
+
+        /* actual number of entries read */
+        n_read = 0;
+
+        cur_idx = lppaca[dtl->cpu].dtl_idx;
+        last_idx = dtl->last_idx;
+
+        if (cur_idx - last_idx > dtl->buf_entries) {
+                pr_debug("%s: hv buffer overflow for cpu %d, samples lost\n",
+                                __func__, dtl->cpu);
+        }
+
+        cur_idx  %= dtl->buf_entries;
+        last_idx %= dtl->buf_entries;
+
+        /* read the tail of the buffer if we've wrapped */
+        if (last_idx > cur_idx) {
+                read_size = min(n_req, dtl->buf_entries - last_idx);
+
+                rc = copy_to_user(buf, &dtl->buf[last_idx],
+                                read_size * sizeof(struct dtl_entry));
+                if (rc)
+                        return -EFAULT;
+
+                last_idx = 0;
+                n_req -= read_size;
+                n_read += read_size;
+                buf += read_size * sizeof(struct dtl_entry);
+        }
+
+        /* .. and now the head */
+        read_size = min(n_req, cur_idx - last_idx);
+        rc = copy_to_user(buf, &dtl->buf[last_idx],
+                        read_size * sizeof(struct dtl_entry));
+        if (rc)
+                return -EFAULT;
+
+        n_read += read_size;
+        dtl->last_idx += n_read;
+
+        return n_read * sizeof(struct dtl_entry);
+}
+
+static struct file_operations dtl_fops = {
+        .open           = dtl_file_open,
+        .release        = dtl_file_release,
+        .read           = dtl_file_read,
+        .llseek         = no_llseek,
+};
+
+static struct dentry *dtl_dir;
+
+static int dtl_setup_file(struct dtl *dtl)
+{
+        char name[10];
+
+        sprintf(name, "cpu-%d", dtl->cpu);
+
+        dtl->file = debugfs_create_file(name, 0400, dtl_dir, dtl, &dtl_fops);
+        if (!dtl->file)
+                return -ENOMEM;
+
+        return 0;
+}
+
+static int dtl_init(void)
+{
+        struct dentry *event_mask_file, *buf_entries_file;
+        int rc, i;
+
+        if (!firmware_has_feature(FW_FEATURE_SPLPAR))
+                return -ENODEV;
+
+        /* set up common debugfs structure */
+
+        rc = -ENOMEM;
+        dtl_dir = debugfs_create_dir("dtl", powerpc_debugfs_root);
+        if (!dtl_dir) {
+                printk(KERN_WARNING "%s: can't create dtl root dir\n",
+                                __func__);
+                goto err;
+        }
+
+        event_mask_file = debugfs_create_x8("dtl_event_mask", 0600,
+                                dtl_dir, &dtl_event_mask);
+        buf_entries_file = debugfs_create_u32("dtl_buf_entries", 0600,
+                                dtl_dir, &dtl_buf_entries);
+
+        if (!event_mask_file || !buf_entries_file) {
+                printk(KERN_WARNING "%s: can't create dtl files\n", __func__);
+                goto err_remove_dir;
+        }
+
+        /* set up the per-cpu log structures */
+        for_each_possible_cpu(i) {
+                struct dtl *dtl = &per_cpu(dtl, i);
+                dtl->cpu = i;
+
+                rc = dtl_setup_file(dtl);
+                if (rc)
+                        goto err_remove_dir;
+        }
+
+        return 0;
+
+err_remove_dir:
+        debugfs_remove_recursive(dtl_dir);
+err:
+        return rc;
+}
+arch_initcall(dtl_init);
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 0ad56ff7b4a0..380420f8c400 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -79,6 +79,40 @@ static int irq_in_use(unsigned int irq)
         return rc;
 }
 
+/**
+ * eeh_disable_irq - disable interrupt for the recovering device
+ */
+static void eeh_disable_irq(struct pci_dev *dev)
+{
+        struct device_node *dn = pci_device_to_OF_node(dev);
+
+        /* Don't disable MSI and MSI-X interrupts. They are
+         * effectively disabled by the DMA Stopped state
+         * when an EEH error occurs.
+        */
+        if (dev->msi_enabled || dev->msix_enabled)
+                return;
+
+        if (!irq_in_use(dev->irq))
+                return;
+
+        PCI_DN(dn)->eeh_mode |= EEH_MODE_IRQ_DISABLED;
+        disable_irq_nosync(dev->irq);
+}
+
+/**
+ * eeh_enable_irq - enable interrupt for the recovering device
+ */
+static void eeh_enable_irq(struct pci_dev *dev)
+{
+        struct device_node *dn = pci_device_to_OF_node(dev);
+
+        if ((PCI_DN(dn)->eeh_mode) & EEH_MODE_IRQ_DISABLED) {
+                PCI_DN(dn)->eeh_mode &= ~EEH_MODE_IRQ_DISABLED;
+                enable_irq(dev->irq);
+        }
+}
+
 /* ------------------------------------------------------- */
 /**
  * eeh_report_error - report pci error to each device driver
@@ -98,11 +132,8 @@ static void eeh_report_error(struct pci_dev *dev, void *userdata)
         if (!driver)
                 return;
 
-        if (irq_in_use (dev->irq)) {
-                struct device_node *dn = pci_device_to_OF_node(dev);
-                PCI_DN(dn)->eeh_mode |= EEH_MODE_IRQ_DISABLED;
-                disable_irq_nosync(dev->irq);
-        }
+        eeh_disable_irq(dev);
+
         if (!driver->err_handler ||
             !driver->err_handler->error_detected)
                 return;
@@ -147,15 +178,12 @@ static void eeh_report_reset(struct pci_dev *dev, void *userdata)
 {
         enum pci_ers_result rc, *res = userdata;
         struct pci_driver *driver = dev->driver;
-        struct device_node *dn = pci_device_to_OF_node(dev);
 
         if (!driver)
                 return;
 
-        if ((PCI_DN(dn)->eeh_mode) & EEH_MODE_IRQ_DISABLED) {
-                PCI_DN(dn)->eeh_mode &= ~EEH_MODE_IRQ_DISABLED;
-                enable_irq(dev->irq);
-        }
+        eeh_enable_irq(dev);
+
         if (!driver->err_handler ||
             !driver->err_handler->slot_reset)
                 return;
@@ -174,17 +202,14 @@ static void eeh_report_reset(struct pci_dev *dev, void *userdata)
 static void eeh_report_resume(struct pci_dev *dev, void *userdata)
 {
         struct pci_driver *driver = dev->driver;
-        struct device_node *dn = pci_device_to_OF_node(dev);
 
         dev->error_state = pci_channel_io_normal;
 
         if (!driver)
                 return;
 
-        if ((PCI_DN(dn)->eeh_mode) & EEH_MODE_IRQ_DISABLED) {
-                PCI_DN(dn)->eeh_mode &= ~EEH_MODE_IRQ_DISABLED;
-                enable_irq(dev->irq);
-        }
+        eeh_enable_irq(dev);
+
         if (!driver->err_handler ||
             !driver->err_handler->resume)
                 return;
@@ -208,15 +233,12 @@ static void eeh_report_failure(struct pci_dev *dev, void *userdata)
         if (!driver)
                 return;
 
-        if (irq_in_use (dev->irq)) {
-                struct device_node *dn = pci_device_to_OF_node(dev);
-                PCI_DN(dn)->eeh_mode |= EEH_MODE_IRQ_DISABLED;
-                disable_irq_nosync(dev->irq);
-        }
-        if (!driver->err_handler)
-                return;
-        if (!driver->err_handler->error_detected)
+        eeh_disable_irq(dev);
+
+        if (!driver->err_handler ||
+            !driver->err_handler->error_detected)
                 return;
+
         driver->err_handler->error_detected(dev, pci_channel_io_perm_failure);
 }
 
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index f15222bbe136..bf2e1ac41308 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -71,11 +71,13 @@ static int rtas_change_msi(struct pci_dn *pdn, u32 func, u32 num_irqs)
         } while (rtas_busy_delay(rc));
 
         /*
-         * If the RTAS call succeeded, check the number of irqs is actually
-         * what we asked for. If not, return an error.
+         * If the RTAS call succeeded, return the number of irqs allocated.
+         * If not, make sure we return a negative error code.
          */
-        if (rc == 0 && rtas_ret[0] != num_irqs)
-                rc = -ENOSPC;
+        if (rc == 0)
+                rc = rtas_ret[0];
+        else if (rc > 0)
+                rc = -rc;
 
         pr_debug("rtas_msi: ibm,change_msi(func=%d,num=%d), got %d rc = %d\n",
                  func, num_irqs, rtas_ret[0], rc);
@@ -91,7 +93,7 @@ static void rtas_disable_msi(struct pci_dev *pdev)
         if (!pdn)
                 return;
 
-        if (rtas_change_msi(pdn, RTAS_CHANGE_FN, 0))
+        if (rtas_change_msi(pdn, RTAS_CHANGE_FN, 0) != 0)
                 pr_debug("rtas_msi: Setting MSIs to 0 failed!\n");
 }
 
@@ -132,7 +134,7 @@ static void rtas_teardown_msi_irqs(struct pci_dev *pdev)
         rtas_disable_msi(pdev);
 }
 
-static int check_req_msi(struct pci_dev *pdev, int nvec)
+static int check_req(struct pci_dev *pdev, int nvec, char *prop_name)
 {
         struct device_node *dn;
         struct pci_dn *pdn;
@@ -144,26 +146,235 @@ static int check_req_msi(struct pci_dev *pdev, int nvec)
 
         dn = pdn->node;
 
-        req_msi = of_get_property(dn, "ibm,req#msi", NULL);
+        req_msi = of_get_property(dn, prop_name, NULL);
         if (!req_msi) {
-                pr_debug("rtas_msi: No ibm,req#msi on %s\n", dn->full_name);
+                pr_debug("rtas_msi: No %s on %s\n", prop_name, dn->full_name);
                 return -ENOENT;
         }
 
         if (*req_msi < nvec) {
-                pr_debug("rtas_msi: ibm,req#msi requests < %d MSIs\n", nvec);
-                return -ENOSPC;
+                pr_debug("rtas_msi: %s requests < %d MSIs\n", prop_name, nvec);
+
+                if (*req_msi == 0) /* Be paranoid */
+                        return -ENOSPC;
+
+                return *req_msi;
         }
 
         return 0;
 }
 
+static int check_req_msi(struct pci_dev *pdev, int nvec)
+{
+        return check_req(pdev, nvec, "ibm,req#msi");
+}
+
+static int check_req_msix(struct pci_dev *pdev, int nvec)
+{
+        return check_req(pdev, nvec, "ibm,req#msi-x");
+}
+
+/* Quota calculation */
+
+static struct device_node *find_pe_total_msi(struct pci_dev *dev, int *total)
+{
+        struct device_node *dn;
+        const u32 *p;
+
+        dn = of_node_get(pci_device_to_OF_node(dev));
+        while (dn) {
+                p = of_get_property(dn, "ibm,pe-total-#msi", NULL);
+                if (p) {
+                        pr_debug("rtas_msi: found prop on dn %s\n",
+                                dn->full_name);
+                        *total = *p;
+                        return dn;
+                }
+
+                dn = of_get_next_parent(dn);
+        }
+
+        return NULL;
+}
+
+static struct device_node *find_pe_dn(struct pci_dev *dev, int *total)
+{
+        struct device_node *dn;
+
+        /* Found our PE and assume 8 at that point. */
+
+        dn = pci_device_to_OF_node(dev);
+        if (!dn)
+                return NULL;
+
+        dn = find_device_pe(dn);
+        if (!dn)
+                return NULL;
+
+        /* We actually want the parent */
+        dn = of_get_parent(dn);
+        if (!dn)
+                return NULL;
+
+        /* Hardcode of 8 for old firmwares */
+        *total = 8;
+        pr_debug("rtas_msi: using PE dn %s\n", dn->full_name);
+
+        return dn;
+}
+
+struct msi_counts {
+        struct device_node *requestor;
+        int num_devices;
+        int request;
+        int quota;
+        int spare;
+        int over_quota;
+};
+
+static void *count_non_bridge_devices(struct device_node *dn, void *data)
+{
+        struct msi_counts *counts = data;
+        const u32 *p;
+        u32 class;
+
+        pr_debug("rtas_msi: counting %s\n", dn->full_name);
+
+        p = of_get_property(dn, "class-code", NULL);
+        class = p ? *p : 0;
+
+        if ((class >> 8) != PCI_CLASS_BRIDGE_PCI)
+                counts->num_devices++;
+
+        return NULL;
+}
+
+static void *count_spare_msis(struct device_node *dn, void *data)
+{
+        struct msi_counts *counts = data;
+        const u32 *p;
+        int req;
+
+        if (dn == counts->requestor)
+                req = counts->request;
+        else {
+                /* We don't know if a driver will try to use MSI or MSI-X,
+                 * so we just have to punt and use the larger of the two. */
+                req = 0;
+                p = of_get_property(dn, "ibm,req#msi", NULL);
+                if (p)
+                        req = *p;
+
+                p = of_get_property(dn, "ibm,req#msi-x", NULL);
+                if (p)
+                        req = max(req, (int)*p);
+        }
+
+        if (req < counts->quota)
+                counts->spare += counts->quota - req;
+        else if (req > counts->quota)
+                counts->over_quota++;
+
+        return NULL;
+}
+
+static int msi_quota_for_device(struct pci_dev *dev, int request)
+{
+        struct device_node *pe_dn;
+        struct msi_counts counts;
+        int total;
+
+        pr_debug("rtas_msi: calc quota for %s, request %d\n", pci_name(dev),
+                  request);
+
+        pe_dn = find_pe_total_msi(dev, &total);
+        if (!pe_dn)
+                pe_dn = find_pe_dn(dev, &total);
+
+        if (!pe_dn) {
+                pr_err("rtas_msi: couldn't find PE for %s\n", pci_name(dev));
+                goto out;
+        }
+
+        pr_debug("rtas_msi: found PE %s\n", pe_dn->full_name);
+
+        memset(&counts, 0, sizeof(struct msi_counts));
+
+        /* Work out how many devices we have below this PE */
+        traverse_pci_devices(pe_dn, count_non_bridge_devices, &counts);
+
+        if (counts.num_devices == 0) {
+                pr_err("rtas_msi: found 0 devices under PE for %s\n",
+                        pci_name(dev));
+                goto out;
+        }
+
+        counts.quota = total / counts.num_devices;
+        if (request <= counts.quota)
+                goto out;
+
+        /* else, we have some more calculating to do */
+        counts.requestor = pci_device_to_OF_node(dev);
+        counts.request = request;
+        traverse_pci_devices(pe_dn, count_spare_msis, &counts);
+
+        /* If the quota isn't an integer multiple of the total, we can
+         * use the remainder as spare MSIs for anyone that wants them. */
+        counts.spare += total % counts.num_devices;
+
+        /* Divide any spare by the number of over-quota requestors */
+        if (counts.over_quota)
+                counts.quota += counts.spare / counts.over_quota;
+
+        /* And finally clamp the request to the possibly adjusted quota */
+        request = min(counts.quota, request);
+
+        pr_debug("rtas_msi: request clamped to quota %d\n", request);
+out:
+        of_node_put(pe_dn);
+
+        return request;
+}
+
 static int rtas_msi_check_device(struct pci_dev *pdev, int nvec, int type)
 {
+        int quota, rc;
+
         if (type == PCI_CAP_ID_MSIX)
-                pr_debug("rtas_msi: MSI-X untested, trying anyway.\n");
+                rc = check_req_msix(pdev, nvec);
+        else
+                rc = check_req_msi(pdev, nvec);
+
+        if (rc)
+                return rc;
+
+        quota = msi_quota_for_device(pdev, nvec);
 
-        return check_req_msi(pdev, nvec);
+        if (quota && quota < nvec)
+                return quota;
+
+        return 0;
+}
+
+static int check_msix_entries(struct pci_dev *pdev)
+{
+        struct msi_desc *entry;
+        int expected;
+
+        /* There's no way for us to express to firmware that we want
+         * a discontiguous, or non-zero based, range of MSI-X entries.
+         * So we must reject such requests. */
+
+        expected = 0;
+        list_for_each_entry(entry, &pdev->msi_list, list) {
+                if (entry->msi_attrib.entry_nr != expected) {
+                        pr_debug("rtas_msi: bad MSI-X entries.\n");
+                        return -EINVAL;
+                }
+                expected++;
+        }
+
+        return 0;
 }
 
 static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
@@ -177,6 +388,9 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         if (!pdn)
                 return -ENODEV;
 
+        if (type == PCI_CAP_ID_MSIX && check_msix_entries(pdev))
+                return -EINVAL;
+
         /*
          * Try the new more explicit firmware interface, if that fails fall
          * back to the old interface. The old interface is known to never
@@ -185,21 +399,21 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         if (type == PCI_CAP_ID_MSI) {
                 rc = rtas_change_msi(pdn, RTAS_CHANGE_MSI_FN, nvec);
 
-                if (rc) {
+                if (rc < 0) {
                         pr_debug("rtas_msi: trying the old firmware call.\n");
                         rc = rtas_change_msi(pdn, RTAS_CHANGE_FN, nvec);
                 }
         } else
                 rc = rtas_change_msi(pdn, RTAS_CHANGE_MSIX_FN, nvec);
 
-        if (rc) {
+        if (rc != nvec) {
                 pr_debug("rtas_msi: rtas_change_msi() failed\n");
                 return rc;
         }
 
         i = 0;
         list_for_each_entry(entry, &pdev->msi_list, list) {
-                hwirq = rtas_query_irq_number(pdn, i);
+                hwirq = rtas_query_irq_number(pdn, i++);
                 if (hwirq < 0) {
                         pr_debug("rtas_msi: error (%d) getting hwirq\n", rc);
                         return hwirq;
@@ -234,8 +448,8 @@ static void rtas_msi_pci_irq_fixup(struct pci_dev *pdev)
         }
 
         /* No MSI -> MSIs can't have been assigned by fw, leave LSI */
-        if (check_req_msi(pdev, 1)) {
-                dev_dbg(&pdev->dev, "rtas_msi: no req#msi, nothing to do.\n");
+        if (check_req_msi(pdev, 1) && check_req_msix(pdev, 1)) {
+                dev_dbg(&pdev->dev, "rtas_msi: no req#msi/x, nothing to do.\n");
                 return;
         }
 
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 5e1ed3d60ee5..ad152a0e3946 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -137,11 +137,9 @@ EXPORT_SYMBOL_GPL(pcibios_add_pci_devices);
 struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
 {
         struct pci_controller *phb;
-        int primary;
 
         pr_debug("PCI: Initializing new hotplug PHB %s\n", dn->full_name);
 
-        primary = list_empty(&hose_list);
         phb = pcibios_alloc_controller(dn);
         if (!phb)
                 return NULL;
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index d967c1893ab5..a24a6b2333b2 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -43,6 +43,16 @@ static inline long register_slb_shadow(unsigned long cpu, unsigned long vpa)
         return vpa_call(0x3, cpu, vpa);
 }
 
+static inline long unregister_dtl(unsigned long cpu, unsigned long vpa)
+{
+        return vpa_call(0x6, cpu, vpa);
+}
+
+static inline long register_dtl(unsigned long cpu, unsigned long vpa)
+{
+        return vpa_call(0x2, cpu, vpa);
+}
+
 static inline long plpar_page_set_loaned(unsigned long vpa)
 {
         unsigned long cmo_page_sz = cmo_get_page_size();
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index c591a25b0b0d..b6f1b137d427 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -468,9 +468,13 @@ static int do_update_property(char *buf, size_t bufsize)
 
                 rc = blocking_notifier_call_chain(&pSeries_reconfig_chain,
                                                   action, value);
+                if (rc == NOTIFY_BAD) {
+                        rc = prom_update_property(np, oldprop, newprop);
+                        return -ENOMEM;
+                }
         }
 
-        return rc;
+        return 0;
 }
 
 /**