summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-05-02 15:23:19 +0300
committerTony Lindgren <tony@atomide.com>2012-05-08 16:54:00 -0700
commit4b21ffcf5d6f197b535593b732e0e4fd2cc11921 (patch)
tree67b429d6b0eee74409efef3d2530c6e8bd6a4d2d /arch/arm/mach-omap2
parent259bd6ce0200c4b9692fcbfa9cbc29d818aa2116 (diff)
downloadlinux-4b21ffcf5d6f197b535593b732e0e4fd2cc11921.tar.gz
OMAP4: devices: Do not create mcpdm 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')
-rw-r--r--arch/arm/mach-omap2/devices.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index addaa588c8e7..ddf304de473c 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/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();