diff options
| author | Kyle Moffett <Kyle.D.Moffett@boeing.com> | 2011-12-02 06:28:02 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-07 13:43:07 +1100 |
| commit | 996983b75cebb1bc1c2c545f20336f24ebfa17af (patch) | |
| tree | ba137847233819cf043ef441420cf6e134ba557c /arch/powerpc/platforms/86xx/pic.c | |
| parent | e7a98675caf272a11dc1012c7a8c6c00cab09f5b (diff) | |
| download | linux-996983b75cebb1bc1c2c545f20336f24ebfa17af.tar.gz linux-996983b75cebb1bc1c2c545f20336f24ebfa17af.tar.bz2 linux-996983b75cebb1bc1c2c545f20336f24ebfa17af.zip | |
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/86xx/pic.c')
| -rw-r--r-- | arch/powerpc/platforms/86xx/pic.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c index f85c8f0aa966..ed85b3c8ed18 100644 --- a/arch/powerpc/platforms/86xx/pic.c +++ b/arch/powerpc/platforms/86xx/pic.c @@ -31,24 +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; #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; - - mpic = mpic_alloc(np, 0, + 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); |