espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/remove_rwdt_workaround_for_p4_rev3.2_v5.5' into 'release/v5.5'

Browse Source 
change(esp_rom): remove wdt_hal_config_stage API workaround for P4 ECO7 (v5.5)

See merge request espressif/esp-idf!47172
This commit is contained in:
Jiang Jiang Jian
2026-04-03 14:05:53 +08:00
parent 9348f1aea9 8622bc38c4
commit c76d44eb63
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_rom/patches/esp_rom_wdt.c
+6 -4
View File
@@ -6,9 +6,11 @@
#include "sdkconfig.h"
#include <stddef.h>
#include "soc/soc_caps.h"
#include "soc/chip_revision.h"
#include "esp_rom_caps.h"
#include "hal/config.h"
#include "hal/efuse_hal.h"
#include "hal/wdt_types.h"
#include "hal/wdt_hal.h"
#include "hal/mwdt_ll.h"
@@ -119,13 +121,13 @@ void wdt_hal_deinit(wdt_hal_context_t *hal)
hal->mwdt_dev = NULL;
}
#if CONFIG_IDF_TARGET_ESP32P4
#if CONFIG_IDF_TARGET_ESP32P4 && (HAL_CONFIG(CHIP_SUPPORT_MIN_REV) <= 301)
extern void rom_wdt_hal_config_stage(wdt_hal_context_t *hal, wdt_stage_t stage, uint32_t timeout, wdt_stage_action_t behavior);
/* rwdt_ll_config_stage is implemented erroneously in ESP32P4 rom code, TODO: PM-654*/
void wdt_hal_config_stage(wdt_hal_context_t *hal, wdt_stage_t stage, uint32_t timeout_ticks, wdt_stage_action_t behavior)
{
if (hal->inst == WDT_RWDT && stage == WDT_STAGE0) {
if ((hal->inst == WDT_RWDT && stage == WDT_STAGE0) && !ESP_CHIP_REV_ABOVE(efuse_hal_chip_revision(), 302)) {
timeout_ticks = timeout_ticks >> (1 + REG_GET_FIELD(EFUSE_RD_REPEAT_DATA1_REG, EFUSE_WDT_DELAY_SEL));
}
rom_wdt_hal_config_stage(hal, stage, timeout_ticks, behavior);