]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: OMAP2+: Remove legacy device creation for McPDM and DMIC
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 11 Jul 2013 14:04:48 +0000 (16:04 +0200)
committerTony Lindgren <tony@atomide.com>
Wed, 21 Aug 2013 07:52:03 +0000 (00:52 -0700)
McPDM and DMIC only available on OMAP4/5 which no longer boots in legacy
mode.
The code to create the devices in legacy mode can be removed.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/devices.c

index 3c1279f27d1fe4436595e94fb4977707a5f5fadb..73ae7536a32b7bd24040e385dc218027e5b7c600 100644 (file)
@@ -327,44 +327,6 @@ static void omap_init_audio(void)
 static inline void omap_init_audio(void) {}
 #endif
 
-#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
-               defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
-
-static void __init omap_init_mcpdm(void)
-{
-       struct omap_hwmod *oh;
-       struct platform_device *pdev;
-
-       oh = omap_hwmod_lookup("mcpdm");
-       if (!oh)
-               return;
-
-       pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0);
-       WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n");
-}
-#else
-static inline void omap_init_mcpdm(void) {}
-#endif
-
-#if defined(CONFIG_SND_OMAP_SOC_DMIC) || \
-               defined(CONFIG_SND_OMAP_SOC_DMIC_MODULE)
-
-static void __init omap_init_dmic(void)
-{
-       struct omap_hwmod *oh;
-       struct platform_device *pdev;
-
-       oh = omap_hwmod_lookup("dmic");
-       if (!oh)
-               return;
-
-       pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0);
-       WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n");
-}
-#else
-static inline void omap_init_dmic(void) {}
-#endif
-
 #if defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI) || \
                defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI_MODULE)
 
@@ -565,8 +527,6 @@ static int __init omap2_init_devices(void)
        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_sham();
                omap_init_aes();