Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8339f0b6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/da7219' of... 

Merge branch 'fix/da7219' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-da7219
parents 6a0b87c6 96fc294c

sound/soc/codecs/da7219.c

+8 −0
Original line number Diff line number Diff line
@@ -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) {