Merge branch 'next/multiplatform' into for-next

* next/multiplatform:
  net: cwdavinci_cpdma: export symbols for cpsw
  remoteproc: omap: depend on OMAP_MBOX_FWK
  [media] davinci: do not include mach/hardware.h
  ARM: OMAP2+: Make sure files with omap initcalls include soc.h
  ARM: OMAP2+: Include soc.h to drm.c to fix compiling
  ARM: OMAP2+: Fix warning for hwspinlock omap_postcore_initcall
  ARM: multi_v7_defconfig: add ARCH_ZYNQ
  ARM: multi_v7_defconfig: remove unnecessary CONFIG_GPIOLIB
  arm: vt8500: Remove remaining mach includes
  arm: vt8500: Convert debug-macro.S to be multiplatform friendly
  arm: vt8500: Remove single platform Kconfig options
  ARM: OMAP2+: Remove now obsolete uncompress.h and debug-macro.S
  ARM: OMAP2+: Add minimal support for booting vexpress
  ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support
  ARM: OMAP2+: Disable code that currently does not work with multiplaform
  ARM: OMAP2+: Add multiplatform debug_ll support
  ARM: OMAP: Fix dmaengine init for multiplatform
  ARM: OMAP: Fix i2c cmdline initcall for multiplatform
  ARM: OMAP2+: Use omap initcalls
  ARM: OMAP2+: Limit omap initcalls to omap only on multiplatform kernels

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-omap2/include/mach/uncompress.h
	arch/arm/mach-vt8500/Kconfig
	arch/arm/mach-vt8500/include/mach/uncompress.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

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

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

diff --cc arch/arm/mach-omap2/omap4-common.c
index 5470948836060d4dfa8cf72f11d4b5c5af4d42e6,ec11e49e08e5b4542bde67442189aaf227ba6748..708bb115a27ff8e54f0e760eaebaf2c10c9f4af1
--- 1/arch/arm/mach-omap2/omap4-common.c
--- 2/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@@ -254,8 -253,14 +254,8 @@@ static int __init omap4_sar_ram_init(vo
  
        return 0;
  }
- early_initcall(omap4_sar_ram_init);
+ omap_early_initcall(omap4_sar_ram_init);
  
 -static struct of_device_id irq_match[] __initdata = {
 -      { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
 -      { .compatible = "arm,cortex-a15-gic", .data = gic_of_init, },
 -      { }
 -};
 -
  void __init omap_gic_of_init(void)
  {
        omap_wakeupgen_init();

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

diff --cc arch/arm/mach-vt8500/Kconfig
index 9adcb9e76f5445d040848817954d86b065856e0c,cdcc4329b4a88d26dbeb1048eb923bf49980c02a..7a602069bab99d334eecf147a5abb82e1bec5d4e
--- 1/arch/arm/mach-vt8500/Kconfig
--- 2/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@@ -4,10 -3,15 +3,16 @@@ config ARCH_VT850
        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
-       select CPU_ARM926T
 +      select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select HAVE_CLK
 +      select VT8500_TIMER
        help
          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
+ 
+ config ARCH_WM8505
+       bool "VIA/Wondermedia 85xx and WM8650"
+       depends on ARCH_MULTI_V5
+       select ARCH_VT8500
+       select CPU_ARM926T
+       help