1 files changed, 8 insertions, 4 deletions

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index f630250c6b87..1bfaad628731 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -261,7 +261,12 @@ static int at91_pm_enter(suspend_state_t state)
                          * For ARM 926 based chips, this requirement is weaker
                          * as at91sam9 can access a RAM in self-refresh mode.
                          */
-                        at91_standby();
+                        if (cpu_is_at91rm9200())
+                                at91rm9200_standby();
+                        else if (cpu_is_at91sam9g45())
+                                at91sam9g45_standby();
+                        else
+                                at91sam9_standby();
                         break;
 
                 case PM_SUSPEND_ON:
@@ -307,10 +312,9 @@ static int __init at91_pm_init(void)
 
         pr_info("AT91: Power Management%s\n", (slow_clock ? " (with slow clock mode)" : ""));
 
-#ifdef CONFIG_ARCH_AT91RM9200
         /* AT91RM9200 SDRAM low-power mode cannot be used with self-refresh. */
-        at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0);
-#endif
+        if (cpu_is_at91rm9200())
+                at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0);
 
         suspend_set_ops(&at91_pm_ops);