diff options
Diffstat (limited to 'arch/powerpc/platforms/86xx/pic.c')
-rw-r--r-- | arch/powerpc/platforms/86xx/pic.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c index 8ef8960abda6..52bbfa031531 100644 --- a/arch/powerpc/platforms/86xx/pic.c +++ b/arch/powerpc/platforms/86xx/pic.c | |||
@@ -31,26 +31,16 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc) | |||
31 | 31 | ||
32 | void __init mpc86xx_init_irq(void) | 32 | void __init mpc86xx_init_irq(void) |
33 | { | 33 | { |
34 | struct mpic *mpic; | ||
35 | struct device_node *np; | ||
36 | struct resource res; | ||
37 | #ifdef CONFIG_PPC_I8259 | 34 | #ifdef CONFIG_PPC_I8259 |
35 | struct device_node *np; | ||
38 | struct device_node *cascade_node = NULL; | 36 | struct device_node *cascade_node = NULL; |
39 | int cascade_irq; | 37 | int cascade_irq; |
40 | #endif | 38 | #endif |
41 | 39 | ||
42 | /* Determine PIC address. */ | 40 | struct mpic *mpic = mpic_alloc(NULL, 0, |
43 | np = of_find_node_by_type(NULL, "open-pic"); | 41 | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | |
44 | if (np == NULL) | 42 | MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU, |
45 | return; | ||
46 | of_address_to_resource(np, 0, &res); | ||
47 | |||
48 | mpic = mpic_alloc(np, res.start, | ||
49 | MPIC_PRIMARY | MPIC_WANTS_RESET | | ||
50 | MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | | ||
51 | MPIC_SINGLE_DEST_CPU, | ||
52 | 0, 256, " MPIC "); | 43 | 0, 256, " MPIC "); |
53 | of_node_put(np); | ||
54 | BUG_ON(mpic == NULL); | 44 | BUG_ON(mpic == NULL); |
55 | 45 | ||
56 | mpic_init(mpic); | 46 | mpic_init(mpic); |