1 files changed, 13 insertions, 17 deletions

diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
index 64955340ff75..dfe1d7f74ea6 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/ep93xx/snappercl15.c
@@ -15,14 +15,12 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 
 #include "../codecs/tlv320aic23.h"
 #include "ep93xx-pcm.h"
-#include "ep93xx-i2s.h"
 
 #define CODEC_CLOCK 5644800
 
@@ -30,8 +28,8 @@ static int snappercl15_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 err;
 
         err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
@@ -77,36 +75,35 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"MICIN", NULL, "Mic Jack"},
 };
 
-static int snappercl15_tlv320aic23_init(struct snd_soc_codec *codec)
+static int snappercl15_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
 {
-        snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets,
+        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,
                                   ARRAY_SIZE(tlv320aic23_dapm_widgets));
 
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
         return 0;
 }
 
 static struct snd_soc_dai_link snappercl15_dai = {
         .name           = "tlv320aic23",
         .stream_name    = "AIC23",
-        .cpu_dai        = &ep93xx_i2s_dai,
-        .codec_dai      = &tlv320aic23_dai,
+        .cpu_dai_name   = "ep93xx-i2s",
+        .codec_dai_name = "tlv320aic23-hifi",
+        .codec_name     = "tlv320aic23-codec.0-001a",
+        .platform_name  =  "ep93xx-pcm-audio",
         .init           = snappercl15_tlv320aic23_init,
         .ops            = &snappercl15_ops,
 };
 
 static struct snd_soc_card snd_soc_snappercl15 = {
         .name           = "Snapper CL15",
-        .platform       = &ep93xx_soc_platform,
         .dai_link       = &snappercl15_dai,
         .num_links      = 1,
 };
 
-static struct snd_soc_device snappercl15_snd_devdata = {
-        .card           = &snd_soc_snappercl15,
-        .codec_dev      = &soc_codec_dev_tlv320aic23,
-};
-
 static struct platform_device *snappercl15_snd_device;
 
 static int __init snappercl15_init(void)
@@ -126,8 +123,7 @@ static int __init snappercl15_init(void)
         if (!snappercl15_snd_device)
                 return -ENOMEM;
         
-        platform_set_drvdata(snappercl15_snd_device, &snappercl15_snd_devdata);
-        snappercl15_snd_devdata.dev = &snappercl15_snd_device->dev;
+        platform_set_drvdata(snappercl15_snd_device, &snd_soc_snappercl15);
         ret = platform_device_add(snappercl15_snd_device);
         if (ret)
                 platform_device_put(snappercl15_snd_device);