Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a03010ed authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/q40: Convert Q40/Q60 to genirq 



q40_irq_handler() must be kept to translate ISA IRQs to the range 1-15.
q40_probe_irq_o{ff,n}() become unused.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Zidlicky <rz@linux-m68k.org>
parent dda75359

arch/m68k/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,6 @@ config MMU_SUN3 
config USE_GENERIC_HARDIRQS

config USE_GENERIC_HARDIRQS

	bool "Use genirq"

	bool "Use genirq"

	depends on MMU

	depends on MMU

	depends on !Q40

	select HAVE_GENERIC_HARDIRQS

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

arch/m68k/include/asm/q40ints.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -25,5 +25,7 @@ 
#define Q40_IRQ14_MASK       (1<<6)

#define Q40_IRQ14_MASK       (1<<6)

#define Q40_IRQ15_MASK       (1<<7)

#define Q40_IRQ15_MASK       (1<<7)





#ifndef CONFIG_GENERIC_HARDIRQS

extern unsigned long q40_probe_irq_on (void);

extern unsigned long q40_probe_irq_on (void);

extern int q40_probe_irq_off (unsigned long irqs);

extern int q40_probe_irq_off (unsigned long irqs);

#endif

arch/m68k/q40/q40ints.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -15,10 +15,14 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#ifdef CONFIG_GENERIC_HARDIRQS

#include <linux/irq.h>

#else

#include <asm/irq.h>

#endif





#include <asm/ptrace.h>

#include <asm/ptrace.h>

#include <asm/system.h>

#include <asm/system.h>

#include <asm/irq.h>

#include <asm/traps.h>

#include <asm/traps.h>





#include <asm/q40_master.h>

#include <asm/q40_master.h>
@@ -326,6 +330,7 @@ void q40_irq_disable(struct irq_data *data) 
	}

	}

}

}





#ifndef CONFIG_GENERIC_HARDIRQS

unsigned long q40_probe_irq_on(void)

unsigned long q40_probe_irq_on(void)

{

{

	printk("irq probing not working - reconfigure the driver to avoid this\n");

	printk("irq probing not working - reconfigure the driver to avoid this\n");
@@ -335,3 +340,4 @@ int q40_probe_irq_off(unsigned long irqs) 
{

{

	return -1;

	return -1;

}

}

#endif