diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-05-02 15:23:18 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-08 16:53:31 -0700 |
| commit | 259bd6ce0200c4b9692fcbfa9cbc29d818aa2116 (patch) | |
| tree | da4051a7f4ff0dfa168bc6ff6200bc4b585ce6f8 /arch/arm/mach-omap2/devices.c | |
| parent | b3431f5ba402a98a89b78a9408b4972d8870df4d (diff) | |
| download | talos-obmc-linux-259bd6ce0200c4b9692fcbfa9cbc29d818aa2116.tar.gz talos-obmc-linux-259bd6ce0200c4b9692fcbfa9cbc29d818aa2116.zip | |
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) */ 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(); |
