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

Commit 0068402c authored by Jassi Brar's avatar Jassi Brar Committed by Mark Brown
Browse files

ASoC: Samsung: Rename s3c64xx I2S device 



Since the I2S of S3C64XX and newer SoCs are incremental
versions of each other with changes managable in a single
driver, rename the 's3c64xx-iis' -> 'samsung-i2s'

Signed-off-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>
parent c3f2028b

sound/soc/s3c24xx/s3c64xx-i2s-v4.c

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static struct platform_driver s3c64xx_i2sv4_driver = { 
	.probe  = s3c64xx_i2sv4_dev_probe,

	.remove = s3c64xx_i2sv4_dev_remove,

	.driver = {

		.name = "s3c64xx-iis-v4",

		.name = "samsung-i2s-v4",

		.owner = THIS_MODULE,

	},

};
@@ -227,4 +227,4 @@ module_exit(s3c64xx_i2sv4_exit); 
MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>");

MODULE_DESCRIPTION("S3C64XX I2Sv4 SoC Interface");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:s3c64xx-iis-v4");
 
MODULE_ALIAS("platform:samsung-i2s-v4");

sound/soc/s3c24xx/s3c64xx-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static struct platform_driver s3c64xx_iis_driver = { 
	.probe  = s3c64xx_iis_dev_probe,

	.remove = s3c64xx_iis_dev_remove,

	.driver = {

		.name = "s3c64xx-iis",

		.name = "samsung-i2s",

		.owner = THIS_MODULE,

	},

};
@@ -239,4 +239,4 @@ module_exit(s3c64xx_i2s_exit); 
MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");

MODULE_DESCRIPTION("S3C64XX I2S SoC Interface");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:s3c64xx-iis");
 
MODULE_ALIAS("platform:samsung-i2s");

sound/soc/s3c24xx/smdk64xx_wm8580.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { 
{ /* Primary Playback i/f */

	.name = "WM8580 PAIF RX",

	.stream_name = "Playback",

	.cpu_dai_name = "s3c64xx-iis-v4",

	.cpu_dai_name = "samsung-i2s-v4",

	.codec_dai_name = "wm8580-hifi-playback",

	.platform_name = "samsung-audio",

	.codec_name = "wm8580-codec.0-001b",
@@ -233,7 +233,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { 
{ /* Primary Capture i/f */

	.name = "WM8580 PAIF TX",

	.stream_name = "Capture",

	.cpu_dai_name = "s3c64xx-iis-v4",

	.cpu_dai_name = "samsung-i2s-v4",

	.codec_dai_name = "wm8580-hifi-capture",

	.platform_name = "samsung-audio",

	.codec_name = "wm8580-codec.0-001b",