powerpc/mpic: Search for open-pic device-tree node if NULL

[karo-tx-linux.git] / arch / powerpc / platforms / 86xx / pic.c

diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c
index 8ef8960abda6d53ccd17193ab5722ab700a2d231..ed85b3c8ed186d4c490be9b26fe3732729b86095 100644 (file)
--- a/arch/powerpc/platforms/86xx/pic.c
+++ b/arch/powerpc/platforms/86xx/pic.c
@@ -31,26 +31,17 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 
 void __init mpc86xx_init_irq(void)
 {
-       struct mpic *mpic;
-       struct device_node *np;
-       struct resource res;
 #ifdef CONFIG_PPC_I8259
+       struct device_node *np;
        struct device_node *cascade_node = NULL;
        int cascade_irq;
 #endif
 
-       /* Determine PIC address. */
-       np = of_find_node_by_type(NULL, "open-pic");
-       if (np == NULL)
-               return;
-       of_address_to_resource(np, 0, &res);
-
-       mpic = mpic_alloc(np, res.start,
+       struct mpic *mpic = mpic_alloc(NULL, 0,
                        MPIC_PRIMARY | MPIC_WANTS_RESET |
                        MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
                        MPIC_SINGLE_DEST_CPU,
                        0, 256, " MPIC     ");
-       of_node_put(np);
        BUG_ON(mpic == NULL);
 
        mpic_init(mpic);