From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Feb 2013 23:20:41 +0000 (-0800)
Subject: Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.9-rc1~119
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=3298a3511f1e73255a8dc023efd909e569eea037;p=~andy%2Flinux

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC multiplatform support from Arnd Bergmann:
 "Converting more ARM platforms to multiplatform support.  This time,
  OMAP gets converted, which is a major step since this is by far the
  largest platform in terms of code size.  The same thing happens to the
  vt8500 platform."

* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  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
---

3298a3511f1e73255a8dc023efd909e569eea037
diff --cc arch/arm/mach-omap2/omap4-common.c
index 54709488360,ec11e49e08e..708bb115a27
--- 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 9adcb9e76f5,cdcc4329b4a..7a602069bab
--- 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
diff --cc drivers/net/ethernet/ti/davinci_cpdma.c
index 68c3418160b,1abe0964a5a..ee13dc78430
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@@ -492,11 -473,13 +492,13 @@@ int cpdma_ctlr_int_ctrl(struct cpdma_ct
  	spin_unlock_irqrestore(&ctlr->lock, flags);
  	return 0;
  }
+ EXPORT_SYMBOL_GPL(cpdma_ctlr_int_ctrl);
  
 -void cpdma_ctlr_eoi(struct cpdma_ctlr *ctlr)
 +void cpdma_ctlr_eoi(struct cpdma_ctlr *ctlr, u32 value)
  {
 -	dma_reg_write(ctlr, CPDMA_MACEOIVECTOR, 0);
 +	dma_reg_write(ctlr, CPDMA_MACEOIVECTOR, value);
  }
+ EXPORT_SYMBOL_GPL(cpdma_ctlr_eoi);
  
  struct cpdma_chan *cpdma_chan_create(struct cpdma_ctlr *ctlr, int chan_num,
  				     cpdma_handler_fn handler)