1 files changed, 4 insertions, 52 deletions

diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index 17f99745f0e4..eff5baabc3fb 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -193,17 +193,14 @@ machine_device_initcall(mpc832x_rdb, mpc832x_spi_init);
  */
 static void __init mpc832x_rdb_setup_arch(void)
 {
-#if defined(CONFIG_PCI) || defined(CONFIG_QUICC_ENGINE)
+#if defined(CONFIG_QUICC_ENGINE)
         struct device_node *np;
 #endif
 
         if (ppc_md.progress)
                 ppc_md.progress("mpc832x_rdb_setup_arch()", 0);
 
-#ifdef CONFIG_PCI
-        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
-                mpc83xx_add_bridge(np);
-#endif
+        mpc83xx_setup_pci();
 
 #ifdef CONFIG_QUICC_ENGINE
         qe_reset();
@@ -218,52 +215,7 @@ static void __init mpc832x_rdb_setup_arch(void)
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
 
-static struct of_device_id mpc832x_ids[] = {
-        { .type = "soc", },
-        { .compatible = "soc", },
-        { .compatible = "simple-bus", },
-        { .type = "qe", },
-        { .compatible = "fsl,qe", },
-        {},
-};
-
-static int __init mpc832x_declare_of_platform_devices(void)
-{
-        /* Publish the QE devices */
-        of_platform_bus_probe(NULL, mpc832x_ids, NULL);
-
-        return 0;
-}
-machine_device_initcall(mpc832x_rdb, mpc832x_declare_of_platform_devices);
-
-static void __init mpc832x_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();
-        of_node_put(np);
-
-#ifdef CONFIG_QUICC_ENGINE
-        np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
-        if (!np) {
-                np = of_find_node_by_type(NULL, "qeic");
-                if (!np)
-                        return;
-        }
-        qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
-        of_node_put(np);
-#endif                          /* CONFIG_QUICC_ENGINE */
-}
+machine_device_initcall(mpc832x_rdb, mpc83xx_declare_of_platform_devices);
 
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
@@ -279,7 +231,7 @@ define_machine(mpc832x_rdb) {
         .name           = "MPC832x RDB",
         .probe          = mpc832x_rdb_probe,
         .setup_arch     = mpc832x_rdb_setup_arch,
-        .init_IRQ       = mpc832x_rdb_init_IRQ,
+        .init_IRQ       = mpc83xx_ipic_and_qe_init_IRQ,
         .get_irq        = ipic_get_irq,
         .restart        = mpc83xx_restart,
         .time_init      = mpc83xx_time_init,