Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	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-mxs/include/mach/common.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/at91cap9.c
index 29373397d2df83c6766a5ee87c098ec55c3892df,506a26c3fff63eeae2673226133489642f64ede9..edb879ac04c8e30c3d2b814f24497ae86075e7be
--- 1/arch/arm/mach-at91/at91cap9.c
--- 2/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@@ -333,10 -328,16 +328,16 @@@ static void __init at91cap9_map_io(void
        at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE);
  }
  
+ static void __init at91cap9_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);
+ }
+ 
  static void __init at91cap9_initialize(void)
  {
 -      at91_arch_reset = at91cap9_reset;
 +      arm_pm_restart = at91cap9_restart;
-       pm_power_off = at91cap9_poweroff;
        at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
  
        /* Register GPIO subsystem */

diff --cc arch/arm/mach-at91/at91rm9200.c
index 430a9fdc3dbf5e04662802c17f6cba825d1a16da,9163d7d5f76e5ff2e7a311994b9da52254ce7961..99c3174e24a2262d1ff4e5d2cef8a7e54ecef33b
--- 1/arch/arm/mach-at91/at91rm9200.c
--- 2/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@@ -307,9 -308,13 +308,13 @@@ static void __init at91rm9200_map_io(vo
        iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
  }
  
+ static void __init at91rm9200_ioremap_registers(void)
+ {
+ }
+ 
  static void __init at91rm9200_initialize(void)
  {
 -      at91_arch_reset = at91rm9200_reset;
 +      arm_pm_restart = at91rm9200_restart;
        at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)
                        | (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)
                        | (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5)

diff --cc arch/arm/mach-at91/at91sam9260.c
index e76cd49ebc9e8252fc6502c6b071cd4d5a03177c,3a960d2740b6d111ca4ce341d81fb6cd433d1abe..5e46e4a96430d90e793343115cbce42001e5cecc
--- 1/arch/arm/mach-at91/at91sam9260.c
--- 2/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@@ -325,10 -320,16 +320,16 @@@ static void __init at91sam9260_map_io(v
        }
  }
  
+ static void __init at91sam9260_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
+ }
+ 
  static void __init at91sam9260_initialize(void)
  {
 -      at91_arch_reset = at91sam9_alt_reset;
 +      arm_pm_restart = at91sam9_alt_restart;
-       pm_power_off = at91sam9260_poweroff;
        at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
                        | (1 << AT91SAM9260_ID_IRQ2);
  

diff --cc arch/arm/mach-at91/at91sam9261.c
index 19ac7c0729a0bc2d38b1ac9a2dbce81c299f5604,a0538c5c252029f3c30392eeab9e9608740f767b..b85b9ea6017071252a670fdb6e22cb222336055d
--- 1/arch/arm/mach-at91/at91sam9261.c
--- 2/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@@ -285,10 -278,16 +278,16 @@@ static void __init at91sam9261_map_io(v
                at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);
  }
  
+ static void __init at91sam9261_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);
+ }
+ 
  static void __init at91sam9261_initialize(void)
  {
 -      at91_arch_reset = at91sam9_alt_reset;
 +      arm_pm_restart = at91sam9_alt_restart;
-       pm_power_off = at91sam9261_poweroff;
        at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
                        | (1 << AT91SAM9261_ID_IRQ2);
  

diff --cc arch/arm/mach-at91/at91sam9263.c
index 50d016310031aefd557da1323d82549edc9db595,5ffbbb024c1e385d2ed966abbb3fc4700d2aeb22..79e3669b1117cbdf7ae18fd685647625766da513
--- 1/arch/arm/mach-at91/at91sam9263.c
--- 2/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@@ -303,10 -298,17 +298,17 @@@ static void __init at91sam9263_map_io(v
        at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);
  }
  
+ static void __init at91sam9263_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);
+       at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);
+ }
+ 
  static void __init at91sam9263_initialize(void)
  {
 -      at91_arch_reset = at91sam9_alt_reset;
 +      arm_pm_restart = at91sam9_alt_restart;
-       pm_power_off = at91sam9263_poweroff;
        at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
  
        /* Register GPIO subsystem */

diff --cc arch/arm/mach-at91/at91sam9g45.c
index ff21f7a60c63dfa0e32bbfb3e999783109925e9f,f61eb64e6b3992d1dac8204873374858c0fcba7c..7032dd32cdf0fbc207dc265958e70faeb1e32143
--- 1/arch/arm/mach-at91/at91sam9g45.c
--- 2/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@@ -338,10 -333,16 +333,16 @@@ static void __init at91sam9g45_map_io(v
        init_consistent_dma_size(SZ_4M);
  }
  
+ static void __init at91sam9g45_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);
+ }
+ 
  static void __init at91sam9g45_initialize(void)
  {
 -      at91_arch_reset = at91sam9g45_reset;
 +      arm_pm_restart = at91sam9g45_restart;
-       pm_power_off = at91sam9g45_poweroff;
        at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);
  
        /* Register GPIO subsystem */

diff --cc arch/arm/mach-at91/at91sam9rl.c
index 61cbb46f5b0eed6b8bd5a8269efa657696b1e3c2,96247f68b9d242745645c8a6b1acde694f1078b5..d6bcb1da11dfbc004d0c59890d60fef8d3dde27f
--- 1/arch/arm/mach-at91/at91sam9rl.c
--- 2/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@@ -290,10 -283,16 +283,16 @@@ static void __init at91sam9rl_map_io(vo
        at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);
  }
  
