Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c

diff --cc arch/arm/mach-at91/at91cap9.c
index a42edc2,1d29a6c..8967d75
--- 1/arch/arm/mach-at91/at91cap9.c
--- 2/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@@ -313,6 -315,17 +314,12 @@@ static struct at91_gpio_bank at91cap9_g
        }
  };
  
 -static void at91cap9_restart(char mode, const char *cmd)
 -{
 -      at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
 -}
 -
+ static void at91cap9_idle(void)
+ {
+       at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
+       cpu_do_idle();
+ }
+ 
  /* --------------------------------------------------------------------
   *  AT91CAP9 processor initialization
   * -------------------------------------------------------------------- */
@@@ -332,7 -344,8 +339,8 @@@ static void __init at91cap9_ioremap_reg
  
  static void __init at91cap9_initialize(void)
  {
 -      arm_pm_restart = at91cap9_restart;
+       arm_pm_idle = at91cap9_idle;
 +      arm_pm_restart = at91sam9g45_restart;
        at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
  
        /* Register GPIO subsystem */

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
index 1cb6a96,0e80b39..5b12192
--- 1/arch/arm/mach-at91/at91sam9g45.c
--- 2/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@@ -317,6 -318,17 +317,12 @@@ static struct at91_gpio_bank at91sam9g4
        }
  };
  
 -static void at91sam9g45_restart(char mode, const char *cmd)
 -{
 -      at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
 -}
 -
+ static void at91sam9g45_idle(void)
+ {
+       at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
+       cpu_do_idle();
+ }
+ 
  /* --------------------------------------------------------------------
   *  AT91SAM9G45 processor initialization
   * -------------------------------------------------------------------- */

diff --cc arch/arm/mach-at91/at91sam9rl.c
Simple merge

diff --cc arch/arm/mach-imx/mm-imx5.c
Simple merge

diff --cc arch/arm/mach-realview/realview_eb.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb11mp.c
Simple merge

diff --cc arch/arm/mach-vexpress/ct-ca9x4.c
Simple merge