[alsa-devel] [PATCH] ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt

[Lars-Peter Clausen]

On 07/21/2015 11:46 PM, Ben Zhang wrote:
> The regmap_write in ssm4567_set_dai_fmt accidentally clears the
> TDM_BCLKS field which was set earlier by ssm4567_set_tdm_slot.
>
> This patch fixes it by using regmap_update_bits with proper mask.
>
> Signed-off-by: Ben Zhang <benzh at chromium.org>

Acked-by: Lars-Peter Clausen <lars at metafoo.de>

Thanks.

> ---
>   sound/soc/codecs/ssm4567.c | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c
> index 4662587..a757ab8 100644
> --- a/sound/soc/codecs/ssm4567.c
> +++ b/sound/soc/codecs/ssm4567.c
> @@ -315,7 +315,13 @@ static int ssm4567_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
>   	if (invert_fclk)
>   		ctrl1 |= SSM4567_SAI_CTRL_1_FSYNC;
>
> -	return regmap_write(ssm4567->regmap, SSM4567_REG_SAI_CTRL_1, ctrl1);
> +	return regmap_update_bits(ssm4567->regmap, SSM4567_REG_SAI_CTRL_1,
> +			SSM4567_SAI_CTRL_1_BCLK |
> +			SSM4567_SAI_CTRL_1_FSYNC |
> +			SSM4567_SAI_CTRL_1_LJ |
> +			SSM4567_SAI_CTRL_1_TDM |
> +			SSM4567_SAI_CTRL_1_PDM,
> +			ctrl1);
>   }
>
>   static int ssm4567_set_power(struct ssm4567 *ssm4567, bool enable)
>