Commit 58bb4072 authored by Jassi Brar's avatar Jassi Brar Committed by Mark Brown

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: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3a56d0ca
...@@ -319,7 +319,7 @@ void __init s3c64xx_ac97_setup_gpio(int num) ...@@ -319,7 +319,7 @@ void __init s3c64xx_ac97_setup_gpio(int num)
static u64 s3c_device_audio_dmamask = 0xffffffffUL; static u64 s3c_device_audio_dmamask = 0xffffffffUL;
struct platform_device s3c_device_pcm = { struct platform_device s3c_device_pcm = {
.name = "s3c24xx-pcm-audio", .name = "samsung-audio",
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &s3c_device_audio_dmamask, .dma_mask = &s3c_device_audio_dmamask,
......
...@@ -264,7 +264,7 @@ EXPORT_SYMBOL(s3c_device_iis); ...@@ -264,7 +264,7 @@ EXPORT_SYMBOL(s3c_device_iis);
static u64 s3c_device_audio_dmamask = 0xffffffffUL; static u64 s3c_device_audio_dmamask = 0xffffffffUL;
struct platform_device s3c_device_pcm = { struct platform_device s3c_device_pcm = {
.name = "s3c24xx-pcm-audio", .name = "samsung-audio",
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &s3c_device_audio_dmamask, .dma_mask = &s3c_device_audio_dmamask,
......
...@@ -251,7 +251,7 @@ static struct snd_soc_dai_link goni_dai[] = { ...@@ -251,7 +251,7 @@ static struct snd_soc_dai_link goni_dai[] = {
.stream_name = "WM8994 HiFi", .stream_name = "WM8994 HiFi",
.cpu_dai_name = "s3c64xx-i2s-v4", .cpu_dai_name = "s3c64xx-i2s-v4",
.codec_dai_name = "wm8994-hifi", .codec_dai_name = "wm8994-hifi",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.codec_name = "wm8994-codec.0-0x1a", .codec_name = "wm8994-codec.0-0x1a",
.init = goni_wm8994_init, .init = goni_wm8994_init,
.ops = &goni_hifi_ops, .ops = &goni_hifi_ops,
...@@ -260,7 +260,7 @@ static struct snd_soc_dai_link goni_dai[] = { ...@@ -260,7 +260,7 @@ static struct snd_soc_dai_link goni_dai[] = {
.stream_name = "Voice", .stream_name = "Voice",
.cpu_dai_name = "goni-voice-dai", .cpu_dai_name = "goni-voice-dai",
.codec_dai_name = "wm8994-voice", .codec_dai_name = "wm8994-voice",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.codec_name = "wm8994-codec.0-0x1a", .codec_name = "wm8994-codec.0-0x1a",
.ops = &goni_voice_ops, .ops = &goni_voice_ops,
}, },
......
...@@ -141,7 +141,7 @@ static struct snd_soc_dai_link jive_dai = { ...@@ -141,7 +141,7 @@ static struct snd_soc_dai_link jive_dai = {
.stream_name = "WM8750", .stream_name = "WM8750",
.cpu_dai_name = "s3c2412-i2s", .cpu_dai_name = "s3c2412-i2s",
.codec_dai_name = "wm8750-hifi", .codec_dai_name = "wm8750-hifi",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.codec_name = "wm8750-codec.0-0x1a", .codec_name = "wm8750-codec.0-0x1a",
.init = jive_wm8750_init, .init = jive_wm8750_init,
.ops = &jive_ops, .ops = &jive_ops,
......
...@@ -34,7 +34,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { ...@@ -34,7 +34,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
.cpu_dai_name = "s3c-ac97", .cpu_dai_name = "s3c-ac97",
.codec_dai_name = "ac97-hifi", .codec_dai_name = "ac97-hifi",
.codec_name = "ac97-codec", .codec_name = "ac97-codec",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
}, },
}; };
......
...@@ -400,7 +400,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { ...@@ -400,7 +400,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-i2s",
.codec_dai_name = "wm8753-hifi", .codec_dai_name = "wm8753-hifi",
.init = neo1973_gta02_wm8753_init, .init = neo1973_gta02_wm8753_init,
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.codec_name = "wm8753-codec.0-0x1a", .codec_name = "wm8753-codec.0-0x1a",
.ops = &neo1973_gta02_hifi_ops, .ops = &neo1973_gta02_hifi_ops,
}, },
...@@ -411,7 +411,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { ...@@ -411,7 +411,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
.codec_dai_name = "wm8753-voice", .codec_dai_name = "wm8753-voice",
.ops = &neo1973_gta02_voice_ops, .ops = &neo1973_gta02_voice_ops,
.codec_name = "wm8753-codec.0-0x1a", .codec_name = "wm8753-codec.0-0x1a",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
}, },
}; };
......
...@@ -558,7 +558,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { ...@@ -558,7 +558,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
{ /* Hifi Playback - for similatious use with voice below */ { /* Hifi Playback - for similatious use with voice below */
.name = "WM8753", .name = "WM8753",
.stream_name = "WM8753 HiFi", .stream_name = "WM8753 HiFi",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-i2s",
.codec_dai_name = "wm8753-hifi", .codec_dai_name = "wm8753-hifi",
.codec_name = "wm8753-codec.0-0x1a", .codec_name = "wm8753-codec.0-0x1a",
...@@ -568,7 +568,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { ...@@ -568,7 +568,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
{ /* Voice via BT */ { /* Voice via BT */
.name = "Bluetooth", .name = "Bluetooth",
.stream_name = "Voice", .stream_name = "Voice",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.cpu_dai_name = "bluetooth-dai", .cpu_dai_name = "bluetooth-dai",
.codec_dai_name = "wm8753-voice", .codec_dai_name = "wm8753-voice",
.codec_name = "wm8753-codec.0-0x1a", .codec_name = "wm8753-codec.0-0x1a",
......
...@@ -94,7 +94,7 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = { ...@@ -94,7 +94,7 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = {
.cpu_dai_name = "s3c24xx-iis", .cpu_dai_name = "s3c24xx-iis",
.codec_dai_name = "uda1380-hifi", .codec_dai_name = "uda1380-hifi",
.init = rx1950_uda1380_init, .init = rx1950_uda1380_init,
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.codec_name = "uda1380-codec.0-001a", .codec_name = "uda1380-codec.0-001a",
.ops = &rx1950_ops, .ops = &rx1950_ops,
}, },
......
...@@ -476,7 +476,7 @@ static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev) ...@@ -476,7 +476,7 @@ static int __devexit s3c24xx_soc_platform_remove(struct platform_device *pdev)
static struct platform_driver s3c24xx_pcm_driver = { static struct platform_driver s3c24xx_pcm_driver = {
.driver = { .driver = {
.name = "s3c24xx-pcm-audio", .name = "samsung-audio",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
...@@ -499,4 +499,4 @@ module_exit(snd_s3c24xx_pcm_exit); ...@@ -499,4 +499,4 @@ module_exit(snd_s3c24xx_pcm_exit);
MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); MODULE_DESCRIPTION("Samsung S3C Audio DMA module");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:s3c24xx-pcm-audio"); MODULE_ALIAS("platform:samsung-audio");
...@@ -99,7 +99,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = { ...@@ -99,7 +99,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = {
.codec_name = "tlv320aic3x-codec.0-0x1a", .codec_name = "tlv320aic3x-codec.0-0x1a",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-i2s",
.codec_dai_name = "tlv320aic3x-hifi", .codec_dai_name = "tlv320aic3x-hifi",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.init = simtec_hermes_init, .init = simtec_hermes_init,
}; };
......
...@@ -88,7 +88,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = { ...@@ -88,7 +88,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = {
.codec_name = "tlv320aic3x-codec.0-0x1a", .codec_name = "tlv320aic3x-codec.0-0x1a",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-i2s",
.codec_dai_name = "tlv320aic3x-hifi", .codec_dai_name = "tlv320aic3x-hifi",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.init = simtec_tlv320aic23_init, .init = simtec_tlv320aic23_init,
}; };
......
...@@ -230,7 +230,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { ...@@ -230,7 +230,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
.codec_dai_name = "uda134x-hifi", .codec_dai_name = "uda134x-hifi",
.cpu_dai_name = "s3c24xx-i2s", .cpu_dai_name = "s3c24xx-i2s",
.ops = &s3c24xx_uda134x_ops, .ops = &s3c24xx_uda134x_ops,
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
}; };
static struct snd_soc_card snd_soc_s3c24xx_uda134x = { static struct snd_soc_card snd_soc_s3c24xx_uda134x = {
......
...@@ -214,7 +214,7 @@ static struct snd_soc_dai_link smartq_dai[] = { ...@@ -214,7 +214,7 @@ static struct snd_soc_dai_link smartq_dai[] = {
.stream_name = "SmartQ Hi-Fi", .stream_name = "SmartQ Hi-Fi",
.cpu_dai_name = "s3c64xx-i2s.0", .cpu_dai_name = "s3c64xx-i2s.0",
.codec_dai_name = "wm8750-hifi", .codec_dai_name = "wm8750-hifi",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.codec_name = "wm8750-codec.0-0x1a", .codec_name = "wm8750-codec.0-0x1a",
.init = smartq_wm8987_init, .init = smartq_wm8987_init,
.ops = &smartq_hifi_ops, .ops = &smartq_hifi_ops,
......
...@@ -30,7 +30,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { ...@@ -30,7 +30,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = {
.cpu_dai_name = "s3c-ac97", .cpu_dai_name = "s3c-ac97",
.codec_dai_name = "ac97-hifi", .codec_dai_name = "ac97-hifi",
.codec_name = "ac97-codec", .codec_name = "ac97-codec",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
}, },
}; };
......
...@@ -225,7 +225,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { ...@@ -225,7 +225,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = {
.stream_name = "Playback", .stream_name = "Playback",
.cpu_dai_name = "s3c64xx-iis-v4", .cpu_dai_name = "s3c64xx-iis-v4",
.codec_dai_name = "wm8580-hifi-playback", .codec_dai_name = "wm8580-hifi-playback",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.codec_name = "wm8580-codec.0-001b", .codec_name = "wm8580-codec.0-001b",
.init = smdk64xx_wm8580_init_paifrx, .init = smdk64xx_wm8580_init_paifrx,
.ops = &smdk64xx_ops, .ops = &smdk64xx_ops,
...@@ -235,7 +235,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = { ...@@ -235,7 +235,7 @@ static struct snd_soc_dai_link smdk64xx_dai[] = {
.stream_name = "Capture", .stream_name = "Capture",
.cpu_dai_name = "s3c64xx-iis-v4", .cpu_dai_name = "s3c64xx-iis-v4",
.codec_dai_name = "wm8580-hifi-capture", .codec_dai_name = "wm8580-hifi-capture",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.codec_name = "wm8580-codec.0-001b", .codec_name = "wm8580-codec.0-001b",
.init = smdk64xx_wm8580_init_paiftx, .init = smdk64xx_wm8580_init_paiftx,
.ops = &smdk64xx_ops, .ops = &smdk64xx_ops,
......
...@@ -157,7 +157,7 @@ static struct snd_soc_card smdk; ...@@ -157,7 +157,7 @@ static struct snd_soc_card smdk;
static struct snd_soc_dai_link smdk_dai = { static struct snd_soc_dai_link smdk_dai = {
.name = "S/PDIF", .name = "S/PDIF",
.stream_name = "S/PDIF PCM Playback", .stream_name = "S/PDIF PCM Playback",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.cpu_dai_name = "samsung-spdif", .cpu_dai_name = "samsung-spdif",
.codec_dai_name = "dit-hifi", .codec_dai_name = "dit-hifi",
.codec_name = "spdif-dit", .codec_name = "spdif-dit",
......
...@@ -45,7 +45,7 @@ static struct snd_soc_card smdk; ...@@ -45,7 +45,7 @@ static struct snd_soc_card smdk;
static struct snd_soc_dai_link smdk_dai = { static struct snd_soc_dai_link smdk_dai = {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 PCM", .stream_name = "AC97 PCM",
.platform_name = "s3c24xx-pcm-audio", .platform_name = "samsung-audio",
.cpu_dai_name = "s3c-ac97", .cpu_dai_name = "s3c-ac97",
.codec_dai_name = "wm9713-hifi", .codec_dai_name = "wm9713-hifi",
.codec_name = "wm9713-codec", .codec_name = "wm9713-codec",
......
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