| From 738a0fd752dc60e20beeda6f2f0f62e58dc0e344 Mon Sep 17 00:00:00 2001 |
| From: Nicolas Ferre <nicolas.ferre@atmel.com> |
| Date: Wed, 24 Oct 2012 16:09:57 +0200 |
| Subject: ARM: at91: fix external interrupts in non-DT case |
| |
| From: Nicolas Ferre <nicolas.ferre@atmel.com> |
| |
| commit 738a0fd752dc60e20beeda6f2f0f62e58dc0e344 upstream. |
| |
| Management of external interrupts has changed but the |
| non-DT code has not integrated these changes. |
| Add a mask to pass external irq specification from SoC |
| specific code to the at91_aic_init() function. |
| |
| Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> |
| Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
| Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mach-at91/generic.h | 3 ++- |
| arch/arm/mach-at91/irq.c | 9 +++++++-- |
| arch/arm/mach-at91/setup.c | 2 +- |
| 3 files changed, 10 insertions(+), 4 deletions(-) |
| |
| --- a/arch/arm/mach-at91/generic.h |
| +++ b/arch/arm/mach-at91/generic.h |
| @@ -26,7 +26,8 @@ extern void __init at91_dt_initialize(vo |
| extern void __init at91_init_irq_default(void); |
| extern void __init at91_init_interrupts(unsigned int priority[]); |
| extern void __init at91x40_init_interrupts(unsigned int priority[]); |
| -extern void __init at91_aic_init(unsigned int priority[]); |
| +extern void __init at91_aic_init(unsigned int priority[], |
| + unsigned int ext_irq_mask); |
| extern int __init at91_aic_of_init(struct device_node *node, |
| struct device_node *parent); |
| extern int __init at91_aic5_of_init(struct device_node *node, |
| --- a/arch/arm/mach-at91/irq.c |
| +++ b/arch/arm/mach-at91/irq.c |
| @@ -502,14 +502,19 @@ int __init at91_aic5_of_init(struct devi |
| /* |
| * Initialize the AIC interrupt controller. |
| */ |
| -void __init at91_aic_init(unsigned int *priority) |
| +void __init at91_aic_init(unsigned int *priority, unsigned int ext_irq_mask) |
| { |
| unsigned int i; |
| int irq_base; |
| |
| - if (at91_aic_pm_init()) |
| + at91_extern_irq = kzalloc(BITS_TO_LONGS(n_irqs) |
| + * sizeof(*at91_extern_irq), GFP_KERNEL); |
| + |
| + if (at91_aic_pm_init() || at91_extern_irq == NULL) |
| panic("Unable to allocate bit maps\n"); |
| |
| + *at91_extern_irq = ext_irq_mask; |
| + |
| at91_aic_base = ioremap(AT91_AIC, 512); |
| if (!at91_aic_base) |
| panic("Unable to ioremap AIC registers\n"); |
| --- a/arch/arm/mach-at91/setup.c |
| +++ b/arch/arm/mach-at91/setup.c |
| @@ -47,7 +47,7 @@ void __init at91_init_irq_default(void) |
| void __init at91_init_interrupts(unsigned int *priority) |
| { |
| /* Initialize the AIC interrupt controller */ |
| - at91_aic_init(priority); |
| + at91_aic_init(priority, at91_extern_irq); |
| |
| /* Enable GPIO interrupts */ |
| at91_gpio_irq_setup(); |
