summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-24 16:18:19 +0100
committerMark Brown <broonie@kernel.org>2015-07-24 16:18:19 +0100
commit5c851ba4d5d23baff8766a2f176d7feaaae3b694 (patch)
treee0493f77bdc048fb6633bc713f1a48b295426377 /sound
parent51126f60491ab1a4952e2a2e93579c9b1deee9d2 (diff)
parenta6c2a32ac83567f15e9af3dcbc73148ce68b2ced (diff)
downloadlinux-5c851ba4d5d23baff8766a2f176d7feaaae3b694.tar.bz2
Merge remote-tracking branch 'asoc/fix/ssm4567' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ssm4567.c8
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)
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)