summary refs log tree commit diff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-27 18:24:35 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-28 12:09:53 +0100
commit69b91bc1551a2fc746a01fea9d3291e60be3780d (patch)
treefd53d2267bfb045209f16d51e1cd35368ef1e66d /sound/soc
parent1270b01f7530ac73bcf08325bcd85c94e2bbebc1 (diff)
downloadlinux-69b91bc1551a2fc746a01fea9d3291e60be3780d.tar.gz
ASoC: Fix CODEC DAI names for Goni
Immediately after sending the last fix I realised that the CODEC DAI names
also don't correspond to the WM8994 driver. Update the DAI names to match.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/samsung/goni_wm8994.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index 3a7861c058fb..0e80daee8b6f 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -236,7 +236,7 @@ static struct snd_soc_dai_link goni_dai[] = {
 	.name = "WM8994",
 	.stream_name = "WM8994 HiFi",
 	.cpu_dai_name = "samsung-i2s.0",
-	.codec_dai_name = "wm8994-hifi",
+	.codec_dai_name = "wm8994-aif1",
 	.platform_name = "samsung-audio",
 	.codec_name = "wm8994-codec.0-001a",
 	.init = goni_wm8994_init,
@@ -245,7 +245,7 @@ static struct snd_soc_dai_link goni_dai[] = {
 	.name = "WM8994 Voice",
 	.stream_name = "Voice",
 	.cpu_dai_name = "goni-voice-dai",
-	.codec_dai_name = "wm8994-voice",
+	.codec_dai_name = "wm8994-aif2",
 	.platform_name = "samsung-audio",
 	.codec_name = "wm8994-codec.0-001a",
 	.ops = &goni_voice_ops,