Merge branch 'fix/esp_idf_h4h21_ana_wait_short' into 'master'

fix(esp_hw_support): fix xtal unstable when carry 154 and ble cases

See merge request espressif/esp-idf!50249
This commit is contained in:
He Binglin
2026-07-13 11:51:58 +08:00
2 changed files with 7 additions and 7 deletions
@@ -548,7 +548,7 @@ typedef struct pmu_sleep_machine_constant {
.lp = { \ .lp = { \
.min_slp_time_us = 450, \ .min_slp_time_us = 450, \
.analog_wait_time_us = 154, \ .analog_wait_time_us = 154, \
.xtal_wait_stable_time_us = 200, \ .xtal_wait_stable_time_us = 250, \
.clk_switch_cycle = 1, \ .clk_switch_cycle = 1, \
.clk_power_on_wait_cycle = 1, \ .clk_power_on_wait_cycle = 1, \
.isolate_wait_time_us = 1, \ .isolate_wait_time_us = 1, \
@@ -558,14 +558,14 @@ typedef struct pmu_sleep_machine_constant {
}, \ }, \
.hp = { \ .hp = { \
.min_slp_time_us = 450, \ .min_slp_time_us = 450, \
.analog_wait_time_us = 140, \ .analog_wait_time_us = 154, \
.isolate_wait_time_us = 1, \ .isolate_wait_time_us = 1, \
.reset_wait_time_us = 1, \ .reset_wait_time_us = 1, \
.power_supply_wait_time_us = 2, \ .power_supply_wait_time_us = 2, \
.power_up_wait_time_us = 2, \ .power_up_wait_time_us = 2, \
.regdma_s2a_work_time_us = PMU_REGDMA_S2A_WORK_TIME_US, \ .regdma_s2a_work_time_us = PMU_REGDMA_S2A_WORK_TIME_US, \
.regdma_a2s_work_time_us = PMU_REGDMA_A2S_WORK_TIME_US, \ .regdma_a2s_work_time_us = PMU_REGDMA_A2S_WORK_TIME_US, \
.xtal_wait_stable_time_us = 110, \ .xtal_wait_stable_time_us = 250, \
.pll_wait_stable_time_us = 1 \ .pll_wait_stable_time_us = 1 \
} \ } \
} }
@@ -526,8 +526,8 @@ typedef struct pmu_sleep_machine_constant {
.lp = { \ .lp = { \
.min_slp_time_us = 450, \ .min_slp_time_us = 450, \
.wakeup_wait_cycle = 4, \ .wakeup_wait_cycle = 4, \
.analog_wait_time_us = 130, \ .analog_wait_time_us = 154, \
.xtal_wait_stable_time_us = 160, \ .xtal_wait_stable_time_us = 250, \
.clk_switch_cycle = 1, \ .clk_switch_cycle = 1, \
.clk_power_on_wait_cycle = 1, \ .clk_power_on_wait_cycle = 1, \
.isolate_wait_time_us = 1, \ .isolate_wait_time_us = 1, \
@@ -539,7 +539,7 @@ typedef struct pmu_sleep_machine_constant {
.min_slp_time_us = 450, \ .min_slp_time_us = 450, \
.clock_domain_sync_time_us = 150, \ .clock_domain_sync_time_us = 150, \
.system_dfs_up_work_time_us = 124, \ .system_dfs_up_work_time_us = 124, \
.analog_wait_time_us = 190, \ .analog_wait_time_us = 154, \
.isolate_wait_time_us = 1, \ .isolate_wait_time_us = 1, \
.reset_wait_time_us = 1, \ .reset_wait_time_us = 1, \
.power_supply_wait_time_us = 2, \ .power_supply_wait_time_us = 2, \
@@ -550,7 +550,7 @@ typedef struct pmu_sleep_machine_constant {
.regdma_a2s_work_time_us = 265, \ .regdma_a2s_work_time_us = 265, \
.regdma_rf_on_work_time_us = 70, \ .regdma_rf_on_work_time_us = 70, \
.regdma_rf_off_work_time_us = 23, \ .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 \ .pll_wait_stable_time_us = 1 \
} \ } \
} }