diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-01-21 14:14:17 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-25 10:18:42 -0500 |
commit | a3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (patch) | |
tree | b9f11b63322e39f04d9f287f32f6ba8decef5620 /sound | |
parent | 518aa59f6e45b3c90b849187ae1d56757d074b92 (diff) |
ASoC: correct link specifications for corgi, poodle and spitz
ASoC DAI link descriptions for Corgi, Poodle and Spitz platforms
contained incorrect names for cpu_dai and codec, which effectievly disabled sound
on theese platforms. Fix that errors.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/pxa/corgi.c | 4 | ||||
-rw-r--r-- | sound/soc/pxa/poodle.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/spitz.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index fc592f0d5fc7..784cff5f67e8 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd) | |||
307 | static struct snd_soc_dai_link corgi_dai = { | 307 | static struct snd_soc_dai_link corgi_dai = { |
308 | .name = "WM8731", | 308 | .name = "WM8731", |
309 | .stream_name = "WM8731", | 309 | .stream_name = "WM8731", |
310 | .cpu_dai_name = "pxa-is2-dai", | 310 | .cpu_dai_name = "pxa2xx-i2s", |
311 | .codec_dai_name = "wm8731-hifi", | 311 | .codec_dai_name = "wm8731-hifi", |
312 | .platform_name = "pxa-pcm-audio", | 312 | .platform_name = "pxa-pcm-audio", |
313 | .codec_name = "wm8731-codec-0.001a", | 313 | .codec_name = "wm8731-codec-0.001b", |
314 | .init = corgi_wm8731_init, | 314 | .init = corgi_wm8731_init, |
315 | .ops = &corgi_ops, | 315 | .ops = &corgi_ops, |
316 | }; | 316 | }; |
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 6298ee115e27..a7d4999f9b24 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = { | |||
276 | .cpu_dai_name = "pxa2xx-i2s", | 276 | .cpu_dai_name = "pxa2xx-i2s", |
277 | .codec_dai_name = "wm8731-hifi", | 277 | .codec_dai_name = "wm8731-hifi", |
278 | .platform_name = "pxa-pcm-audio", | 278 | .platform_name = "pxa-pcm-audio", |
279 | .codec_name = "wm8731-codec.0-001a", | 279 | .codec_name = "wm8731-codec.0-001b", |
280 | .init = poodle_wm8731_init, | 280 | .init = poodle_wm8731_init, |
281 | .ops = &poodle_ops, | 281 | .ops = &poodle_ops, |
282 | }; | 282 | }; |
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index c2acb69b957a..8e1571350630 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd) | |||
315 | static struct snd_soc_dai_link spitz_dai = { | 315 | static struct snd_soc_dai_link spitz_dai = { |
316 | .name = "wm8750", | 316 | .name = "wm8750", |
317 | .stream_name = "WM8750", | 317 | .stream_name = "WM8750", |
318 | .cpu_dai_name = "pxa-is2", | 318 | .cpu_dai_name = "pxa2xx-i2s", |
319 | .codec_dai_name = "wm8750-hifi", | 319 | .codec_dai_name = "wm8750-hifi", |
320 | .platform_name = "pxa-pcm-audio", | 320 | .platform_name = "pxa-pcm-audio", |
321 | .codec_name = "wm8750-codec.0-001a", | 321 | .codec_name = "wm8750-codec.0-001b", |
322 | .init = spitz_wm8750_init, | 322 | .init = spitz_wm8750_init, |
323 | .ops = &spitz_ops, | 323 | .ops = &spitz_ops, |
324 | }; | 324 | }; |