diff options
author | Mark Brown <broonie@kernel.org> | 2015-07-24 11:18:19 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-24 11:18:19 -0400 |
commit | 5c851ba4d5d23baff8766a2f176d7feaaae3b694 (patch) | |
tree | e0493f77bdc048fb6633bc713f1a48b295426377 | |
parent | 51126f60491ab1a4952e2a2e93579c9b1deee9d2 (diff) | |
parent | a6c2a32ac83567f15e9af3dcbc73148ce68b2ced (diff) |
Merge remote-tracking branch 'asoc/fix/ssm4567' into asoc-linus
-rw-r--r-- | sound/soc/codecs/ssm4567.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c index 938d2cb6d78b..84a4f5ad8064 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) | |||
315 | if (invert_fclk) | 315 | if (invert_fclk) |
316 | ctrl1 |= SSM4567_SAI_CTRL_1_FSYNC; | 316 | ctrl1 |= SSM4567_SAI_CTRL_1_FSYNC; |
317 | 317 | ||
318 | return regmap_write(ssm4567->regmap, SSM4567_REG_SAI_CTRL_1, ctrl1); | 318 | return regmap_update_bits(ssm4567->regmap, SSM4567_REG_SAI_CTRL_1, |
319 | SSM4567_SAI_CTRL_1_BCLK | | ||
320 | SSM4567_SAI_CTRL_1_FSYNC | | ||
321 | SSM4567_SAI_CTRL_1_LJ | | ||
322 | SSM4567_SAI_CTRL_1_TDM | | ||
323 | SSM4567_SAI_CTRL_1_PDM, | ||
324 | ctrl1); | ||
319 | } | 325 | } |
320 | 326 | ||
321 | static int ssm4567_set_power(struct ssm4567 *ssm4567, bool enable) | 327 | static int ssm4567_set_power(struct ssm4567 *ssm4567, bool enable) |