Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / arch / arm / mach-at91 / pm.c

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 4073ab7..9b15169 100644 (file)
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -29,10 +29,8 @@
 #include <mach/cpu.h>
 #include <mach/hardware.h>
 
-#include "at91_aic.h"
 #include "generic.h"
 #include "pm.h"
-#include "gpio.h"
 
 static void (*at91_pm_standby)(void);
 
@@ -131,23 +129,7 @@ extern u32 at91_slow_clock_sz;
 
 static int at91_pm_enter(suspend_state_t state)
 {
-       if (of_have_populated_dt())
-               at91_pinctrl_gpio_suspend();
-       else
-               at91_gpio_suspend();
-
-       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);
-       }
+       at91_pinctrl_gpio_suspend();
 
        switch (state) {
                /*
@@ -212,21 +194,10 @@ static int at91_pm_enter(suspend_state_t state)
                        goto error;
        }
 
-       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;
 
-       if (IS_ENABLED(CONFIG_OLD_IRQ_AT91) && at91_aic_base)
-               at91_irq_resume();
-
-       if (of_have_populated_dt())
-               at91_pinctrl_gpio_resume();
-       else
-               at91_gpio_resume();
+       at91_pinctrl_gpio_resume();
        return 0;
 }