aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/p1023_rds.c
diff options
context:
space:
mode:
authorKyle Moffett <Kyle.D.Moffett@boeing.com>2011-12-02 01:28:02 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-06 21:43:07 -0500
commit996983b75cebb1bc1c2c545f20336f24ebfa17af (patch)
treeba137847233819cf043ef441420cf6e134ba557c /arch/powerpc/platforms/85xx/p1023_rds.c
parente7a98675caf272a11dc1012c7a8c6c00cab09f5b (diff)
powerpc/mpic: Search for open-pic device-tree node if NULL
Almost all PowerPC platforms use a standard "open-pic" device node so the mpic_alloc() function now accepts NULL for the device-node. This will cause it to perform a default search with of_find_matching_node(). Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/p1023_rds.c')
-rw-r--r--arch/powerpc/platforms/85xx/p1023_rds.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/85xx/p1023_rds.c b/arch/powerpc/platforms/85xx/p1023_rds.c
index df7ccf688218..b3c78fe07110 100644
--- a/arch/powerpc/platforms/85xx/p1023_rds.c
+++ b/arch/powerpc/platforms/85xx/p1023_rds.c
@@ -93,16 +93,7 @@ machine_device_initcall(p1023_rds, mpc85xx_common_publish_devices);
93 93
94static void __init mpc85xx_rds_pic_init(void) 94static void __init mpc85xx_rds_pic_init(void)
95{ 95{
96 struct mpic *mpic; 96 struct mpic *mpic = mpic_alloc(NULL, 0,
97 struct device_node *np = NULL;
98
99 np = of_find_node_by_type(NULL, "open-pic");
100 if (!np) {
101 printk(KERN_ERR "Could not find open-pic node\n");
102 return;
103 }
104
105 mpic = mpic_alloc(np, 0,
106 MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | 97 MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
107 MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU, 98 MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,
108 0, 256, " OpenPIC "); 99 0, 256, " OpenPIC ");