Merge tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[mirror_ubuntu-zesty-kernel.git] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 98cab3a204b9332e86ef21118a30073af70ae89a..b61c3654ecf99c17b1aa250dd6326639b45627b7 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -701,13 +701,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();
        /* If dtb is there, the devices will be created dynamically */
-       if (!of_have_populated_dt())
+       if (!of_have_populated_dt()) {
+               omap_init_dmic();
+               omap_init_mcpdm();
                omap_init_mcspi();
+       }
        omap_init_pmu();
        omap_hdq_init();
        omap_init_sti();