1 files changed, 9 insertions, 15 deletions

diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c
index f15dfbdc47ee..75fb4b83548b 100644
--- a/sound/soc/imx/eukrea-tlv320.c
+++ b/sound/soc/imx/eukrea-tlv320.c
@@ -22,7 +22,6 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <asm/mach-types.h>
 
 #include "../codecs/tlv320aic23.h"
@@ -34,8 +33,8 @@ static int eukrea_tlv320_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->dai->codec_dai;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret;
 
         ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
@@ -79,22 +78,19 @@ static struct snd_soc_ops eukrea_tlv320_snd_ops = {
 static struct snd_soc_dai_link eukrea_tlv320_dai = {
         .name           = "tlv320aic23",
         .stream_name    = "TLV320AIC23",
-        .codec_dai      = &tlv320aic23_dai,
+        .codec_dai_name = "tlv320aic23-hifi",
+        .platform_name  = "imx-fiq-pcm-audio.0",
+        .codec_name     = "tlv320aic23-codec.0-001a",
+        .cpu_dai_name   = "imx-ssi.0",
         .ops            = &eukrea_tlv320_snd_ops,
 };
 
 static struct snd_soc_card eukrea_tlv320 = {
         .name           = "cpuimx-audio",
-        .platform       = &imx_soc_platform,
         .dai_link       = &eukrea_tlv320_dai,
         .num_links      = 1,
 };
 
-static struct snd_soc_device eukrea_tlv320_snd_devdata = {
-        .card           = &eukrea_tlv320,
-        .codec_dev      = &soc_codec_dev_tlv320aic23,
-};
-
 static struct platform_device *eukrea_tlv320_snd_device;
 
 static int __init eukrea_tlv320_init(void)
@@ -102,7 +98,8 @@ static int __init eukrea_tlv320_init(void)
         int ret;
 
         if (!machine_is_eukrea_cpuimx27() && !machine_is_eukrea_cpuimx25sd()
-                && !machine_is_eukrea_cpuimx35sd())
+                && !machine_is_eukrea_cpuimx35sd()
+                && !machine_is_eukrea_cpuimx51sd())
                 /* return happy. We might run on a totally different machine */
                 return 0;
 
@@ -110,10 +107,7 @@ static int __init eukrea_tlv320_init(void)
         if (!eukrea_tlv320_snd_device)
                 return -ENOMEM;
 
-        eukrea_tlv320_dai.cpu_dai = &imx_ssi_pcm_dai[0];
-
-        platform_set_drvdata(eukrea_tlv320_snd_device, &eukrea_tlv320_snd_devdata);
-        eukrea_tlv320_snd_devdata.dev = &eukrea_tlv320_snd_device->dev;
+        platform_set_drvdata(eukrea_tlv320_snd_device, &eukrea_tlv320);
         ret = platform_device_add(eukrea_tlv320_snd_device);
 
         if (ret) {