Skip to content

Commit a378b52

Browse files
committed
Merge branch 'fix/clear_force_on_reg_for_cache_v5.5' into 'release/v5.5'
fix(clk): do not clear force_on reg for cache (v5.5) See merge request espressif/esp-idf!42177
2 parents 8e82dab + 69c3128 commit a378b52

File tree

1 file changed

+1
-10
lines changed
  • components/esp_system/port/soc/esp32p4

1 file changed

+1
-10
lines changed

components/esp_system/port/soc/esp32p4/clk.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -258,17 +258,8 @@ __attribute__((weak)) void esp_perip_clk_init(void)
258258
REG_CLR_BIT(HP_SYS_CLKRST_CLK_FORCE_ON_CTRL0_REG, HP_SYS_CLKRST_REG_CPUICM_GATED_CLK_FORCE_ON
259259
| HP_SYS_CLKRST_REG_TCM_CPU_CLK_FORCE_ON
260260
| HP_SYS_CLKRST_REG_BUSMON_CPU_CLK_FORCE_ON
261-
| HP_SYS_CLKRST_REG_L1CACHE_CPU_CLK_FORCE_ON
262-
| HP_SYS_CLKRST_REG_L1CACHE_D_CPU_CLK_FORCE_ON
263-
| HP_SYS_CLKRST_REG_L1CACHE_I0_CPU_CLK_FORCE_ON
264-
| HP_SYS_CLKRST_REG_L1CACHE_I1_CPU_CLK_FORCE_ON
265261
| HP_SYS_CLKRST_REG_TRACE_CPU_CLK_FORCE_ON
266-
| HP_SYS_CLKRST_REG_TRACE_SYS_CLK_FORCE_ON
267-
| HP_SYS_CLKRST_REG_L1CACHE_MEM_CLK_FORCE_ON
268-
| HP_SYS_CLKRST_REG_L1CACHE_D_MEM_CLK_FORCE_ON
269-
| HP_SYS_CLKRST_REG_L1CACHE_I0_MEM_CLK_FORCE_ON
270-
| HP_SYS_CLKRST_REG_L1CACHE_I1_MEM_CLK_FORCE_ON
271-
| HP_SYS_CLKRST_REG_L2CACHE_MEM_CLK_FORCE_ON);
262+
| HP_SYS_CLKRST_REG_TRACE_SYS_CLK_FORCE_ON);
272263
_adc_ll_sar1_clock_force_en(false);
273264
_adc_ll_sar2_clock_force_en(false);
274265
_emac_ll_clock_force_en(false);

0 commit comments

Comments
 (0)