1 files changed, 5 insertions, 53 deletions

diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index c55129f5760a..65eb792a0d00 100644
--- a/arch/powerpc/platforms/83xx/km83xx.c
+++ b/arch/powerpc/platforms/83xx/km83xx.c
@@ -51,15 +51,14 @@
  */
 static void __init mpc83xx_km_setup_arch(void)
 {
+#ifdef CONFIG_QUICC_ENGINE
         struct device_node *np;
+#endif
 
         if (ppc_md.progress)
                 ppc_md.progress("kmpbec83xx_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();
@@ -122,54 +121,7 @@ static void __init mpc83xx_km_setup_arch(void)
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
 
-static struct of_device_id kmpbec83xx_ids[] = {
-        { .type = "soc", },
-        { .compatible = "soc", },
-        { .compatible = "simple-bus", },
-        { .type = "qe", },
-        { .compatible = "fsl,qe", },
-        {},
-};
-
-static int __init kmeter_declare_of_platform_devices(void)
-{
-        /* Publish the QE devices */
-        of_platform_bus_probe(NULL, kmpbec83xx_ids, NULL);
-
-        return 0;
-}
-machine_device_initcall(mpc83xx_km, kmeter_declare_of_platform_devices);
-
-static void __init mpc83xx_km_init_IRQ(void)
-{
-        struct device_node *np;
-
-        np = of_find_compatible_node(NULL, NULL, "fsl,pq2pro-pic");
-        if (!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(mpc83xx_km, mpc83xx_declare_of_platform_devices);
 
 /* list of the supported boards */
 static char *board[] __initdata = {
@@ -198,7 +150,7 @@ define_machine(mpc83xx_km) {
         .name           = "mpc83xx-km-platform",
         .probe          = mpc83xx_km_probe,
         .setup_arch     = mpc83xx_km_setup_arch,
-        .init_IRQ       = mpc83xx_km_init_IRQ,
+        .init_IRQ       = mpc83xx_ipic_and_qe_init_IRQ,
         .get_irq        = ipic_get_irq,
         .restart        = mpc83xx_restart,
         .time_init      = mpc83xx_time_init,