ASoC: multi-component - ASoC Multi-Component Support

[mv-sheeva.git] / sound / soc / pxa / zylonite.c

diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index dd678ae24398bb7f336257a362b43e54eeb25a5f..d27e05af77594093e20b645ef203887683f8b8d5 100644 (file)
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -23,7 +23,6 @@
 #include <sound/soc-dapm.h>
 
 #include "../codecs/wm9713.h"
-#include "pxa2xx-pcm.h"
 #include "pxa2xx-ac97.h"
 #include "pxa-ssp.h"
 
@@ -71,10 +70,12 @@ static const struct snd_soc_dapm_route audio_map[] = {
        { "Multiactor", NULL, "SPKR" },
 };
 
-static int zylonite_wm9713_init(struct snd_soc_codec *codec)
+static int zylonite_wm9713_init(struct snd_soc_pcm_runtime *rtd)
 {
+       struct snd_soc_codec *codec = rtd->codec;
+
        if (clk_pout)
-               snd_soc_dai_set_pll(&codec->dai[0], 0, 0,
+               snd_soc_dai_set_pll(rtd->codec_dai, 0, 0,
                                    clk_get_rate(pout), 0);
 
        snd_soc_dapm_new_controls(codec, zylonite_dapm_widgets,
@@ -94,8 +95,8 @@ static int zylonite_voice_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;
        unsigned int pll_out = 0;
        unsigned int wm9713_div = 0;
        int ret = 0;
@@ -163,21 +164,27 @@ static struct snd_soc_dai_link zylonite_dai[] = {
 {
        .name = "AC97",
        .stream_name = "AC97 HiFi",
-       .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_HIFI],
-       .codec_dai = &wm9713_dai[WM9713_DAI_AC97_HIFI],
+       .codec_name = "wm9713-codec",
+       .platform_name = "pxa-pcm-audio",
+       .cpu_dai_name = "pxa-ac97.0",
+       .codec_name = "wm9713-hifi",
        .init = zylonite_wm9713_init,
 },
 {
        .name = "AC97 Aux",
        .stream_name = "AC97 Aux",
-       .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX],
-       .codec_dai = &wm9713_dai[WM9713_DAI_AC97_AUX],
+       .codec_name = "wm9713-codec",
+       .platform_name = "pxa-pcm-audio",
+       .cpu_dai_name = "pxa-ac97.1",
+       .codec_name = "wm9713-aux",
 },
 {
        .name = "WM9713 Voice",
        .stream_name = "WM9713 Voice",
-       .cpu_dai = &pxa_ssp_dai[PXA_DAI_SSP3],
-       .codec_dai = &wm9713_dai[WM9713_DAI_PCM_VOICE],
+       .codec_name = "wm9713-codec",
+       .platform_name = "pxa-pcm-audio",
+       .cpu_dai_name = "pxa-ssp-dai.2",
+       .codec_name = "wm9713-voice",
        .ops = &zylonite_voice_ops,
 },
 };
@@ -248,14 +255,9 @@ static struct snd_soc_card zylonite = {
        .remove = &zylonite_remove,
        .suspend_post = &zylonite_suspend_post,
        .resume_pre = &zylonite_resume_pre,
-       .platform = &pxa2xx_soc_platform,
        .dai_link = zylonite_dai,
        .num_links = ARRAY_SIZE(zylonite_dai),
-};
-
-static struct snd_soc_device zylonite_snd_ac97_devdata = {
-       .card = &zylonite,
-       .codec_dev = &soc_codec_dev_wm9713,
+       .owner = THIS_MODULE,
 };
 
 static struct platform_device *zylonite_snd_ac97_device;
@@ -268,9 +270,7 @@ static int __init zylonite_init(void)
        if (!zylonite_snd_ac97_device)
                return -ENOMEM;
 
-       platform_set_drvdata(zylonite_snd_ac97_device,
-                            &zylonite_snd_ac97_devdata);
-       zylonite_snd_ac97_devdata.dev = &zylonite_snd_ac97_device->dev;
+       platform_set_drvdata(zylonite_snd_ac97_device, &zylonite);
 
        ret = platform_device_add(zylonite_snd_ac97_device);
        if (ret != 0)