Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux...

Conflicts:
	arch/arm/common/gic.c
	arch/arm/plat-omap/include/plat/common.h

diff --cc arch/arm/common/gic.c
index a1feb6b,410a546..b2dc2dd
--- 1/arch/arm/common/gic.c
--- 2/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@@ -696,12 -582,16 +697,14 @@@ void __init gic_init_bases(unsigned in
         * For primary GICs, skip over SGIs.
         * For secondary GICs, skip over PPIs, too.
         */
+       domain->hwirq_base = 32;
        if (gic_nr == 0) {
-               domain->hwirq_base = 16;
-               if (irq_start > 0)
-                       irq_start = (irq_start & ~31) + 16;
-       } else
-               domain->hwirq_base = 32;
 -              gic_cpu_base_addr = cpu_base;
 -
+               if ((irq_start & 31) > 0) {
+                       domain->hwirq_base = 16;
+                       if (irq_start != -1)
+                               irq_start = (irq_start & ~31) + 16;
+               }
+       }
  
        /*
         * Find out how many interrupts are supported.

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

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/machine_kexec.c
Simple merge

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mach-highbank/highbank.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/cpuidle34xx.c
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/plat-mxc/include/mach/common.h
Simple merge

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

diff --cc arch/arm/plat-omap/include/plat/common.h
index 346098f,3ff3e36..257f977
--- 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,12 -27,97 +27,15 @@@
  #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 */