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

Unverified Commit 0ce918c9 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Mark Brown
Browse files

ASoC: tlv320aic31xx: Reset registers during power up 



Add a reset function that toggles the reset line if available or uses
the software reset command otherwise. Use this in power up to ensure the
registers are in a sane state. This is useful when the driver module
is reloaded, or after Kexec, warm-reboots, etc..

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cd15da88

sound/soc/codecs/tlv320aic31xx.c

+22 −4
Original line number Diff line number Diff line
@@ -1055,6 +1055,22 @@ static int aic31xx_regulator_event(struct notifier_block *nb, 
	return 0;

}



static int aic31xx_reset(struct aic31xx_priv *aic31xx)

{

	int ret = 0;



	if (aic31xx->gpio_reset) {

		gpiod_set_value(aic31xx->gpio_reset, 1);

		ndelay(10); /* At least 10ns */

		gpiod_set_value(aic31xx->gpio_reset, 0);

	} else {

		ret = regmap_write(aic31xx->regmap, AIC31XX_RESET, 1);

	}

	mdelay(1); /* At least 1ms */



	return ret;

}



static void aic31xx_clk_on(struct snd_soc_codec *codec)

{

	struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec);
@@ -1098,11 +1114,13 @@ static int aic31xx_power_on(struct snd_soc_codec *codec) 
	if (ret)

		return ret;



	if (aic31xx->gpio_reset) {

		gpiod_set_value(aic31xx->gpio_reset, 0);

		udelay(100);

	}

	regcache_cache_only(aic31xx->regmap, false);



	/* Reset device registers for a consistent power-on like state */

	ret = aic31xx_reset(aic31xx);

	if (ret < 0)

		dev_err(aic31xx->dev, "Could not reset device: %d\n", ret);



	ret = regcache_sync(aic31xx->regmap);

	if (ret) {

		dev_err(codec->dev,