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@xxxxxx>
---
sound/soc/omap/omap-abe-twl6040.c | 59 ++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 9c6d97a..4974ea1 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -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 omapabe_card = {
- .name = "SDP4430",
.dai_link = sdp4430_dai,
.num_links = ARRAY_SIZE(sdp4430_dai),
@@ -236,43 +236,56 @@ static struct snd_soc_card omapabe_card = {
.num_dapm_routes = ARRAY_SIZE(audio_map),
};
-static struct platform_device *omapabe_snd_device;
-
-static int __init omapabe_soc_init(void)
+static __devinit int omapabe_probe(struct platform_device *pdev)
{
+ struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev);
+ struct snd_soc_card *card = &omapabe_card;
int ret;
- if (!machine_is_omap_4430sdp())
- return -ENODEV;
- printk(KERN_INFO "SDP4430 SoC init\n");
+ card->dev = &pdev->dev;
- omapabe_snd_device = platform_device_alloc("soc-audio", -1);
- if (!omapabe_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(omapabe_snd_device, &omapabe_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(omapabe_snd_device);
+ ret = snd_soc_register_card(card);
if (ret)
- goto err;
-
- return 0;
+ dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
+ ret);
-err:
- printk(KERN_ERR "Unable to add platform device\n");
- platform_device_put(omapabe_snd_device);
return ret;
}
-module_init(omapabe_soc_init);
-static void __exit omapabe_soc_exit(void)
+static int __devexit omapabe_remove(struct platform_device *pdev)
{
- platform_device_unregister(omapabe_snd_device);
+ struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+ snd_soc_unregister_card(card);
+
+ return 0;
}
-module_exit(omapabe_soc_exit);
+
+static struct platform_driver omapabe_driver = {
+ .driver = {
+ .name = "omap-abe-twl6040",
+ .owner = THIS_MODULE,
+ .pm = &snd_soc_pm_ops,
+ },
+ .probe = omapabe_probe,
+ .remove = __devexit_p(omapabe_remove),
+};
+
+module_platform_driver(omapabe_driver);
MODULE_AUTHOR("Misael Lopez Cruz <misael.lopez@xxxxxx>");
MODULE_DESCRIPTION("ALSA SoC for OMAP boards with ABE and twl6040 codec");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:omap-abe-twl6040");
--
1.7.8.1
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
