aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-11-22 01:36:00 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-23 09:05:29 -0500
commite6104673d28823e33bfc3dfb046a117f2575c9a8 (patch)
treebc8a0b4001f9f41dc2ec010a8511344ed2687855 /arch
parent4b640cf309e517f1ea5ab308fc7b24352612f535 (diff)
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: 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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c64xx/dev-audio.c2
-rw-r--r--arch/arm/mach-s5pc100/dev-audio.c2
-rw-r--r--arch/arm/mach-s5pv210/dev-audio.c2
-rw-r--r--arch/arm/plat-s3c24xx/devs.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c
index 4a4b8a505ff9..cad67022fa25 100644
--- a/arch/arm/mach-s3c64xx/dev-audio.c
+++ b/arch/arm/mach-s3c64xx/dev-audio.c
@@ -296,7 +296,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata;
296static u64 s3c64xx_ac97_dmamask = DMA_BIT_MASK(32); 296static u64 s3c64xx_ac97_dmamask = DMA_BIT_MASK(32);
297 297
298struct platform_device s3c64xx_device_ac97 = { 298struct platform_device s3c64xx_device_ac97 = {
299 .name = "s3c-ac97", 299 .name = "samsung-ac97",
300 .id = -1, 300 .id = -1,
301 .num_resources = ARRAY_SIZE(s3c64xx_ac97_resource), 301 .num_resources = ARRAY_SIZE(s3c64xx_ac97_resource),
302 .resource = s3c64xx_ac97_resource, 302 .resource = s3c64xx_ac97_resource,
diff --git a/arch/arm/mach-s5pc100/dev-audio.c b/arch/arm/mach-s5pc100/dev-audio.c
index 10ab275ebd63..ab2d27172cbc 100644
--- a/arch/arm/mach-s5pc100/dev-audio.c
+++ b/arch/arm/mach-s5pc100/dev-audio.c
@@ -281,7 +281,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {
281static u64 s5pc100_ac97_dmamask = DMA_BIT_MASK(32); 281static u64 s5pc100_ac97_dmamask = DMA_BIT_MASK(32);
282 282
283struct platform_device s5pc100_device_ac97 = { 283struct platform_device s5pc100_device_ac97 = {
284 .name = "s3c-ac97", 284 .name = "samsung-ac97",
285 .id = -1, 285 .id = -1,
286 .num_resources = ARRAY_SIZE(s5pc100_ac97_resource), 286 .num_resources = ARRAY_SIZE(s5pc100_ac97_resource),
287 .resource = s5pc100_ac97_resource, 287 .resource = s5pc100_ac97_resource,
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c
index ddd2704b3467..8d58f1926241 100644
--- a/arch/arm/mach-s5pv210/dev-audio.c
+++ b/arch/arm/mach-s5pv210/dev-audio.c
@@ -311,7 +311,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {
311static u64 s5pv210_ac97_dmamask = DMA_BIT_MASK(32); 311static u64 s5pv210_ac97_dmamask = DMA_BIT_MASK(32);
312 312
313struct platform_device s5pv210_device_ac97 = { 313struct platform_device s5pv210_device_ac97 = {
314 .name = "s3c-ac97", 314 .name = "samsung-ac97",
315 .id = -1, 315 .id = -1,
316 .num_resources = ARRAY_SIZE(s5pv210_ac97_resource), 316 .num_resources = ARRAY_SIZE(s5pv210_ac97_resource),
317 .resource = s5pv210_ac97_resource, 317 .resource = s5pv210_ac97_resource,
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index 5987f949e167..8a42bc48dbf0 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -484,7 +484,7 @@ static struct resource s3c_ac97_resource[] = {
484static u64 s3c_device_audio_dmamask = 0xffffffffUL; 484static u64 s3c_device_audio_dmamask = 0xffffffffUL;
485 485
486struct platform_device s3c_device_ac97 = { 486struct platform_device s3c_device_ac97 = {
487 .name = "s3c-ac97", 487 .name = "samsung-ac97",
488 .id = -1, 488 .id = -1,
489 .num_resources = ARRAY_SIZE(s3c_ac97_resource), 489 .num_resources = ARRAY_SIZE(s3c_ac97_resource),
490 .resource = s3c_ac97_resource, 490 .resource = s3c_ac97_resource,