mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ASoC: pxa: add devicetree support 

Add the devicetree support, so that the driver can be used in a
devictree platform.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Robert Jarzmik 2018-06-17 12:50:01 +02:00 committed by Mark Brown
parent e2b35e468c
commit a4519526eb
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/arm/pxa2xx-ac97-lib.c
View File

@ -19,6 +19,7 @@
#include <linux/module.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <sound/pxa2xx-lib.h>
@ -337,6 +338,17 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)
dev_err(&dev->dev, "Invalid reset GPIO %d\n",
pdata->reset_gpio);
}
} else if (!pdata && dev->dev.of_node) {
pdata = devm_kzalloc(&dev->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata)
return -ENOMEM;
pdata->reset_gpio = of_get_named_gpio(dev->dev.of_node,
"reset-gpios", 0);
if (pdata->reset_gpio == -ENOENT)
pdata->reset_gpio = -1;
else if (pdata->reset_gpio < 0)
return pdata->reset_gpio;
reset_gpio = pdata->reset_gpio;
} else {
if (cpu_is_pxa27x())
reset_gpio = 113;

12
sound/soc/pxa/pxa2xx-ac97.c
View File

@ -238,6 +238,17 @@ static const struct snd_soc_component_driver pxa_ac97_component = {
.name = "pxa-ac97",
};
#ifdef CONFIG_OF
static const struct of_device_id pxa2xx_ac97_dt_ids[] = {
{ .compatible = "marvell,pxa250-ac97", },
{ .compatible = "marvell,pxa270-ac97", },
{ .compatible = "marvell,pxa300-ac97", },
{ }
};
MODULE_DEVICE_TABLE(of, pxa2xx_ac97_dt_ids);
#endif
static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
{
int ret;
@ -296,6 +307,7 @@ static struct platform_driver pxa2xx_ac97_driver = {
#ifdef CONFIG_PM_SLEEP
.pm = &pxa2xx_ac97_pm_ops,
#endif
.of_match_table = of_match_ptr(pxa2xx_ac97_dt_ids),
},
};