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
signature.asc
Description: PGP signature
