ASoC: multi-component - ASoC Multi-Component Support

[mv-sheeva.git] / sound / soc / fsl / efika-audio-fabric.c

diff --git a/sound/soc/fsl/efika-audio-fabric.c b/sound/soc/fsl/efika-audio-fabric.c
index 1a5b8e0d6a34d986fcfb62c5ac0c7cdc6ad9f2b7..53251e6b5bd509303dc17500e8f4d64feeea7021 100644 (file)
--- a/sound/soc/fsl/efika-audio-fabric.c
+++ b/sound/soc/fsl/efika-audio-fabric.c
@@ -24,7 +24,6 @@
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
-#include <sound/soc-of-simple.h>
 
 #include "mpc5200_dma.h"
 #include "mpc5200_psc_ac97.h"
@@ -32,21 +31,24 @@
 
 #define DRV_NAME "efika-audio-fabric"
 
-static struct snd_soc_device device;
 static struct snd_soc_card card;
 
 static struct snd_soc_dai_link efika_fabric_dai[] = {
 {
        .name = "AC97",
        .stream_name = "AC97 Analog",
-       .codec_dai = &stac9766_dai[STAC9766_DAI_AC97_ANALOG],
-       .cpu_dai = &psc_ac97_dai[MPC5200_AC97_NORMAL],
+       .codec_dai_name = "stac9766-hifi-analog",
+       .cpu_dai_name = "mpc5200-psc-ac97.0",
+       .platform_name = "mpc5200-pcm-audio",
+       .codec_name = "stac9766-codec",
 },
 {
        .name = "AC97",
        .stream_name = "AC97 IEC958",
-       .codec_dai = &stac9766_dai[STAC9766_DAI_AC97_DIGITAL],
-       .cpu_dai = &psc_ac97_dai[MPC5200_AC97_SPDIF],
+       .codec_dai_name = "stac9766-hifi-IEC958",
+       .cpu_dai_name = "mpc5200-psc-ac97.1",
+       .platform_name = "mpc5200-pcm-audio",
+       .codec_name = "stac9766-codec",
 },
 };
 
@@ -58,13 +60,10 @@ static __init int efika_fabric_init(void)
        if (!of_machine_is_compatible("bplan,efika"))
                return -ENODEV;
 
-       card.platform = &mpc5200_audio_dma_platform;
        card.name = "Efika";
        card.dai_link = efika_fabric_dai;
        card.num_links = ARRAY_SIZE(efika_fabric_dai);
 
-       device.card = &card;
-       device.codec_dev = &soc_codec_dev_stac9766;
 
        pdev = platform_device_alloc("soc-audio", 1);
        if (!pdev) {
@@ -72,8 +71,7 @@ static __init int efika_fabric_init(void)
                return -ENODEV;
        }
 
-       platform_set_drvdata(pdev, &device);
-       device.dev = &pdev->dev;
+       platform_set_drvdata(pdev, &card);
 
        rc = platform_device_add(pdev);
        if (rc) {