aboutsummaryrefslogtreecommitdiff
path: root/arch/ppc/platforms/sandpoint.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-11 22:03:09 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-11 22:03:09 +1000
commit35d81a4bfe28a6ea81c9f67c9ce40543124ded0b (patch)
tree43ed0161b53e0b4c620066c6b1c49d04b13188f5 /arch/ppc/platforms/sandpoint.c
parentcc5aa206d2c853929ce67d8f5ebb57cd1c7fd413 (diff)
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/sandpoint.c')
-rw-r--r--arch/ppc/platforms/sandpoint.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
index 21e31346b12..84c96cb9ac2 100644
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
@@ -509,15 +509,6 @@ sandpoint_init_IRQ(void)
i8259_init(0xfef00000);
}
-static u32
-sandpoint_irq_canonicalize(u32 irq)
-{
- if (irq == 2)
- return 9;
- else
- return irq;
-}
-
static unsigned long __init
sandpoint_find_end_of_memory(void)
{
@@ -728,10 +719,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 = sandpoint_setup_arch;
ppc_md.show_cpuinfo = sandpoint_show_cpuinfo;
- ppc_md.irq_canonicalize = sandpoint_irq_canonicalize;
ppc_md.init_IRQ = sandpoint_init_IRQ;
ppc_md.get_irq = openpic_get_irq;