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

[linux-2.6-block.git] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index e4336035c0ea85f94ce4e9d4e6b1cd0752e1f5e4..98cab3a204b9332e86ef21118a30073af70ae89a 100644 (file)
--- 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();