diff --git a/[refs] b/[refs]
index c6c0d4334a58..07742969b95e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 259bd6ce0200c4b9692fcbfa9cbc29d818aa2116
+refs/heads/master: 4b21ffcf5d6f197b535593b732e0e4fd2cc11921
diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c
index addaa588c8e7..ddf304de473c 100644
--- a/trunk/arch/arm/mach-omap2/devices.c
+++ b/trunk/arch/arm/mach-omap2/devices.c
@@ -721,12 +721,12 @@ 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_camera();
 	omap_init_mbox();
 	/* 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();