Skip to content

Commit

Permalink
ASoC: fsl_audmix: register card device depends on 'dais' property
Browse files Browse the repository at this point in the history
In order to make the audmix device linked by audio graph card, make
'dais' property to be optional.

If 'dais' property exists, then register the imx-audmix card driver.
otherwise, it should be linked by audio graph card.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://patch.msgid.link/20250226100508.2352568-5-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Shengjiu Wang authored and Mark Brown committed Mar 3, 2025
1 parent 597acf1 commit 294a60e
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions sound/soc/fsl/fsl_audmix.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,17 @@ static int fsl_audmix_probe(struct platform_device *pdev)
goto err_disable_pm;
}

priv->pdev = platform_device_register_data(dev, "imx-audmix", 0, NULL, 0);
if (IS_ERR(priv->pdev)) {
ret = PTR_ERR(priv->pdev);
dev_err(dev, "failed to register platform: %d\n", ret);
goto err_disable_pm;
/*
* If dais property exist, then register the imx-audmix card driver.
* otherwise, it should be linked by audio graph card.
*/
if (of_find_property(pdev->dev.of_node, "dais", NULL)) {
priv->pdev = platform_device_register_data(dev, "imx-audmix", 0, NULL, 0);
if (IS_ERR(priv->pdev)) {
ret = PTR_ERR(priv->pdev);
dev_err(dev, "failed to register platform: %d\n", ret);
goto err_disable_pm;
}
}

return 0;
Expand Down

0 comments on commit 294a60e

Please sign in to comment.