summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-08-30 15:47:19 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-31 16:28:13 +0400
commit2c280320f22153f7035a76ee0948f5577c5482b5 (patch)
tree59c0a4b955d137286bd469e707a6cb2bd2d452dc
parent7522948b1b6105d58d250d3225f86aa0a5ba2bc5 (diff)
downloadlinux-2c280320f22153f7035a76ee0948f5577c5482b5.tar.xz
ASoC: fsi-ak4642/fsi-da7210: modify dai link settings for card detect
This patch modify dai link - platform_name: sh_fsi/sh_fsi2 are used for FSI driver - codec_name: ak4642/ak4643 are used for ak4642 driver This is quick hack. I should modify it more wisely in future 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--sound/soc/sh/fsi-ak4642.c7
-rw-r--r--sound/soc/sh/fsi-da7210.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c
index 9e107a9c4010..53836ca11d3b 100644
--- a/sound/soc/sh/fsi-ak4642.c
+++ b/sound/soc/sh/fsi-ak4642.c
@@ -31,8 +31,13 @@ static struct snd_soc_dai_link fsi_dai_link = {
.stream_name = "AK4642",
.cpu_dai_name = "fsia-dai", /* fsi A */
.codec_dai_name = "ak4642-hifi",
- .platform_name = "fsi-pcm-audio",
+#ifdef CONFIG_MACH_AP4EVB
+ .platform_name = "sh_fsi2.0",
+ .codec_name = "ak4642-codec.0-0013",
+#else
+ .platform_name = "sh_fsi.0",
.codec_name = "ak4642-codec.0-0012",
+#endif
.init = fsi_ak4642_dai_init,
.ops = NULL,
};
diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c
index 4f9298f45215..b5270156c817 100644
--- a/sound/soc/sh/fsi-da7210.c
+++ b/sound/soc/sh/fsi-da7210.c
@@ -27,7 +27,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = {
.stream_name = "DA7210",
.cpu_dai_name = "fsib-dai", /* FSI B */
.codec_dai_name = "da7210-hifi",
- .platform_name = "fsi-pcm-audio",
+ .platform_name = "sh_fsi.0",
.codec_name = "da7210-codec.0-001a",
.init = fsi_da7210_init,
};