From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 26 Jul 2014 09:33:34 +0000 (+0200)
Subject: Merge tag 'omap-for-v3.17/soc-new' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3447^2~16
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0081b77d98317092d2292ff0f8e33c97c1f5d918;p=firefly-linux-kernel-4.4.55.git

Merge tag 'omap-for-v3.17/soc-new' of git://git./linux/kernel/git/tmlind/linux-omap into next/soc

Merge "SoC related changes for omaps for v3.17 merge window"
from Tony Lindgren:

- Add device tree and hwmod data for various devices
  for new SoCs

- Remove legacy mailbox hwmod data that's no longer
  needed for SoCs that are DT only. Note that this may
  cause a minor merge conflict in mach-omap2/devices.c
  with omap_init_mbox() and omap_init_hdmi_audio(), both
  are legacy code that is getting removed

* tag 'omap-for-v3.17/soc-new' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: DRA7: hwmod: Add data for RTC
  arm: dra7xx: Add hwmod data for MDIO and CPSW
  arm: dra7xx: Add hwmod data for pcie1 and pcie2 subsystems
  arm: dra7xx: Add hwmod data for pcie1 phy and pcie2 phy
  ARM: DRA7: hwmod: Add OCP2SCP3 module
  ARM: DRA7: hwmod: remove interrupts for DMA
  ARM: OMAP2+: DMA: remove requirement of irq for platform-dma driver
  ARM: AM33xx: hwmod_data: Remove legacy mailbox addrs
  ARM: OMAP4: hwmod_data: Remove legacy mailbox addrs
  ARM: OMAP2: hwmod_data: Remove legacy mailbox data and addrs
  ARM: OMAP2+: Avoid mailbox legacy device creation for DT-boot
  ARM: DRA7: hwmod_data: Add mailbox hwmod data
  ARM: dts: DRA7: Add mailbox nodes
  ARM: dts: AM4372: Correct mailbox node data
  ARM: dts: AM33xx: Add mailbox node
  ARM: dts: OMAP4: Add mailbox node
  ARM: dts: OMAP2+: Add mailbox fifo and user information
  ARM: AM43xx: hwmod: add DSS hwmod data

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

0081b77d98317092d2292ff0f8e33c97c1f5d918
diff --cc arch/arm/mach-omap2/devices.c
index b6f8f348296e,708eb7db630c..324f02bf8a51
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -432,9 -459,10 +432,9 @@@ static int __init omap2_init_devices(vo
  	 */
  	omap_init_audio();
  	omap_init_camera();
- 	omap_init_mbox();
 -	omap_init_hdmi_audio();
  	/* If dtb is there, the devices will be created dynamically */
  	if (!of_have_populated_dt()) {
+ 		omap_init_mbox();
  		omap_init_mcspi();
  		omap_init_sham();
  		omap_init_aes();