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

[karo-tx-linux.git] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index f3953a4992869966e457dbd91968feed1cb4cf47..84fa55b4c8b9295e8818bcac2d120f01af30c559 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -700,11 +700,14 @@ static int __init omap2_init_devices(void)
         * in alphabetical order so they're easier to sort through.
         */
        omap_init_audio();
-       omap_init_mcpdm();
-       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_dmic();
+               omap_init_mcpdm();
+               omap_init_mcspi();
+       }
        omap_init_pmu();
        omap_hdq_init();
        omap_init_sti();