Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25

28 files changed, 856 insertions, 64 deletions

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 541fbb815631..4fad6c7bf9f1 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -26,6 +26,19 @@ config PQ2FADS
         help
           This option enables support for the PQ2FADS board
 
+config EP8248E
+        bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)"
+        select 8272
+        select 8260
+        select FSL_SOC
+        select PPC_CPM_NEW_BINDING
+        select MDIO_BITBANG
+        help
+          This enables support for the Embedded Planet EP8248E board.
+
+          This board is also resold by Freescale as the QUICCStart
+          MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE.
+
 endchoice
 
 config PQ2ADS
diff --git a/arch/powerpc/platforms/82xx/Makefile b/arch/powerpc/platforms/82xx/Makefile
index 68c8b0c9772b..6cd5cd59bf2a 100644
--- a/arch/powerpc/platforms/82xx/Makefile
+++ b/arch/powerpc/platforms/82xx/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_MPC8272_ADS) += mpc8272_ads.o
 obj-$(CONFIG_CPM2) += pq2.o
 obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
 obj-$(CONFIG_PQ2FADS) += pq2fads.o
+obj-$(CONFIG_EP8248E) += ep8248e.o
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
new file mode 100644
index 000000000000..ba93d8ae9b0c
--- /dev/null
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -0,0 +1,324 @@
+/*
+ * Embedded Planet EP8248E support
+ *
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fsl_devices.h>
+#include <linux/mdio-bitbang.h>
+#include <linux/of_platform.h>
+
+#include <asm/io.h>
+#include <asm/cpm2.h>
+#include <asm/udbg.h>
+#include <asm/machdep.h>
+#include <asm/time.h>
+#include <asm/mpc8260.h>
+#include <asm/prom.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/cpm2_pic.h>
+
+#include "pq2.h"
+
+static u8 __iomem *ep8248e_bcsr;
+static struct device_node *ep8248e_bcsr_node;
+
+#define BCSR7_SCC2_ENABLE 0x10
+
+#define BCSR8_PHY1_ENABLE 0x80
+#define BCSR8_PHY1_POWER  0x40
+#define BCSR8_PHY2_ENABLE 0x20
+#define BCSR8_PHY2_POWER  0x10
+#define BCSR8_MDIO_READ   0x04
+#define BCSR8_MDIO_CLOCK  0x02
+#define BCSR8_MDIO_DATA   0x01
+
+#define BCSR9_USB_ENABLE  0x80
+#define BCSR9_USB_POWER   0x40
+#define BCSR9_USB_HOST    0x20
+#define BCSR9_USB_FULL_SPEED_TARGET 0x10
+
+static void __init ep8248e_pic_init(void)
+{
+        struct device_node *np = of_find_compatible_node(NULL, NULL, "fsl,pq2-pic");
+        if (!np) {
+                printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
+                return;
+        }
+
+        cpm2_pic_init(np);
+        of_node_put(np);
+}
+
+static void ep8248e_set_mdc(struct mdiobb_ctrl *ctrl, int level)
+{
+        if (level)
+                setbits8(&ep8248e_bcsr[8], BCSR8_MDIO_CLOCK);
+        else
+                clrbits8(&ep8248e_bcsr[8], BCSR8_MDIO_CLOCK);
+
+        /* Read back to flush the write. */
+        in_8(&ep8248e_bcsr[8]);
+}
+
+static void ep8248e_set_mdio_dir(struct mdiobb_ctrl *ctrl, int output)
+{
+        if (output)
+                clrbits8(&ep8248e_bcsr[8], BCSR8_MDIO_READ);
+        else
+                setbits8(&ep8248e_bcsr[8], BCSR8_MDIO_READ);
+
+        /* Read back to flush the write. */
+        in_8(&ep8248e_bcsr[8]);
+}
+
+static void ep8248e_set_mdio_data(struct mdiobb_ctrl *ctrl, int data)
+{
+        if (data)
+                setbits8(&ep8248e_bcsr[8], BCSR8_MDIO_DATA);
+        else
+                clrbits8(&ep8248e_bcsr[8], BCSR8_MDIO_DATA);
+
+        /* Read back to flush the write. */
+        in_8(&ep8248e_bcsr[8]);
+}
+
+static int ep8248e_get_mdio_data(struct mdiobb_ctrl *ctrl)
+{
+        return in_8(&ep8248e_bcsr[8]) & BCSR8_MDIO_DATA;
+}
+
+static const struct mdiobb_ops ep8248e_mdio_ops = {
+        .set_mdc = ep8248e_set_mdc,
+        .set_mdio_dir = ep8248e_set_mdio_dir,
+        .set_mdio_data = ep8248e_set_mdio_data,
+        .get_mdio_data = ep8248e_get_mdio_data,
+        .owner = THIS_MODULE,
+};
+
+static struct mdiobb_ctrl ep8248e_mdio_ctrl = {
+        .ops = &ep8248e_mdio_ops,
+};
+
+static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
+                                        const struct of_device_id *match)
+{
+        struct mii_bus *bus;
+        struct resource res;
+        struct device_node *node;
+        int ret, i;
+
+        node = of_get_parent(ofdev->node);
+        of_node_put(node);
+        if (node != ep8248e_bcsr_node)
+                return -ENODEV;
+
+        ret = of_address_to_resource(ofdev->node, 0, &res);
+        if (ret)
+                return ret;
+
+        bus = alloc_mdio_bitbang(&ep8248e_mdio_ctrl);
+        if (!bus)
+                return -ENOMEM;
+
+        bus->phy_mask = 0;
+        bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
+
+        for (i = 0; i < PHY_MAX_ADDR; i++)
+                bus->irq[i] = -1;
+
+        bus->name = "ep8248e-mdio-bitbang";
+        bus->dev = &ofdev->dev;
+        bus->id = res.start;
+
+        return mdiobus_register(bus);
+}
+
+static int ep8248e_mdio_remove(struct of_device *ofdev)
+{
+        BUG();
+        return 0;
+}
+
+static const struct of_device_id ep8248e_mdio_match[] = {
+        {
+                .compatible = "fsl,ep8248e-mdio-bitbang",
+        },
+        {},
+};
+
+static struct of_platform_driver ep8248e_mdio_driver = {
+        .driver = {
+                .name = "ep8248e-mdio-bitbang",
+        },
+        .match_table = ep8248e_mdio_match,
+        .probe = ep8248e_mdio_probe,
+        .remove = ep8248e_mdio_remove,
+};
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static __initdata struct cpm_pin ep8248e_pins[] = {
+        /* SMC1 */
+        {2, 4, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+
+        /* SCC1 */
+        {2, 14, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 15, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* FCC1 */
+        {0, 14, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {0, 15, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {0, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {0, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {0, 18, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {0, 19, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {0, 20, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {0, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {0, 26, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {0, 27, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {0, 28, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {0, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {0, 30, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {0, 31, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {2, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* FCC2 */
+        {1, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 20, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 22, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 25, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 26, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 27, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {1, 30, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {2, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* I2C */
+        {4, 14, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {4, 15, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+
+        /* USB */
+        {2, 10, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 11, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 20, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {2, 24, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {3, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 25, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+};
+
+static void __init init_ioports(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(ep8248e_pins); i++) {
+                const struct cpm_pin *pin = &ep8248e_pins[i];
+                cpm2_set_pin(pin->port, pin->pin, pin->flags);
+        }
+
+        cpm2_smc_clk_setup(CPM_CLK_SMC1, CPM_BRG7);
+        cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_SCC3, CPM_CLK8, CPM_CLK_TX); /* USB */
+        cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK11, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK10, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK13, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK14, CPM_CLK_TX);
+}
+
+static void __init ep8248e_setup_arch(void)
+{
+        if (ppc_md.progress)
+                ppc_md.progress("ep8248e_setup_arch()", 0);
+
+        cpm2_reset();
+
+        /* When this is set, snooping CPM DMA from RAM causes
+         * machine checks.  See erratum SIU18.
+         */
+        clrbits32(&cpm2_immr->im_siu_conf.siu_82xx.sc_bcr, MPC82XX_BCR_PLDP);
+
+        ep8248e_bcsr_node =
+                of_find_compatible_node(NULL, NULL, "fsl,ep8248e-bcsr");
+        if (!ep8248e_bcsr_node) {
+                printk(KERN_ERR "No bcsr in device tree\n");
+                return;
+        }
+
+        ep8248e_bcsr = of_iomap(ep8248e_bcsr_node, 0);
+        if (!ep8248e_bcsr) {
+                printk(KERN_ERR "Cannot map BCSR registers\n");
+                of_node_put(ep8248e_bcsr_node);
+                ep8248e_bcsr_node = NULL;
+                return;
+        }
+
+        setbits8(&ep8248e_bcsr[7], BCSR7_SCC2_ENABLE);
+        setbits8(&ep8248e_bcsr[8], BCSR8_PHY1_ENABLE | BCSR8_PHY1_POWER |
+                                   BCSR8_PHY2_ENABLE | BCSR8_PHY2_POWER);
+
+        init_ioports();
+
+        if (ppc_md.progress)
+                ppc_md.progress("ep8248e_setup_arch(), finish", 0);
+}
+
+static  __initdata struct of_device_id of_bus_ids[] = {
+        { .compatible = "simple-bus", },
+        { .compatible = "fsl,ep8248e-bcsr", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        of_register_platform_driver(&ep8248e_mdio_driver);
+
+        return 0;
+}
+machine_device_initcall(ep8248e, declare_of_platform_devices);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init ep8248e_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "fsl,ep8248e");
+}
+
+define_machine(ep8248e)
+{
+        .name = "Embedded Planet EP8248E",
+        .probe = ep8248e_probe,
+        .setup_arch = ep8248e_setup_arch,
+        .init_IRQ = ep8248e_pic_init,
+        .get_irq = cpm2_get_irq,
+        .calibrate_decr = generic_calibrate_decr,
+        .restart = pq2_restart,
+        .progress = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/83xx/mpc8313_rdb.c b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
index 6fb82993967c..4996b7dfdf1d 100644
--- a/arch/powerpc/platforms/83xx/mpc8313_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/of_platform.h>
 
 #include <asm/time.h>
 #include <asm/ipic.h>
@@ -75,6 +76,18 @@ static int __init mpc8313_rdb_probe(void)
         return of_flat_dt_is_compatible(root, "MPC8313ERDB");
 }
 
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .compatible = "simple-bus" },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+machine_device_initcall(mpc8313_rdb, declare_of_platform_devices);
+
 define_machine(mpc8313_rdb) {
         .name                   = "MPC8313 RDB",
         .probe                  = mpc8313_rdb_probe,
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 1e570bb947fc..dbdd4adef645 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -110,15 +110,12 @@ static struct of_device_id mpc832x_ids[] = {
 
 static int __init mpc832x_declare_of_platform_devices(void)
 {
-        if (!machine_is(mpc832x_mds))
-                return 0;
-
         /* Publish the QE devices */
         of_platform_bus_probe(NULL, mpc832x_ids, NULL);
 
         return 0;
 }
-device_initcall(mpc832x_declare_of_platform_devices);
+machine_device_initcall(mpc832x_mds, mpc832x_declare_of_platform_devices);
 
 static void __init mpc832x_sys_init_IRQ(void)
 {
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index ffb2e9361ce3..5fddd2285abb 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -63,9 +63,6 @@ static struct spi_board_info mpc832x_spi_boardinfo = {
 
 static int __init mpc832x_spi_init(void)
 {
-        if (!machine_is(mpc832x_rdb))
-                return 0;
-
         par_io_config_pin(3,  0, 3, 0, 1, 0); /* SPI1 MOSI, I/O */
         par_io_config_pin(3,  1, 3, 0, 1, 0); /* SPI1 MISO, I/O */
         par_io_config_pin(3,  2, 3, 0, 1, 0); /* SPI1 CLK,  I/O */
@@ -80,7 +77,7 @@ static int __init mpc832x_spi_init(void)
                             mpc83xx_spi_deactivate_cs);
 }
 
-device_initcall(mpc832x_spi_init);
+machine_device_initcall(mpc832x_rdb, mpc832x_spi_init);
 
 /* ************************************************************************
  *
@@ -123,15 +120,12 @@ static struct of_device_id mpc832x_ids[] = {
 
 static int __init mpc832x_declare_of_platform_devices(void)
 {
-        if (!machine_is(mpc832x_rdb))
-                return 0;
-
         /* Publish the QE devices */
         of_platform_bus_probe(NULL, mpc832x_ids, NULL);
 
         return 0;
 }
-device_initcall(mpc832x_declare_of_platform_devices);
+machine_device_initcall(mpc832x_rdb, mpc832x_declare_of_platform_devices);
 
 void __init mpc832x_rdb_init_IRQ(void)
 {
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index aa768199432d..50e8f632061c 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
+#include <linux/of_platform.h>
 
 #include <asm/system.h>
 #include <asm/atomic.h>
@@ -37,6 +38,17 @@
 
 #include "mpc83xx.h"
 
+static struct of_device_id __initdata mpc834x_itx_ids[] = {
+        { .compatible = "fsl,pq2pro-localbus", },
+        {},
+};
+
+static int __init mpc834x_itx_declare_of_platform_devices(void)
+{
+        return of_platform_bus_probe(NULL, mpc834x_itx_ids, NULL);
+}
+machine_device_initcall(mpc834x_itx, mpc834x_itx_declare_of_platform_devices);
+
 /* ************************************************************************
  *
  * Setup the architecture
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 459fb7227e76..2b8a0a3f8557 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -115,13 +115,10 @@ static struct of_device_id mpc834x_ids[] = {
 
 static int __init mpc834x_declare_of_platform_devices(void)
 {
-        if (!machine_is(mpc834x_mds))
-                return 0;
-
         of_platform_bus_probe(NULL, mpc834x_ids, NULL);
         return 0;
 }
-device_initcall(mpc834x_declare_of_platform_devices);
+machine_device_initcall(mpc834x_mds, mpc834x_declare_of_platform_devices);
 
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 2ac9890b763c..db491ec006e0 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -141,15 +141,12 @@ static struct of_device_id mpc836x_ids[] = {
 
 static int __init mpc836x_declare_of_platform_devices(void)
 {
-        if (!machine_is(mpc836x_mds))
-                return 0;
-
         /* Publish the QE devices */
         of_platform_bus_probe(NULL, mpc836x_ids, NULL);
 
         return 0;
 }
-device_initcall(mpc836x_declare_of_platform_devices);
+machine_device_initcall(mpc836x_mds, mpc836x_declare_of_platform_devices);
 
 static void __init mpc836x_mds_init_IRQ(void)
 {
diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c
index 9cdc32b4fa18..8a9c26973605 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c
@@ -22,6 +22,56 @@
 
 #include "mpc83xx.h"
 
+#define BCSR12_USB_SER_MASK     0x8a
+#define BCSR12_USB_SER_PIN      0x80
+#define BCSR12_USB_SER_DEVICE   0x02
+extern int mpc837x_usb_cfg(void);
+
+static int mpc837xmds_usb_cfg(void)
+{
+        struct device_node *np;
+        const void *phy_type, *mode;
+        void __iomem *bcsr_regs = NULL;
+        u8 bcsr12;
+        int ret;
+
+        ret = mpc837x_usb_cfg();
+        if (ret)
+                return ret;
+        /* Map BCSR area */
+        np = of_find_node_by_name(NULL, "bcsr");
+        if (np) {
+                struct resource res;
+
+                of_address_to_resource(np, 0, &res);
+                bcsr_regs = ioremap(res.start, res.end - res.start + 1);
+                of_node_put(np);
+        }
+        if (!bcsr_regs)
+                return -1;
+
+        np = of_find_node_by_name(NULL, "usb");
+        if (!np)
+                return -ENODEV;
+        phy_type = of_get_property(np, "phy_type", NULL);
+        if (phy_type && !strcmp(phy_type, "ulpi")) {
+                clrbits8(bcsr_regs + 12, BCSR12_USB_SER_PIN);
+        } else if (phy_type && !strcmp(phy_type, "serial")) {
+                mode = of_get_property(np, "dr_mode", NULL);
+                bcsr12 = in_8(bcsr_regs + 12) & ~BCSR12_USB_SER_MASK;
+                bcsr12 |= BCSR12_USB_SER_PIN;
+                if (mode && !strcmp(mode, "peripheral"))
+                        bcsr12 |= BCSR12_USB_SER_DEVICE;
+                out_8(bcsr_regs + 12, bcsr12);
+        } else {
+                printk(KERN_ERR "USB DR: unsupported PHY\n");
+        }
+
+        of_node_put(np);
+        iounmap(bcsr_regs);
+        return 0;
+}
+
 /* ************************************************************************
  *
  * Setup the architecture
@@ -40,6 +90,7 @@ static void __init mpc837x_mds_setup_arch(void)
         for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
 #endif
+        mpc837xmds_usb_cfg();
 }
 
 static struct of_device_id mpc837x_ids[] = {
@@ -50,15 +101,12 @@ static struct of_device_id mpc837x_ids[] = {
 
 static int __init mpc837x_declare_of_platform_devices(void)
 {
-        if (!machine_is(mpc837x_mds))
-                return 0;
-
         /* Publish of_device */
         of_platform_bus_probe(NULL, mpc837x_ids, NULL);
 
         return 0;
 }
-device_initcall(mpc837x_declare_of_platform_devices);
+machine_device_initcall(mpc837x_mds, mpc837x_declare_of_platform_devices);
 
 static void __init mpc837x_mds_init_IRQ(void)
 {
diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
index b778cb4f3fb5..88bb748aff0d 100644
--- a/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -14,6 +14,7 @@
 #define MPC83XX_SCCR_USB_DRCM_11   0x00300000
 #define MPC83XX_SCCR_USB_DRCM_01   0x00100000
 #define MPC83XX_SCCR_USB_DRCM_10   0x00200000
+#define MPC837X_SCCR_USB_DRCM_11   0x00c00000
 
 /* system i/o configuration register low */
 #define MPC83XX_SICRL_OFFS         0x114
@@ -22,6 +23,8 @@
 #define MPC834X_SICRL_USB1         0x20000000
 #define MPC831X_SICRL_USB_MASK     0x00000c00
 #define MPC831X_SICRL_USB_ULPI     0x00000800
+#define MPC837X_SICRL_USB_MASK     0xf0000000
+#define MPC837X_SICRL_USB_ULPI     0x50000000
 
 /* system i/o configuration register high */
 #define MPC83XX_SICRH_OFFS         0x118
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index b45160f8d084..6a454a4087c8 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -41,7 +41,7 @@ int mpc834x_usb_cfg(void)
         sicrl = in_be32(immap + MPC83XX_SICRL_OFFS) & ~MPC834X_SICRL_USB_MASK;
         sicrh = in_be32(immap + MPC83XX_SICRH_OFFS) & ~MPC834X_SICRH_USB_UTMI;
 
-        np = of_find_compatible_node(NULL, "usb", "fsl-usb2-dr");
+        np = of_find_compatible_node(NULL, NULL, "fsl-usb2-dr");
         if (np) {
                 sccr |= MPC83XX_SCCR_USB_DRCM_11;  /* 1:3 */
 
@@ -67,7 +67,7 @@ int mpc834x_usb_cfg(void)
                 port0_is_dr = 1;
                 of_node_put(np);
         }
-        np = of_find_compatible_node(NULL, "usb", "fsl-usb2-mph");
+        np = of_find_compatible_node(NULL, NULL, "fsl-usb2-mph");
         if (np) {
                 sccr |= MPC83XX_SCCR_USB_MPHCM_11; /* 1:3 */
 
@@ -111,7 +111,7 @@ int mpc831x_usb_cfg(void)
         const void *dr_mode;
 #endif
 
-        np = of_find_compatible_node(NULL, "usb", "fsl-usb2-dr");
+        np = of_find_compatible_node(NULL, NULL, "fsl-usb2-dr");
         if (!np)
                 return -ENODEV;
         prop = of_get_property(np, "phy_type", NULL);
@@ -179,3 +179,43 @@ int mpc831x_usb_cfg(void)
         return ret;
 }
 #endif /* CONFIG_PPC_MPC831x */
+
+#ifdef CONFIG_PPC_MPC837x
+int mpc837x_usb_cfg(void)
+{
+        void __iomem *immap;
+        struct device_node *np = NULL;
+        const void *prop;
+        int ret = 0;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl-usb2-dr");
+        if (!np)
+                return -ENODEV;
+        prop = of_get_property(np, "phy_type", NULL);
+
+        if (!prop || (strcmp(prop, "ulpi") && strcmp(prop, "serial"))) {
+                printk(KERN_WARNING "837x USB PHY type not supported\n");
+                of_node_put(np);
+                return -EINVAL;
+        }
+
+        /* Map IMMR space for pin and clock settings */
+        immap = ioremap(get_immrbase(), 0x1000);
+        if (!immap) {
+                of_node_put(np);
+                return -ENOMEM;
+        }
+
+        /* Configure clock */
+        clrsetbits_be32(immap + MPC83XX_SCCR_OFFS, MPC837X_SCCR_USB_DRCM_11,
+                        MPC837X_SCCR_USB_DRCM_11);
+
+        /* Configure pin mux for ULPI/serial */
+        clrsetbits_be32(immap + MPC83XX_SICRL_OFFS, MPC837X_SICRL_USB_MASK,
+                        MPC837X_SICRL_USB_ULPI);
+
+        iounmap(immap);
+        of_node_put(np);
+        return ret;
+}
+#endif /* CONFIG_PPC_MPC837x */
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index bccdc25f83a2..4e0305096114 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -52,9 +52,9 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
         int cascade_irq;
 
-        while ((cascade_irq = cpm2_get_irq()) >= 0) {
+        while ((cascade_irq = cpm2_get_irq()) >= 0)
                 generic_handle_irq(cascade_irq);
-        }
+
         desc->chip->eoi(irq);
 }
 
@@ -70,13 +70,12 @@ static void __init mpc85xx_ads_pic_init(void)
 #endif
 
         np = of_find_node_by_type(np, "open-pic");
-
-        if (np == NULL) {
+        if (!np) {
                 printk(KERN_ERR "Could not find open-pic node\n");
                 return;
         }
 
-        if(of_address_to_resource(np, 0, &r)) {
+        if (of_address_to_resource(np, 0, &r)) {
                 printk(KERN_ERR "Could not map mpic register space\n");
                 of_node_put(np);
                 return;
@@ -100,6 +99,7 @@ static void __init mpc85xx_ads_pic_init(void)
         irq = irq_of_parse_and_map(np, 0);
 
         cpm2_pic_init(np);
+        of_node_put(np);
         set_irq_chained_handler(irq, cpm2_cascade);
 #endif
 }
@@ -112,7 +112,7 @@ struct cpm_pin {
         int port, pin, flags;
 };
 
-static struct cpm_pin mpc8560_ads_pins[] = {
+static const struct cpm_pin mpc8560_ads_pins[] = {
         /* SCC1 */
         {3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
         {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
@@ -233,13 +233,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
 
 static int __init declare_of_platform_devices(void)
 {
-        if (!machine_is(mpc85xx_ads))
-                return 0;
-
         of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
         return 0;
 }
-device_initcall(declare_of_platform_devices);
+machine_device_initcall(mpc85xx_ads, declare_of_platform_devices);
 
 /*
  * Called very early, device-tree isn't unflattened
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 4d063eec6210..8b1de7884be6 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -222,9 +222,6 @@ static int mpc85xx_cds_8259_attach(void)
         struct device_node *cascade_node = NULL;
         int cascade_irq;
 
-        if (!machine_is(mpc85xx_cds))
-                return 0;
-
         /* Initialize the i8259 controller */
         for_each_node_by_type(np, "interrupt-controller")
                 if (of_device_is_compatible(np, "chrp,iic")) {
@@ -262,8 +259,7 @@ static int mpc85xx_cds_8259_attach(void)
 
         return 0;
 }
-
-device_initcall(mpc85xx_cds_8259_attach);
+machine_device_initcall(mpc85xx_cds, mpc85xx_cds_8259_attach);
 
 #endif /* CONFIG_PPC_I8259 */
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index e6c63a5b1efb..4fdf5abefffd 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -144,15 +144,12 @@ static struct of_device_id mpc85xx_ids[] = {
 
 static int __init mpc85xx_publish_devices(void)
 {
-        if (!machine_is(mpc85xx_mds))
-                return 0;
-
         /* Publish the QE devices */
-        of_platform_bus_probe(NULL,mpc85xx_ids,NULL);
+        of_platform_bus_probe(NULL, mpc85xx_ids, NULL);
 
         return 0;
 }
-device_initcall(mpc85xx_publish_devices);
+machine_device_initcall(mpc85xx_mds, mpc85xx_publish_devices);
 
 static void __init mpc85xx_mds_pic_init(void)
 {
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index c6d2f48f8f3d..0b07485641fe 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -34,9 +34,24 @@
 
 #include <asm/mpic.h>
 
+#include <linux/of_platform.h>
 #include <sysdev/fsl_pci.h>
 #include <sysdev/fsl_soc.h>
 
+static struct of_device_id __initdata mpc8610_ids[] = {
+        { .compatible = "fsl,mpc8610-immr", },
+        {}
+};
+
+static int __init mpc8610_declare_of_platform_devices(void)
+{
+        /* Without this call, the SSI device driver won't get probed. */
+        of_platform_bus_probe(NULL, mpc8610_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
+
 void __init
 mpc86xx_hpcd_init_irq(void)
 {
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 14f4e527e7ac..cfbe8c52e263 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -18,6 +18,7 @@
 #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>
@@ -212,6 +213,19 @@ mpc86xx_time_init(void)
         return 0;
 }
 
+static __initdata struct of_device_id of_bus_ids[] = {
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(mpc86xx_hpcn, declare_of_platform_devices);
+
 define_machine(mpc86xx_hpcn) {
         .name                   = "MPC86xx HPCN",
         .probe                  = mpc86xx_hpcn_probe,
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 91fbe4241918..7fd224ca233d 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -44,6 +44,15 @@ config PPC_EP88XC
           This board is also resold by Freescale as the QUICCStart
           MPC885 Evaluation System and/or the CWH-PPC-885XN-VE.
 
+config PPC_ADDER875
+        bool "Analogue & Micro Adder 875"
+        select CPM1
+        select PPC_CPM_NEW_BINDING
+        select REDBOOT
+        help
+          This enables support for the Analogue & Micro Adder 875
+          board.
+
 endchoice
 
 menu "Freescale Ethernet driver platform-specific options"
diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile
index 8b7098018b59..7b71d9c8fb45 100644
--- a/arch/powerpc/platforms/8xx/Makefile
+++ b/arch/powerpc/platforms/8xx/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_PPC_8xx)	  += m8xx_setup.o
 obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
 obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
 obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
+obj-$(CONFIG_PPC_ADDER875) += adder875.o
diff --git a/arch/powerpc/platforms/8xx/adder875.c b/arch/powerpc/platforms/8xx/adder875.c
new file mode 100644
index 000000000000..c6bc0783c3b0
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/adder875.c
@@ -0,0 +1,118 @@
+/* Analogue & Micro Adder MPC875 board support
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 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, version 2, as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/fs_enet_pd.h>
+#include <linux/of_platform.h>
+
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/commproc.h>
+#include <asm/fs_pd.h>
+#include <asm/udbg.h>
+#include <asm/prom.h>
+
+#include <sysdev/commproc.h>
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static __initdata struct cpm_pin adder875_pins[] = {
+        /* SMC1 */
+        {CPM_PORTB, 24, CPM_PIN_INPUT}, /* RX */
+        {CPM_PORTB, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
+
+        /* MII1 */
+        {CPM_PORTA, 0, CPM_PIN_INPUT},
+        {CPM_PORTA, 1, CPM_PIN_INPUT},
+        {CPM_PORTA, 2, CPM_PIN_INPUT},
+        {CPM_PORTA, 3, CPM_PIN_INPUT},
+        {CPM_PORTA, 4, CPM_PIN_OUTPUT},
+        {CPM_PORTA, 10, CPM_PIN_OUTPUT},
+        {CPM_PORTA, 11, CPM_PIN_OUTPUT},
+        {CPM_PORTB, 19, CPM_PIN_INPUT},
+        {CPM_PORTB, 31, CPM_PIN_INPUT},
+        {CPM_PORTC, 12, CPM_PIN_INPUT},
+        {CPM_PORTC, 13, CPM_PIN_INPUT},
+        {CPM_PORTE, 30, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 31, CPM_PIN_OUTPUT},
+
+        /* MII2 */
+        {CPM_PORTE, 14, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 15, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 16, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 17, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 18, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 19, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 20, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 21, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 22, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 23, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 24, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 25, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 26, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 27, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 28, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 29, CPM_PIN_OUTPUT},
+};
+
+static void __init init_ioports(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(adder875_pins); i++) {
+                const struct cpm_pin *pin = &adder875_pins[i];
+                cpm1_set_pin(pin->port, pin->pin, pin->flags);
+        }
+
+        cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
+
+        /* Set FEC1 and FEC2 to MII mode */
+        clrbits32(&mpc8xx_immr->im_cpm.cp_cptr, 0x00000180);
+}
+
+static void __init adder875_setup(void)
+{
+        cpm_reset();
+        init_ioports();
+}
+
+static int __init adder875_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "analogue-and-micro,adder875");
+}
+
+static __initdata struct of_device_id of_bus_ids[] = {
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+machine_device_initcall(adder875, declare_of_platform_devices);
+
+define_machine(adder875) {
+        .name = "Adder MPC875",
+        .probe = adder875_probe,
+        .setup_arch = adder875_setup,
+        .init_IRQ = m8xx_pic_init,
+        .get_irq = mpc8xx_get_irq,
+        .restart = mpc8xx_restart,
+        .calibrate_decr = generic_calibrate_decr,
+        .set_rtc_time = mpc8xx_set_rtc_time,
+        .get_rtc_time = mpc8xx_get_rtc_time,
+        .progress = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c
index c518b6cc5fab..88afa353f1d2 100644
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -155,12 +155,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
 static int __init declare_of_platform_devices(void)
 {
         /* Publish the QE devices */
-        if (machine_is(ep88xc))
-                of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
 
         return 0;
 }
-device_initcall(declare_of_platform_devices);
+machine_device_initcall(ep88xc, declare_of_platform_devices);
 
 define_machine(ep88xc) {
         .name = "Embedded Planet EP88xC",
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index d2927a434aef..d7965f885209 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -128,12 +128,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
 
 static int __init declare_of_platform_devices(void)
 {
-        if (machine_is(mpc86x_ads))
-                of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
 
         return 0;
 }
-device_initcall(declare_of_platform_devices);
+machine_device_initcall(mpc86x_ads, declare_of_platform_devices);
 
 define_machine(mpc86x_ads) {
         .name                   = "MPC86x ADS",
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 2cf1b6a75173..6ef8e9e6b8c3 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -264,12 +264,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
 static int __init declare_of_platform_devices(void)
 {
         /* Publish the QE devices */
-        if (machine_is(mpc885_ads))
-                of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
 
         return 0;
 }
-device_initcall(declare_of_platform_devices);
+machine_device_initcall(mpc885_ads, declare_of_platform_devices);
 
 define_machine(mpc885_ads) {
         .name                   = "Freescale MPC885 ADS",
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index ea22cad2cd0a..2cec34314d2e 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -22,6 +22,7 @@ config PPC_83xx
         depends on 6xx
         select FSL_SOC
         select 83xx
+        select IPIC
         select WANT_DEVICE_TREE
 
 config PPC_86xx
@@ -80,6 +81,10 @@ config XICS
         bool
         default y
 
+config IPIC
+        bool
+        default n
+
 config MPIC
         bool
         default n
@@ -265,6 +270,7 @@ config TAU_AVERAGE
 config QUICC_ENGINE
         bool
         select PPC_LIB_RHEAP
+        select CRC32
         help
           The QUICC Engine (QE) is a new generation of communications
           coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 8924095a7928..6c8083757938 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -9,6 +9,8 @@ config LINKSTATION
         select FSL_SOC
         select PPC_UDBG_16550 if SERIAL_8250
         select DEFAULT_UIMAGE
+        select MPC10X_OPENPIC
+        select MPC10X_BRIDGE
         help
           Select LINKSTATION if configuring for one of PPC- (MPC8241)
           based NAS systems from Buffalo Technology. So far only
@@ -16,6 +18,19 @@ config LINKSTATION
           Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
           Terastation systems should be supported too.
 
+config STORCENTER
+        bool "IOMEGA StorCenter"
+        depends on EMBEDDED6xx
+        select MPIC
+        select FSL_SOC
+        select PPC_UDBG_16550 if SERIAL_8250
+        select WANT_DEVICE_TREE
+        select MPC10X_OPENPIC
+        select MPC10X_BRIDGE
+        help
+          Select STORCENTER if configuring for the iomega StorCenter
+          with an 8241 CPU in it.
+
 config MPC7448HPC2
         bool "Freescale MPC7448HPC2(Taiga)"
         depends on EMBEDDED6xx
@@ -23,6 +38,7 @@ config MPC7448HPC2
         select DEFAULT_UIMAGE
         select PPC_UDBG_16550
         select WANT_DEVICE_TREE
+        select TSI108_BRIDGE
         help
           Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
           platform
@@ -33,6 +49,7 @@ config PPC_HOLLY
         select TSI108_BRIDGE
         select PPC_UDBG_16550
         select WANT_DEVICE_TREE
+        select TSI108_BRIDGE
         help
           Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval
           Board with TSI108/9 bridge (Hickory/Holly)
@@ -48,17 +65,13 @@ config PPC_PRPMC2800
 
 config TSI108_BRIDGE
         bool
-        depends on MPC7448HPC2 || PPC_HOLLY
         select PCI
         select MPIC
         select MPIC_WEIRD
-        default y
 
 config MPC10X_BRIDGE
         bool
-        depends on LINKSTATION
         select PPC_INDIRECT_PCI
-        default y
 
 config MV64X60
         bool
@@ -67,8 +80,6 @@ config MV64X60
 
 config MPC10X_OPENPIC
         bool
-        depends on LINKSTATION
-        default y
 
 config MPC10X_STORE_GATHERING
         bool "Enable MPC10x store gathering"
diff --git a/arch/powerpc/platforms/embedded6xx/Makefile b/arch/powerpc/platforms/embedded6xx/Makefile
index 844947cfc5db..06524d3ffd2e 100644
--- a/arch/powerpc/platforms/embedded6xx/Makefile
+++ b/arch/powerpc/platforms/embedded6xx/Makefile
@@ -3,5 +3,6 @@
 #
 obj-$(CONFIG_MPC7448HPC2)       += mpc7448_hpc2.o
 obj-$(CONFIG_LINKSTATION)       += linkstation.o ls_uart.o
+obj-$(CONFIG_STORCENTER)        += storcenter.o
 obj-$(CONFIG_PPC_HOLLY)         += holly.o
 obj-$(CONFIG_PPC_PRPMC2800)     += prpmc2800.o
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index a2c04b9d42b1..d4f8bf581e3a 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -53,8 +53,6 @@
 
 #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000
 
-extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
-
 int mpc7448_hpc2_exclude_device(struct pci_controller *hose,
                                 u_char bus, u_char devfn)
 {
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
new file mode 100644
index 000000000000..e12e9d298716
--- /dev/null
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -0,0 +1,192 @@
+/*
+ * Board setup routines for the storcenter
+ *
+ * Copyright 2007 (C) Oyvind Repvik (nail@nslu2-linux.org)
+ * Copyright 2007 Andy Wilcox, Jon Loeliger
+ *
+ * Based on linkstation.c by G. Liakhovetski
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of
+ * any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/initrd.h>
+#include <linux/mtd/physmap.h>
+#include <linux/of_platform.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/prom.h>
+#include <asm/mpic.h>
+#include <asm/pci-bridge.h>
+
+#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", },
+        {},
+};
+
+static int __init storcenter_device_probe(void)
+{
+        of_platform_bus_probe(NULL, storcenter_of_bus, NULL);
+        return 0;
+}
+machine_device_initcall(storcenter, storcenter_device_probe);
+
+
+static int __init storcenter_add_bridge(struct device_node *dev)
+{
+#ifdef CONFIG_PCI
+        int len;
+        struct pci_controller *hose;
+        const int *bus_range;
+
+        printk("Adding PCI host bridge %s\n", dev->full_name);
+
+        hose = pcibios_alloc_controller(dev);
+        if (hose == NULL)
+                return -ENOMEM;
+
+        bus_range = of_get_property(dev, "bus-range", &len);
+        hose->first_busno = bus_range ? bus_range[0] : 0;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+
+        setup_indirect_pci(hose, MPC10X_MAPB_CNFG_ADDR, MPC10X_MAPB_CNFG_DATA, 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);
+#endif
+
+        return 0;
+}
+
+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);
+
+        printk(KERN_INFO "IOMEGA StorCenter\n");
+}
+
+/*
+ * Interrupt setup and service.  Interrrupts on the turbostation come
+ * from the four PCI slots plus onboard 8241 devices: I2C, DUART.
+ */
+static void __init storcenter_init_IRQ(void)
+{
+        struct mpic *mpic;
+        struct device_node *dnp;
+        const void *prop;
+        int size;
+        phys_addr_t paddr;
+
+        dnp = of_find_node_by_type(NULL, "open-pic");
+        if (dnp == NULL)
+                return;
+
+        prop = of_get_property(dnp, "reg", &size);
+        if (prop == NULL) {
+                of_node_put(dnp);
+                return;
+        }
+
+        paddr = (phys_addr_t)of_translate_address(dnp, prop);
+        mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET,
+                        4, 32, " EPIC     ");
+
+        of_node_put(dnp);
+
+        BUG_ON(mpic == NULL);
+
+        /* PCI IRQs */
+        /*
+         * 2.6.12 patch:
+         *         openpic_set_sources(0, 5, OpenPIC_Addr + 0x10200);
+         *         openpic_set_sources(5, 2, OpenPIC_Addr + 0x11120);
+         *         first_irq, num_irqs, __iomem first_ISR
+         *         o_ss: i, src: 0, fdf50200
+         *         o_ss: i, src: 1, fdf50220
+         *         o_ss: i, src: 2, fdf50240
+         *         o_ss: i, src: 3, fdf50260
+         *         o_ss: i, src: 4, fdf50280
+         *         o_ss: i, src: 5, fdf51120
+         *         o_ss: i, src: 6, fdf51140
+         */
+        mpic_assign_isu(mpic, 0, paddr + 0x10200);
+        mpic_assign_isu(mpic, 1, paddr + 0x10220);
+        mpic_assign_isu(mpic, 2, paddr + 0x10240);
+        mpic_assign_isu(mpic, 3, paddr + 0x10260);
+        mpic_assign_isu(mpic, 4, paddr + 0x10280);
+        mpic_assign_isu(mpic, 5, paddr + 0x11120);
+        mpic_assign_isu(mpic, 6, paddr + 0x11140);
+
+        mpic_init(mpic);
+}
+
+static void storcenter_restart(char *cmd)
+{
+        local_irq_disable();
+
+        /* Set exception prefix high - to the firmware */
+        _nmask_and_or_msr(0, MSR_IP);
+
+        /* Wait for reset to happen */
+        for (;;) ;
+}
+
+static int __init storcenter_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "storcenter");
+}
+
+define_machine(storcenter){
+        .name                   = "IOMEGA StorCenter",
+        .probe                  = storcenter_probe,
+        .setup_arch             = storcenter_setup_arch,
+        .init_IRQ               = storcenter_init_IRQ,
+        .get_irq                = mpic_get_irq,
+        .restart                = storcenter_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+};