Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/esp_idf_h4h21_ana_wait_short_v6.1' into 'release/v6.1'

Browse Source 
fix(esp_hw_support): fix xtal unstable when carry 154 and ble cases(v6.1)

See merge request espressif/esp-idf!50656
This commit is contained in:
Jiang Jiang Jian
2026-07-16 11:40:13 +08:00
parent 8f45ea4dcb 0682c52828
commit 1dfc7914b5
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hw_support/port/esp32h21/private_include/pmu_param.h
+4 -5
View File
@@ -287,11 +287,10 @@ typedef struct {
} lp_sys[PMU_MODE_LP_MAX];
} pmu_sleep_power_config_t;
/* ESP32H21 ECO1 doesn't allow flash_ldo off or standby mode, todo PM-678 */
#define PMU_SLEEP_POWER_CONFIG_DEFAULT(sleep_flags) { \
.hp_sys = { \
.dig_power = { \
.vdd_flash_mode = ((sleep_flags) & PMU_SLEEP_PD_VDDSDIO) ? 1 : 0, \
.vdd_flash_mode = ((sleep_flags) & PMU_SLEEP_PD_VDDSDIO) ? 1 : 3, \
.wifi_pd_en = ((sleep_flags) & PMU_SLEEP_PD_MODEM) ? 1 : 0,\
.cpu_pd_en = ((sleep_flags) & PMU_SLEEP_PD_CPU) ? 1 : 0,\
.top_pd_en = ((sleep_flags) & PMU_SLEEP_PD_TOP) ? 1 : 0,\
@@ -549,7 +548,7 @@ typedef struct pmu_sleep_machine_constant {
.lp = { \
.min_slp_time_us = 450, \
.analog_wait_time_us = 154, \
.xtal_wait_stable_time_us = 200, \
.xtal_wait_stable_time_us = 250, \
.clk_switch_cycle = 1, \
.clk_power_on_wait_cycle = 1, \
.isolate_wait_time_us = 1, \
@@ -559,14 +558,14 @@ typedef struct pmu_sleep_machine_constant {
}, \
.hp = { \
.min_slp_time_us = 450, \
.analog_wait_time_us = 190, \
.analog_wait_time_us = 154, \
.isolate_wait_time_us = 1, \
.reset_wait_time_us = 1, \
.power_supply_wait_time_us = 2, \
.power_up_wait_time_us = 2, \
.regdma_s2a_work_time_us = PMU_REGDMA_S2A_WORK_TIME_US, \
.regdma_a2s_work_time_us = PMU_REGDMA_A2S_WORK_TIME_US, \
.xtal_wait_stable_time_us = 160, \
.xtal_wait_stable_time_us = 250, \
.pll_wait_stable_time_us = 1 \
} \
}
components/esp_hw_support/port/esp32h4/private_include/pmu_param.h
+4 -4
View File
@@ -526,8 +526,8 @@ typedef struct pmu_sleep_machine_constant {
.lp = { \
.min_slp_time_us = 450, \
.wakeup_wait_cycle = 4, \
.analog_wait_time_us = 130, \
.xtal_wait_stable_time_us = 160, \
.analog_wait_time_us = 154, \
.xtal_wait_stable_time_us = 250, \
.clk_switch_cycle = 1, \
.clk_power_on_wait_cycle = 1, \
.isolate_wait_time_us = 1, \
@@ -539,7 +539,7 @@ typedef struct pmu_sleep_machine_constant {
.min_slp_time_us = 450, \
.clock_domain_sync_time_us = 150, \
.system_dfs_up_work_time_us = 124, \
.analog_wait_time_us = 190, \
.analog_wait_time_us = 154, \
.isolate_wait_time_us = 1, \
.reset_wait_time_us = 1, \
.power_supply_wait_time_us = 2, \
@@ -550,7 +550,7 @@ typedef struct pmu_sleep_machine_constant {
.regdma_a2s_work_time_us = 265, \
.regdma_rf_on_work_time_us = 70, \
.regdma_rf_off_work_time_us = 23, \
.xtal_wait_stable_time_us = 160, \
.xtal_wait_stable_time_us = 250, \
.pll_wait_stable_time_us = 1 \
} \
}