diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-11 22:03:09 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-11 22:03:09 +1000 |
| commit | 35d81a4bfe28a6ea81c9f67c9ce40543124ded0b (patch) | |
| tree | 43ed0161b53e0b4c620066c6b1c49d04b13188f5 /arch/ppc/platforms/pplus.c | |
| parent | cc5aa206d2c853929ce67d8f5ebb57cd1c7fd413 (diff) | |
| download | blackbird-op-linux-35d81a4bfe28a6ea81c9f67c9ce40543124ded0b.tar.gz blackbird-op-linux-35d81a4bfe28a6ea81c9f67c9ce40543124ded0b.zip | |
ppc: Adapt to asm-powerpc/irq.h irq_canonicalize changes
Now instead of having a ppc_md function, we just have a variable
which says whether to do the i8259 irq canonicalization or not,
and set that variable on the platforms that need that. It looks
to me that radstone_ppc7d was trying to use irq canonicalization
for something else in a broken kind of way - it will need to be
fixed properly.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms/pplus.c')
| -rw-r--r-- | arch/ppc/platforms/pplus.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c index 65705c911795..93e9c7b889f7 100644 --- a/arch/ppc/platforms/pplus.c +++ b/arch/ppc/platforms/pplus.c @@ -647,14 +647,6 @@ static void pplus_power_off(void) pplus_halt(); } -static unsigned int pplus_irq_canonicalize(u_int irq) -{ - if (irq == 2) - return 9; - else - return irq; -} - static void __init pplus_init_IRQ(void) { int i; @@ -873,10 +865,10 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, ISA_DMA_THRESHOLD = 0x00ffffff; DMA_MODE_READ = 0x44; DMA_MODE_WRITE = 0x48; + ppc_do_canonicalize_irqs = 1; ppc_md.setup_arch = pplus_setup_arch; ppc_md.show_cpuinfo = pplus_show_cpuinfo; - ppc_md.irq_canonicalize = pplus_irq_canonicalize; ppc_md.init_IRQ = pplus_init_IRQ; /* this gets changed later on if we have an OpenPIC -- Cort */ ppc_md.get_irq = i8259_irq; |
