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/radstone_ppc7d.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/radstone_ppc7d.c')
-rw-r--r-- | arch/ppc/platforms/radstone_ppc7d.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c index 5058568c13ec..6f97911c330d 100644 --- a/arch/ppc/platforms/radstone_ppc7d.c +++ b/arch/ppc/platforms/radstone_ppc7d.c | |||
@@ -514,13 +514,9 @@ static void __init ppc7d_init_irq(void) | |||
514 | int irq; | 514 | int irq; |
515 | 515 | ||
516 | pr_debug("%s\n", __FUNCTION__); | 516 | pr_debug("%s\n", __FUNCTION__); |
517 | i8259_init(0); | 517 | i8259_init(0, 0); |
518 | mv64360_init_irq(); | 518 | mv64360_init_irq(); |
519 | 519 | ||
520 | /* IRQ 0..15 are handled by the cascaded 8259's of the Ali1535 */ | ||
521 | for (irq = 0; irq < 16; irq++) { | ||
522 | irq_desc[irq].handler = &i8259_pic; | ||
523 | } | ||
524 | /* IRQs 5,6,9,10,11,14,15 are level sensitive */ | 520 | /* IRQs 5,6,9,10,11,14,15 are level sensitive */ |
525 | irq_desc[5].status |= IRQ_LEVEL; | 521 | irq_desc[5].status |= IRQ_LEVEL; |
526 | irq_desc[6].status |= IRQ_LEVEL; | 522 | irq_desc[6].status |= IRQ_LEVEL; |