From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 19 Oct 2010 19:12:24 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f779b7dd3259ec138c7aba793f0602b20262af83;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-rmk' of git://git./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.
---

f779b7dd3259ec138c7aba793f0602b20262af83
diff --cc arch/arm/mach-at91/include/mach/system.h
index bfbb612265d6,ee8db152592e..36af14bc13bb
--- a/arch/arm/mach-at91/include/mach/system.h
+++ b/arch/arm/mach-at91/include/mach/system.h
@@@ -33,16 -32,12 +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
diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index 28f73a1c79f7,6830afd1d2ba..a1681fc9d9b0
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -258,9 -259,8 +258,9 @@@ static void __init eukrea_cpuimx27_init
  	i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
  				ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
  
- 	imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);
 -	imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
++	imx27_add_imx_i2c(0, &cpuimx27_i2c1_data);
  
 +	imx27_add_fec(NULL);
  	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
  
  #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2)