1 files changed, 11 insertions, 85 deletions

diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 9a2666ffc16c..7cf35c82368a 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -44,29 +44,8 @@ static int zoom2_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret;
 
-        /* Set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai,
-                                  SND_SOC_DAIFMT_I2S |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set codec DAI configuration\n");
-                return ret;
-        }
-
-        /* Set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai,
-                                  SND_SOC_DAIFMT_I2S |
-                                  SND_SOC_DAIFMT_NB_NF |
-                                  SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set cpu DAI configuration\n");
-                return ret;
-        }
-
         /* Set the codec system clock for DAC and ADC */
         ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
                                         SND_SOC_CLOCK_IN);
@@ -82,49 +61,6 @@ static struct snd_soc_ops zoom2_ops = {
         .hw_params = zoom2_hw_params,
 };
 
-static int zoom2_hw_voice_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;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        int ret;
-
-        /* Set codec DAI configuration */
-        ret = snd_soc_dai_set_fmt(codec_dai,
-                                SND_SOC_DAIFMT_DSP_A |
-                                SND_SOC_DAIFMT_IB_NF |
-                                SND_SOC_DAIFMT_CBM_CFM);
-        if (ret) {
-                printk(KERN_ERR "can't set codec DAI configuration\n");
-                return ret;
-        }
-
-        /* Set cpu DAI configuration */
-        ret = snd_soc_dai_set_fmt(cpu_dai,
-                                SND_SOC_DAIFMT_DSP_A |
-                                SND_SOC_DAIFMT_IB_NF |
-                                SND_SOC_DAIFMT_CBM_CFM);
-        if (ret < 0) {
-                printk(KERN_ERR "can't set cpu DAI configuration\n");
-                return 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_voice_ops = {
-        .hw_params = zoom2_hw_voice_params,
-};
-
 /* Zoom2 machine DAPM */
 static const struct snd_soc_dapm_widget zoom2_twl4030_dapm_widgets[] = {
         SND_SOC_DAPM_MIC("Ext Mic", NULL),
@@ -162,23 +98,6 @@ 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;
-        int ret;
-
-        /* Add Zoom2 specific widgets */
-        ret = snd_soc_dapm_new_controls(dapm, zoom2_twl4030_dapm_widgets,
-                                ARRAY_SIZE(zoom2_twl4030_dapm_widgets));
-        if (ret)
-                return ret;
-
-        /* Set up Zoom2 specific audio path audio_map */
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
-        /* Zoom2 connected pins */
-        snd_soc_dapm_enable_pin(dapm, "Ext Mic");
-        snd_soc_dapm_enable_pin(dapm, "Ext Spk");
-        snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-        snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
-        snd_soc_dapm_enable_pin(dapm, "Aux In");
 
         /* TWL4030 not connected pins */
         snd_soc_dapm_nc_pin(dapm, "CARKITMIC");
@@ -190,9 +109,7 @@ static int zoom2_twl4030_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "CARKITL");
         snd_soc_dapm_nc_pin(dapm, "CARKITR");
 
-        ret = snd_soc_dapm_sync(dapm);
-
-        return ret;
+        return 0;
 }
 
 static int zoom2_twl4030_voice_init(struct snd_soc_pcm_runtime *rtd)
@@ -217,6 +134,8 @@ static struct snd_soc_dai_link zoom2_dai[] = {
                 .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,
         },
@@ -227,8 +146,10 @@ static struct snd_soc_dai_link zoom2_dai[] = {
                 .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,
                 .init = zoom2_twl4030_voice_init,
-                .ops = &zoom2_voice_ops,
+                .ops = &zoom2_ops,
         },
 };
 
@@ -237,6 +158,11 @@ static struct snd_soc_card snd_soc_zoom2 = {
         .name = "Zoom2",
         .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;