diff options
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index b60a3083c6f..d8add7e7b2e 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -33,9 +33,6 @@ #include <plat/remoteproc.h> #include <plat/omap44xx.h> -#include <sound/omap-abe-dsp.h> - - /*-------------------------------------------------------------------------*/ #if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE) @@ -131,55 +128,6 @@ fail: /*-------------------------------------------------------------------------*/ -#if defined(CONFIG_SND_OMAP_SOC_ABE_DSP) || \ - defined(CONFIG_SND_OMAP_SOC_ABE_DSP_MODULE) - -static struct omap_device_pm_latency omap_aess_latency[] = { - { - .deactivate_func = omap_device_idle_hwmods, - .activate_func = omap_device_enable_hwmods, - .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, - }, -}; - -static void omap_init_aess(void) -{ - struct omap_hwmod *oh; - struct omap_device *od; - struct omap4_abe_dsp_pdata *pdata; - - oh = omap_hwmod_lookup("aess"); - if (!oh) { - printk (KERN_ERR "Could not look up aess hw_mod\n"); - return; - } - - pdata = kzalloc(sizeof(struct omap4_abe_dsp_pdata), GFP_KERNEL); - if (!pdata) { - printk(KERN_ERR "Could not allocate platform data\n"); - return; - } - - /* FIXME: Add correct context loss counter */ - //pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count; - - od = omap_device_build("aess", -1, oh, pdata, - sizeof(struct omap4_abe_dsp_pdata), - omap_aess_latency, - ARRAY_SIZE(omap_aess_latency), 0); - - kfree(pdata); - - if (IS_ERR(od)) - printk(KERN_ERR "Could not build omap_device for omap-aess-audio\n"); -} -#else -static inline void omap_init_aess(void) {} -#endif - - -/*-------------------------------------------------------------------------*/ - #if defined(CONFIG_HW_RANDOM_OMAP) || defined(CONFIG_HW_RANDOM_OMAP_MODULE) #ifdef CONFIG_ARCH_OMAP2 @@ -379,7 +327,6 @@ static int __init omap_init_devices(void) * in alphabetical order so they're easier to sort through. */ omap_init_rng(); - omap_init_aess(); omap_init_uwire(); return 0; } |