summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/devices.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r--arch/arm/mach-omap2/devices.c34
1 files changed, 1 insertions, 33 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index cea349bb9784..e612ac3ec006 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -254,39 +254,6 @@ static inline void omap_init_camera(void)
#endif
}
-#if defined(CONFIG_SND_OMAP_SOC_DMIC) || \
- defined(CONFIG_SND_OMAP_SOC_DMIC_MODULE)
-
-static struct omap_device_pm_latency omap_dmic_latency[] = {
- {
- .deactivate_func = omap_device_idle_hwmods,
- .activate_func = omap_device_enable_hwmods,
- .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
- },
-};
-
-static void omap_init_dmic(void)
-{
- struct omap_hwmod *oh;
- struct omap_device *od;
-
- oh = omap_hwmod_lookup("dmic");
- if (!oh) {
- printk(KERN_ERR "Could not look up dmic hw_mod\n");
- return;
- }
-
- od = omap_device_build("omap-dmic-dai", -1, oh, NULL, 0,
- omap_dmic_latency,
- ARRAY_SIZE(omap_dmic_latency), 0);
- if (IS_ERR(od))
- printk(KERN_ERR "Could not build omap_device for omap-dmic-dai\n");
-}
-#else
-static inline void omap_init_dmic(void) {}
-#endif
-
-
struct omap_device_pm_latency omap_keyboard_latency[] = {
{
.deactivate_func = omap_device_idle_hwmods,
@@ -458,6 +425,7 @@ static void __init omap_init_dmic(void)
}
#else
static inline void omap_init_dmic(void) {}
+#endif
#if defined(CONFIG_SND_OMAP_SOC_ABE_DSP) || \
defined(CONFIG_SND_OMAP_SOC_ABE_DSP_MODULE)