Merge branch 'fix/brownout_restore_after_deepsleep_reject' into 'master'

fix(esp_hw_support): restore brownout after deep sleep rejection on ESP32-S2

Closes PM-519

See merge request espressif/esp-idf!52475
This commit is contained in:
Jiang Jiang Jian
2026-09-08 11:05:01 +08:00

View File

@@ -1277,11 +1277,11 @@ static esp_err_t FORCE_IRAM_ATTR deep_sleep_start(bool allow_sleep_rejection)
}
}
#endif
#if CONFIG_IDF_TARGET_ESP32S2
#if CONFIG_IDF_TARGET_ESP32S2 && CONFIG_ESP_BROWNOUT_DET
/* Due to hardware limitations, on S2 the brownout detector sometimes trigger during deep sleep
to circumvent this we disable the brownout detector before sleeping */
esp_brownout_disable();
#endif //CONFIG_IDF_TARGET_ESP32S2
#endif //CONFIG_IDF_TARGET_ESP32S2 && CONFIG_ESP_BROWNOUT_DET
esp_sync_timekeeping_timers();
@@ -1412,6 +1412,12 @@ static esp_err_t FORCE_IRAM_ATTR deep_sleep_start(bool allow_sleep_rejection)
#endif
esp_sleep_exit_critical();
#if CONFIG_IDF_TARGET_ESP32S2 && CONFIG_ESP_BROWNOUT_DET
/* Brownout was disabled before attempting deep sleep; restore it after rejection. */
esp_brownout_init();
#endif //CONFIG_IDF_TARGET_ESP32S2 && CONFIG_ESP_BROWNOUT_DET
return err;
}