aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/codecs/ssm4567.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-24 16:15:02 +0100
committerMark Brown <broonie@kernel.org>2015-07-24 16:15:02 +0100
commit0e375d625b3493721219af571aeeca17e01f6da4 (patch)
tree76781a3f14e5a1cd26adf24b843871b1fb7cd81b /sound/soc/codecs/ssm4567.c
parentbeb8962210f592bd285ed77559ac4458cc26f774 (diff)
parenta6c2a32ac83567f15e9af3dcbc73148ce68b2ced (diff)
Merge branch 'fix/ssm4567' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567
Diffstat (limited to 'sound/soc/codecs/ssm4567.c')
-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 7a12ac5a24a6..ac242b2ebdea 100644
--- a/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
@@ -316,7 +316,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)