ASoC: fsi: Add specified ID for soc-audio
Kuninori Morimoto [Fri, 16 Jul 2010 10:51:06 +0000 (19:51 +0900)]
Specified ID is necessary, when some codecs are used with FSI.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

include/sound/sh_fsi.h
sound/soc/sh/fsi-ak4642.c
sound/soc/sh/fsi-da7210.c

index 2c6237e..6ac7186 100644 (file)
@@ -12,6 +12,9 @@
  * published by the Free Software Foundation.
  */
 
+#define FSI_PORT_A     0
+#define FSI_PORT_B     1
+
 /* flags format
 
  * 0xABCDEEFF
index 2871a20..dad575a 100644 (file)
@@ -29,7 +29,7 @@ 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 */
+       .cpu_dai        = &fsi_soc_dai[FSI_PORT_A],
        .codec_dai      = &ak4642_dai,
        .init           = fsi_ak4642_dai_init,
        .ops            = NULL,
@@ -53,7 +53,7 @@ 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;
 
index 4d4fd77..121bbb0 100644 (file)
@@ -24,7 +24,7 @@ static int fsi_da7210_init(struct snd_soc_codec *codec)
 static struct snd_soc_dai_link fsi_da7210_dai = {
        .name           = "DA7210",
        .stream_name    = "DA7210",
-       .cpu_dai        = &fsi_soc_dai[1], /* FSI B */
+       .cpu_dai        = &fsi_soc_dai[FSI_PORT_B],
        .codec_dai      = &da7210_dai,
        .init           = fsi_da7210_init,
 };
@@ -47,7 +47,7 @@ static int __init fsi_da7210_sound_init(void)
 {
        int ret;
 
-       fsi_da7210_snd_device = platform_device_alloc("soc-audio", -1);
+       fsi_da7210_snd_device = platform_device_alloc("soc-audio", FSI_PORT_B);
        if (!fsi_da7210_snd_device)
                return -ENOMEM;