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>

diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index 03765fc5ac74537fd311796b6b65d2696bc42625..154fc6f234389e74d4354770b6057074377f6be2 100644 (file)
--- a/sound/soc/pxa/imote2.c
+++ b/sound/soc/pxa/imote2.c
@@ -63,7 +63,7 @@ static struct snd_soc_ops imote2_asoc_ops = {
 static struct snd_soc_dai_link imote2_dai = {
        .name = "WM8940",
        .stream_name = "WM8940",
-       .cpu_dai_name = "pxa-i2s",
+       .cpu_dai_name = "pxa2xx-i2s",
        .codec_dai_name = "wm8940-hifi",
        .platform_name = "pxa-pcm-audio",
        .codec_name = "wm8940-codec.0-0034",

diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 608bc3dd835ff7c7125591db47bc0fdfb4f809d9..b8207ced40729b0b375f28566b09de404313f28a 100644 (file)
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -437,7 +437,7 @@ static struct snd_soc_dai_link magician_dai[] = {
 {
        .name = "uda1380",
        .stream_name = "UDA1380 Capture",
-       .cpu_dai_name = "pxa-i2s",
+       .cpu_dai_name = "pxa2xx-i2s",
        .codec_dai_name = "uda1380-hifi-capture",
        .platform_name = "pxa-pcm-audio",
        .codec_name = "uda1380-codec.0-0018",

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index fa752f6ec37d819e167f497781c889a360f54db7..af84ee9c5e11edde0c8a253e3a5072e5f3ac0e36 100644 (file)
--- 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)
 static struct snd_soc_dai_link poodle_dai = {
        .name = "WM8731",
        .stream_name = "WM8731",
-       .cpu_dai_name = "pxa-i2s",
+       .cpu_dai_name = "pxa2xx-i2s",
        .codec_dai_name = "wm8731-hifi",
        .platform_name = "pxa-pcm-audio",
        .codec_name = "wm8731-codec.0-001a",

diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 704f74b56ab61452bc621e0faa31fe4e83e4e0e6..4cc841b441829bf6f04a2a00f683e4093619a372 100644 (file)
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -189,7 +189,7 @@ static struct snd_soc_ops z2_ops = {
 static struct snd_soc_dai_link z2_dai = {
        .name           = "wm8750",
        .stream_name    = "WM8750",
-       .cpu_dai_name   = "pxa-i2s",
+       .cpu_dai_name   = "pxa2xx-i2s",
        .codec_dai_name = "wm8750-hifi",
        .platform_name = "pxa-pcm-audio",
        .codec_name     = "wm8750-codec.0-001a",