Commit 4bfc4e25 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Mark Brown

ASoC: correct pxa AC97 DAI names

Correct names for pxa AC97 DAI are pxa2xx-ac97 and pxa2xx-ac97-aux. Fix
that for all PXA platforms.
Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent cea2bc50
...@@ -117,7 +117,7 @@ static struct snd_soc_dai_link e740_dai[] = { ...@@ -117,7 +117,7 @@ static struct snd_soc_dai_link e740_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "pxa-ac97.0", .cpu_dai_name = "pxa2xx-ac97",
.codec_dai_name = "wm9705-hifi", .codec_dai_name = "wm9705-hifi",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9705-codec", .codec_name = "wm9705-codec",
...@@ -126,7 +126,7 @@ static struct snd_soc_dai_link e740_dai[] = { ...@@ -126,7 +126,7 @@ static struct snd_soc_dai_link e740_dai[] = {
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai_name = "pxa-ac97.1", .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_dai_name = "wm9705-aux", .codec_dai_name = "wm9705-aux",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9705-codec", .codec_name = "wm9705-codec",
......
...@@ -99,7 +99,7 @@ static struct snd_soc_dai_link e750_dai[] = { ...@@ -99,7 +99,7 @@ static struct snd_soc_dai_link e750_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "pxa-ac97.0", .cpu_dai_name = "pxa2xx-ac97",
.codec_dai_name = "wm9705-hifi", .codec_dai_name = "wm9705-hifi",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9705-codec", .codec_name = "wm9705-codec",
...@@ -109,7 +109,7 @@ static struct snd_soc_dai_link e750_dai[] = { ...@@ -109,7 +109,7 @@ static struct snd_soc_dai_link e750_dai[] = {
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai_name = "pxa-ac97.1", .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_dai_name ="wm9705-aux", .codec_dai_name ="wm9705-aux",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9705-codec", .codec_name = "wm9705-codec",
......
...@@ -89,7 +89,7 @@ static struct snd_soc_dai_link e800_dai[] = { ...@@ -89,7 +89,7 @@ static struct snd_soc_dai_link e800_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "pxa-ac97.0", .cpu_dai_name = "pxa2xx-ac97",
.codec_dai_name = "wm9712-hifi", .codec_dai_name = "wm9712-hifi",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9712-codec", .codec_name = "wm9712-codec",
...@@ -98,7 +98,7 @@ static struct snd_soc_dai_link e800_dai[] = { ...@@ -98,7 +98,7 @@ static struct snd_soc_dai_link e800_dai[] = {
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai_name = "pxa-ac97.1", .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_dai_name ="wm9712-aux", .codec_dai_name ="wm9712-aux",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9712-codec", .codec_name = "wm9712-codec",
......
...@@ -37,7 +37,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { ...@@ -37,7 +37,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "pxa-ac97.0", .cpu_dai_name = "pxa2xx-ac97",
.codec_dai_name = "wm9712-hifi", .codec_dai_name = "wm9712-hifi",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9712-codec", .codec_name = "wm9712-codec",
...@@ -45,7 +45,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { ...@@ -45,7 +45,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai_name = "pxa-ac97.1", .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_dai_name ="wm9712-aux", .codec_dai_name ="wm9712-aux",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9712-codec", .codec_name = "wm9712-codec",
......
...@@ -162,7 +162,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { ...@@ -162,7 +162,7 @@ static struct snd_soc_dai_link mioa701_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "pxa-ac97.0", .cpu_dai_name = "pxa2xx-ac97",
.codec_dai_name = "wm9713-hifi", .codec_dai_name = "wm9713-hifi",
.codec_name = "wm9713-codec", .codec_name = "wm9713-codec",
.init = mioa701_wm9713_init, .init = mioa701_wm9713_init,
...@@ -172,7 +172,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { ...@@ -172,7 +172,7 @@ static struct snd_soc_dai_link mioa701_dai[] = {
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai_name = "pxa-ac97.1", .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_dai_name ="wm9713-aux", .codec_dai_name ="wm9713-aux",
.codec_name = "wm9713-codec", .codec_name = "wm9713-codec",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
......
...@@ -132,7 +132,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { ...@@ -132,7 +132,7 @@ static struct snd_soc_dai_link palm27x_dai[] = {
{ {
.name = "AC97 HiFi", .name = "AC97 HiFi",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "pxa-ac97.0", .cpu_dai_name = "pxa2xx-ac97",
.codec_dai_name = "wm9712-hifi", .codec_dai_name = "wm9712-hifi",
.codec_name = "wm9712-codec", .codec_name = "wm9712-codec",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
...@@ -141,7 +141,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { ...@@ -141,7 +141,7 @@ static struct snd_soc_dai_link palm27x_dai[] = {
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai_name = "pxa-ac97.1", .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_dai_name = "wm9712-aux", .codec_dai_name = "wm9712-aux",
.codec_name = "wm9712-codec", .codec_name = "wm9712-codec",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
......
...@@ -219,7 +219,7 @@ static struct snd_soc_dai_link tosa_dai[] = { ...@@ -219,7 +219,7 @@ static struct snd_soc_dai_link tosa_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "pxa-ac97.0", .cpu_dai_name = "pxa2xx-ac97",
.codec_dai_name = "wm9712-hifi", .codec_dai_name = "wm9712-hifi",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9712-codec", .codec_name = "wm9712-codec",
...@@ -229,7 +229,7 @@ static struct snd_soc_dai_link tosa_dai[] = { ...@@ -229,7 +229,7 @@ static struct snd_soc_dai_link tosa_dai[] = {
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai_name = "pxa-ac97.1", .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_dai_name = "wm9712-aux", .codec_dai_name = "wm9712-aux",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.codec_name = "wm9712-codec", .codec_name = "wm9712-codec",
......
...@@ -166,7 +166,7 @@ static struct snd_soc_dai_link zylonite_dai[] = { ...@@ -166,7 +166,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.codec_name = "wm9713-codec", .codec_name = "wm9713-codec",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.cpu_dai_name = "pxa-ac97.0", .cpu_dai_name = "pxa2xx-ac97",
.codec_name = "wm9713-hifi", .codec_name = "wm9713-hifi",
.init = zylonite_wm9713_init, .init = zylonite_wm9713_init,
}, },
...@@ -175,7 +175,7 @@ static struct snd_soc_dai_link zylonite_dai[] = { ...@@ -175,7 +175,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.codec_name = "wm9713-codec", .codec_name = "wm9713-codec",
.platform_name = "pxa-pcm-audio", .platform_name = "pxa-pcm-audio",
.cpu_dai_name = "pxa-ac97.1", .cpu_dai_name = "pxa2xx-ac97-aux",
.codec_name = "wm9713-aux", .codec_name = "wm9713-aux",
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment