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: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c
index 46b65d7cb630fa90843432eab4641d8afb8e56f0..8a080416ce8532958e0f18c8d950308df75983d3 100644 (file)
--- a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c
@@ -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");

diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index 0288d4ef14b3f86d47865e88400dbdb37e140360..0fefbb545947c79e7bbd4ce56b6fc3e493102951 100644 (file)
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -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");

diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c
index 5125bc14fc0f677539a2af124df264a288cbc8b6..095379126435662676e400eeda257cc97ea70625 100644 (file)
--- a/sound/soc/s3c24xx/smdk64xx_wm8580.c
+++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c
@@ -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",