1 files changed, 3 insertions, 27 deletions

diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 6b45969567d4..39849dd1b5bb 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -41,13 +41,12 @@
 
 static struct of_device_id __initdata mpc834x_itx_ids[] = {
         { .compatible = "fsl,pq2pro-localbus", },
-        { .compatible = "simple-bus", },
-        { .compatible = "gianfar", },
         {},
 };
 
 static int __init mpc834x_itx_declare_of_platform_devices(void)
 {
+        mpc83xx_declare_of_platform_devices();
         return of_platform_bus_probe(NULL, mpc834x_itx_ids, NULL);
 }
 machine_device_initcall(mpc834x_itx, mpc834x_itx_declare_of_platform_devices);
@@ -59,37 +58,14 @@ machine_device_initcall(mpc834x_itx, mpc834x_itx_declare_of_platform_devices);
  */
 static void __init mpc834x_itx_setup_arch(void)
 {
-#ifdef CONFIG_PCI
-        struct device_node *np;
-#endif
-
         if (ppc_md.progress)
                 ppc_md.progress("mpc834x_itx_setup_arch()", 0);
 
-#ifdef CONFIG_PCI
-        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
-                mpc83xx_add_bridge(np);
-#endif
+        mpc83xx_setup_pci();
 
         mpc834x_usb_cfg();
 }
 
-static void __init mpc834x_itx_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();
-}
-
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
@@ -104,7 +80,7 @@ define_machine(mpc834x_itx) {
         .name                   = "MPC834x ITX",
         .probe                  = mpc834x_itx_probe,
         .setup_arch             = mpc834x_itx_setup_arch,
-        .init_IRQ               = mpc834x_itx_init_IRQ,
+        .init_IRQ               = mpc83xx_ipic_init_IRQ,
         .get_irq                = ipic_get_irq,
         .restart                = mpc83xx_restart,
         .time_init              = mpc83xx_time_init,