git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/lola' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
system.h
diff --git
a/arch/arm/plat-mxc/include/mach/system.h
b/arch/arm/plat-mxc/include/mach/system.h
index
95be51b
..
0417da9
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/system.h
+++ b/
arch/arm/plat-mxc/include/mach/system.h
@@
-20,6
+20,8
@@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/common.h>
+extern void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode);
+
static inline void arch_idle(void)
{
#ifdef CONFIG_ARCH_MXC91231
static inline void arch_idle(void)
{
#ifdef CONFIG_ARCH_MXC91231
@@
-54,7
+56,9
@@
static inline void arch_idle(void)
"orr %0, %0, #0x00000004\n"
"mcr p15, 0, %0, c1, c0, 0\n"
: "=r" (reg));
"orr %0, %0, #0x00000004\n"
"mcr p15, 0, %0, c1, c0, 0\n"
: "=r" (reg));
- } else
+ } else if (cpu_is_mx51())
+ mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
+ else
cpu_do_idle();
}
cpu_do_idle();
}