evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: Samsung: Rename AC97 platform device

Browse source 
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>
This commit is contained in:
Jassi Brar 2010-11-22 15:36:00 +09:00 • committed by Mark Brown
parent 4b640cf309
commit e6104673d2
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-s3c64xx/dev-audio.c
View file

@ -296,7 +296,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata;
static u64 s3c64xx_ac97_dmamask = DMA_BIT_MASK(32); static u64 s3c64xx_ac97_dmamask = DMA_BIT_MASK(32);
struct platform_device s3c64xx_device_ac97 = { struct platform_device s3c64xx_device_ac97 = {
.name = "s3c-ac97", .name = "samsung-ac97",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(s3c64xx_ac97_resource), .num_resources = ARRAY_SIZE(s3c64xx_ac97_resource),
.resource = s3c64xx_ac97_resource, .resource = s3c64xx_ac97_resource,

2
arch/arm/mach-s5pc100/dev-audio.c
View file

@ -281,7 +281,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {
static u64 s5pc100_ac97_dmamask = DMA_BIT_MASK(32); static u64 s5pc100_ac97_dmamask = DMA_BIT_MASK(32);
struct platform_device s5pc100_device_ac97 = { struct platform_device s5pc100_device_ac97 = {
.name = "s3c-ac97", .name = "samsung-ac97",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(s5pc100_ac97_resource), .num_resources = ARRAY_SIZE(s5pc100_ac97_resource),
.resource = s5pc100_ac97_resource, .resource = s5pc100_ac97_resource,

2
arch/arm/mach-s5pv210/dev-audio.c
View file

@ -311,7 +311,7 @@ static struct s3c_audio_pdata s3c_ac97_pdata = {
static u64 s5pv210_ac97_dmamask = DMA_BIT_MASK(32); static u64 s5pv210_ac97_dmamask = DMA_BIT_MASK(32);
struct platform_device s5pv210_device_ac97 = { struct platform_device s5pv210_device_ac97 = {
.name = "s3c-ac97", .name = "samsung-ac97",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(s5pv210_ac97_resource), .num_resources = ARRAY_SIZE(s5pv210_ac97_resource),
.resource = s5pv210_ac97_resource, .resource = s5pv210_ac97_resource,

2
arch/arm/plat-s3c24xx/devs.c
View file

@ -484,7 +484,7 @@ static struct resource s3c_ac97_resource[] = {
static u64 s3c_device_audio_dmamask = 0xffffffffUL; static u64 s3c_device_audio_dmamask = 0xffffffffUL;
struct platform_device s3c_device_ac97 = { struct platform_device s3c_device_ac97 = {
.name = "s3c-ac97", .name = "samsung-ac97",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(s3c_ac97_resource), .num_resources = ARRAY_SIZE(s3c_ac97_resource),
.resource = s3c_ac97_resource, .resource = s3c_ac97_resource,

2
sound/soc/s3c24xx/ln2440sbc_alc650.c
View file

@ -31,7 +31,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "s3c-ac97", .cpu_dai_name = "samsung-ac97",
.codec_dai_name = "ac97-hifi", .codec_dai_name = "ac97-hifi",
.codec_name = "ac97-codec", .codec_name = "ac97-codec",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",

4
sound/soc/s3c24xx/s3c-ac97.c
View file

@ -497,7 +497,7 @@ static struct platform_driver s3c_ac97_driver = {
.probe = s3c_ac97_probe, .probe = s3c_ac97_probe,
.remove = s3c_ac97_remove, .remove = s3c_ac97_remove,
.driver = { .driver = {
.name = "s3c-ac97", .name = "samsung-ac97",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
@ -517,4 +517,4 @@ module_exit(s3c_ac97_exit);
MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>"); MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>");
MODULE_DESCRIPTION("AC97 driver for the Samsung SoC"); MODULE_DESCRIPTION("AC97 driver for the Samsung SoC");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:s3c-ac97"); MODULE_ALIAS("platform:samsung-ac97");

2
sound/soc/s3c24xx/smdk2443_wm9710.c
View file

@ -27,7 +27,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = {
{ {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 HiFi", .stream_name = "AC97 HiFi",
.cpu_dai_name = "s3c-ac97", .cpu_dai_name = "samsung-ac97",
.codec_dai_name = "ac97-hifi", .codec_dai_name = "ac97-hifi",
.codec_name = "ac97-codec", .codec_name = "ac97-codec",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",

2
sound/soc/s3c24xx/smdk_wm9713.c
View file

@ -46,7 +46,7 @@ static struct snd_soc_dai_link smdk_dai = {
.name = "AC97", .name = "AC97",
.stream_name = "AC97 PCM", .stream_name = "AC97 PCM",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.cpu_dai_name = "s3c-ac97", .cpu_dai_name = "samsung-ac97",
.codec_dai_name = "wm9713-hifi", .codec_dai_name = "wm9713-hifi",
.codec_name = "wm9713-codec", .codec_name = "wm9713-codec",
}; };