Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc
Olof Johansson [Tue, 7 Feb 2012 23:04:15 +0000 (15:04 -0800)]
There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

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

1  2 
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-vexpress/ct-ca9x4.c

@@@ -315,17 -313,6 +314,12 @@@ static struct at91_gpio_bank at91cap9_g
        }
  };
  
 +static void at91cap9_idle(void)
 +{
 +      at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
 +      cpu_do_idle();
 +}
 +
- static void at91cap9_restart(char mode, const char *cmd)
- {
-       at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
- }
  /* --------------------------------------------------------------------
   *  AT91CAP9 processor initialization
   * -------------------------------------------------------------------- */
@@@ -344,8 -332,7 +339,8 @@@ static void __init at91cap9_ioremap_reg
  
  static void __init at91cap9_initialize(void)
  {
 +      arm_pm_idle = at91cap9_idle;
-       arm_pm_restart = at91cap9_restart;
+       arm_pm_restart = at91sam9g45_restart;
        at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
  
        /* Register GPIO subsystem */
Simple merge
Simple merge
Simple merge
@@@ -318,17 -317,6 +317,12 @@@ static struct at91_gpio_bank at91sam9g4
        }
  };
  
 +static void at91sam9g45_idle(void)
 +{
 +      at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
 +      cpu_do_idle();
 +}
 +
- static void at91sam9g45_restart(char mode, const char *cmd)
- {
-       at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
- }
  /* --------------------------------------------------------------------
   *  AT91SAM9G45 processor initialization
   * -------------------------------------------------------------------- */
Simple merge
Simple merge
Simple merge
Simple merge