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

Commit 3d5a4516 authored by Eric Bénard's avatar Eric Bénard Committed by Liam Girdwood
Browse files

codecs/tlv320aic23: fix bias management for suspend/resume 



in tlv320aic23_set_bias_level, for the case SND_SOC_BIAS_ON, the
comment says "vref/mid, osc on, dac unmute" but the code doesn't
clear the corresponding bits, thus when resuming, several bits are
not cleared preventing the codec from working.

in tlv320aic23_suspend, clearing the active register is not needed
as it will be done by tlv320aic23_set_bias_level, when setting
bias to SND_SOC_BIAS_OFF

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
Cc: broonie@opensource.wolfsonmicro.com
Cc: anuj.aggarwal@ti.com
Cc: lrg@slimlogic.co.uk
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 4b94dba0

sound/soc/codecs/tlv320aic23.c

+4 −3
Original line number Diff line number Diff line
@@ -560,13 +560,16 @@ static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec, 
	switch (level) {

	case SND_SOC_BIAS_ON:

		/* vref/mid, osc on, dac unmute */

		reg &= ~(TLV320AIC23_DEVICE_PWR_OFF | TLV320AIC23_OSC_OFF | \

			TLV320AIC23_DAC_OFF);

		tlv320aic23_write(codec, TLV320AIC23_PWR, reg);

		break;

	case SND_SOC_BIAS_PREPARE:

		break;

	case SND_SOC_BIAS_STANDBY:

		/* everything off except vref/vmid, */

		tlv320aic23_write(codec, TLV320AIC23_PWR, reg | 0x0040);

		tlv320aic23_write(codec, TLV320AIC23_PWR, reg | \

			TLV320AIC23_CLK_OFF);

		break;

	case SND_SOC_BIAS_OFF:

		/* everything off, dac mute, inactive */
@@ -615,7 +618,6 @@ static int tlv320aic23_suspend(struct platform_device *pdev, 
	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_codec *codec = socdev->card->codec;



	tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x0);

	tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_OFF);



	return 0;
@@ -632,7 +634,6 @@ static int tlv320aic23_resume(struct platform_device *pdev) 
		u16 val = tlv320aic23_read_reg_cache(codec, reg);

		tlv320aic23_write(codec, reg, val);

	}



	tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	return 0;