ASoC: fsl-asoc-card: Support new property fsl, asrc-format

In order to align with new ESARC, we add new property fsl,asrc-format.
The fsl,asrc-format can replace the fsl,asrc-width, driver
can accept format from devicetree, don't need to convert it to
format through width.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Link: https://lore.kernel.org/r/02f53d5512b9acd3492e2acdd5e0ba3113f18009.1587038908.git.shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index bb33601fab844a4aefa2f96691a9e9d45bb8ee4d..cf4feb835743db88d1c6696f12d630e6c3ffeeb0 100644 (file)
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -680,17 +680,23 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
                        goto asrc_fail;
                }
 
-               ret = of_property_read_u32(asrc_np, "fsl,asrc-width", &width);
+               ret = of_property_read_u32(asrc_np, "fsl,asrc-format",
+                                          &priv->asrc_format);
                if (ret) {
-                       dev_err(&pdev->dev, "failed to get output rate\n");
-                       ret = -EINVAL;
-                       goto asrc_fail;
+                       /* Fallback to old binding; translate to asrc_format */
+                       ret = of_property_read_u32(asrc_np, "fsl,asrc-width",
+                                                  &width);
+                       if (ret) {
+                               dev_err(&pdev->dev,
+                                       "failed to decide output format\n");
+                               goto asrc_fail;
+                       }
+
+                       if (width == 24)
+                               priv->asrc_format = SNDRV_PCM_FORMAT_S24_LE;
+                       else
+                               priv->asrc_format = SNDRV_PCM_FORMAT_S16_LE;
                }
-
-               if (width == 24)
-                       priv->asrc_format = SNDRV_PCM_FORMAT_S24_LE;
-               else
-                       priv->asrc_format = SNDRV_PCM_FORMAT_S16_LE;
        }
 
        /* Finish card registering */