diff options
| author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2014-07-10 19:14:20 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-19 20:32:48 +0200 |
| commit | 071926041e5b38f84f2aaac2122c57e398e535b5 (patch) | |
| tree | 45eb6c3e89b9b4038ee4300cda5b80ffc16db156 /arch/arm/mach-at91/setup.c | |
| parent | 91a55d4f690066a249d5cdeca86f0c3164301861 (diff) | |
| download | linux-071926041e5b38f84f2aaac2122c57e398e535b5.tar.gz linux-071926041e5b38f84f2aaac2122c57e398e535b5.tar.bz2 linux-071926041e5b38f84f2aaac2122c57e398e535b5.zip | |
ARM: at91: enclose at91_aic_xx calls in IS_ENABLED(CONFIG_OLD_IRQ_AT91) blocks
Enclose at91_aic_xx calls in IS_ENABLED(CONFIG_OLD_IRQ_AT91) blocks in
order to prepare migration to the new AIC driver.
In the new AIC driver the suspend/resume functions are called by the
generic irq framework and are no longer needed in the PM specific code.
Moreover, the new AIC driver no longer exposes the at91_aic_base variable
which is used by the at91_aic_read functions.
Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index f7a07a58ebb6..0bf893a574f9 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -49,7 +49,8 @@ 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_boot_soc.extern_irq); + if (IS_ENABLED(CONFIG_OLD_IRQ_AT91)) + at91_aic_init(priority, at91_boot_soc.extern_irq); /* Enable GPIO interrupts */ at91_gpio_irq_setup(); |