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/chrp_setup.c | |
| parent | cc5aa206d2c853929ce67d8f5ebb57cd1c7fd413 (diff) | |
| download | linux-3.10-35d81a4bfe28a6ea81c9f67c9ce40543124ded0b.tar.gz linux-3.10-35d81a4bfe28a6ea81c9f67c9ce40543124ded0b.tar.bz2 linux-3.10-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/chrp_setup.c')
| -rw-r--r-- | arch/ppc/platforms/chrp_setup.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c index 47b154c2761..a0cf1b6fdbf 100644 --- a/arch/ppc/platforms/chrp_setup.c +++ b/arch/ppc/platforms/chrp_setup.c @@ -337,14 +337,6 @@ chrp_halt(void) chrp_power_off(); } -u_int -chrp_irq_canonicalize(u_int irq) -{ - if (irq == 2) - return 9; - return irq; -} - /* * Finds the open-pic node and sets OpenPIC_Addr based on its reg property. * Then checks if it has an interrupt-ranges property. If it does then @@ -500,6 +492,7 @@ chrp_init(unsigned long r3, unsigned long r4, unsigned long r5, DMA_MODE_READ = 0x44; DMA_MODE_WRITE = 0x48; isa_io_base = CHRP_ISA_IO_BASE; /* default value */ + ppc_do_canonicalize_irqs = 1; if (root) machine = get_property(root, "model", NULL); @@ -518,7 +511,6 @@ chrp_init(unsigned long r3, unsigned long r4, unsigned long r5, ppc_md.show_percpuinfo = of_show_percpuinfo; ppc_md.show_cpuinfo = chrp_show_cpuinfo; - ppc_md.irq_canonicalize = chrp_irq_canonicalize; ppc_md.init_IRQ = chrp_init_IRQ; if (_chrp_type == _CHRP_Pegasos) ppc_md.get_irq = i8259_irq; |