Merge remote-tracking branch 'asoc/fix/ssm4567' into asoc-linus

5c851ba4 · Mark Brown · 51126f60 · a6c2a32a · 5c851ba4
Commit 5c851ba4 authored Jul 24, 2015 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

sound/soc/codecs/ssm4567.c sound/soc/codecs/ssm4567.c +7 -1

No files found.
--- 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)