Commit 2c84afb5 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: cs35l35: Improve power down time 



Shorten the time it takes to power down the amp by disabling the volume
ramp whilst doing the final shutdown. The driver has already muted the
amplifier at this stage so doing the volume ramp serves no purpose.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarBrian Austin <brian.austin@cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8e71321d

sound/soc/codecs/cs35l35.c

+8 −0
Original line number Diff line number Diff line
@@ -187,6 +187,10 @@ static int cs35l35_sdin_event(struct snd_soc_dapm_widget *w, 
		regmap_update_bits(cs35l35->regmap, CS35L35_PWRCTL1,

					  CS35L35_PDN_ALL_MASK, 1);



		/* Already muted, so disable volume ramp for faster shutdown */

		regmap_update_bits(cs35l35->regmap, CS35L35_AMP_DIG_VOL_CTL,

				   CS35L35_AMP_DIGSFT_MASK, 0);



		reinit_completion(&cs35l35->pdn_done);



		ret = wait_for_completion_timeout(&cs35l35->pdn_done,
@@ -199,6 +203,10 @@ static int cs35l35_sdin_event(struct snd_soc_dapm_widget *w, 
		regmap_update_bits(cs35l35->regmap, CS35L35_CLK_CTL1,

					CS35L35_MCLK_DIS_MASK,

					1 << CS35L35_MCLK_DIS_SHIFT);



		regmap_update_bits(cs35l35->regmap, CS35L35_AMP_DIG_VOL_CTL,

				   CS35L35_AMP_DIGSFT_MASK,

				   1 << CS35L35_AMP_DIGSFT_SHIFT);

		break;

	default:

		dev_err(codec->dev, "Invalid event = 0x%x\n", event);

sound/soc/codecs/cs35l35.h

+3 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ 
#define CS35L35_AMP_GAIN_ZC_MASK	0x10

#define CS35L35_AMP_GAIN_ZC_SHIFT	4



#define CS35L35_AMP_DIGSFT_MASK		0x02

#define CS35L35_AMP_DIGSFT_SHIFT	1



/* CS35L35_SP_FMT_CTL3 */

#define CS35L35_SP_I2S_DRV_MASK		0x03

#define CS35L35_SP_I2S_DRV_SHIFT	0

CRA Git | Maintained and supported by SUSTech CRA and CCSE