On Mon, Mar 09, 2020 at 11:58:29AM +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 <shengjiu.wang@xxxxxxx>
> ---
> sound/soc/fsl/fsl-asoc-card.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
> index 9ce55feaac22..32101b9a37b9 100644
> --- a/sound/soc/fsl/fsl-asoc-card.c
> +++ b/sound/soc/fsl/fsl-asoc-card.c
> @@ -680,17 +680,19 @@ 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");
Nice that your patch fixed my copy-n-paste typo here :)
> - ret = -EINVAL;
> - goto asrc_fail;
> - }
It'd be nicer to have a line of comments:
/* 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");
> + return ret;
> + }
>
> - 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;
> + }
