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

[karo-tx-linux.git] / arch / powerpc / platforms / 85xx / socrates.c

diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c
index fec496ad79c0f54016078c0f7cbccbfa15d83ca1..8175f0a5e5f097818c8fad4753eb65895630dc3d 100644 (file)
--- a/arch/powerpc/platforms/85xx/socrates.c
+++ b/arch/powerpc/platforms/85xx/socrates.c
@@ -46,28 +46,12 @@
 
 static void __init socrates_pic_init(void)
 {
-       struct mpic *mpic;
-       struct resource r;
        struct device_node *np;
 
-       np = of_find_node_by_type(NULL, "open-pic");
-       if (!np) {
-               printk(KERN_ERR "Could not find open-pic node\n");
-               return;
-       }
-
-       if (of_address_to_resource(np, 0, &r)) {
-               printk(KERN_ERR "Could not map mpic register space\n");
-               of_node_put(np);
-               return;
-       }
-
-       mpic = mpic_alloc(np, r.start,
+       struct mpic *mpic = mpic_alloc(NULL, 0,
                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
                        0, 256, " OpenPIC  ");
        BUG_ON(mpic == NULL);
-       of_node_put(np);
-
        mpic_init(mpic);
 
        np = of_find_compatible_node(NULL, NULL, "abb,socrates-fpga-pic");