Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6c2a32a authored by Ben Zhang's avatar Ben Zhang Committed by Mark Brown
Browse files

ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt 



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: default avatarBen Zhang <benzh@chromium.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarAnatol Pomozov <anatol.pomozov@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent bc0195aa

sound/soc/codecs/ssm4567.c

+7 −1
Original line number Diff line number Diff line
@@ -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)