From 259bd6ce0200c4b9692fcbfa9cbc29d818aa2116 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 2 May 2012 15:23:18 +0300 Subject: OMAP4: devices: Do not create dmic device if the dtb has been provided If dtb is provided the needed device will be created dynamically. Signed-off-by: Peter Ujfalusi Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/devices.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-omap2/devices.c') diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 8a489ba68714..addaa588c8e7 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -722,12 +722,13 @@ static int __init omap2_init_devices(void) */ 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_mcspi(); + } omap_init_pmu(); omap_hdq_init(); omap_init_sti(); -- cgit v1.2.3