From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2013 16:00:15 +0000 (+0100)
Subject: Merge branch 'next/multiplatform' into for-next
X-Git-Tag: next-20130220~18^2~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=55a24b8e73a53b06a96e2f9f3f114707449ee068;p=karo-tx-linux.git

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
---

55a24b8e73a53b06a96e2f9f3f114707449ee068
diff --cc arch/arm/mach-omap2/omap4-common.c
index 547094883606,ec11e49e08e5..708bb115a27f
--- a/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-vt8500/Kconfig
index 9adcb9e76f54,cdcc4329b4a8..7a602069bab9
--- a/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 CLKSRC_OF
- 	select CPU_ARM926T
  	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