diff options
author | Ian Lartey <ian@opensource.wolfsonmicro.com> | 2010-08-20 12:18:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-23 08:36:46 -0400 |
commit | a2a0086d4b812dd5d44af84c43d6c6ba089e8210 (patch) | |
tree | 421e5a5bd31b44856fbf1da3c932d4e4e731a415 /sound/soc/pxa | |
parent | 49d7ad9d8a5546d96061f08de1fb30241140849c (diff) |
ASoC: pxa2xx-i2s is the proper name of the I2S DAI, not pxa-i2s.
Signed-off-by: Ian Lartey <ian@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r-- | sound/soc/pxa/imote2.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/magician.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/poodle.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/z2.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c index 03765fc5ac74..154fc6f23438 100644 --- a/sound/soc/pxa/imote2.c +++ b/sound/soc/pxa/imote2.c | |||
@@ -63,7 +63,7 @@ static struct snd_soc_ops imote2_asoc_ops = { | |||
63 | static struct snd_soc_dai_link imote2_dai = { | 63 | static struct snd_soc_dai_link imote2_dai = { |
64 | .name = "WM8940", | 64 | .name = "WM8940", |
65 | .stream_name = "WM8940", | 65 | .stream_name = "WM8940", |
66 | .cpu_dai_name = "pxa-i2s", | 66 | .cpu_dai_name = "pxa2xx-i2s", |
67 | .codec_dai_name = "wm8940-hifi", | 67 | .codec_dai_name = "wm8940-hifi", |
68 | .platform_name = "pxa-pcm-audio", | 68 | .platform_name = "pxa-pcm-audio", |
69 | .codec_name = "wm8940-codec.0-0034", | 69 | .codec_name = "wm8940-codec.0-0034", |
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index 608bc3dd835f..b8207ced4072 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c | |||
@@ -437,7 +437,7 @@ static struct snd_soc_dai_link magician_dai[] = { | |||
437 | { | 437 | { |
438 | .name = "uda1380", | 438 | .name = "uda1380", |
439 | .stream_name = "UDA1380 Capture", | 439 | .stream_name = "UDA1380 Capture", |
440 | .cpu_dai_name = "pxa-i2s", | 440 | .cpu_dai_name = "pxa2xx-i2s", |
441 | .codec_dai_name = "uda1380-hifi-capture", | 441 | .codec_dai_name = "uda1380-hifi-capture", |
442 | .platform_name = "pxa-pcm-audio", | 442 | .platform_name = "pxa-pcm-audio", |
443 | .codec_name = "uda1380-codec.0-0018", | 443 | .codec_name = "uda1380-codec.0-0018", |
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index fa752f6ec37d..af84ee9c5e11 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -266,7 +266,7 @@ static int poodle_wm8731_init(struct snd_soc_pcm_runtime *rtd) | |||
266 | static struct snd_soc_dai_link poodle_dai = { | 266 | static struct snd_soc_dai_link poodle_dai = { |
267 | .name = "WM8731", | 267 | .name = "WM8731", |
268 | .stream_name = "WM8731", | 268 | .stream_name = "WM8731", |
269 | .cpu_dai_name = "pxa-i2s", | 269 | .cpu_dai_name = "pxa2xx-i2s", |
270 | .codec_dai_name = "wm8731-hifi", | 270 | .codec_dai_name = "wm8731-hifi", |
271 | .platform_name = "pxa-pcm-audio", | 271 | .platform_name = "pxa-pcm-audio", |
272 | .codec_name = "wm8731-codec.0-001a", | 272 | .codec_name = "wm8731-codec.0-001a", |
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 704f74b56ab6..4cc841b44182 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c | |||
@@ -189,7 +189,7 @@ static struct snd_soc_ops z2_ops = { | |||
189 | static struct snd_soc_dai_link z2_dai = { | 189 | static struct snd_soc_dai_link z2_dai = { |
190 | .name = "wm8750", | 190 | .name = "wm8750", |
191 | .stream_name = "WM8750", | 191 | .stream_name = "WM8750", |
192 | .cpu_dai_name = "pxa-i2s", | 192 | .cpu_dai_name = "pxa2xx-i2s", |
193 | .codec_dai_name = "wm8750-hifi", | 193 | .codec_dai_name = "wm8750-hifi", |
194 | .platform_name = "pxa-pcm-audio", | 194 | .platform_name = "pxa-pcm-audio", |
195 | .codec_name = "wm8750-codec.0-001a", | 195 | .codec_name = "wm8750-codec.0-001a", |