diff --git a/components/soc/esp32c5/include/modem/modem_lpcon_reg.h b/components/soc/esp32c5/include/modem/modem_lpcon_reg.h index 2e16b2e54c..014d5e62f7 100644 --- a/components/soc/esp32c5/include/modem/modem_lpcon_reg.h +++ b/components/soc/esp32c5/include/modem/modem_lpcon_reg.h @@ -222,6 +222,12 @@ extern "C" { #define MODEM_LPCON_CLK_WIFIPWR_ST_MAP_S 16 #define MODEM_LPCON_RST_CONF_REG (DR_REG_MODEM_LPCON_BASE + 0x24) +/* MODEM_LPCON_RST_DCMEM : WO ;bitpos:[4] ;default: 1'b0 ; */ +/*description: .*/ +#define MODEM_LPCON_RST_DCMEM (BIT(4)) +#define MODEM_LPCON_RST_DCMEM_M (BIT(4)) +#define MODEM_LPCON_RST_DCMEM_V 0x1 +#define MODEM_LPCON_RST_DCMEM_S 4 /* MODEM_LPCON_RST_LP_TIMER : WO ;bitpos:[3] ;default: 1'b0 ; */ /*description: .*/ #define MODEM_LPCON_RST_LP_TIMER (BIT(3)) @@ -365,8 +371,40 @@ extern "C" { #define MODEM_LPCON_CHAN_FREQ_MEM_EN_V 0x1 #define MODEM_LPCON_CHAN_FREQ_MEM_EN_S 0 -#define MODEM_LPCON_DATE_REG (DR_REG_MODEM_LPCON_BASE + 0x3C) -/* MODEM_LPCON_DATE : R/W ;bitpos:[27:0] ;default: 28'h2311220 ; */ +#define MODEM_LPCON_DCMEM_VALID_0_REG (DR_REG_MODEM_LPCON_BASE + 0x3C) +/* MODEM_LPCON_DCMEM_VALID_0 : RO ;bitpos:[31:0] ;default: 32'h0 ; */ +/*description: .*/ +#define MODEM_LPCON_DCMEM_VALID_0 0xFFFFFFFF +#define MODEM_LPCON_DCMEM_VALID_0_M ((MODEM_LPCON_DCMEM_VALID_0_V)<<(MODEM_LPCON_DCMEM_VALID_0_S)) +#define MODEM_LPCON_DCMEM_VALID_0_V 0xFFFFFFFF +#define MODEM_LPCON_DCMEM_VALID_0_S 0 + +#define MODEM_LPCON_DCMEM_VALID_1_REG (DR_REG_MODEM_LPCON_BASE + 0x40) +/* MODEM_LPCON_DCMEM_VALID_1 : RO ;bitpos:[31:0] ;default: 32'h0 ; */ +/*description: .*/ +#define MODEM_LPCON_DCMEM_VALID_1 0xFFFFFFFF +#define MODEM_LPCON_DCMEM_VALID_1_M ((MODEM_LPCON_DCMEM_VALID_1_V)<<(MODEM_LPCON_DCMEM_VALID_1_S)) +#define MODEM_LPCON_DCMEM_VALID_1_V 0xFFFFFFFF +#define MODEM_LPCON_DCMEM_VALID_1_S 0 + +#define MODEM_LPCON_DCMEM_VALID_2_REG (DR_REG_MODEM_LPCON_BASE + 0x44) +/* MODEM_LPCON_DCMEM_VALID_2 : RO ;bitpos:[31:0] ;default: 32'h0 ; */ +/*description: .*/ +#define MODEM_LPCON_DCMEM_VALID_2 0xFFFFFFFF +#define MODEM_LPCON_DCMEM_VALID_2_M ((MODEM_LPCON_DCMEM_VALID_2_V)<<(MODEM_LPCON_DCMEM_VALID_2_S)) +#define MODEM_LPCON_DCMEM_VALID_2_V 0xFFFFFFFF +#define MODEM_LPCON_DCMEM_VALID_2_S 0 + +#define MODEM_LPCON_DCMEM_VALID_3_REG (DR_REG_MODEM_LPCON_BASE + 0x48) +/* MODEM_LPCON_DCMEM_VALID_3 : RO ;bitpos:[31:0] ;default: 32'h0 ; */ +/*description: .*/ +#define MODEM_LPCON_DCMEM_VALID_3 0xFFFFFFFF +#define MODEM_LPCON_DCMEM_VALID_3_M ((MODEM_LPCON_DCMEM_VALID_3_V)<<(MODEM_LPCON_DCMEM_VALID_3_S)) +#define MODEM_LPCON_DCMEM_VALID_3_V 0xFFFFFFFF +#define MODEM_LPCON_DCMEM_VALID_3_S 0 + +#define MODEM_LPCON_DATE_REG (DR_REG_MODEM_LPCON_BASE + 0x4C) +/* MODEM_LPCON_DATE : R/W ;bitpos:[27:0] ;default: 28'h2410170 ; */ /*description: .*/ #define MODEM_LPCON_DATE 0x0FFFFFFF #define MODEM_LPCON_DATE_M ((MODEM_LPCON_DATE_V)<<(MODEM_LPCON_DATE_S)) diff --git a/components/soc/esp32c5/include/modem/modem_lpcon_struct.h b/components/soc/esp32c5/include/modem/modem_lpcon_struct.h index 8ce1a6ab15..06531841dd 100644 --- a/components/soc/esp32c5/include/modem/modem_lpcon_struct.h +++ b/components/soc/esp32c5/include/modem/modem_lpcon_struct.h @@ -157,7 +157,7 @@ typedef volatile struct { uint32_t rst_coex : 1; uint32_t rst_i2c_mst : 1; uint32_t rst_lp_timer : 1; - uint32_t reserved4 : 1; + uint32_t rst_dcmem : 1; uint32_t reserved5 : 1; uint32_t reserved6 : 1; uint32_t reserved7 : 1; @@ -231,6 +231,10 @@ typedef volatile struct { }; uint32_t val; } apb_mem_sel; + uint32_t dcmem_valid_0; + uint32_t dcmem_valid_1; + uint32_t dcmem_valid_2; + uint32_t dcmem_valid_3; union { struct { uint32_t date : 28; @@ -243,7 +247,7 @@ typedef volatile struct { extern modem_lpcon_dev_t MODEM_LPCON; #ifndef __cplusplus -_Static_assert(sizeof(modem_lpcon_dev_t) == 0x40, "Invalid size of modem_lpcon_dev_t structure"); +_Static_assert(sizeof(modem_lpcon_dev_t) == 0x50, "Invalid size of modem_lpcon_dev_t structure"); #endif #ifdef __cplusplus diff --git a/components/soc/esp32c5/include/modem/modem_syscon_reg.h b/components/soc/esp32c5/include/modem/modem_syscon_reg.h index 765cb3a00c..3abf763ee8 100644 --- a/components/soc/esp32c5/include/modem/modem_syscon_reg.h +++ b/components/soc/esp32c5/include/modem/modem_syscon_reg.h @@ -559,7 +559,15 @@ extern "C" { #define MODEM_SYSCON_WIFI_BB_CFG_V 0xFFFFFFFF #define MODEM_SYSCON_WIFI_BB_CFG_S 0 -#define MODEM_SYSCON_MEM_RF1_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x1C) +#define MODEM_SYSCON_FE_CFG_REG (DR_REG_MODEM_SYSCON_BASE + 0x1C) +/* MODEM_SYSCON_FE_CFG : R/W ;bitpos:[31:0] ;default: 32'h0 ; */ +/*description: .*/ +#define MODEM_SYSCON_FE_CFG 0xFFFFFFFF +#define MODEM_SYSCON_FE_CFG_M ((MODEM_SYSCON_FE_CFG_V)<<(MODEM_SYSCON_FE_CFG_S)) +#define MODEM_SYSCON_FE_CFG_V 0xFFFFFFFF +#define MODEM_SYSCON_FE_CFG_S 0 + +#define MODEM_SYSCON_MEM_RF1_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x20) /* MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL : R/W ;bitpos:[31:0] ;default: 32'h00002070 ; */ /*description: .*/ #define MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL 0xFFFFFFFF @@ -567,7 +575,7 @@ extern "C" { #define MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL_V 0xFFFFFFFF #define MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL_S 0 -#define MODEM_SYSCON_MEM_RF2_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x20) +#define MODEM_SYSCON_MEM_RF2_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x24) /* MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL : R/W ;bitpos:[31:0] ;default: 32'h00000000 ; */ /*description: .*/ #define MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL 0xFFFFFFFF @@ -575,8 +583,8 @@ extern "C" { #define MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL_V 0xFFFFFFFF #define MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL_S 0 -#define MODEM_SYSCON_DATE_REG (DR_REG_MODEM_SYSCON_BASE + 0x24) -/* MODEM_SYSCON_DATE : R/W ;bitpos:[27:0] ;default: 28'h2312050 ; */ +#define MODEM_SYSCON_DATE_REG (DR_REG_MODEM_SYSCON_BASE + 0x28) +/* MODEM_SYSCON_DATE : R/W ;bitpos:[27:0] ;default: 28'h2410160 ; */ /*description: .*/ #define MODEM_SYSCON_DATE 0x0FFFFFFF #define MODEM_SYSCON_DATE_M ((MODEM_SYSCON_DATE_V)<<(MODEM_SYSCON_DATE_S)) diff --git a/components/soc/esp32c5/include/modem/modem_syscon_struct.h b/components/soc/esp32c5/include/modem/modem_syscon_struct.h index 3e42205e60..a827dd2c60 100644 --- a/components/soc/esp32c5/include/modem/modem_syscon_struct.h +++ b/components/soc/esp32c5/include/modem/modem_syscon_struct.h @@ -152,6 +152,7 @@ typedef volatile struct { uint32_t val; } clk_conf1; uint32_t wifi_bb_cfg; + uint32_t fe_cfg; uint32_t mem_rf1_conf; uint32_t mem_rf2_conf; union { @@ -166,7 +167,7 @@ typedef volatile struct { extern modem_syscon_dev_t MODEM_SYSCON; #ifndef __cplusplus -_Static_assert(sizeof(modem_syscon_dev_t) == 0x28, "Invalid size of modem_syscon_dev_t structure"); +_Static_assert(sizeof(modem_syscon_dev_t) == 0x2c, "Invalid size of modem_syscon_dev_t structure"); #endif #ifdef __cplusplus