[PATCH AUTOSEL 6.1 6/9] ASoC: fsl_audmix: register card device depends on 'dais' property

[PATCH AUTOSEL 6.1 6/9] ASoC: fsl_audmix: register card device depends on 'dais' property

[Sasha Levin]

From: Shengjiu Wang <shengjiu.wang@nxp.com>

[ Upstream commit 294a60e5e9830045c161181286d44ce669f88833 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 sound/soc/fsl/fsl_audmix.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c
index 672148dd4b234..acb499a5043c8 100644
--- a/sound/soc/fsl/fsl_audmix.c
+++ b/sound/soc/fsl/fsl_audmix.c
@@ -492,11 +492,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;
-- 
2.39.5

Re: [PATCH AUTOSEL 6.1 6/9] ASoC: fsl_audmix: register card device depends on 'dais' property

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]

Hi!

> [ Upstream commit 294a60e5e9830045c161181286d44ce669f88833 ]
> 
> 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.

This is part of series, AFAICT; should we have it in -stable?

Best regards,
									Pavel

> +++ b/sound/soc/fsl/fsl_audmix.c
> @@ -492,11 +492,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;

-- 
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]