Re: [PATCH v6 3/7] ASoC: fsl-asoc-card: Support new property fsl,asrc-format
From: Nicolin Chen <nicoleotsuka@gmail.com>
Date: 2020-04-06 22:59:47
Also in:
alsa-devel, linux-devicetree, lkml
On Wed, Apr 01, 2020 at 04:45:36PM +0800, Shengjiu Wang wrote:
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 <redacted>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
quoted hunk ↗ jump to hunk
--- sound/soc/fsl/fsl-asoc-card.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index bb33601fab84..a0f5eb27d61a 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c@@ -680,17 +680,20 @@ 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 get output width\n");
Should warn 'format' over 'width', since it's preferable.
+ return ret;
Should goto asrc_fail as we did prior to the change.
And some of lines are over 80 characters.
Let's try this:
ret = of_property_read_u32(asrc_np, "fsl,asrc-format",
&priv->asrc_format);
if (ret) {
/* 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;
}