linux-next: manual merge of the arm tree with the arm-current tree

[Stephen Rothwell]

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-at91/include/mach/system.h between commit
5c189208b606a85b4e97109af70d59f10a42fdfd ("ARM: 6436/1: AT91: Fix
power-saving in idle-mode on 926T processors") from the arm-current tree
and commit cb809b1a5ebffca8cf0314b788919989e8e4ab5f ("AT91: fix use of
clock disable on idle for AT91x40 devices") from the arm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-at91/include/mach/system.h
index ee8db15,bfbb612..0000000
--- a/arch/arm/mach-at91/include/mach/system.h
+++ b/arch/arm/mach-at91/include/mach/system.h
@@@ -32,12 -33,16 +32,16 @@@ static inline void arch_idle(void
  	 * Disable the processor clock.  The processor will be automatically
  	 * re-enabled by an interrupt or by a reset.
  	 */
+ #ifdef AT91_PS
+ 	at91_sys_write(AT91_PS_CR, AT91_PS_CR_CPU);
+ #else
  	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
+ #endif
 -#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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/