Skip to content

Commit

Permalink
Merge branch 'bugfix/remove_redundant_macro_wrapping' into 'master'
Browse files Browse the repository at this point in the history
bugfix: remove wrong SOC_PM_SUPPORT_XTAL_PD wrapping

Closes IDFGH-9300

See merge request espressif/esp-idf!22239
  • Loading branch information
esp-wzh committed Feb 7, 2023
2 parents 404eb39 + 75d15e8 commit 86797f0
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions components/esp_hw_support/sleep_modes.c
Original file line number Diff line number Diff line change
Expand Up @@ -1455,10 +1455,8 @@ static uint32_t get_power_down_flags(void)
}
#endif

#if SOC_PM_SUPPORT_XTAL_PD
#ifdef CONFIG_IDF_TARGET_ESP32
s_config.domain[ESP_PD_DOMAIN_XTAL].pd_option = ESP_PD_OPTION_OFF;
#endif
#endif

const __attribute__((unused)) char *option_str[] = {"OFF", "ON", "AUTO(OFF)" /* Auto works as OFF */};
Expand Down Expand Up @@ -1511,11 +1509,9 @@ static uint32_t get_power_down_flags(void)
pd_flags |= RTC_SLEEP_PD_INT_8M;
}
#endif
#if SOC_PM_SUPPORT_XTAL_PD
if (s_config.domain[ESP_PD_DOMAIN_XTAL].pd_option != ESP_PD_OPTION_ON) {
pd_flags |= RTC_SLEEP_PD_XTAL;
}
#endif
#if SOC_PM_SUPPORT_VDDSDIO_PD
if (s_config.domain[ESP_PD_DOMAIN_VDDSDIO].pd_option != ESP_PD_OPTION_ON) {
pd_flags |= RTC_SLEEP_PD_VDDSDIO;
Expand Down

0 comments on commit 86797f0

Please sign in to comment.