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

Conflicts:
	arch/arm/plat-omap/include/plat/common.h
	arch/arm/tools/mach-types

diff --cc arch/arm/mach-highbank/highbank.c
Simple merge

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

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

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-omap1/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/pm.c
Simple merge

diff --cc arch/arm/mach-omap2/smartreflex.c
Simple merge

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

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

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

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

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

diff --cc arch/arm/plat-mxc/include/mach/common.h
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/system.h
index b9895d250167cf6b384d5cb1320e00e855537019,b9c71b409095db90ce3e3d0647a8ec23f76a0da4..13ad0df2e86065bf43cb8882fab90e4fed5b4957
--- 1/arch/arm/plat-mxc/include/mach/system.h
--- 2/arch/arm/plat-mxc/include/mach/system.h
+++ b/arch/arm/plat-mxc/include/mach/system.h
@@@ -17,11 -17,14 +17,9 @@@
  #ifndef __ASM_ARCH_MXC_SYSTEM_H__
  #define __ASM_ARCH_MXC_SYSTEM_H__
  
 -extern void (*imx_idle)(void);
 -
  static inline void arch_idle(void)
  {
 -      if (imx_idle != NULL)
 -              (imx_idle)();
 -      else
 -              cpu_do_idle();
 +      cpu_do_idle();
  }
  
- void arch_reset(char mode, const char *cmd);
- 
  #endif /* __ASM_ARCH_MXC_SYSTEM_H__ */

diff --cc arch/arm/plat-mxc/system.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/common.h
index 3ff3e36580f267df6890712efef55e8ee22bdbc7,346098fb92190320c2c21e21b276175362e6b1b2..20674bfa280f81173e78d78715b4ffb5f76f2b35
--- 1/arch/arm/plat-omap/include/plat/common.h
--- 2/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@@ -27,97 -27,12 +27,16 @@@
  #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
  #define __ARCH_ARM_MACH_OMAP_COMMON_H
  
- #include <linux/delay.h>
- 
  #include <plat/i2c.h>
 +#include <plat/omap_hwmod.h>
  
- struct sys_timer;
- 
- extern void omap_map_common_io(void);
- extern struct sys_timer omap1_timer;
- extern struct sys_timer omap2_timer;
- extern struct sys_timer omap3_timer;
- extern struct sys_timer omap3_secure_timer;
- extern struct sys_timer omap4_timer;
- extern bool omap_32k_timer_init(void);
  extern int __init omap_init_clocksource_32k(void);
  extern unsigned long long notrace omap_32k_sched_clock(void);
  
  extern void omap_reserve(void);
- void omap2420_init_early(void);
- void omap2430_init_early(void);
- void omap3430_init_early(void);
- void omap35xx_init_early(void);
- void omap3630_init_early(void);
- void omap3_init_early(void);  /* Do not use this one */
- void am35xx_init_early(void);
- void ti816x_init_early(void);
- void omap4430_init_early(void);
- 
 +
 +extern int omap_dss_reset(struct omap_hwmod *);
 +
  void omap_sram_init(void);
  
- /*
-  * IO bases for various OMAP processors
-  * Except the tap base, rest all the io bases
-  * listed are physical addresses.
-  */
- struct omap_globals {
-       u32             class;          /* OMAP class to detect */
-       void __iomem    *tap;           /* Control module ID code */
-       void __iomem    *sdrc;           /* SDRAM Controller */
-       void __iomem    *sms;            /* SDRAM Memory Scheduler */
-       void __iomem    *ctrl;           /* System Control Module */
-       void __iomem    *ctrl_pad;      /* PAD Control Module */
-       void __iomem    *prm;            /* Power and Reset Management */
-       void __iomem    *cm;             /* Clock Management */
-       void __iomem    *cm2;
- };
- 
- void omap2_set_globals_242x(void);
- void omap2_set_globals_243x(void);
- void omap2_set_globals_3xxx(void);
- void omap2_set_globals_443x(void);
- void omap2_set_globals_ti816x(void);
- 
- /* These get called from omap2_set_globals_xxxx(), do not call these */
- void omap2_set_globals_tap(struct omap_globals *);
- void omap2_set_globals_sdrc(struct omap_globals *);
- void omap2_set_globals_control(struct omap_globals *);
- void omap2_set_globals_prcm(struct omap_globals *);
- 
- void omap242x_map_io(void);
- void omap243x_map_io(void);
- void omap3_map_io(void);
- void omap4_map_io(void);
- 
- 
- /**
-  * omap_test_timeout - busy-loop, testing a condition
-  * @cond: condition to test until it evaluates to true
-  * @timeout: maximum number of microseconds in the timeout
-  * @index: loop index (integer)
-  *
-  * Loop waiting for @cond to become true or until at least @timeout
-  * microseconds have passed.  To use, define some integer @index in the
-  * calling code.  After running, if @index == @timeout, then the loop has
-  * timed out.
-  */
- #define omap_test_timeout(cond, timeout, index)                       \
- ({                                                            \
-       for (index = 0; index < timeout; index++) {             \
-               if (cond)                                       \
-                       break;                                  \
-               udelay(1);                                      \
-       }                                                       \
- })
- 
- extern struct device *omap2_get_mpuss_device(void);
- extern struct device *omap2_get_iva_device(void);
- extern struct device *omap2_get_l3_device(void);
- extern struct device *omap4_get_dsp_device(void);
- 
  #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */