1 files changed, 6 insertions, 41 deletions

diff --git a/arch/powerpc/platforms/85xx/p1023_rds.c b/arch/powerpc/platforms/85xx/p1023_rds.c
index 835e0b335bfa..d951e7027bb6 100644
--- a/arch/powerpc/platforms/85xx/p1023_rds.c
+++ b/arch/powerpc/platforms/85xx/p1023_rds.c
@@ -30,19 +30,18 @@
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/mpic.h>
+#include "smp.h"
 
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
 
+#include "mpc85xx.h"
+
 /* ************************************************************************
  *
  * Setup the architecture
  *
  */
-#ifdef CONFIG_SMP
-void __init mpc85xx_smp_init(void);
-#endif
-
 static void __init mpc85xx_rds_setup_arch(void)
 {
         struct device_node *np;
@@ -87,53 +86,19 @@ static void __init mpc85xx_rds_setup_arch(void)
                 fsl_add_bridge(np, 0);
 #endif
 
-#ifdef CONFIG_SMP
         mpc85xx_smp_init();
-#endif
-}
-
-static struct of_device_id p1023_ids[] = {
-        { .type = "soc", },
-        { .compatible = "soc", },
-        { .compatible = "simple-bus", },
-        {},
-};
-
-
-static int __init p1023_publish_devices(void)
-{
-        of_platform_bus_probe(NULL, p1023_ids, NULL);
-
-        return 0;
 }
 
-machine_device_initcall(p1023_rds, p1023_publish_devices);
+machine_device_initcall(p1023_rds, mpc85xx_common_publish_devices);
 
 static void __init mpc85xx_rds_pic_init(void)
 {
-        struct mpic *mpic;
-        struct resource r;
-        struct device_node *np = NULL;
-
-        np = of_find_node_by_type(NULL, "open-pic");
-        if (!np) {
-                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 | MPIC_BIG_ENDIAN |
+        struct mpic *mpic = mpic_alloc(NULL, 0,
+                MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
                 MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
                 0, 256, " OpenPIC  ");
 
         BUG_ON(mpic == NULL);
-        of_node_put(np);
 
         mpic_init(mpic);
 }