ASoC: Samsung: Rename DMA device

Some Samsung SoCs have a PCM(DSP) controller. So the name
s3c24xx-pcm-audio for DMA driver is not very appropraite.
This patch moves :-
	s3c24xx-pcm-audio -> samsung-audio

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c
index 7618627b98f5c6b53a1d97d89133fe828bfa7f7b..bbaf7b3fa8ae0b9403e21bbe817c8448cc52effd 100644 (file)
--- a/arch/arm/mach-s3c64xx/dev-audio.c
+++ b/arch/arm/mach-s3c64xx/dev-audio.c
@@ -319,7 +319,7 @@ void __init s3c64xx_ac97_setup_gpio(int num)
 static u64 s3c_device_audio_dmamask = 0xffffffffUL;
 
 struct platform_device s3c_device_pcm = {
-       .name             = "s3c24xx-pcm-audio",
+       .name             = "samsung-audio",
        .id               = -1,
        .dev              = {
                .dma_mask = &s3c_device_audio_dmamask,

diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index 2f91057a0c02380841db092f087ea9f6731efca6..4bf0b3912a690fe050c143db7a345b62b4d4e0f8 100644 (file)
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -264,7 +264,7 @@ EXPORT_SYMBOL(s3c_device_iis);
 static u64 s3c_device_audio_dmamask = 0xffffffffUL;
 
 struct platform_device s3c_device_pcm = {
-       .name             = "s3c24xx-pcm-audio",
+       .name             = "samsung-audio",
        .id               = -1,
        .dev              = {
                .dma_mask = &s3c_device_audio_dmamask,

diff --git a/sound/soc/s3c24xx/goni_wm8994.c b/sound/soc/s3c24xx/goni_wm8994.c
index 62134ed3aa574bb783423e9c57b42db4aae27d8b..b43ab334958553549d07ac65c366c86fe81b0e76 100644 (file)
--- a/sound/soc/s3c24xx/goni_wm8994.c
+++ b/sound/soc/s3c24xx/goni_wm8994.c
@@ -251,7 +251,7 @@ static struct snd_soc_dai_link goni_dai[] = {
        .stream_name = "WM8994 HiFi",
        .cpu_dai_name = "s3c64xx-i2s-v4",
        .codec_dai_name = "wm8994-hifi",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .codec_name = "wm8994-codec.0-0x1a",
        .init = goni_wm8994_init,
        .ops = &goni_hifi_ops,
@@ -260,7 +260,7 @@ static struct snd_soc_dai_link goni_dai[] = {
        .stream_name = "Voice",
        .cpu_dai_name = "goni-voice-dai",
        .codec_dai_name = "wm8994-voice",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .codec_name = "wm8994-codec.0-0x1a",
        .ops = &goni_voice_ops,
 },

diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c
index 100f0f0eabef84269426b965c415b52663807460..0bf0b99daa8d9613071dd0e7a3593eb7aeb6d32f 100644 (file)
--- a/sound/soc/s3c24xx/jive_wm8750.c
+++ b/sound/soc/s3c24xx/jive_wm8750.c
@@ -141,7 +141,7 @@ static struct snd_soc_dai_link jive_dai = {
        .stream_name    = "WM8750",
        .cpu_dai_name   = "s3c2412-i2s",
        .codec_dai_name = "wm8750-hifi",
-       .platform_name  = "s3c24xx-pcm-audio",
+       .platform_name  = "samsung-audio",
        .codec_name     = "wm8750-codec.0-0x1a",
        .init           = jive_wm8750_init,
        .ops            = &jive_ops,

diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c
index dd4fad8c7b50ba4b8ce6f8704d8df857a62c3d89..d04c0f2da09068912872b94ede0a3cf9791e0cc9 100644 (file)
--- a/sound/soc/s3c24xx/ln2440sbc_alc650.c
+++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c
@@ -34,7 +34,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
        .cpu_dai_name = "s3c-ac97",
        .codec_dai_name = "ac97-hifi",
        .codec_name = "ac97-codec",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
 },
 };
 

diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
index 64c98e5d648df9d7bec4834c821c4becb37799b2..0451d0f28d0cd97f0c39a00437f8d66659a3fa3f 100644 (file)
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@@ -400,7 +400,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
        .cpu_dai_name = "s3c24xx-i2s",
        .codec_dai_name = "wm8753-hifi",
        .init = neo1973_gta02_wm8753_init,
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .codec_name = "wm8753-codec.0-0x1a",
        .ops = &neo1973_gta02_hifi_ops,
 },
@@ -411,7 +411,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
        .codec_dai_name = "wm8753-voice",
        .ops = &neo1973_gta02_voice_ops,
        .codec_name = "wm8753-codec.0-0x1a",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
 },
 };
 

diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 11e3c905bd876671147928c25b73313ba9884b9b..000ed5f50723d3ff03a19aa4bee2679e72561f05 100644 (file)
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -558,7 +558,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
 { /* Hifi Playback - for similatious use with voice below */
        .name = "WM8753",
        .stream_name = "WM8753 HiFi",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .cpu_dai_name = "s3c24xx-i2s",
        .codec_dai_name = "wm8753-hifi",
        .codec_name = "wm8753-codec.0-0x1a",
@@ -568,7 +568,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
 { /* Voice via BT */
        .name = "Bluetooth",
        .stream_name = "Voice",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .cpu_dai_name = "bluetooth-dai",
        .codec_dai_name = "wm8753-voice",
        .codec_name = "wm8753-codec.0-0x1a",

diff --git a/sound/soc/s3c24xx/rx1950_uda1380.c b/sound/soc/s3c24xx/rx1950_uda1380.c
index 5dfd4dbddca268505d0a971bf4873f4262810510..6e7912eb19f236b4dce458429f73dd53a96bc5f8 100644 (file)
--- a/sound/soc/s3c24xx/rx1950_uda1380.c
+++ b/sound/soc/s3c24xx/rx1950_uda1380.c
@@ -94,7 +94,7 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = {
                .cpu_dai_name   = "s3c24xx-iis",
                .codec_dai_name = "uda1380-hifi",
                .init           = rx1950_uda1380_init,
-               .platform_name  = "s3c24xx-pcm-audio",
+               .platform_name  = "samsung-audio",
                .codec_name     = "uda1380-codec.0-001a",
                .ops            = &rx1950_ops,
        },

diff --git a/sound/soc/s3c24xx/s3c-dma.c b/sound/soc/s3c24xx/s3c-dma.c
index 243f79bf43bb127fabffa4474db175f4d297ea29..19bcfa43107560b0e0dd97c676d3ce413b1aec01 100644 (file)
--- a/sound/soc/s3c24xx/s3c-dma.c
+++ b/sound/soc/s3c24xx/s3c-dma.c
@@ -476,7 +476,7 @@ static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev)
 
 static struct platform_driver s3c24xx_pcm_driver = {
        .driver = {
-               .name = "s3c24xx-pcm-audio",
+               .name = "samsung-audio",
                .owner = THIS_MODULE,
        },
 
@@ -499,4 +499,4 @@ module_exit(snd_s3c24xx_pcm_exit);
 MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("Samsung S3C Audio DMA module");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:s3c24xx-pcm-audio");
+MODULE_ALIAS("platform:samsung-audio");

diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
index 044a0b24164288f31844f666948038ed15f9e7c6..c1abd43bb9d113479157f6ca211a63f6d530e8a0 100644 (file)
--- a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
@@ -99,7 +99,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = {
        .codec_name     = "tlv320aic3x-codec.0-0x1a",
        .cpu_dai_name   = "s3c24xx-i2s",
        .codec_dai_name = "tlv320aic3x-hifi",
-       .platform_name  = "s3c24xx-pcm-audio",
+       .platform_name  = "samsung-audio",
        .init           = simtec_hermes_init,
 };
 

diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
index f2f70a93711009199eef1af1085acbadf3915490..1de58571aa56817ee7bd644a2fa419eba88e8a39 100644 (file)
--- a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
@@ -88,7 +88,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = {
        .codec_name     = "tlv320aic3x-codec.0-0x1a",
        .cpu_dai_name   = "s3c24xx-i2s",
        .codec_dai_name = "tlv320aic3x-hifi",
-       .platform_name  = "s3c24xx-pcm-audio",
+       .platform_name  = "samsung-audio",
        .init           = simtec_tlv320aic23_init,
 };
 

diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c
index 4f1eeb64b4c42db270c9fd40b38c4d74de8d74bf..0bdfc6bbf778bda1f280c6f413ebb88e51dd9fad 100644 (file)
--- a/sound/soc/s3c24xx/s3c24xx_uda134x.c
+++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c
@@ -230,7 +230,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
        .codec_dai_name = "uda134x-hifi",
        .cpu_dai_name = "s3c24xx-i2s",
        .ops = &s3c24xx_uda134x_ops,
-       .platform_name  = "s3c24xx-pcm-audio",
+       .platform_name  = "samsung-audio",
 };
 
 static struct snd_soc_card snd_soc_s3c24xx_uda134x = {

diff --git a/sound/soc/s3c24xx/smartq_wm8987.c b/sound/soc/s3c24xx/smartq_wm8987.c
index 5b07bb9802eec0b5fdf74205bb665ad62985cdd1..ca83e1878666b413ef29867908feeba01df18e9c 100644 (file)
--- a/sound/soc/s3c24xx/smartq_wm8987.c
+++ b/sound/soc/s3c24xx/smartq_wm8987.c
@@ -214,7 +214,7 @@ static struct snd_soc_dai_link smartq_dai[] = {
                .stream_name    = "SmartQ Hi-Fi",
                .cpu_dai_name   = "s3c64xx-i2s.0",
                .codec_dai_name = "wm8750-hifi",
-               .platform_name  = "s3c24xx-pcm-audio",
+               .platform_name  = "samsung-audio",
                .codec_name     = "wm8750-codec.0-0x1a",
                .init           = smartq_wm8987_init,
                .ops            = &smartq_hifi_ops,

diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c
index ec05df92234ba16817a7e5e56e0b369bf0a7f614..50d70779351124e9a89ff3477872add071cd53c7 100644 (file)
--- a/sound/soc/s3c24xx/smdk2443_wm9710.c
+++ b/sound/soc/s3c24xx/smdk2443_wm9710.c
@@ -30,7 +30,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = {
        .cpu_dai_name = "s3c-ac97",
        .codec_dai_name = "ac97-hifi",
        .codec_name = "ac97-codec",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
 },
 };
 

diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c
index e6b461cce1919f51eb0ca72276ebac18833fb663..3ed8bd098c4b651aa0c348ec54c68d4b9a6234d4 100644 (file)
--- a/sound/soc/s3c24xx/smdk64xx_wm8580.c
+++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c
@@ -225,7 +225,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = {
        .stream_name = "Playback",
        .cpu_dai_name = "s3c64xx-iis-v4",
        .codec_dai_name = "wm8580-hifi-playback",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .codec_name = "wm8580-codec.0-001b",
        .init = smdk64xx_wm8580_init_paifrx,
        .ops = &smdk64xx_ops,
@@ -235,7 +235,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = {
        .stream_name = "Capture",
        .cpu_dai_name = "s3c64xx-iis-v4",
        .codec_dai_name = "wm8580-hifi-capture",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .codec_name = "wm8580-codec.0-001b",
        .init = smdk64xx_wm8580_init_paiftx,
        .ops = &smdk64xx_ops,

diff --git a/sound/soc/s3c24xx/smdk_spdif.c b/sound/soc/s3c24xx/smdk_spdif.c
index c8bd90488a87385d33b168813878893bfa5b9266..362957942994764c724cfd43d7be0720a10ad4a7 100644 (file)
--- a/sound/soc/s3c24xx/smdk_spdif.c
+++ b/sound/soc/s3c24xx/smdk_spdif.c
@@ -157,7 +157,7 @@ static struct snd_soc_card smdk;
 static struct snd_soc_dai_link smdk_dai = {
        .name = "S/PDIF",
        .stream_name = "S/PDIF PCM Playback",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .cpu_dai_name = "samsung-spdif",
        .codec_dai_name = "dit-hifi",
        .codec_name = "spdif-dit",

diff --git a/sound/soc/s3c24xx/smdk_wm9713.c b/sound/soc/s3c24xx/smdk_wm9713.c
index 33ba8fdbcf07c2a0845caca16f39bba5d3bbc6bb..ea96a519e02f833f71ea5bb1bdb81ebde9ebedf1 100644 (file)
--- a/sound/soc/s3c24xx/smdk_wm9713.c
+++ b/sound/soc/s3c24xx/smdk_wm9713.c
@@ -45,7 +45,7 @@ static struct snd_soc_card smdk;
 static struct snd_soc_dai_link smdk_dai = {
        .name = "AC97",
        .stream_name = "AC97 PCM",
-       .platform_name = "s3c24xx-pcm-audio",
+       .platform_name = "samsung-audio",
        .cpu_dai_name = "s3c-ac97",
        .codec_dai_name = "wm9713-hifi",
        .codec_name = "wm9713-codec",