diff options
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 3c1279f27d1f..73ae7536a32b 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -327,44 +327,6 @@ static void omap_init_audio(void) | |||
327 | static inline void omap_init_audio(void) {} | 327 | static inline void omap_init_audio(void) {} |
328 | #endif | 328 | #endif |
329 | 329 | ||
330 | #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \ | ||
331 | defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE) | ||
332 | |||
333 | static void __init omap_init_mcpdm(void) | ||
334 | { | ||
335 | struct omap_hwmod *oh; | ||
336 | struct platform_device *pdev; | ||
337 | |||
338 | oh = omap_hwmod_lookup("mcpdm"); | ||
339 | if (!oh) | ||
340 | return; | ||
341 | |||
342 | pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0); | ||
343 | WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n"); | ||
344 | } | ||
345 | #else | ||
346 | static inline void omap_init_mcpdm(void) {} | ||
347 | #endif | ||
348 | |||
349 | #if defined(CONFIG_SND_OMAP_SOC_DMIC) || \ | ||
350 | defined(CONFIG_SND_OMAP_SOC_DMIC_MODULE) | ||
351 | |||
352 | static void __init omap_init_dmic(void) | ||
353 | { | ||
354 | struct omap_hwmod *oh; | ||
355 | struct platform_device *pdev; | ||
356 | |||
357 | oh = omap_hwmod_lookup("dmic"); | ||
358 | if (!oh) | ||
359 | return; | ||
360 | |||
361 | pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0); | ||
362 | WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n"); | ||
363 | } | ||
364 | #else | ||
365 | static inline void omap_init_dmic(void) {} | ||
366 | #endif | ||
367 | |||
368 | #if defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI) || \ | 330 | #if defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI) || \ |
369 | defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI_MODULE) | 331 | defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI_MODULE) |
370 | 332 | ||
@@ -565,8 +527,6 @@ static int __init omap2_init_devices(void) | |||
565 | omap_init_mbox(); | 527 | omap_init_mbox(); |
566 | /* If dtb is there, the devices will be created dynamically */ | 528 | /* If dtb is there, the devices will be created dynamically */ |
567 | if (!of_have_populated_dt()) { | 529 | if (!of_have_populated_dt()) { |
568 | omap_init_dmic(); | ||
569 | omap_init_mcpdm(); | ||
570 | omap_init_mcspi(); | 530 | omap_init_mcspi(); |
571 | omap_init_sham(); | 531 | omap_init_sham(); |
572 | omap_init_aes(); | 532 | omap_init_aes(); |