From 27fe024e308aec2d12711878f7d6e7f2f30c6eee Mon Sep 17 00:00:00 2001 From: hebinglin Date: Thu, 20 Aug 2026 14:52:10 +0800 Subject: [PATCH] fix(esp_hw_support): pmu_icg_mapping define mistake --- .../lowpower/port/esp32h4/sleep_clock_icg.c | 4 ++-- .../esp_hw_support/port/esp32h4/pmu_param.c | 2 +- .../soc/esp32h4/include/soc/pmu_icg_mapping.h | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/components/esp_hw_support/lowpower/port/esp32h4/sleep_clock_icg.c b/components/esp_hw_support/lowpower/port/esp32h4/sleep_clock_icg.c index 7460590ca21..2717101ae44 100644 --- a/components/esp_hw_support/lowpower/port/esp32h4/sleep_clock_icg.c +++ b/components/esp_hw_support/lowpower/port/esp32h4/sleep_clock_icg.c @@ -67,10 +67,10 @@ static const uint32_t s_retention_module_retention_clocks[SLEEP_RETENTION_MODULE [SLEEP_RETENTION_MODULE_TWAI0] = RETENTION_COMMON | PMU_CLK_ICG ( TWAI0 ), [SLEEP_RETENTION_MODULE_PARLIO0] = RETENTION_COMMON | PMU_CLK_ICGS( PARL_TX, PARL_RX ), [SLEEP_RETENTION_MODULE_GPSPI2] = RETENTION_COMMON | PMU_CLK_ICG ( SPI2 ), - [SLEEP_RETENTION_MODULE_GPSPI3] = RETENTION_COMMON | PMU_CLK_ICGS( SPI2 ), + [SLEEP_RETENTION_MODULE_GPSPI3] = RETENTION_COMMON | PMU_CLK_ICGS( SPI3 ), [SLEEP_RETENTION_MODULE_LEDC] = RETENTION_COMMON | PMU_CLK_ICGS( LEDC0 ), [SLEEP_RETENTION_MODULE_MCPWM0] = RETENTION_COMMON | PMU_CLK_ICG ( PWM ), - [SLEEP_RETENTION_MODULE_MCPWM1] = RETENTION_COMMON | PMU_CLK_ICG ( PWM ), + [SLEEP_RETENTION_MODULE_MCPWM1] = RETENTION_COMMON | PMU_CLK_ICG ( PWM1 ), [SLEEP_RETENTION_MODULE_SDM0] = RETENTION_COMMON, [SLEEP_RETENTION_MODULE_CLOCK_MODEM] = RETENTION_COMMON, [SLEEP_RETENTION_MODULE_BLE_MAC] = RETENTION_COMMON, diff --git a/components/esp_hw_support/port/esp32h4/pmu_param.c b/components/esp_hw_support/port/esp32h4/pmu_param.c index 668390b0d68..a81a5124050 100644 --- a/components/esp_hw_support/port/esp32h4/pmu_param.c +++ b/components/esp_hw_support/port/esp32h4/pmu_param.c @@ -136,7 +136,7 @@ const pmu_hp_system_power_param_t * pmu_hp_system_power_param_default(pmu_hp_mod } #define PMU_HP_MODEM_CLOCK_CONFIG_DEFAULT() { \ - .icg_func = BIT(PMU_ICG_FUNC_ENA_REGDMA) | BIT(PMU_ICG_FUNC_ENA_HPBUS), \ + .icg_func = BIT(PMU_ICG_FUNC_ENA_HPBUS), \ .icg_apb = 0, \ .icg_modem = { \ .code = PMU_HP_ICG_MODEM_CODE_MODEM \ diff --git a/components/soc/esp32h4/include/soc/pmu_icg_mapping.h b/components/soc/esp32h4/include/soc/pmu_icg_mapping.h index a5c32191237..5f7d1634861 100644 --- a/components/soc/esp32h4/include/soc/pmu_icg_mapping.h +++ b/components/soc/esp32h4/include/soc/pmu_icg_mapping.h @@ -16,7 +16,7 @@ #define PMU_ICG_APB_ENA_MSPI 5 #define PMU_ICG_APB_ENA_UART0 6 #define PMU_ICG_APB_ENA_UART1 7 -#define PMU_ICG_APB_ENA_UHCI 8 +#define PMU_ICG_APB_ENA_SPI3 8 #define PMU_ICG_APB_ENA_SARADC 9 #define PMU_ICG_APB_ENA_TG0 11 #define PMU_ICG_APB_ENA_TG1 12 @@ -26,7 +26,7 @@ #define PMU_ICG_APB_ENA_SYSTIMER 16 #define PMU_ICG_APB_ENA_USB_DEVICE 17 #define PMU_ICG_APB_ENA_TWAI0 18 -#define PMU_ICG_APB_ENA_TWAI1 19 +#define PMU_ICG_APB_ENA_PWM1 19 #define PMU_ICG_APB_ENA_PCNT 20 #define PMU_ICG_APB_ENA_PWM 21 #define PMU_ICG_APB_ENA_SOC_ETM 22 @@ -35,18 +35,19 @@ #define PMU_ICG_APB_ENA_MEM_MONITOR 25 #define PMU_ICG_APB_ENA_IOMUX 26 #define PMU_ICG_APB_ENA_PVT_MONITOR 27 +#define PMU_ICG_APB_ENA_BS 28 #define PMU_ICG_FUNC_ENA_GDMA 0 #define PMU_ICG_FUNC_ENA_SPI2 1 #define PMU_ICG_FUNC_ENA_I2S_RX 2 #define PMU_ICG_FUNC_ENA_UART0 3 #define PMU_ICG_FUNC_ENA_UART1 4 -#define PMU_ICG_FUNC_ENA_UHCI 5 +#define PMU_ICG_FUNC_ENA_PCNT 5 #define PMU_ICG_FUNC_ENA_USB_DEVICE 6 #define PMU_ICG_FUNC_ENA_I2S_TX 7 -#define PMU_ICG_FUNC_ENA_REGDMA 8 -#define PMU_ICG_FUNC_ENA_RETENTION 9 -#define PMU_ICG_FUNC_ENA_MEM_MONITOR 10 -#define PMU_ICG_FUNC_ENA_SDIO_SLAVE 11 +#define PMU_ICG_FUNC_ENA_ASRC 8 +#define PMU_ICG_FUNC_ENA_USB_OTG11 9 +#define PMU_ICG_FUNC_ENA_DEBUG 10 +#define PMU_ICG_FUNC_ENA_SPI3 11 #define PMU_ICG_FUNC_ENA_TSENS 12 #define PMU_ICG_FUNC_ENA_TG1 13 #define PMU_ICG_FUNC_ENA_TG0 14 @@ -59,13 +60,13 @@ #define PMU_ICG_FUNC_ENA_RMT 21 #define PMU_ICG_FUNC_ENA_PWM 22 #define PMU_ICG_FUNC_ENA_PVT_MONITOR 23 -#define PMU_ICG_FUNC_ENA_PARL_TX 24 +#define PMU_ICG_FUNC_ENA_PWM1 24 #define PMU_ICG_FUNC_ENA_PARL_RX 25 #define PMU_ICG_FUNC_ENA_MSPI 26 #define PMU_ICG_FUNC_ENA_LEDC0 27 #define PMU_ICG_FUNC_ENA_IOMUX 28 #define PMU_ICG_FUNC_ENA_I2C 29 -#define PMU_ICG_FUNC_ENA_TWAI1 30 +#define PMU_ICG_FUNC_ENA_PARL_TX 30 #define PMU_ICG_FUNC_ENA_TWAI0 31 #ifdef __cplusplus