diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-05-02 08:23:18 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-08 19:53:31 -0400 |
commit | 259bd6ce0200c4b9692fcbfa9cbc29d818aa2116 (patch) | |
tree | da4051a7f4ff0dfa168bc6ff6200bc4b585ce6f8 /arch/arm/mach-omap2/devices.c | |
parent | b3431f5ba402a98a89b78a9408b4972d8870df4d (diff) |
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 <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) | |||
722 | */ | 722 | */ |
723 | omap_init_audio(); | 723 | omap_init_audio(); |
724 | omap_init_mcpdm(); | 724 | omap_init_mcpdm(); |
725 | omap_init_dmic(); | ||
726 | omap_init_camera(); | 725 | omap_init_camera(); |
727 | omap_init_mbox(); | 726 | omap_init_mbox(); |
728 | /* If dtb is there, the devices will be created dynamically */ | 727 | /* If dtb is there, the devices will be created dynamically */ |
729 | if (!of_have_populated_dt()) | 728 | if (!of_have_populated_dt()) { |
729 | omap_init_dmic(); | ||
730 | omap_init_mcspi(); | 730 | omap_init_mcspi(); |
731 | } | ||
731 | omap_init_pmu(); | 732 | omap_init_pmu(); |
732 | omap_hdq_init(); | 733 | omap_hdq_init(); |
733 | omap_init_sti(); | 734 | omap_init_sti(); |