espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 13:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/remove_redundant_macro_wrapping' into 'master'

Browse Source 
bugfix: remove wrong SOC_PM_SUPPORT_XTAL_PD wrapping

Closes IDFGH-9300

See merge request espressif/esp-idf!22239
This commit is contained in:
Wu Zheng Hui
2023-02-07 23:31:09 +08:00
parent 404eb39adf 75d15e8b80
commit 86797f03a8
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_hw_support/sleep_modes.c
View File

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