Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
Russell King [Tue, 19 Oct 2010 19:12:24 +0000 (20:12 +0100)]
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.

1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-cpuimx27.c
drivers/net/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
@@@ -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)
Simple merge