From 1339cc41f99bfe56b24dabfb41c8dc51522e97ef Mon Sep 17 00:00:00 2001 From: hebinglin Date: Thu, 14 May 2026 15:27:31 +0800 Subject: [PATCH] change(modem): update esp32h21 modem_syscon header --- .../esp32h21/include/modem/modem_syscon_reg.h | 19 +++++++++++++------ .../include/modem/modem_syscon_struct.h | 12 ++++++++---- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/components/soc/esp32h21/include/modem/modem_syscon_reg.h b/components/soc/esp32h21/include/modem/modem_syscon_reg.h index 7526eb04094..e133a10cc65 100644 --- a/components/soc/esp32h21/include/modem/modem_syscon_reg.h +++ b/components/soc/esp32h21/include/modem/modem_syscon_reg.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 OR MIT */ @@ -26,20 +26,27 @@ extern "C" { * No description */ #define MODEM_SYSCON_CLK_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x4) -/** MODEM_SYSCON_CLK_ETM_EN : R/W; bitpos: [21]; default: 0; +/** MODEM_SYSCON_CLK_ETM_EN : R/W; bitpos: [20]; default: 0; * No description */ -#define MODEM_SYSCON_CLK_ETM_EN (BIT(21)) +#define MODEM_SYSCON_CLK_ETM_EN (BIT(20)) #define MODEM_SYSCON_CLK_ETM_EN_M (MODEM_SYSCON_CLK_ETM_EN_V << MODEM_SYSCON_CLK_ETM_EN_S) #define MODEM_SYSCON_CLK_ETM_EN_V 0x00000001U -#define MODEM_SYSCON_CLK_ETM_EN_S 21 -/** MODEM_SYSCON_CLK_ZB_APB_EN : R/W; bitpos: [22]; default: 0; +#define MODEM_SYSCON_CLK_ETM_EN_S 20 +/** MODEM_SYSCON_CLK_ZB_APB_EN : R/W; bitpos: [21]; default: 0; * No description */ #define MODEM_SYSCON_CLK_ZB_APB_EN (BIT(22)) #define MODEM_SYSCON_CLK_ZB_APB_EN_M (MODEM_SYSCON_CLK_ZB_APB_EN_V << MODEM_SYSCON_CLK_ZB_APB_EN_S) #define MODEM_SYSCON_CLK_ZB_APB_EN_V 0x00000001U -#define MODEM_SYSCON_CLK_ZB_APB_EN_S 22 +#define MODEM_SYSCON_CLK_ZB_APB_EN_S 21 +/** MODEM_SYSCON_CLK_ZB_MAC_SYS_EN : R/W; bitpos: [22]; default: 0; + * No description + */ +#define MODEM_SYSCON_CLK_ZB_MAC_SYS_EN (BIT(22)) +#define MODEM_SYSCON_CLK_ZB_MAC_SYS_EN_M (MODEM_SYSCON_CLK_ZB_MAC_SYS_EN_V << MODEM_SYSCON_CLK_ZB_MAC_SYS_EN_S) +#define MODEM_SYSCON_CLK_ZB_MAC_SYS_EN_V 0x00000001U +#define MODEM_SYSCON_CLK_ZB_MAC_SYS_EN_S 22 /** MODEM_SYSCON_CLK_ZB_MAC_EN : R/W; bitpos: [23]; default: 0; * No description */ diff --git a/components/soc/esp32h21/include/modem/modem_syscon_struct.h b/components/soc/esp32h21/include/modem/modem_syscon_struct.h index 868f65b2489..fd9ab50b03f 100644 --- a/components/soc/esp32h21/include/modem/modem_syscon_struct.h +++ b/components/soc/esp32h21/include/modem/modem_syscon_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 OR MIT */ @@ -30,15 +30,19 @@ typedef union { */ typedef union { struct { - uint32_t reserved_0: 21; - /** clk_etm_en : R/W; bitpos: [21]; default: 0; + uint32_t reserved_0: 20; + /** clk_etm_en : R/W; bitpos: [20]; default: 0; * No description */ uint32_t clk_etm_en: 1; - /** clk_zb_apb_en : R/W; bitpos: [22]; default: 0; + /** clk_zb_apb_en : R/W; bitpos: [21]; default: 0; * No description */ uint32_t clk_zb_apb_en: 1; + /** clk_zb_mac_sys_en : R/W; bitpos: [22]; default: 0; + * No description + */ + uint32_t clk_zb_mac_sys_en: 1; /** clk_zb_mac_en : R/W; bitpos: [23]; default: 0; * No description */