summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/cpuidle.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-02-13 14:58:30 +0800
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-04-17 14:46:43 +0200
commitefd09165aa554f84a42565d5ae6a1af58b06a97a (patch)
tree3ca981db0ec5b7882f8e07f2ef204e97ea1b63f9 /arch/arm/mach-at91/cpuidle.c
parent7eb1dbb3beb982a7d72514abff96ebc08a22e5cd (diff)
downloadop-kernel-dev-efd09165aa554f84a42565d5ae6a1af58b06a97a.zip
op-kernel-dev-efd09165aa554f84a42565d5ae6a1af58b06a97a.tar.gz
ARM: at91: pm select memory controler at runtime
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> [nicolas.ferre@atmel.com: add cpuidle modification] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/cpuidle.c')
-rw-r--r--arch/arm/mach-at91/cpuidle.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c
index ece1f9a..0c63815 100644
--- a/arch/arm/mach-at91/cpuidle.c
+++ b/arch/arm/mach-at91/cpuidle.c
@@ -21,6 +21,7 @@
#include <linux/export.h>
#include <asm/proc-fns.h>
#include <asm/cpuidle.h>
+#include <mach/cpu.h>
#include "pm.h"
@@ -33,7 +34,12 @@ static int at91_enter_idle(struct cpuidle_device *dev,
struct cpuidle_driver *drv,
int index)
{
- at91_standby();
+ if (cpu_is_at91rm9200())
+ at91rm9200_standby();
+ else if (cpu_is_at91sam9g45())
+ at91sam9g45_standby();
+ else
+ at91sam9_standby();
return index;
}
OpenPOWER on IntegriCloud