Merge branch 'fix/clear_force_on_reg_for_cache' into 'master'

fix(clk): do not clear force_on reg for cache

Closes IDFCI-2944, IDFCI-2988, and IDFCI-2953

See merge request espressif/esp-idf!42023
This commit is contained in:
morris
2025-09-24 14:27:16 +08:00

View File

@@ -258,17 +258,8 @@ __attribute__((weak)) void esp_perip_clk_init(void)
REG_CLR_BIT(HP_SYS_CLKRST_CLK_FORCE_ON_CTRL0_REG, HP_SYS_CLKRST_REG_CPUICM_GATED_CLK_FORCE_ON REG_CLR_BIT(HP_SYS_CLKRST_CLK_FORCE_ON_CTRL0_REG, HP_SYS_CLKRST_REG_CPUICM_GATED_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_TCM_CPU_CLK_FORCE_ON | HP_SYS_CLKRST_REG_TCM_CPU_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_BUSMON_CPU_CLK_FORCE_ON | HP_SYS_CLKRST_REG_BUSMON_CPU_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_L1CACHE_CPU_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_L1CACHE_D_CPU_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_L1CACHE_I0_CPU_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_L1CACHE_I1_CPU_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_TRACE_CPU_CLK_FORCE_ON | HP_SYS_CLKRST_REG_TRACE_CPU_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_TRACE_SYS_CLK_FORCE_ON | HP_SYS_CLKRST_REG_TRACE_SYS_CLK_FORCE_ON);
| HP_SYS_CLKRST_REG_L1CACHE_MEM_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_L1CACHE_D_MEM_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_L1CACHE_I0_MEM_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_L1CACHE_I1_MEM_CLK_FORCE_ON
| HP_SYS_CLKRST_REG_L2CACHE_MEM_CLK_FORCE_ON);
_adc_ll_sar1_clock_force_en(false); _adc_ll_sar1_clock_force_en(false);
_adc_ll_sar2_clock_force_en(false); _adc_ll_sar2_clock_force_en(false);
_emac_ll_clock_force_en(false); _emac_ll_clock_force_en(false);