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>

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index e95554532987e431ae509d47aa8f4f0dc70833e6..5920373809c52dd5195200e99171f16ce1647bcb 100644 (file)
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -206,16 +206,19 @@ static int at91_pm_enter(suspend_state_t state)
                at91_pinctrl_gpio_suspend();
        else
                at91_gpio_suspend();
-       at91_irq_suspend();
 
-       pr_debug("AT91: PM - wake mask %08x, pm state %d\n",
-                       /* remember all the always-wake irqs */
-                       (at91_pmc_read(AT91_PMC_PCSR)
-                                       | (1 << AT91_ID_FIQ)
-                                       | (1 << AT91_ID_SYS)
-                                       | (at91_get_extern_irq()))
-                               & at91_aic_read(AT91_AIC_IMR),
-                       state);
+       if (IS_ENABLED(CONFIG_OLD_IRQ_AT91) && at91_aic_base) {
+               at91_irq_suspend();
+
+               pr_debug("AT91: PM - wake mask %08x, pm state %d\n",
+                               /* remember all the always-wake irqs */
+                               (at91_pmc_read(AT91_PMC_PCSR)
+                                               | (1 << AT91_ID_FIQ)
+                                               | (1 << AT91_ID_SYS)
+                                               | (at91_get_extern_irq()))
+                                       & at91_aic_read(AT91_AIC_IMR),
+                               state);
+       }
 
        switch (state) {
                /*
@@ -280,12 +283,17 @@ static int at91_pm_enter(suspend_state_t state)
                        goto error;
        }
 
-       pr_debug("AT91: PM - wakeup %08x\n",
-                       at91_aic_read(AT91_AIC_IPR) & at91_aic_read(AT91_AIC_IMR));
+       if (IS_ENABLED(CONFIG_OLD_IRQ_AT91) && at91_aic_base)
+               pr_debug("AT91: PM - wakeup %08x\n",
+                        at91_aic_read(AT91_AIC_IPR) &
+                        at91_aic_read(AT91_AIC_IMR));
 
 error:
        target_state = PM_SUSPEND_ON;
-       at91_irq_resume();
+
+       if (IS_ENABLED(CONFIG_OLD_IRQ_AT91) && at91_aic_base)
+               at91_irq_resume();
+
        if (of_have_populated_dt())
                at91_pinctrl_gpio_resume();
        else

diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index f7a07a58ebb6aa10da5f9aae0dac80bd745d1e15..0bf893a574f984ec7844eb0626e9ed90dee389ce 100644 (file)
--- 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();