UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: omap-abe-twl6040: Convert to platform deriver 

Convert the OMAP4 ABE/TWL6040 machine driver to platform
driver.
For the card name use the string provided via platform data.
The card's name for OMAP4 SDP4430 has been changed:
SDP4430 -> OMAP4-SDP4430

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2011-12-08 11:07:42 +02:00
parent a433ffabab
commit d1be1d2fd1
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
sound/soc/omap/omap-abe-twl6040.c
View File

@ -23,6 +23,7 @@
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/mfd/twl6040.h>
#include <linux/platform_data/omap-abe-twl6040.h>
#include <linux/module.h>
#include <sound/core.h>
@ -226,7 +227,6 @@ static struct snd_soc_dai_link sdp4430_dai[] = {
/* Audio machine driver */
static struct snd_soc_card omap_abe_card = {
.name = "SDP4430",
.owner = THIS_MODULE,
.dai_link = sdp4430_dai,
.num_links = ARRAY_SIZE(sdp4430_dai),
@ -237,44 +237,56 @@ static struct snd_soc_card omap_abe_card = {
.num_dapm_routes = ARRAY_SIZE(audio_map),
};
static struct platform_device *omap_abe_snd_device;
static int __init omap_abe_soc_init(void)
static __devinit int omap_abe_probe(struct platform_device *pdev)
{
struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev);
struct snd_soc_card *card = &omap_abe_card;
int ret;
if (!machine_is_omap_4430sdp())
return -ENODEV;
printk(KERN_INFO "SDP4430 SoC init\n");
card->dev = &pdev->dev;
omap_abe_snd_device = platform_device_alloc("soc-audio", -1);
if (!omap_abe_snd_device) {
printk(KERN_ERR "Platform device allocation failed\n");
return -ENOMEM;
if (!pdata) {
dev_err(&pdev->dev, "Missing pdata\n");
return -ENODEV;
}
platform_set_drvdata(omap_abe_snd_device, &omap_abe_card);
if (pdata->card_name) {
card->name = pdata->card_name;
} else {
dev_err(&pdev->dev, "Card name is not provided\n");
return -ENODEV;
}
ret = platform_device_add(omap_abe_snd_device);
ret = snd_soc_register_card(card);
if (ret)
goto err;
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return 0;
err:
printk(KERN_ERR "Unable to add platform device\n");
platform_device_put(omap_abe_snd_device);
return ret;
}
module_init(omap_abe_soc_init);
static void __exit omap_abe_soc_exit(void)
static int __devexit omap_abe_remove(struct platform_device *pdev)
{
platform_device_unregister(omap_abe_snd_device);
struct snd_soc_card *card = platform_get_drvdata(pdev);
snd_soc_unregister_card(card);
return 0;
}
module_exit(omap_abe_soc_exit);
static struct platform_driver omap_abe_driver = {
.driver = {
.name = "omap-abe-twl6040",
.owner = THIS_MODULE,
.pm = &snd_soc_pm_ops,
},
.probe = omap_abe_probe,
.remove = __devexit_p(omap_abe_remove),
};
module_platform_driver(omap_abe_driver);
MODULE_AUTHOR("Misael Lopez Cruz <misael.lopez@ti.com>");
MODULE_DESCRIPTION("ALSA SoC for OMAP boards with ABE and twl6040 codec");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:omap-abe-twl6040");