diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-26 02:47:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 02:47:42 -0400 |
commit | f9bd170a87948a9e077149b70fb192c563770fdf (patch) | |
tree | c759b57b67ab41a859e19f7dcee571504b368202 /arch/ppc/platforms/lopec.c | |
parent | 25635c71e44111a6bd48f342e144e2fc02d0a314 (diff) |
powerpc: Merge i8259.c into arch/powerpc/sysdev
This changes the parameters for i8259_init so that it takes two
parameters: a physical address for generating an interrupt
acknowledge cycle, and an interrupt number offset. i8259_init
now sets the irq_desc[] for its interrupts; all the callers
were doing this, and that code is gone now. This also defines
a CONFIG_PPC_I8259 symbol to select i8259.o for inclusion, and
makes the platforms that need it select that symbol.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms/lopec.c')
-rw-r--r-- | arch/ppc/platforms/lopec.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/ppc/platforms/lopec.c b/arch/ppc/platforms/lopec.c index 800c56a07a97..06d247c23b82 100644 --- a/arch/ppc/platforms/lopec.c +++ b/arch/ppc/platforms/lopec.c | |||
@@ -267,15 +267,11 @@ lopec_init_IRQ(void) | |||
267 | openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade", | 267 | openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade", |
268 | &i8259_irq); | 268 | &i8259_irq); |
269 | 269 | ||
270 | /* Map i8259 interrupts */ | ||
271 | for(i = 0; i < NUM_8259_INTERRUPTS; i++) | ||
272 | irq_desc[i].handler = &i8259_pic; | ||
273 | |||
274 | /* | 270 | /* |
275 | * The EPIC allows for a read in the range of 0xFEF00000 -> | 271 | * The EPIC allows for a read in the range of 0xFEF00000 -> |
276 | * 0xFEFFFFFF to generate a PCI interrupt-acknowledge transaction. | 272 | * 0xFEFFFFFF to generate a PCI interrupt-acknowledge transaction. |
277 | */ | 273 | */ |
278 | i8259_init(0xfef00000); | 274 | i8259_init(0xfef00000, 0); |
279 | } | 275 | } |
280 | 276 | ||
281 | static int __init | 277 | static int __init |