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: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c
index 9688274f7c9060393b097a22355c3c49aaf086fd..1db07a6296a416934c29c37eacb32bc70aa4e52a 100644 (file)
--- a/sound/soc/codecs/cs35l35.c
+++ b/sound/soc/codecs/cs35l35.c
@@ -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);

diff --git a/sound/soc/codecs/cs35l35.h b/sound/soc/codecs/cs35l35.h
index 156d2f0e6fd8d1fd228fd039510e4b9437ea25fd..54e9ac536b205b330dcdaeec66b5e2cba7f908df 100644 (file)
--- a/sound/soc/codecs/cs35l35.h
+++ b/sound/soc/codecs/cs35l35.h
@@ -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