diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 15:12:24 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 15:12:24 -0400 |
commit | f779b7dd3259ec138c7aba793f0602b20262af83 (patch) | |
tree | 7ed94961b196c81fcd413e2b04d1e6945d6d227a /arch/arm/mach-at91/include | |
parent | 3c00079b31f910309b30ed5c2fd2b7a2d86bba60 (diff) | |
parent | fe0cdec8bad919fd91cd344123906a55f3857209 (diff) |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-imx/mach-cpuimx27.c
AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
Diffstat (limited to 'arch/arm/mach-at91/include')
-rw-r--r-- | arch/arm/mach-at91/include/mach/system.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/include/mach/system.h b/arch/arm/mach-at91/include/mach/system.h index bfbb612265d6..36af14bc13bb 100644 --- a/arch/arm/mach-at91/include/mach/system.h +++ b/arch/arm/mach-at91/include/mach/system.h | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | static inline void arch_idle(void) | 29 | static inline void arch_idle(void) |
30 | { | 30 | { |
31 | #ifndef CONFIG_DEBUG_KERNEL | ||
32 | /* | 31 | /* |
33 | * Disable the processor clock. The processor will be automatically | 32 | * Disable the processor clock. The processor will be automatically |
34 | * re-enabled by an interrupt or by a reset. | 33 | * re-enabled by an interrupt or by a reset. |
@@ -38,11 +37,11 @@ static inline void arch_idle(void) | |||
38 | #else | 37 | #else |
39 | at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); | 38 | at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); |
40 | #endif | 39 | #endif |
41 | #else | 40 | #ifndef CONFIG_CPU_ARM920T |
42 | /* | 41 | /* |
43 | * Set the processor (CP15) into 'Wait for Interrupt' mode. | 42 | * Set the processor (CP15) into 'Wait for Interrupt' mode. |
44 | * Unlike disabling the processor clock via the PMC (above) | 43 | * Post-RM9200 processors need this in conjunction with the above |
45 | * this allows the processor to be woken via JTAG. | 44 | * to save power when idle. |
46 | */ | 45 | */ |
47 | cpu_do_idle(); | 46 | cpu_do_idle(); |
48 | #endif | 47 | #endif |