summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Rodionov <vitalyr@opensource.cirrus.com>2024-02-16 10:11:57 +0000
committerMark Brown <broonie@kernel.org>2024-02-19 17:02:18 +0000
commit3b4ec34602c562fa8fa59dd8545ac7f3cdfc235e (patch)
treedb38f46cceb6c9c98e525d82f8960782ac391644
parente480c0991db00b24b39010bfd56eda5ec2417186 (diff)
downloadlinux-stable-3b4ec34602c562fa8fa59dd8545ac7f3cdfc235e.tar.gz
linux-stable-3b4ec34602c562fa8fa59dd8545ac7f3cdfc235e.tar.bz2
linux-stable-3b4ec34602c562fa8fa59dd8545ac7f3cdfc235e.zip
ASoC: cs42l42: Remove redundant delays in suspend().
This patch will remove redundant delay and minimise total suspend() function call time. Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com> Link: https://msgid.link/r/20240216101157.23176-1-vitalyr@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--include/sound/cs42l42.h5
-rw-r--r--sound/soc/codecs/cs42l42.c1
2 files changed, 2 insertions, 4 deletions
diff --git a/include/sound/cs42l42.h b/include/sound/cs42l42.h
index 3994e933db19..1bd8eee54f66 100644
--- a/include/sound/cs42l42.h
+++ b/include/sound/cs42l42.h
@@ -809,8 +809,7 @@
#define CS42L42_PLL_LOCK_TIMEOUT_US 1250
#define CS42L42_HP_ADC_EN_TIME_US 20000
#define CS42L42_PDN_DONE_POLL_US 1000
-#define CS42L42_PDN_DONE_TIMEOUT_US 200000
-#define CS42L42_PDN_DONE_TIME_MS 100
-#define CS42L42_FILT_DISCHARGE_TIME_MS 46
+#define CS42L42_PDN_DONE_TIMEOUT_US 235000
+#define CS42L42_PDN_DONE_TIME_MS 65
#endif /* __CS42L42_H */
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 2d11c5125f73..60d366e53526 100644
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -2195,7 +2195,6 @@ int cs42l42_suspend(struct device *dev)
/* Discharge FILT+ */
regmap_update_bits(cs42l42->regmap, CS42L42_PWR_CTL2,
CS42L42_DISCHARGE_FILT_MASK, CS42L42_DISCHARGE_FILT_MASK);
- msleep(CS42L42_FILT_DISCHARGE_TIME_MS);
regcache_cache_only(cs42l42->regmap, true);
gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);