+ static void __init at91sam9rl_ioremap_registers(void)
+ {
+       at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);
+       at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);
+       at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);
+ }
+ 
  static void __init at91sam9rl_initialize(void)
  {
 -      at91_arch_reset = at91sam9_alt_reset;
 +      arm_pm_restart = at91sam9_alt_restart;
-       pm_power_off = at91sam9rl_poweroff;
        at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
  
        /* Register GPIO subsystem */

diff --cc arch/arm/mach-at91/generic.h
index 7f4503bc4cbb10f89da3b3bf025829ebaa9319b5,40309588f3600a0ce0c779e50b2fba4f1d3b788a..4866b8180d66610d17d6a0576424e19a751995a0
--- 1/arch/arm/mach-at91/generic.h
--- 2/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@@ -57,8 -58,11 +58,11 @@@ extern void at91_irq_suspend(void)
  extern void at91_irq_resume(void);
  
  /* reset */
 -extern void at91sam9_alt_reset(void);
 +extern void at91sam9_alt_restart(char, const char *);
  
+ /* shutdown */
+ extern void at91_ioremap_shdwc(u32 base_addr);
+ 
   /* GPIO */
  #define AT91RM9200_PQFP               3       /* AT91RM9200 PQFP package has 3 banks */
  #define AT91RM9200_BGA                4       /* AT91RM9200 BGA package has 4 banks */

diff --cc arch/arm/mach-imx/imx51-dt.c
Simple merge

diff --cc arch/arm/mach-imx/imx53-dt.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-mmp/avengers_lite.c
Simple merge

diff --cc arch/arm/mach-mmp/brownstone.c
Simple merge

diff --cc arch/arm/mach-mmp/flint.c
Simple merge

diff --cc arch/arm/mach-mmp/gplugd.c
Simple merge

diff --cc arch/arm/mach-mmp/include/mach/pxa168.h
Simple merge

diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge

diff --cc arch/arm/mach-mmp/tavorevb.c
Simple merge

diff --cc arch/arm/mach-mmp/teton_bga.c
Simple merge

diff --cc arch/arm/mach-mmp/ttc_dkb.c
Simple merge

diff --cc arch/arm/mach-mxs/include/mach/common.h
index 1388485414c9f37174c575791d9aac6bc9ad79e4,3bbb94f4bbe12a430cebebce77bc3a608f300b68..e1237ab25862416f52de15a7812485d97f6a5f6c
--- 1/arch/arm/mach-mxs/include/mach/common.h
--- 2/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@@ -16,7 -16,7 +16,8 @@@ struct clk
  extern const u32 *mxs_get_ocotp(void);
  extern int mxs_reset_block(void __iomem *);
  extern void mxs_timer_init(struct clk *, int);
 +extern void mxs_restart(char, const char *);
+ extern int mxs_saif_clkmux_select(unsigned int clkmux);
  
  extern int mx23_register_gpios(void);
  extern int mx23_clocks_init(void);

diff --cc arch/arm/mach-mxs/mach-mx28evk.c
Simple merge

diff --cc arch/arm/mach-omap2/common.h
Simple merge

diff --cc arch/arm/mach-pxa/balloon3.c
Simple merge

diff --cc arch/arm/mach-pxa/capc7117.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x2xx.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/colibri-pxa270.c
Simple merge

diff --cc arch/arm/mach-pxa/colibri-pxa300.c
Simple merge

diff --cc arch/arm/mach-pxa/colibri-pxa320.c
Simple merge

diff --cc arch/arm/mach-pxa/corgi.c
Simple merge

diff --cc arch/arm/mach-pxa/em-x270.c
Simple merge

diff --cc arch/arm/mach-pxa/eseries.c
Simple merge

diff --cc arch/arm/mach-pxa/hx4700.c
Simple merge

diff --cc arch/arm/mach-pxa/icontrol.c
Simple merge

diff --cc arch/arm/mach-pxa/idp.c
Simple merge

diff --cc arch/arm/mach-pxa/littleton.c
Simple merge

diff --cc arch/arm/mach-pxa/lpd270.c
Simple merge

diff --cc arch/arm/mach-pxa/lubbock.c
Simple merge

diff --cc arch/arm/mach-pxa/magician.c
Simple merge

diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge

diff --cc arch/arm/mach-pxa/mioa701.c
Simple merge

diff --cc arch/arm/mach-pxa/poodle.c
Simple merge

diff --cc arch/arm/mach-pxa/raumfeld.c
Simple merge

diff --cc arch/arm/mach-pxa/saar.c
Simple merge

diff --cc arch/arm/mach-pxa/saarb.c
Simple merge

diff --cc arch/arm/mach-pxa/spitz.c
Simple merge

diff --cc arch/arm/mach-pxa/stargate2.c
Simple merge

diff --cc arch/arm/mach-pxa/tavorevb.c
Simple merge

diff --cc arch/arm/mach-pxa/tavorevb3.c
Simple merge

diff --cc arch/arm/mach-pxa/tosa.c
Simple merge

diff --cc arch/arm/mach-pxa/viper.c
Simple merge

diff --cc arch/arm/mach-pxa/vpac270.c
Simple merge

diff --cc arch/arm/mach-pxa/z2.c
Simple merge

diff --cc arch/arm/mach-pxa/zeus.c
Simple merge

diff --cc arch/arm/mach-pxa/zylonite.c
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge