Commit a2a0086d authored by Ian Lartey's avatar Ian Lartey Committed by Mark Brown
Browse files

ASoC: pxa2xx-i2s is the proper name of the I2S DAI, not pxa-i2s. 



Signed-off-by: default avatarIan Lartey <ian@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 49d7ad9d

sound/soc/pxa/imote2.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

sound/soc/pxa/magician.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

sound/soc/pxa/poodle.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

sound/soc/pxa/z2.c

+1 −1
Original line number Diff line number Diff line
@@ -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",