feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_deepsleep_saradc_leakage_by_sar' into 'release/v5.0'

Browse Source 
bugfix: fix adc current leakage by sar_adc on v5.0

See merge request espressif/esp-idf!24344
This commit is contained in:
Jiang Jiang Jian
2023-06-29 14:23:38 +08:00
parent 96119acc8b f030c92d05
commit 3a8e28d862
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
components/esp_hw_support/sleep_modes.c
View File

@@ -354,19 +354,31 @@ static void IRAM_ATTR resume_uarts(uint32_t uarts_resume_bmap)
*/ */
inline static void IRAM_ATTR misc_modules_sleep_prepare(bool deep_sleep) inline static void IRAM_ATTR misc_modules_sleep_prepare(bool deep_sleep)
{ {
if (deep_sleep) {
extern bool esp_phy_is_initialized(void);
if (esp_phy_is_initialized()) {
extern void phy_close_rf(void);
phy_close_rf();
#if !CONFIG_IDF_TARGET_ESP32
extern void phy_xpd_tsens(void);
phy_xpd_tsens();
#endif
}
} else {
#if CONFIG_MAC_BB_PD #if CONFIG_MAC_BB_PD
mac_bb_power_down_cb_execute(); mac_bb_power_down_cb_execute();
#endif #endif
#if CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL #if CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL
gpio_sleep_mode_config_apply(); gpio_sleep_mode_config_apply();
#endif #endif
#if SOC_PM_SUPPORT_CPU_PD || SOC_PM_SUPPORT_TAGMEM_PD #if SOC_PM_SUPPORT_CPU_PD || SOC_PM_SUPPORT_TAGMEM_PD
sleep_enable_memory_retention(); sleep_enable_memory_retention();
#endif #endif
#if REGI2C_ANA_CALI_PD_WORKAROUND #if REGI2C_ANA_CALI_PD_WORKAROUND
regi2c_analog_cali_reg_read(); regi2c_analog_cali_reg_read();
#endif #endif
if (!(deep_sleep && s_adc_tsen_enabled)){ }
if (!(deep_sleep && s_adc_tsen_enabled)) {
sar_periph_ctrl_power_disable(); sar_periph_ctrl_power_disable();
} }
} }
@@ -463,19 +475,7 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
} }
#endif #endif
if (deep_sleep) { misc_modules_sleep_prepare(deep_sleep);
extern bool esp_phy_is_initialized(void);
if (esp_phy_is_initialized()){
extern void phy_close_rf(void);
phy_close_rf();
#if !CONFIG_IDF_TARGET_ESP32
extern void phy_xpd_tsens(void);
phy_xpd_tsens();
#endif
}
} else {
misc_modules_sleep_prepare(deep_sleep);
}
#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
if (deep_sleep) { if (deep_sleep) {