1 files changed, 33 insertions, 35 deletions

diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 93bb8eee22b3..9d93793d3077 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -40,6 +40,11 @@
 #include "omap-pcm.h"
 #include "../codecs/twl6040.h"
 
+struct abe_twl6040 {
+        int     jack_detection; /* board can detect jack events */
+        int     mclk_freq;      /* MCLK frequency speed for twl6040 */
+};
+
 static int omap_abe_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
@@ -47,13 +52,13 @@ static int omap_abe_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_card *card = codec->card;
-        struct omap_abe_twl6040_data *pdata = dev_get_platdata(card->dev);
+        struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
         int clk_id, freq;
         int ret;
 
         clk_id = twl6040_get_clk_id(rtd->codec);
         if (clk_id == TWL6040_SYSCLK_SEL_HPPLL)
-                freq = pdata->mclk_freq;
+                freq = priv->mclk_freq;
         else if (clk_id == TWL6040_SYSCLK_SEL_LPPLL)
                 freq = 32768;
         else
@@ -128,6 +133,9 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
         SND_SOC_DAPM_MIC("Main Handset Mic", NULL),
         SND_SOC_DAPM_MIC("Sub Handset Mic", NULL),
         SND_SOC_DAPM_LINE("Line In", NULL),
+
+        /* Digital microphones */
+        SND_SOC_DAPM_MIC("Digital Mic", NULL),
 };
 
 static const struct snd_soc_dapm_route audio_map[] = {
@@ -173,6 +181,7 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_card *card = codec->card;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct omap_abe_twl6040_data *pdata = dev_get_platdata(card->dev);
+        struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
         int hs_trim;
         int ret = 0;
 
@@ -196,7 +205,7 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
                                         TWL6040_HSF_TRIM_RIGHT(hs_trim));
 
         /* Headset jack detection only if it is supported */
-        if (pdata->jack_detection) {
+        if (priv->jack_detection) {
                 ret = snd_soc_jack_new(codec, "Headset Jack",
                                         SND_JACK_HEADSET, &hs_jack);
                 if (ret)
@@ -210,10 +219,6 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
         return ret;
 }
 
-static const struct snd_soc_dapm_widget dmic_dapm_widgets[] = {
-        SND_SOC_DAPM_MIC("Digital Mic", NULL),
-};
-
 static const struct snd_soc_dapm_route dmic_audio_map[] = {
         {"DMic", NULL, "Digital Mic"},
         {"Digital Mic", NULL, "Digital Mic1 Bias"},
@@ -223,19 +228,13 @@ static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
-        int ret;
-
-        ret = snd_soc_dapm_new_controls(dapm, dmic_dapm_widgets,
-                                ARRAY_SIZE(dmic_dapm_widgets));
-        if (ret)
-                return ret;
 
         return snd_soc_dapm_add_routes(dapm, dmic_audio_map,
                                 ARRAY_SIZE(dmic_audio_map));
 }
 
 /* Digital audio interface glue - connects codec <--> CPU */
-static struct snd_soc_dai_link twl6040_dmic_dai[] = {
+static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
         {
                 .name = "TWL6040",
                 .stream_name = "TWL6040",
@@ -258,19 +257,6 @@ static struct snd_soc_dai_link twl6040_dmic_dai[] = {
         },
 };
 
-static struct snd_soc_dai_link twl6040_only_dai[] = {
-        {
-                .name = "TWL6040",
-                .stream_name = "TWL6040",
-                .cpu_dai_name = "omap-mcpdm",
-                .codec_dai_name = "twl6040-legacy",
-                .platform_name = "omap-pcm-audio",
-                .codec_name = "twl6040-codec",
-                .init = omap_abe_twl6040_init,
-                .ops = &omap_abe_ops,
-        },
-};
-
 /* Audio machine driver */
 static struct snd_soc_card omap_abe_card = {
         .owner = THIS_MODULE,
@@ -285,6 +271,8 @@ static __devinit int omap_abe_probe(struct platform_device *pdev)
 {
         struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev);
         struct snd_soc_card *card = &omap_abe_card;
+        struct abe_twl6040 *priv;
+        int num_links = 0;
         int ret;
 
         card->dev = &pdev->dev;
@@ -294,6 +282,10 @@ static __devinit int omap_abe_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
+        priv = devm_kzalloc(&pdev->dev, sizeof(struct abe_twl6040), GFP_KERNEL);
+        if (priv == NULL)
+                return -ENOMEM;
+
         if (pdata->card_name) {
                 card->name = pdata->card_name;
         } else {
@@ -301,18 +293,24 @@ static __devinit int omap_abe_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        if (!pdata->mclk_freq) {
+        priv->jack_detection = pdata->jack_detection;
+        priv->mclk_freq = pdata->mclk_freq;
+
+
+        if (!priv->mclk_freq) {
                 dev_err(&pdev->dev, "MCLK frequency missing\n");
                 return -ENODEV;
         }
 
-        if (pdata->has_dmic) {
-                card->dai_link = twl6040_dmic_dai;
-                card->num_links = ARRAY_SIZE(twl6040_dmic_dai);
-        } else {
-                card->dai_link = twl6040_only_dai;
-                card->num_links = ARRAY_SIZE(twl6040_only_dai);
-        }
+        if (pdata->has_dmic)
+                num_links = 2;
+        else
+                num_links = 1;
+
+        card->dai_link = abe_twl6040_dai_links;
+        card->num_links = num_links;
+
+        snd_soc_card_set_drvdata(card, priv);
 
         ret = snd_soc_register_card(card);
         if (ret)