ASoC: multi-component - ASoC Multi-Component Support

[mirror_ubuntu-jammy-kernel.git] / sound / soc / sh / fsi-ak4642.c

diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c
index be018542314e6d340e1285ad6851ef58f30bbd55..9e107a9c40105f9e37dffdfe8a5c7aff1c6d10ec 100644 (file)
--- a/sound/soc/sh/fsi-ak4642.c
+++ b/sound/soc/sh/fsi-ak4642.c
@@ -9,28 +9,19 @@
  * for more details.
  */
 
-#include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/platform_device.h>
-#include <linux/i2c.h>
-#include <linux/io.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-#include <sound/soc-dapm.h>
-
 #include <sound/sh_fsi.h>
-#include <../sound/soc/codecs/ak4642.h>
 
-static int fsi_ak4642_dai_init(struct snd_soc_codec *codec)
+static int fsi_ak4642_dai_init(struct snd_soc_pcm_runtime *rtd)
 {
+       struct snd_soc_dai *dai = rtd->codec_dai;
        int ret;
 
-       ret = snd_soc_dai_set_fmt(&ak4642_dai, SND_SOC_DAIFMT_CBM_CFM);
+       ret = snd_soc_dai_set_fmt(dai, SND_SOC_DAIFMT_CBM_CFM);
        if (ret < 0)
                return ret;
 
-       ret = snd_soc_dai_set_sysclk(&ak4642_dai, 0, 11289600, 0);
+       ret = snd_soc_dai_set_sysclk(dai, 0, 11289600, 0);
 
        return ret;
 }
@@ -38,37 +29,31 @@ static int fsi_ak4642_dai_init(struct snd_soc_codec *codec)
 static struct snd_soc_dai_link fsi_dai_link = {
        .name           = "AK4642",
        .stream_name    = "AK4642",
-       .cpu_dai        = &fsi_soc_dai[0], /* fsi */
-       .codec_dai      = &ak4642_dai,
+       .cpu_dai_name   = "fsia-dai", /* fsi A */
+       .codec_dai_name = "ak4642-hifi",
+       .platform_name  = "fsi-pcm-audio",
+       .codec_name     = "ak4642-codec.0-0012",
        .init           = fsi_ak4642_dai_init,
        .ops            = NULL,
 };
 
 static struct snd_soc_card fsi_soc_card  = {
        .name           = "FSI",
-       .platform       = &fsi_soc_platform,
        .dai_link       = &fsi_dai_link,
        .num_links      = 1,
 };
 
-static struct snd_soc_device fsi_snd_devdata = {
-       .card           = &fsi_soc_card,
-       .codec_dev      = &soc_codec_dev_ak4642,
-};
-
 static struct platform_device *fsi_snd_device;
 
 static int __init fsi_ak4642_init(void)
 {
        int ret = -ENOMEM;
 
-       fsi_snd_device = platform_device_alloc("soc-audio", -1);
+       fsi_snd_device = platform_device_alloc("soc-audio", FSI_PORT_A);
        if (!fsi_snd_device)
                goto out;
 
-       platform_set_drvdata(fsi_snd_device,
-                            &fsi_snd_devdata);
-       fsi_snd_devdata.dev = &fsi_snd_device->dev;
+       platform_set_drvdata(fsi_snd_device, &fsi_soc_card);
        ret = platform_device_add(fsi_snd_device);
 
        if (ret)