aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-07-16 06:51:06 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-17 14:45:56 -0400
commit3c2ef841c0e27f37923ed15dc5d744cd6ba704ae (patch)
treecce8bde5c98f4334c9bb55924a061398949c8305
parentd9478374106741d539d6b002e5e747d1ca9e4032 (diff)
ASoC: fsi: Add specified ID for soc-audio
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>
-rw-r--r--include/sound/sh_fsi.h3
-rw-r--r--sound/soc/sh/fsi-ak4642.c4
-rw-r--r--sound/soc/sh/fsi-da7210.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/include/sound/sh_fsi.h b/include/sound/sh_fsi.h
index 2c6237e6c045..6ac71863c70f 100644
--- a/include/sound/sh_fsi.h
+++ b/include/sound/sh_fsi.h
@@ -12,6 +12,9 @@
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13 */ 13 */
14 14
15#define FSI_PORT_A 0
16#define FSI_PORT_B 1
17
15/* flags format 18/* flags format
16 19
17 * 0xABCDEEFF 20 * 0xABCDEEFF
diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c
index 2871a200160c..dad575a22622 100644
--- a/sound/soc/sh/fsi-ak4642.c
+++ b/sound/soc/sh/fsi-ak4642.c
@@ -29,7 +29,7 @@ static int fsi_ak4642_dai_init(struct snd_soc_codec *codec)
29static struct snd_soc_dai_link fsi_dai_link = { 29static struct snd_soc_dai_link fsi_dai_link = {
30 .name = "AK4642", 30 .name = "AK4642",
31 .stream_name = "AK4642", 31 .stream_name = "AK4642",
32 .cpu_dai = &fsi_soc_dai[0], /* fsi */ 32 .cpu_dai = &fsi_soc_dai[FSI_PORT_A],
33 .codec_dai = &ak4642_dai, 33 .codec_dai = &ak4642_dai,
34 .init = fsi_ak4642_dai_init, 34 .init = fsi_ak4642_dai_init,
35 .ops = NULL, 35 .ops = NULL,
@@ -53,7 +53,7 @@ static int __init fsi_ak4642_init(void)
53{ 53{
54 int ret = -ENOMEM; 54 int ret = -ENOMEM;
55 55
56 fsi_snd_device = platform_device_alloc("soc-audio", -1); 56 fsi_snd_device = platform_device_alloc("soc-audio", FSI_PORT_A);
57 if (!fsi_snd_device) 57 if (!fsi_snd_device)
58 goto out; 58 goto out;
59 59
diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c
index 4d4fd777b45a..121bbb07bb03 100644
--- a/sound/soc/sh/fsi-da7210.c
+++ b/sound/soc/sh/fsi-da7210.c
@@ -24,7 +24,7 @@ static int fsi_da7210_init(struct snd_soc_codec *codec)
24static struct snd_soc_dai_link fsi_da7210_dai = { 24static struct snd_soc_dai_link fsi_da7210_dai = {
25 .name = "DA7210", 25 .name = "DA7210",
26 .stream_name = "DA7210", 26 .stream_name = "DA7210",
27 .cpu_dai = &fsi_soc_dai[1], /* FSI B */ 27 .cpu_dai = &fsi_soc_dai[FSI_PORT_B],
28 .codec_dai = &da7210_dai, 28 .codec_dai = &da7210_dai,
29 .init = fsi_da7210_init, 29 .init = fsi_da7210_init,
30}; 30};
@@ -47,7 +47,7 @@ static int __init fsi_da7210_sound_init(void)
47{ 47{
48 int ret; 48 int ret;
49 49
50 fsi_da7210_snd_device = platform_device_alloc("soc-audio", -1); 50 fsi_da7210_snd_device = platform_device_alloc("soc-audio", FSI_PORT_B);
51 if (!fsi_da7210_snd_device) 51 if (!fsi_da7210_snd_device)
52 return -ENOMEM; 52 return -ENOMEM;
53 53