summaryrefslogtreecommitdiffstats
path: root/arch/m68k/apollo
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-08-18 14:45:57 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 22:35:51 +0100
commitbc7485acd09405d9544783d773ee040af4a5c861 (patch)
tree8b5af62f51483e99a79a97c11a48f06b08a93b35 /arch/m68k/apollo
parent6c490c4da4642ec9e7569c8b50a98a22c71ad184 (diff)
downloadlinux-bc7485acd09405d9544783d773ee040af4a5c861.tar.bz2
m68k/apollo: Convert Apollo to genirq
Replace the custom user vector interrupt handler that calls do_IRQ() and does an EOI by handle_fasteoi_irq(). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Peter De Schrijver <p2@debian.org>
Diffstat (limited to 'arch/m68k/apollo')
-rw-r--r--arch/m68k/apollo/dn_ints.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c
index 4b764312aed0..fc190b34b621 100644
--- a/arch/m68k/apollo/dn_ints.c
+++ b/arch/m68k/apollo/dn_ints.c
@@ -1,9 +1,14 @@
#include <linux/interrupt.h>
-
+#ifdef CONFIG_GENERIC_HARDIRQS
+#include <linux/irq.h>
+#else
#include <asm/irq.h>
+#endif
+
#include <asm/traps.h>
#include <asm/apollohw.h>
+#ifndef CONFIG_GENERIC_HARDIRQS
void dn_process_int(unsigned int irq, struct pt_regs *fp)
{
do_IRQ(irq, fp);
@@ -11,6 +16,7 @@ void dn_process_int(unsigned int irq, struct pt_regs *fp)
*(volatile unsigned char *)(pica)=0x20;
*(volatile unsigned char *)(picb)=0x20;
}
+#endif
unsigned int apollo_irq_startup(struct irq_data *data)
{
@@ -33,16 +39,31 @@ void apollo_irq_shutdown(struct irq_data *data)
*(volatile unsigned char *)(picb+1) |= (1 << (irq - 8));
}
+#ifdef CONFIG_GENERIC_HARDIRQS
+void apollo_irq_eoi(struct irq_data *data)
+{
+ *(volatile unsigned char *)(pica) = 0x20;
+ *(volatile unsigned char *)(picb) = 0x20;
+}
+#endif
+
static struct irq_chip apollo_irq_chip = {
.name = "apollo",
.irq_startup = apollo_irq_startup,
.irq_shutdown = apollo_irq_shutdown,
+#ifdef CONFIG_GENERIC_HARDIRQS
+ .irq_eoi = apollo_irq_eoi,
+#endif
};
void __init dn_init_IRQ(void)
{
+#ifdef CONFIG_GENERIC_HARDIRQS
+ m68k_setup_user_interrupt(VEC_USER + 96, 16, NULL);
+#else
m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int);
- m68k_setup_irq_controller(&apollo_irq_chip, handle_simple_irq,
+#endif
+ m68k_setup_irq_controller(&apollo_irq_chip, handle_fasteoi_irq,
IRQ_APOLLO, 16);
}