ASoC: OMAP: Remove obsolete machine drivers for Zoom2 and SDP3430

These boards are using the common omap-twl4030 machine driver, no need for
separate machine drivers anymore.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 0 insertions, 193 deletions

diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
deleted file mode 100644
index 62a6b02d9b36..000000000000
--- a/sound/soc/omap/zoom2.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * zoom2.c  --  SoC audio for Zoom2
- *
- * Author: Misael Lopez Cruz <x0052729@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <linux/clk.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-
-#include <asm/mach-types.h>
-#include <linux/platform_data/asoc-ti-mcbsp.h>
-#include <linux/platform_data/gpio-omap.h>
-
-/* Register descriptions for twl4030 codec part */
-#include <linux/mfd/twl4030-audio.h>
-#include <linux/module.h>
-
-#include "omap-mcbsp.h"
-#include "omap-pcm.h"
-
-static int zoom2_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *params)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        int ret;
-
-        /* Set the codec system clock for DAC and ADC */
-        ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
-                                        SND_SOC_CLOCK_IN);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set codec system clock\n");
-                return ret;
-        }
-
-        return 0;
-}
-
-static struct snd_soc_ops zoom2_ops = {
-        .hw_params = zoom2_hw_params,
-};
-
-/* Zoom2 machine DAPM */
-static const struct snd_soc_dapm_widget zoom2_twl4030_dapm_widgets[] = {
-        SND_SOC_DAPM_MIC("Ext Mic", NULL),
-        SND_SOC_DAPM_SPK("Ext Spk", NULL),
-        SND_SOC_DAPM_MIC("Headset Mic", NULL),
-        SND_SOC_DAPM_HP("Headset Stereophone", NULL),
-        SND_SOC_DAPM_LINE("Aux In", NULL),
-};
-
-static const struct snd_soc_dapm_route audio_map[] = {
-        /* External Mics: MAINMIC, SUBMIC with bias */
-        {"MAINMIC", NULL, "Ext Mic"},
-        {"SUBMIC", NULL, "Ext Mic"},
-        {"Ext Mic", NULL, "Mic Bias 1"},
-        {"Ext Mic", NULL, "Mic Bias 2"},
-
-        /* External Speakers: HFL, HFR */
-        {"Ext Spk", NULL, "HFL"},
-        {"Ext Spk", NULL, "HFR"},
-
-        /* Headset Stereophone:  HSOL, HSOR */
-        {"Headset Stereophone", NULL, "HSOL"},
-        {"Headset Stereophone", NULL, "HSOR"},
-
-        /* Headset Mic: HSMIC with bias */
-        {"HSMIC", NULL, "Headset Mic"},
-        {"Headset Mic", NULL, "Headset Mic Bias"},
-
-        /* Aux In: AUXL, AUXR */
-        {"Aux In", NULL, "AUXL"},
-        {"Aux In", NULL, "AUXR"},
-};
-
-static int zoom2_twl4030_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        /* TWL4030 not connected pins */
-        snd_soc_dapm_nc_pin(dapm, "CARKITMIC");
-        snd_soc_dapm_nc_pin(dapm, "DIGIMIC0");
-        snd_soc_dapm_nc_pin(dapm, "DIGIMIC1");
-        snd_soc_dapm_nc_pin(dapm, "EARPIECE");
-        snd_soc_dapm_nc_pin(dapm, "PREDRIVEL");
-        snd_soc_dapm_nc_pin(dapm, "PREDRIVER");
-        snd_soc_dapm_nc_pin(dapm, "CARKITL");
-        snd_soc_dapm_nc_pin(dapm, "CARKITR");
-
-        return 0;
-}
-
-/* Digital audio interface glue - connects codec <--> CPU */
-static struct snd_soc_dai_link zoom2_dai[] = {
-        {
-                .name = "TWL4030 I2S",
-                .stream_name = "TWL4030 Audio",
-                .cpu_dai_name = "omap-mcbsp.2",
-                .codec_dai_name = "twl4030-hifi",
-                .platform_name = "omap-pcm-audio",
-                .codec_name = "twl4030-codec",
-                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                           SND_SOC_DAIFMT_CBM_CFM,
-                .init = zoom2_twl4030_init,
-                .ops = &zoom2_ops,
-        },
-        {
-                .name = "TWL4030 PCM",
-                .stream_name = "TWL4030 Voice",
-                .cpu_dai_name = "omap-mcbsp.3",
-                .codec_dai_name = "twl4030-voice",
-                .platform_name = "omap-pcm-audio",
-                .codec_name = "twl4030-codec",
-                .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
-                           SND_SOC_DAIFMT_CBM_CFM,
-                .ops = &zoom2_ops,
-        },
-};
-
-/* Audio machine driver */
-static struct snd_soc_card snd_soc_zoom2 = {
-        .name = "Zoom2",
-        .owner = THIS_MODULE,
-        .dai_link = zoom2_dai,
-        .num_links = ARRAY_SIZE(zoom2_dai),
-
-        .dapm_widgets = zoom2_twl4030_dapm_widgets,
-        .num_dapm_widgets = ARRAY_SIZE(zoom2_twl4030_dapm_widgets),
-        .dapm_routes = audio_map,
-        .num_dapm_routes = ARRAY_SIZE(audio_map),
-};
-
-static struct platform_device *zoom2_snd_device;
-
-static int __init zoom2_soc_init(void)
-{
-        int ret;
-
-        if (!machine_is_omap_zoom2())
-                return -ENODEV;
-        printk(KERN_INFO "Zoom2 SoC init\n");
-
-        zoom2_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!zoom2_snd_device) {
-                printk(KERN_ERR "Platform device allocation failed\n");
-                return -ENOMEM;
-        }
-
-        platform_set_drvdata(zoom2_snd_device, &snd_soc_zoom2);
-        ret = platform_device_add(zoom2_snd_device);
-        if (ret)
-                goto err1;
-
-        return 0;
-
-err1:
-        printk(KERN_ERR "Unable to add platform device\n");
-        platform_device_put(zoom2_snd_device);
-
-        return ret;
-}
-module_init(zoom2_soc_init);
-
-static void __exit zoom2_soc_exit(void)
-{
-        platform_device_unregister(zoom2_snd_device);
-}
-module_exit(zoom2_soc_exit);
-
-MODULE_AUTHOR("Misael Lopez Cruz <x0052729@ti.com>");
-MODULE_DESCRIPTION("ALSA SoC Zoom2");
-MODULE_LICENSE("GPL");
-