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

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
...@@ -206,7 +206,7 @@ static struct platform_driver s3c64xx_i2sv4_driver = { ...@@ -206,7 +206,7 @@ static struct platform_driver s3c64xx_i2sv4_driver = {
.probe = s3c64xx_i2sv4_dev_probe, .probe = s3c64xx_i2sv4_dev_probe,
.remove = s3c64xx_i2sv4_dev_remove, .remove = s3c64xx_i2sv4_dev_remove,
.driver = { .driver = {
.name = "s3c64xx-iis-v4", .name = "samsung-i2s-v4",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
...@@ -227,4 +227,4 @@ module_exit(s3c64xx_i2sv4_exit); ...@@ -227,4 +227,4 @@ module_exit(s3c64xx_i2sv4_exit);
MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>"); MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>");
MODULE_DESCRIPTION("S3C64XX I2Sv4 SoC Interface"); MODULE_DESCRIPTION("S3C64XX I2Sv4 SoC Interface");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:s3c64xx-iis-v4"); MODULE_ALIAS("platform:samsung-i2s-v4");
...@@ -218,7 +218,7 @@ static struct platform_driver s3c64xx_iis_driver = { ...@@ -218,7 +218,7 @@ static struct platform_driver s3c64xx_iis_driver = {
.probe = s3c64xx_iis_dev_probe, .probe = s3c64xx_iis_dev_probe,
.remove = s3c64xx_iis_dev_remove, .remove = s3c64xx_iis_dev_remove,
.driver = { .driver = {
.name = "s3c64xx-iis", .name = "samsung-i2s",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
...@@ -239,4 +239,4 @@ module_exit(s3c64xx_i2s_exit); ...@@ -239,4 +239,4 @@ module_exit(s3c64xx_i2s_exit);
MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
MODULE_DESCRIPTION("S3C64XX I2S SoC Interface"); MODULE_DESCRIPTION("S3C64XX I2S SoC Interface");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:s3c64xx-iis"); MODULE_ALIAS("platform:samsung-i2s");
...@@ -223,7 +223,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { ...@@ -223,7 +223,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = {
{ /* Primary Playback i/f */ { /* Primary Playback i/f */
.name = "WM8580 PAIF RX", .name = "WM8580 PAIF RX",
.stream_name = "Playback", .stream_name = "Playback",
.cpu_dai_name = "s3c64xx-iis-v4", .cpu_dai_name = "samsung-i2s-v4",
.codec_dai_name = "wm8580-hifi-playback", .codec_dai_name = "wm8580-hifi-playback",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.codec_name = "wm8580-codec.0-001b", .codec_name = "wm8580-codec.0-001b",
...@@ -233,7 +233,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { ...@@ -233,7 +233,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = {
{ /* Primary Capture i/f */ { /* Primary Capture i/f */
.name = "WM8580 PAIF TX", .name = "WM8580 PAIF TX",
.stream_name = "Capture", .stream_name = "Capture",
.cpu_dai_name = "s3c64xx-iis-v4", .cpu_dai_name = "samsung-i2s-v4",
.codec_dai_name = "wm8580-hifi-capture", .codec_dai_name = "wm8580-hifi-capture",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.codec_name = "wm8580-codec.0-001b", .codec_name = "wm8580-codec.0-001b",
......
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