summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-26 09:39:35 -0700
committerMark Brown <broonie@kernel.org>2016-09-26 09:39:35 -0700
commit8339f0b6b209b640afe8381aa9b5d7accfeaf848 (patch)
treefd75876f957940f6f4d242ac6220531cf25715c0 /sound
parent6a0b87c6e7f664aff8957e0889f9f82e5ee27f65 (diff)
parent96fc294cf6cb27f01a865959b9637d0aea3b57c2 (diff)
downloadlinux-8339f0b6b209b640afe8381aa9b5d7accfeaf848.tar.bz2
Merge branch 'fix/da7219' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-da7219
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/da7219.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 737e91422a5e..9d08c11b6f14 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1941,6 +1941,14 @@ static int da7219_i2c_probe(struct i2c_client *i2c,
return ret;
}
+ /* Software reset codec. */
+ regmap_write_bits(da7219->regmap, DA7219_ACCDET_CONFIG_1,
+ DA7219_ACCDET_EN_MASK, 0);
+ regmap_write_bits(da7219->regmap, DA7219_CIF_CTRL,
+ DA7219_CIF_REG_SOFT_RESET_MASK, 0);
+ regmap_write_bits(da7219->regmap, DA7219_SYSTEM_ACTIVE,
+ DA7219_SYSTEM_ACTIVE_MASK, 0);
+
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_da7219,
&da7219_dai, 1);
if (ret < 0) {