aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-03 04:34:41 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-09 11:17:48 -0400
commit5d5d09b2fe8f00778576021d91c27b749a936420 (patch)
treea78ee434394440e4896f2ddac6e0e1a94e2d02bd /sound
parent6f1a7767fdcadd1ea1a0fa90e0a203a0e5a2acc1 (diff)
ASoC: Update SMDKs for WM8580 -codec removal
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/samsung/smdk_wm8580.c6
-rw-r--r--sound/soc/samsung/smdk_wm8580pcm.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index 3d26f6607aa..20deecf3b24 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -210,7 +210,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
210 .cpu_dai_name = "samsung-i2s.0", 210 .cpu_dai_name = "samsung-i2s.0",
211 .codec_dai_name = "wm8580-hifi-playback", 211 .codec_dai_name = "wm8580-hifi-playback",
212 .platform_name = "samsung-audio", 212 .platform_name = "samsung-audio",
213 .codec_name = "wm8580-codec.0-001b", 213 .codec_name = "wm8580.0-001b",
214 .init = smdk_wm8580_init_paifrx, 214 .init = smdk_wm8580_init_paifrx,
215 .ops = &smdk_ops, 215 .ops = &smdk_ops,
216 }, 216 },
@@ -220,7 +220,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
220 .cpu_dai_name = "samsung-i2s.0", 220 .cpu_dai_name = "samsung-i2s.0",
221 .codec_dai_name = "wm8580-hifi-capture", 221 .codec_dai_name = "wm8580-hifi-capture",
222 .platform_name = "samsung-audio", 222 .platform_name = "samsung-audio",
223 .codec_name = "wm8580-codec.0-001b", 223 .codec_name = "wm8580.0-001b",
224 .init = smdk_wm8580_init_paiftx, 224 .init = smdk_wm8580_init_paiftx,
225 .ops = &smdk_ops, 225 .ops = &smdk_ops,
226 }, 226 },
@@ -230,7 +230,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
230 .cpu_dai_name = "samsung-i2s.x", 230 .cpu_dai_name = "samsung-i2s.x",
231 .codec_dai_name = "wm8580-hifi-playback", 231 .codec_dai_name = "wm8580-hifi-playback",
232 .platform_name = "samsung-audio", 232 .platform_name = "samsung-audio",
233 .codec_name = "wm8580-codec.0-001b", 233 .codec_name = "wm8580.0-001b",
234 .init = smdk_wm8580_init_paifrx, 234 .init = smdk_wm8580_init_paifrx,
235 .ops = &smdk_ops, 235 .ops = &smdk_ops,
236 }, 236 },
diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c
index 0d12092df16..4b9c73477ce 100644
--- a/sound/soc/samsung/smdk_wm8580pcm.c
+++ b/sound/soc/samsung/smdk_wm8580pcm.c
@@ -127,7 +127,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
127 .cpu_dai_name = "samsung-pcm.0", 127 .cpu_dai_name = "samsung-pcm.0",
128 .codec_dai_name = "wm8580-hifi-playback", 128 .codec_dai_name = "wm8580-hifi-playback",
129 .platform_name = "samsung-audio", 129 .platform_name = "samsung-audio",
130 .codec_name = "wm8580-codec.0-001b", 130 .codec_name = "wm8580.0-001b",
131 .ops = &smdk_wm8580_pcm_ops, 131 .ops = &smdk_wm8580_pcm_ops,
132 }, { 132 }, {
133 .name = "WM8580 PAIF PCM TX", 133 .name = "WM8580 PAIF PCM TX",
@@ -135,7 +135,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
135 .cpu_dai_name = "samsung-pcm.0", 135 .cpu_dai_name = "samsung-pcm.0",
136 .codec_dai_name = "wm8580-hifi-capture", 136 .codec_dai_name = "wm8580-hifi-capture",
137 .platform_name = "samsung-audio", 137 .platform_name = "samsung-audio",
138 .codec_name = "wm8580-codec.0-001b", 138 .codec_name = "wm8580.0-001b",
139 .ops = &smdk_wm8580_pcm_ops, 139 .ops = &smdk_wm8580_pcm_ops,
140 }, 140 },
141}; 141};