diff options
Diffstat (limited to 'arch/arm/mach-orion5x/irq.c')
| -rw-r--r-- | arch/arm/mach-orion5x/irq.c | 29 | 
1 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c index 30a192b9c51..cd4bac4d7e4 100644 --- a/arch/arm/mach-orion5x/irq.c +++ b/arch/arm/mach-orion5x/irq.c @@ -16,6 +16,8 @@  #include <mach/bridge-regs.h>  #include <plat/orion-gpio.h>  #include <plat/irq.h> +#include <asm/exception.h> +#include "common.h"  static int __initdata gpio0_irqs[4] = {  	IRQ_ORION5X_GPIO_0_7, @@ -24,10 +26,37 @@ static int __initdata gpio0_irqs[4] = {  	IRQ_ORION5X_GPIO_24_31,  }; +#ifdef CONFIG_MULTI_IRQ_HANDLER +/* + * Compiling with both non-DT and DT support enabled, will + * break asm irq handler used by non-DT boards. Therefore, + * we provide a C-style irq handler even for non-DT boards, + * if MULTI_IRQ_HANDLER is set. + */ + +asmlinkage void +__exception_irq_entry orion5x_legacy_handle_irq(struct pt_regs *regs) +{ +	u32 stat; + +	stat = readl_relaxed(MAIN_IRQ_CAUSE); +	stat &= readl_relaxed(MAIN_IRQ_MASK); +	if (stat) { +		unsigned int hwirq = __fls(stat); +		handle_IRQ(hwirq, regs); +		return; +	} +} +#endif +  void __init orion5x_init_irq(void)  {  	orion_irq_init(0, MAIN_IRQ_MASK); +#ifdef CONFIG_MULTI_IRQ_HANDLER +	set_handle_irq(orion5x_legacy_handle_irq); +#endif +  	/*  	 * Initialize gpiolib for GPIOs 0-31.  	 */  | 
