5 files changed, 135 insertions, 13 deletions

diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index cfc2c60d1f5f..f468d215f716 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -100,8 +100,18 @@
                 };
 
                 board-control@3,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         compatible = "fsl,fpga-pixis";
                         reg = <3 0 0x20>;
+                        ranges = <0 3 0 0x20>;
+
+                        sdcsr_pio: gpio-controller@a {
+                                #gpio-cells = <2>;
+                                compatible = "fsl,fpga-pixis-gpio-bank";
+                                reg = <0xa 1>;
+                                gpio-controller;
+                        };
                 };
         };
 
@@ -176,6 +186,28 @@
                         interrupt-parent = <&mpic>;
                 };
 
+                spi@7000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc8610-spi", "fsl,spi";
+                        reg = <0x7000 0x40>;
+                        cell-index = <0>;
+                        interrupts = <59 2>;
+                        interrupt-parent = <&mpic>;
+                        mode = "cpu";
+                        gpios = <&sdcsr_pio 7 0>;
+
+                        mmc-slot@0 {
+                                compatible = "fsl,mpc8610hpcd-mmc-slot",
+                                             "mmc-spi-slot";
+                                reg = <0>;
+                                gpios = <&sdcsr_pio 0 1   /* nCD */
+                                         &sdcsr_pio 1 0>; /*  WP */
+                                voltage-ranges = <3300 3300>;
+                                spi-max-frequency = <50000000>;
+                        };
+                };
+
                 display@2c000 {
                         compatible = "fsl,diu";
                         reg = <0x2c000 100>;
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index ba17d5d90a49..d9483c504d2d 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -195,19 +195,6 @@ extern void pcibios_bus_to_resource(struct pci_dev *dev,
                         struct resource *res,
                         struct pci_bus_region *region);
 
-static inline struct resource *pcibios_select_root(struct pci_dev *pdev,
-                        struct resource *res)
-{
-        struct resource *root = NULL;
-
-        if (res->flags & IORESOURCE_IO)
-                root = &ioport_resource;
-        if (res->flags & IORESOURCE_MEM)
-                root = &iomem_resource;
-
-        return root;
-}
-
 extern void pcibios_claim_one_bus(struct pci_bus *b);
 
 extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index ef6f64950e9b..a538824616fd 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1947,8 +1947,47 @@ static void __init fixup_device_tree_maple(void)
         prom_setprop(isa, name, "ranges",
                         isa_ranges, sizeof(isa_ranges));
 }
+
+#define CPC925_MC_START         0xf8000000
+#define CPC925_MC_LENGTH        0x1000000
+/* The values for memory-controller don't have right number of cells */
+static void __init fixup_device_tree_maple_memory_controller(void)
+{
+        phandle mc;
+        u32 mc_reg[4];
+        char *name = "/hostbridge@f8000000";
+        struct prom_t *_prom = &RELOC(prom);
+        u32 ac, sc;
+
+        mc = call_prom("finddevice", 1, 1, ADDR(name));
+        if (!PHANDLE_VALID(mc))
+                return;
+
+        if (prom_getproplen(mc, "reg") != 8)
+                return;
+
+        prom_getprop(_prom->root, "#address-cells", &ac, sizeof(ac));
+        prom_getprop(_prom->root, "#size-cells", &sc, sizeof(sc));
+        if ((ac != 2) || (sc != 2))
+                return;
+
+        if (prom_getprop(mc, "reg", mc_reg, sizeof(mc_reg)) == PROM_ERROR)
+                return;
+
+        if (mc_reg[0] != CPC925_MC_START || mc_reg[1] != CPC925_MC_LENGTH)
+                return;
+
+        prom_printf("Fixing up bogus hostbridge on Maple...\n");
+
+        mc_reg[0] = 0x0;
+        mc_reg[1] = CPC925_MC_START;
+        mc_reg[2] = 0x0;
+        mc_reg[3] = CPC925_MC_LENGTH;
+        prom_setprop(mc, name, "reg", mc_reg, sizeof(mc_reg));
+}
 #else
 #define fixup_device_tree_maple()
+#define fixup_device_tree_maple_memory_controller()
 #endif
 
 #ifdef CONFIG_PPC_CHRP
@@ -2189,6 +2228,7 @@ static void __init fixup_device_tree_efika(void)
 static void __init fixup_device_tree(void)
 {
         fixup_device_tree_maple();
+        fixup_device_tree_maple_memory_controller();
         fixup_device_tree_chrp();
         fixup_device_tree_pmac();
         fixup_device_tree_efika();
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 51eec0cd5519..627908a4cd77 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -37,6 +37,7 @@
 #include <linux/of_platform.h>
 #include <sysdev/fsl_pci.h>
 #include <sysdev/fsl_soc.h>
+#include <sysdev/simple_gpio.h>
 
 #include "mpc86xx.h"
 
@@ -51,6 +52,9 @@ static struct of_device_id __initdata mpc8610_ids[] = {
 
 static int __init mpc8610_declare_of_platform_devices(void)
 {
+        /* Firstly, register PIXIS GPIOs. */
+        simple_gpiochip_init("fsl,fpga-pixis-gpio-bank");
+
         /* Without this call, the SSI device driver won't get probed. */
         of_platform_bus_probe(NULL, mpc8610_ids, NULL);
 
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index bfd60e4accee..0636a3df6978 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -335,3 +335,62 @@ define_machine(maple) {
         .progress               = maple_progress,
         .power_save             = power4_idle,
 };
+
+#ifdef CONFIG_EDAC
+/*
+ * Register a platform device for CPC925 memory controller on
+ * Motorola ATCA-6101 blade.
+ */
+#define MAPLE_CPC925_MODEL      "Motorola,ATCA-6101"
+static int __init maple_cpc925_edac_setup(void)
+{
+        struct platform_device *pdev;
+        struct device_node *np = NULL;
+        struct resource r;
+        const unsigned char *model;
+        int ret;
+
+        np = of_find_node_by_path("/");
+        if (!np) {
+                printk(KERN_ERR "%s: Unable to get root node\n", __func__);
+                return -ENODEV;
+        }
+
+        model = (const unsigned char *)of_get_property(np, "model", NULL);
+        if (!model) {
+                printk(KERN_ERR "%s: Unabel to get model info\n", __func__);
+                return -ENODEV;
+        }
+
+        ret = strcmp(model, MAPLE_CPC925_MODEL);
+        of_node_put(np);
+
+        if (ret != 0)
+                return 0;
+
+        np = of_find_node_by_type(NULL, "memory-controller");
+        if (!np) {
+                printk(KERN_ERR "%s: Unable to find memory-controller node\n",
+                        __func__);
+                return -ENODEV;
+        }
+
+        ret = of_address_to_resource(np, 0, &r);
+        of_node_put(np);
+
+        if (ret < 0) {
+                printk(KERN_ERR "%s: Unable to get memory-controller reg\n",
+                        __func__);
+                return -ENODEV;
+        }
+
+        pdev = platform_device_register_simple("cpc925_edac", 0, &r, 1);
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
+
+        printk(KERN_INFO "%s: CPC925 platform device created\n", __func__);
+
+        return 0;
+}
+machine_device_initcall(maple, maple_cpc925_edac_setup);
+#endif