Browse Source

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

Mark Brown 10 years ago
parent
commit
5c851ba4d5
1 changed files with 7 additions and 1 deletions
  1. 7 1
      sound/soc/codecs/ssm4567.c

+ 7 - 1
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)
 	if (invert_fclk)
 		ctrl1 |= SSM4567_SAI_CTRL_1_FSYNC;
 		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)
 static int ssm4567_set_power(struct ssm4567 *ssm4567, bool enable)