leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: pxa: Convert poodle to use snd_soc_register_card()

Browse Source 
Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-12-30 09:16:11 +08:00 committed by Mark Brown
parent 1b39bf3468
commit 2445ecc3c0
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-pxa/poodle.c
View File

@ -158,6 +158,11 @@ static struct scoop_pcmcia_config poodle_pcmcia_config = {
EXPORT_SYMBOL(poodle_scoop_device); EXPORT_SYMBOL(poodle_scoop_device);
static struct platform_device poodle_audio_device = {
.name = "poodle-audio",
.id = -1,
};
/* LoCoMo device */ /* LoCoMo device */
static struct resource locomo_resources[] = { static struct resource locomo_resources[] = {
[0] = { [0] = {
@ -407,6 +412,7 @@ static struct platform_device sharpsl_rom_device = {
static struct platform_device *devices[] __initdata = { static struct platform_device *devices[] __initdata = {
&poodle_locomo_device, &poodle_locomo_device,
&poodle_scoop_device, &poodle_scoop_device,
&poodle_audio_device,
&sharpsl_nand_device, &sharpsl_nand_device,
&sharpsl_rom_device, &sharpsl_rom_device,
}; };

42
sound/soc/pxa/poodle.c
View File

@ -281,22 +281,18 @@ static struct snd_soc_dai_link poodle_dai = {
}; };
/* poodle audio machine driver */ /* poodle audio machine driver */
static struct snd_soc_card snd_soc_poodle = { static struct snd_soc_card poodle = {
.name = "Poodle", .name = "Poodle",
.dai_link = &poodle_dai, .dai_link = &poodle_dai,
.num_links = 1, .num_links = 1,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static struct platform_device *poodle_snd_device; static int __devinit poodle_probe(struct platform_device *pdev)
static int __init poodle_init(void)
{ {
struct snd_soc_card *card = &poodle;
int ret; int ret;
if (!machine_is_poodle())
return -ENODEV;
locomo_gpio_set_dir(&poodle_locomo_device.dev, locomo_gpio_set_dir(&poodle_locomo_device.dev,
POODLE_LOCOMO_GPIO_AMP_ON, 0); POODLE_LOCOMO_GPIO_AMP_ON, 0);
/* should we mute HP at startup - burning power ?*/ /* should we mute HP at startup - burning power ?*/
@ -305,28 +301,36 @@ static int __init poodle_init(void)
locomo_gpio_set_dir(&poodle_locomo_device.dev, locomo_gpio_set_dir(&poodle_locomo_device.dev,
POODLE_LOCOMO_GPIO_MUTE_R, 0); POODLE_LOCOMO_GPIO_MUTE_R, 0);
poodle_snd_device = platform_device_alloc("soc-audio", -1); card->dev = &pdev->dev;
if (!poodle_snd_device)
return -ENOMEM;
platform_set_drvdata(poodle_snd_device, &snd_soc_poodle);
ret = platform_device_add(poodle_snd_device);
ret = snd_soc_register_card(card);
if (ret) if (ret)
platform_device_put(poodle_snd_device); dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret; return ret;
} }
static void __exit poodle_exit(void) static int __devexit poodle_remove(struct platform_device *pdev)
{ {
platform_device_unregister(poodle_snd_device); struct snd_soc_card *card = platform_get_drvdata(pdev);
snd_soc_unregister_card(card);
return 0;
} }
module_init(poodle_init); static struct platform_driver poodle_driver = {
module_exit(poodle_exit); .driver = {
.name = "poodle-audio",
.owner = THIS_MODULE,
},
.probe = poodle_probe,
.remove = __devexit_p(poodle_remove),
};
module_platform_driver(poodle_driver);
/* Module information */ /* Module information */
MODULE_AUTHOR("Richard Purdie"); MODULE_AUTHOR("Richard Purdie");
MODULE_DESCRIPTION("ALSA SoC Poodle"); MODULE_DESCRIPTION("ALSA SoC Poodle");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:poodle-audio");