From 859217a9a9546fd805c9b52f510ce1f5ae343660 Mon Sep 17 00:00:00 2001 From: Anders Larsen Date: Thu, 7 Oct 2010 20:44:15 +0100 Subject: [PATCH] --- yaml --- r: 211476 b: refs/heads/master c: 5c189208b606a85b4e97109af70d59f10a42fdfd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/include/mach/system.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7fcc8eb89067..1c687f7a79b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdaf9a2f280b25dd2fb1e04da5d3899411766e1b +refs/heads/master: 5c189208b606a85b4e97109af70d59f10a42fdfd diff --git a/trunk/arch/arm/mach-at91/include/mach/system.h b/trunk/arch/arm/mach-at91/include/mach/system.h index c80e090b3670..ee8db152592e 100644 --- a/trunk/arch/arm/mach-at91/include/mach/system.h +++ b/trunk/arch/arm/mach-at91/include/mach/system.h @@ -28,17 +28,16 @@ static inline void arch_idle(void) { -#ifndef CONFIG_DEBUG_KERNEL /* * Disable the processor clock. The processor will be automatically * re-enabled by an interrupt or by a reset. */ at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); -#else +#ifndef CONFIG_CPU_ARM920T /* * Set the processor (CP15) into 'Wait for Interrupt' mode. - * Unlike disabling the processor clock via the PMC (above) - * this allows the processor to be woken via JTAG. + * Post-RM9200 processors need this in conjunction with the above + * to save power when idle. */ cpu_do_idle(); #endif