1 files changed, 38 insertions, 30 deletions

diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c
index b8c9060cfd8e..d6651c033cb7 100644
--- a/sound/soc/blackfin/bf5xx-ad193x.c
+++ b/sound/soc/blackfin/bf5xx-ad193x.c
@@ -29,7 +29,6 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/pcm_params.h>
 
 #include <asm/blackfin.h>
@@ -39,30 +38,28 @@
 #include <asm/portmux.h>
 
 #include "../codecs/ad193x.h"
-#include "bf5xx-sport.h"
 
 #include "bf5xx-tdm-pcm.h"
 #include "bf5xx-tdm.h"
 
 static struct snd_soc_card bf5xx_ad193x;
 
-static int bf5xx_ad193x_startup(struct snd_pcm_substream *substream)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
-
-        cpu_dai->private_data = sport_handle;
-        return 0;
-}
-
 static int bf5xx_ad193x_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 *cpu_dai = rtd->dai->cpu_dai;
-        struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        unsigned int clk = 0;
         unsigned int channel_map[] = {0, 1, 2, 3, 4, 5, 6, 7};
         int ret = 0;
+
+        switch (params_rate(params)) {
+        case 48000:
+                clk = 12288000;
+                break;
+        }
+
         /* set cpu DAI configuration */
         ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A |
                 SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM);
@@ -75,6 +72,12 @@ static int bf5xx_ad193x_hw_params(struct snd_pcm_substream *substream,
         if (ret < 0)
                 return ret;
 
+        /* set the codec system clock for DAC and ADC */
+        ret = snd_soc_dai_set_sysclk(codec_dai, 0, clk,
+                SND_SOC_CLOCK_IN);
+        if (ret < 0)
+                return ret;
+
         /* set codec DAI slots, 8 channels, all channels are enabled */
         ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xFF, 0xFF, 8, 32);
         if (ret < 0)
@@ -90,30 +93,36 @@ static int bf5xx_ad193x_hw_params(struct snd_pcm_substream *substream,
 }
 
 static struct snd_soc_ops bf5xx_ad193x_ops = {
-        .startup = bf5xx_ad193x_startup,
         .hw_params = bf5xx_ad193x_hw_params,
 };
 
-static struct snd_soc_dai_link bf5xx_ad193x_dai = {
-        .name = "ad193x",
-        .stream_name = "AD193X",
-        .cpu_dai = &bf5xx_tdm_dai,
-        .codec_dai = &ad193x_dai,
-        .ops = &bf5xx_ad193x_ops,
+static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
+        {
+                .name = "ad193x",
+                .stream_name = "AD193X",
+                .cpu_dai_name = "bfin-tdm.0",
+                .codec_dai_name ="ad193x-hifi",
+                .platform_name = "bfin-tdm-pcm-audio",
+                .codec_name = "ad193x.5",
+                .ops = &bf5xx_ad193x_ops,
+        },
+        {
+                .name = "ad193x",
+                .stream_name = "AD193X",
+                .cpu_dai_name = "bfin-tdm.1",
+                .codec_dai_name ="ad193x-hifi",
+                .platform_name = "bfin-tdm-pcm-audio",
+                .codec_name = "ad193x.5",
+                .ops = &bf5xx_ad193x_ops,
+        },
 };
 
 static struct snd_soc_card bf5xx_ad193x = {
-        .name = "bf5xx_ad193x",
-        .platform = &bf5xx_tdm_soc_platform,
-        .dai_link = &bf5xx_ad193x_dai,
+        .name = "bfin-ad193x",
+        .dai_link = &bf5xx_ad193x_dai[CONFIG_SND_BF5XX_SPORT_NUM],
         .num_links = 1,
 };
 
-static struct snd_soc_device bf5xx_ad193x_snd_devdata = {
-        .card = &bf5xx_ad193x,
-        .codec_dev = &soc_codec_dev_ad193x,
-};
-
 static struct platform_device *bfxx_ad193x_snd_device;
 
 static int __init bf5xx_ad193x_init(void)
@@ -124,8 +133,7 @@ static int __init bf5xx_ad193x_init(void)
         if (!bfxx_ad193x_snd_device)
                 return -ENOMEM;
 
-        platform_set_drvdata(bfxx_ad193x_snd_device, &bf5xx_ad193x_snd_devdata);
-        bf5xx_ad193x_snd_devdata.dev = &bfxx_ad193x_snd_device->dev;
+        platform_set_drvdata(bfxx_ad193x_snd_device, &bf5xx_ad193x);
         ret = platform_device_add(bfxx_ad193x_snd_device);
 
         if (ret)