OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: fsl_audmix: remove "model" attribute 

Use "of_device_id.data" to specify the machine driver
instead of "model" DTS attribute.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Viorel Suman 2019-04-10 11:06:36 +00:00 committed by Mark Brown
parent d04195b0a3
commit f2a36a7842
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sound/soc/fsl/fsl_audmix.c
View File

@ -445,13 +445,29 @@ static const struct regmap_config fsl_audmix_regmap_config = {
.cache_type = REGCACHE_FLAT,
};
static const struct of_device_id fsl_audmix_ids[] = {
{
.compatible = "fsl,imx8qm-audmix",
.data = "imx-audmix",
},
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, fsl_audmix_ids);
static int fsl_audmix_probe(struct platform_device *pdev)
{
struct fsl_audmix *priv;
struct resource *res;
const char *mdrv;
const struct of_device_id *of_id;
void __iomem *regs;
int ret;
const char *sprop;
of_id = of_match_device(fsl_audmix_ids, &pdev->dev);
if (!of_id || !of_id->data)
return -EINVAL;
mdrv = of_id->data;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@ -487,19 +503,12 @@ static int fsl_audmix_probe(struct platform_device *pdev)
return ret;
}
sprop = of_get_property(pdev->dev.of_node, "model", NULL);
if (sprop) {
priv->pdev = platform_device_register_data(&pdev->dev, sprop, 0,
NULL, 0);
if (IS_ERR(priv->pdev)) {
ret = PTR_ERR(priv->pdev);
dev_err(&pdev->dev,
"failed to register platform %s: %d\n", sprop,
ret);
}
} else {
dev_err(&pdev->dev, "[model] attribute missing.\n");
ret = -EINVAL;
priv->pdev = platform_device_register_data(&pdev->dev, mdrv, 0, NULL,
0);
if (IS_ERR(priv->pdev)) {
ret = PTR_ERR(priv->pdev);
dev_err(&pdev->dev, "failed to register platform %s: %d\n",
mdrv, ret);
}
return ret;
@ -553,12 +562,6 @@ static const struct dev_pm_ops fsl_audmix_pm = {
pm_runtime_force_resume)
};
static const struct of_device_id fsl_audmix_ids[] = {
{ .compatible = "fsl,imx8qm-audmix", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, fsl_audmix_ids);
static struct platform_driver fsl_audmix_driver = {
.probe = fsl_audmix_probe,
.remove = fsl_audmix_remove,