diff options
| author | Mark Brown <broonie@kernel.org> | 2025-03-04 18:38:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-03-04 18:38:42 +0000 |
| commit | 426aae69373fb149e5bbe1d5fa18299d38414f22 (patch) | |
| tree | bf0c15d55b9f9cc06597c3fb6554424eaab1fa5c /sound/soc/fsl | |
| parent | 6db63090272768785e6bb4a3afa16650c1e96c54 (diff) | |
| parent | 294a60e5e9830045c161181286d44ce669f88833 (diff) | |
ASoC: fsl_audmix: support audio graph card for audmix
Merge series from Shengjiu Wang <shengjiu.wang@nxp.com>:
Change 'dais' property to be optional, that fsl_audmix device can be
linked with SAI device by audio graph card.
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/fsl_audmix.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c index 3cd9a66b70a1..7981d598ba13 100644 --- a/sound/soc/fsl/fsl_audmix.c +++ b/sound/soc/fsl/fsl_audmix.c @@ -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; |