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

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

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

arch/arm/mach-s3c64xx/dev-audio.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/arm/plat-s3c24xx/devs.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/s3c24xx/goni_wm8994.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

},

sound/soc/s3c24xx/jive_wm8750.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/s3c24xx/ln2440sbc_alc650.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

},

};