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

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

ASoC: Samsung: Rename AC97 platform device 



Call the AC97 controller devices found in S3C, S5P and newer
SoCs as 'samsung-ac97' rather than 's3c-ac97'.

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 4b640cf3

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

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata; 
static u64 s3c64xx_ac97_dmamask = DMA_BIT_MASK(32);



struct platform_device s3c64xx_device_ac97 = {

	.name		  = "s3c-ac97",

	.name		  = "samsung-ac97",

	.id		  = -1,

	.num_resources	  = ARRAY_SIZE(s3c64xx_ac97_resource),

	.resource	  = s3c64xx_ac97_resource,

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

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = { 
static u64 s5pc100_ac97_dmamask = DMA_BIT_MASK(32);



struct platform_device s5pc100_device_ac97 = {

	.name		  = "s3c-ac97",

	.name		  = "samsung-ac97",

	.id		  = -1,

	.num_resources	  = ARRAY_SIZE(s5pc100_ac97_resource),

	.resource	  = s5pc100_ac97_resource,

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

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = { 
static u64 s5pv210_ac97_dmamask = DMA_BIT_MASK(32);



struct platform_device s5pv210_device_ac97 = {

	.name		  = "s3c-ac97",

	.name		  = "samsung-ac97",

	.id		  = -1,

	.num_resources	  = ARRAY_SIZE(s5pv210_ac97_resource),

	.resource	  = s5pv210_ac97_resource,

arch/arm/plat-s3c24xx/devs.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static struct resource s3c_ac97_resource[] = { 
static u64 s3c_device_audio_dmamask = 0xffffffffUL;



struct platform_device s3c_device_ac97 = {

	.name		  = "s3c-ac97",

	.name		  = "samsung-ac97",

	.id		  = -1,

	.num_resources	  = ARRAY_SIZE(s3c_ac97_resource),

	.resource	  = s3c_ac97_resource,

sound/soc/s3c24xx/ln2440sbc_alc650.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { 
{

	.name = "AC97",

	.stream_name = "AC97 HiFi",

	.cpu_dai_name = "s3c-ac97",

	.cpu_dai_name = "samsung-ac97",

	.codec_dai_name = "ac97-hifi",

	.codec_name = "ac97-codec",

	.platform_name = "samsung-audio",