diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-10 23:48:28 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-10 23:48:28 -0700 |
| commit | 6ec4ed82e9cf2ee5c83fd529af69b2c63b004809 (patch) | |
| tree | 437e1d7e42ed225862e50574a2f5a45ab38701d5 /arch/arm/mach-omap2 | |
| parent | 70888a4b412abd55c1710e2d36a9a00f4d23f474 (diff) | |
| parent | 40364b9f5a4d167d97bb6a76cd239ca8cfff056a (diff) | |
Merge tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Minor DT updates based on the dt-missed-3.4 branch
By Benoit Cousson (3) and Peter Ujfalusi (2)
via Tony Lindgren
* tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
arm/dts: omap4-panda: Add LEDs support
arm/dts: omap4-sdp: Add LEDs support
arm/dts: twl4030: Add twl4030-gpio node
OMAP4: devices: Do not create mcpdm device if the dtb has been provided
OMAP4: devices: Do not create dmic device if the dtb has been provided
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 98cab3a204b9..b61c3654ecf9 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -701,13 +701,14 @@ 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_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_mcpdm(); omap_init_mcspi(); + } omap_init_pmu(); omap_hdq_init(); omap_init_sti(); |