1 files changed, 3 insertions, 40 deletions

diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index f859ead49a8d..fa25977c52de 100644
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -28,38 +28,13 @@
  */
 static void __init mpc831x_rdb_setup_arch(void)
 {
-#ifdef CONFIG_PCI
-        struct device_node *np;
-#endif
-
         if (ppc_md.progress)
                 ppc_md.progress("mpc831x_rdb_setup_arch()", 0);
 
-#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
+        mpc83xx_setup_pci();
         mpc831x_usb_cfg();
 }
 
-static void __init mpc831x_rdb_init_IRQ(void)
-{
-        struct device_node *np;
-
-        np = of_find_node_by_type(NULL, "ipic");
-        if (!np)
-                return;
-
-        ipic_init(np, 0);
-
-        /* Initialize the default interrupt mapping priorities,
-         * in case the boot rom changed something on us.
-         */
-        ipic_set_default_priority();
-}
-
 static const char *board[] __initdata = {
         "MPC8313ERDB",
         "fsl,mpc8315erdb",
@@ -74,25 +49,13 @@ static int __init mpc831x_rdb_probe(void)
         return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
-static struct of_device_id __initdata of_bus_ids[] = {
-        { .compatible = "simple-bus" },
-        { .compatible = "gianfar" },
-        { .compatible = "gpio-leds", },
-        {},
-};
-
-static int __init declare_of_platform_devices(void)
-{
-        of_platform_bus_probe(NULL, of_bus_ids, NULL);
-        return 0;
-}
-machine_device_initcall(mpc831x_rdb, declare_of_platform_devices);
+machine_device_initcall(mpc831x_rdb, mpc83xx_declare_of_platform_devices);
 
 define_machine(mpc831x_rdb) {
         .name                   = "MPC831x RDB",
         .probe                  = mpc831x_rdb_probe,
         .setup_arch             = mpc831x_rdb_setup_arch,
-        .init_IRQ               = mpc831x_rdb_init_IRQ,
+        .init_IRQ               = mpc83xx_ipic_init_IRQ,
         .get_irq                = ipic_get_irq,
         .restart                = mpc83xx_restart,
         .time_init              = mpc83xx_time_init,