Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 518aa59f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Samsung: Fix outdated cpu_dai_name for s3c24xx i2s 



During the multi-component patch the s3c24xx i2s driver was renamed from
"s3c24xx-i2s" to "s3c24xx-iis", while the sound board drivers were not
updated to reflect this change as well.

As a result there is no match between the dai_link and the i2s driver and no
sound card is instantiated.

This patch fixes the problem by updating the sound board drivers to use
"s3c24xx-iis" for the cpu_dai_name.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarJassi Brar <jassi.brar@samsung.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 81d7da54

sound/soc/samsung/neo1973_gta02_wm8753.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { 
{ /* Hifi Playback - for similatious use with voice below */

	.name = "WM8753",

	.stream_name = "WM8753 HiFi",

	.cpu_dai_name = "s3c24xx-i2s",

	.cpu_dai_name = "s3c24xx-iis",

	.codec_dai_name = "wm8753-hifi",

	.init = neo1973_gta02_wm8753_init,

	.platform_name = "samsung-audio",

sound/soc/samsung/neo1973_wm8753.c

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { 
	.name = "WM8753",

	.stream_name = "WM8753 HiFi",

	.platform_name = "samsung-audio",

	.cpu_dai_name = "s3c24xx-i2s",

	.cpu_dai_name = "s3c24xx-iis",

	.codec_dai_name = "wm8753-hifi",

	.codec_name = "wm8753-codec.0-001a",

	.init = neo1973_wm8753_init,

sound/soc/samsung/s3c24xx_simtec_hermes.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = { 
	.name		= "tlv320aic33",

	.stream_name	= "TLV320AIC33",

	.codec_name	= "tlv320aic3x-codec.0-001a",

	.cpu_dai_name	= "s3c24xx-i2s",

	.cpu_dai_name	= "s3c24xx-iis",

	.codec_dai_name = "tlv320aic3x-hifi",

	.platform_name	= "samsung-audio",

	.init		= simtec_hermes_init,

sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = { 
	.name		= "tlv320aic23",

	.stream_name	= "TLV320AIC23",

	.codec_name	= "tlv320aic3x-codec.0-001a",

	.cpu_dai_name	= "s3c24xx-i2s",

	.cpu_dai_name	= "s3c24xx-iis",

	.codec_dai_name = "tlv320aic3x-hifi",

	.platform_name	= "samsung-audio",

	.init		= simtec_tlv320aic23_init,

sound/soc/samsung/s3c24xx_uda134x.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { 
	.stream_name = "UDA134X",

	.codec_name = "uda134x-hifi",

	.codec_dai_name = "uda134x-hifi",

	.cpu_dai_name = "s3c24xx-i2s",

	.cpu_dai_name = "s3c24xx-iis",

	.ops = &s3c24xx_uda134x_ops,

	.platform_name	= "samsung-audio",

};