summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-08-18 14:46:46 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 22:35:52 +0100
commitdda7535912255015ecf7264c1d6691a09f8ba487 (patch)
tree6c7b6aa45b63374bd83793c4082bfddc96258e3e /arch/m68k
parent4045513286462a3c12140fac0559f09bcb5e7f10 (diff)
m68k/sun3: Convert Sun3/3x to genirq
Replace the custom irq handler that masks the irq and calls do_IRQ(), and the unmasking in the individual handlers, by handle_level_irq(). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Sam Creasey <sammy@sammy.net>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/Kconfig2
-rw-r--r--arch/m68k/sun3/sun3ints.c16
2 files changed, 14 insertions, 4 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index f2dc708d3da9..290f9c838b35 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -87,9 +87,7 @@ config MMU_SUN3
config USE_GENERIC_HARDIRQS
bool "Use genirq"
depends on MMU
- depends on !SUN3X
depends on !Q40
- depends on !SUN3
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c
index 1273eb879a15..626b601931e9 100644
--- a/arch/m68k/sun3/sun3ints.c
+++ b/arch/m68k/sun3/sun3ints.c
@@ -53,7 +53,9 @@ static irqreturn_t sun3_int7(int irq, void *dev_id)
{
unsigned int cnt;
+#ifndef CONFIG_GENERIC_HARDIRQS
*sun3_intreg |= (1 << irq);
+#endif
cnt = kstat_irqs_cpu(irq, 0);
if (!(cnt % 2000))
sun3_leds(led_pattern[cnt % 16000 / 2000]);
@@ -67,7 +69,9 @@ static irqreturn_t sun3_int5(int irq, void *dev_id)
#ifdef CONFIG_SUN3
intersil_clear();
#endif
+#ifndef CONFIG_GENERIC_HARDIRQS
*sun3_intreg |= (1 << irq);
+#endif
#ifdef CONFIG_SUN3
intersil_clear();
#endif
@@ -85,12 +89,14 @@ static irqreturn_t sun3_vec255(int irq, void *dev_id)
return IRQ_HANDLED;
}
+#ifndef CONFIG_GENERIC_HARDIRQS
static void sun3_inthandle(unsigned int irq, struct pt_regs *fp)
{
*sun3_intreg &= ~(1 << irq);
do_IRQ(irq, fp);
}
+#endif
static void sun3_irq_enable(struct irq_data *data)
{
@@ -108,15 +114,21 @@ static struct irq_chip sun3_irq_chip = {
.irq_shutdown = m68k_irq_shutdown,
.irq_enable = sun3_irq_enable,
.irq_disable = sun3_irq_disable,
+#ifdef CONFIG_GENERIC_HARDIRQS
+ .irq_mask = sun3_irq_disable,
+ .irq_unmask = sun3_irq_enable,
+#endif
};
void __init sun3_init_IRQ(void)
{
*sun3_intreg = 1;
+#ifndef CONFIG_GENERIC_HARDIRQS
m68k_setup_auto_interrupt(sun3_inthandle);
- m68k_setup_irq_controller(&sun3_irq_chip, handle_simple_irq,
- IRQ_AUTO_1, 7);
+#endif
+ m68k_setup_irq_controller(&sun3_irq_chip, handle_level_irq, IRQ_AUTO_1,
+ 7);
m68k_setup_user_interrupt(VEC_USER, 128, NULL);
if (request_irq(IRQ_AUTO_5, sun3_int5, 0, "int5", NULL))