1 files changed, 5 insertions, 33 deletions

diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c
index f79f2f10214..cf266826682 100644
--- a/arch/powerpc/platforms/85xx/mpc8536_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c
@@ -32,31 +32,15 @@
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
 
+#include "mpc85xx.h"
+
 void __init mpc8536_ds_pic_init(void)
 {
-        struct mpic *mpic;
-        struct resource r;
-        struct device_node *np;
-
-        np = of_find_node_by_type(NULL, "open-pic");
-        if (np == NULL) {
-                printk(KERN_ERR "Could not find open-pic node\n");
-                return;
-        }
-
-        if (of_address_to_resource(np, 0, &r)) {
-                printk(KERN_ERR "Failed to map mpic register space\n");
-                of_node_put(np);
-                return;
-        }
-
-        mpic = mpic_alloc(np, r.start,
-                          MPIC_PRIMARY | MPIC_WANTS_RESET |
+        struct mpic *mpic = mpic_alloc(NULL, 0,
+                          MPIC_WANTS_RESET |
                           MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
                         0, 256, " OpenPIC  ");
         BUG_ON(mpic == NULL);
-        of_node_put(np);
-
         mpic_init(mpic);
 }
 
@@ -104,19 +88,7 @@ static void __init mpc8536_ds_setup_arch(void)
         printk("MPC8536 DS board from Freescale Semiconductor\n");
 }
 
-static struct of_device_id __initdata mpc8536_ds_ids[] = {
-        { .type = "soc", },
-        { .compatible = "soc", },
-        { .compatible = "simple-bus", },
-        { .compatible = "gianfar", },
-        {},
-};
-
-static int __init mpc8536_ds_publish_devices(void)
-{
-        return of_platform_bus_probe(NULL, mpc8536_ds_ids, NULL);
-}
-machine_device_initcall(mpc8536_ds, mpc8536_ds_publish_devices);
+machine_device_initcall(mpc8536_ds, mpc85xx_common_publish_devices);
 
 machine_arch_initcall(mpc8536_ds, swiotlb_setup_bus_notifier);