Merge branch 'omap/dt-missed-3.4' into next/dt

* omap/dt-missed-3.4:
  arm/dts: OMAP3: Add mmc controller nodes and board data
  arm/dts: OMAP4: Add mmc controller nodes and board data
  arm/dts: twl: Pass regulator data from dt
  arm/dts: omap4-sdp: Add ks8851 ethernet SPI device
  arm/dts: OMAP3: Add SPI controller nodes
  arm/dts: OMAP4: Add SPI controller nodes
  arm/dts: OMAP3: Add gpio nodes
  arm/dts: OMAP4: Add gpio nodes
  ARM: OMAP2+: board-generic: Remove i2c static init
  arm/dts: omap3-beagle: Add twl4030 and i2c EEPROM
  arm/dts: omap4-sdp: Add twl6030, i2c3 and i2c4 devices
  arm/dts: omap4-panda: Add twl6030 and i2c EEPROM
  arm/dts: twl4030: Add DTS file for twl4030 PM + Audio IC
  arm/dts: twl6030: Add DTS file for twl6030 PMIC

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index e4336035c0ea..98cab3a204b9 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -705,7 +705,9 @@ static int __init omap2_init_devices(void)
         omap_init_dmic();
         omap_init_camera();
         omap_init_mbox();
-        omap_init_mcspi();
+        /* If dtb is there, the devices will be created dynamically */
+        if (!of_have_populated_dt())
+                omap_init_mcspi();
         omap_init_pmu();
         omap_hdq_init();
         omap_init_sti();