Skip to content

Commit ef619a4

Browse files
esp-lisQingzhaoYin
authored andcommitted
change(soc): update modem syscon and lpcon register and structure header files
1 parent 74f0ad5 commit ef619a4

File tree

4 files changed

+60
-9
lines changed

4 files changed

+60
-9
lines changed

components/soc/esp32c5/include/modem/modem_lpcon_reg.h

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,12 @@ extern "C" {
222222
#define MODEM_LPCON_CLK_WIFIPWR_ST_MAP_S 16
223223

224224
#define MODEM_LPCON_RST_CONF_REG (DR_REG_MODEM_LPCON_BASE + 0x24)
225+
/* MODEM_LPCON_RST_DCMEM : WO ;bitpos:[4] ;default: 1'b0 ; */
226+
/*description: .*/
227+
#define MODEM_LPCON_RST_DCMEM (BIT(4))
228+
#define MODEM_LPCON_RST_DCMEM_M (BIT(4))
229+
#define MODEM_LPCON_RST_DCMEM_V 0x1
230+
#define MODEM_LPCON_RST_DCMEM_S 4
225231
/* MODEM_LPCON_RST_LP_TIMER : WO ;bitpos:[3] ;default: 1'b0 ; */
226232
/*description: .*/
227233
#define MODEM_LPCON_RST_LP_TIMER (BIT(3))
@@ -365,8 +371,40 @@ extern "C" {
365371
#define MODEM_LPCON_CHAN_FREQ_MEM_EN_V 0x1
366372
#define MODEM_LPCON_CHAN_FREQ_MEM_EN_S 0
367373

368-
#define MODEM_LPCON_DATE_REG (DR_REG_MODEM_LPCON_BASE + 0x3C)
369-
/* MODEM_LPCON_DATE : R/W ;bitpos:[27:0] ;default: 28'h2311220 ; */
374+
#define MODEM_LPCON_DCMEM_VALID_0_REG (DR_REG_MODEM_LPCON_BASE + 0x3C)
375+
/* MODEM_LPCON_DCMEM_VALID_0 : RO ;bitpos:[31:0] ;default: 32'h0 ; */
376+
/*description: .*/
377+
#define MODEM_LPCON_DCMEM_VALID_0 0xFFFFFFFF
378+
#define MODEM_LPCON_DCMEM_VALID_0_M ((MODEM_LPCON_DCMEM_VALID_0_V)<<(MODEM_LPCON_DCMEM_VALID_0_S))
379+
#define MODEM_LPCON_DCMEM_VALID_0_V 0xFFFFFFFF
380+
#define MODEM_LPCON_DCMEM_VALID_0_S 0
381+
382+
#define MODEM_LPCON_DCMEM_VALID_1_REG (DR_REG_MODEM_LPCON_BASE + 0x40)
383+
/* MODEM_LPCON_DCMEM_VALID_1 : RO ;bitpos:[31:0] ;default: 32'h0 ; */
384+
/*description: .*/
385+
#define MODEM_LPCON_DCMEM_VALID_1 0xFFFFFFFF
386+
#define MODEM_LPCON_DCMEM_VALID_1_M ((MODEM_LPCON_DCMEM_VALID_1_V)<<(MODEM_LPCON_DCMEM_VALID_1_S))
387+
#define MODEM_LPCON_DCMEM_VALID_1_V 0xFFFFFFFF
388+
#define MODEM_LPCON_DCMEM_VALID_1_S 0
389+
390+
#define MODEM_LPCON_DCMEM_VALID_2_REG (DR_REG_MODEM_LPCON_BASE + 0x44)
391+
/* MODEM_LPCON_DCMEM_VALID_2 : RO ;bitpos:[31:0] ;default: 32'h0 ; */
392+
/*description: .*/
393+
#define MODEM_LPCON_DCMEM_VALID_2 0xFFFFFFFF
394+
#define MODEM_LPCON_DCMEM_VALID_2_M ((MODEM_LPCON_DCMEM_VALID_2_V)<<(MODEM_LPCON_DCMEM_VALID_2_S))
395+
#define MODEM_LPCON_DCMEM_VALID_2_V 0xFFFFFFFF
396+
#define MODEM_LPCON_DCMEM_VALID_2_S 0
397+
398+
#define MODEM_LPCON_DCMEM_VALID_3_REG (DR_REG_MODEM_LPCON_BASE + 0x48)
399+
/* MODEM_LPCON_DCMEM_VALID_3 : RO ;bitpos:[31:0] ;default: 32'h0 ; */
400+
/*description: .*/
401+
#define MODEM_LPCON_DCMEM_VALID_3 0xFFFFFFFF
402+
#define MODEM_LPCON_DCMEM_VALID_3_M ((MODEM_LPCON_DCMEM_VALID_3_V)<<(MODEM_LPCON_DCMEM_VALID_3_S))
403+
#define MODEM_LPCON_DCMEM_VALID_3_V 0xFFFFFFFF
404+
#define MODEM_LPCON_DCMEM_VALID_3_S 0
405+
406+
#define MODEM_LPCON_DATE_REG (DR_REG_MODEM_LPCON_BASE + 0x4C)
407+
/* MODEM_LPCON_DATE : R/W ;bitpos:[27:0] ;default: 28'h2410170 ; */
370408
/*description: .*/
371409
#define MODEM_LPCON_DATE 0x0FFFFFFF
372410
#define MODEM_LPCON_DATE_M ((MODEM_LPCON_DATE_V)<<(MODEM_LPCON_DATE_S))

components/soc/esp32c5/include/modem/modem_lpcon_struct.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ typedef volatile struct {
157157
uint32_t rst_coex : 1;
158158
uint32_t rst_i2c_mst : 1;
159159
uint32_t rst_lp_timer : 1;
160-
uint32_t reserved4 : 1;
160+
uint32_t rst_dcmem : 1;
161161
uint32_t reserved5 : 1;
162162
uint32_t reserved6 : 1;
163163
uint32_t reserved7 : 1;
@@ -231,6 +231,10 @@ typedef volatile struct {
231231
};
232232
uint32_t val;
233233
} apb_mem_sel;
234+
uint32_t dcmem_valid_0;
235+
uint32_t dcmem_valid_1;
236+
uint32_t dcmem_valid_2;
237+
uint32_t dcmem_valid_3;
234238
union {
235239
struct {
236240
uint32_t date : 28;
@@ -243,7 +247,7 @@ typedef volatile struct {
243247
extern modem_lpcon_dev_t MODEM_LPCON;
244248

245249
#ifndef __cplusplus
246-
_Static_assert(sizeof(modem_lpcon_dev_t) == 0x40, "Invalid size of modem_lpcon_dev_t structure");
250+
_Static_assert(sizeof(modem_lpcon_dev_t) == 0x50, "Invalid size of modem_lpcon_dev_t structure");
247251
#endif
248252

249253
#ifdef __cplusplus

components/soc/esp32c5/include/modem/modem_syscon_reg.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,24 +559,32 @@ extern "C" {
559559
#define MODEM_SYSCON_WIFI_BB_CFG_V 0xFFFFFFFF
560560
#define MODEM_SYSCON_WIFI_BB_CFG_S 0
561561

562-
#define MODEM_SYSCON_MEM_RF1_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x1C)
562+
#define MODEM_SYSCON_FE_CFG_REG (DR_REG_MODEM_SYSCON_BASE + 0x1C)
563+
/* MODEM_SYSCON_FE_CFG : R/W ;bitpos:[31:0] ;default: 32'h0 ; */
564+
/*description: .*/
565+
#define MODEM_SYSCON_FE_CFG 0xFFFFFFFF
566+
#define MODEM_SYSCON_FE_CFG_M ((MODEM_SYSCON_FE_CFG_V)<<(MODEM_SYSCON_FE_CFG_S))
567+
#define MODEM_SYSCON_FE_CFG_V 0xFFFFFFFF
568+
#define MODEM_SYSCON_FE_CFG_S 0
569+
570+
#define MODEM_SYSCON_MEM_RF1_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x20)
563571
/* MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL : R/W ;bitpos:[31:0] ;default: 32'h00002070 ; */
564572
/*description: .*/
565573
#define MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL 0xFFFFFFFF
566574
#define MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL_M ((MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL_V)<<(MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL_S))
567575
#define MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL_V 0xFFFFFFFF
568576
#define MODEM_SYSCON_MODEM_RF1_MEM_AUX_CTRL_S 0
569577

570-
#define MODEM_SYSCON_MEM_RF2_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x20)
578+
#define MODEM_SYSCON_MEM_RF2_CONF_REG (DR_REG_MODEM_SYSCON_BASE + 0x24)
571579
/* MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL : R/W ;bitpos:[31:0] ;default: 32'h00000000 ; */
572580
/*description: .*/
573581
#define MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL 0xFFFFFFFF
574582
#define MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL_M ((MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL_V)<<(MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL_S))
575583
#define MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL_V 0xFFFFFFFF
576584
#define MODEM_SYSCON_MODEM_RF2_MEM_AUX_CTRL_S 0
577585

578-
#define MODEM_SYSCON_DATE_REG (DR_REG_MODEM_SYSCON_BASE + 0x24)
579-
/* MODEM_SYSCON_DATE : R/W ;bitpos:[27:0] ;default: 28'h2312050 ; */
586+
#define MODEM_SYSCON_DATE_REG (DR_REG_MODEM_SYSCON_BASE + 0x28)
587+
/* MODEM_SYSCON_DATE : R/W ;bitpos:[27:0] ;default: 28'h2410160 ; */
580588
/*description: .*/
581589
#define MODEM_SYSCON_DATE 0x0FFFFFFF
582590
#define MODEM_SYSCON_DATE_M ((MODEM_SYSCON_DATE_V)<<(MODEM_SYSCON_DATE_S))

components/soc/esp32c5/include/modem/modem_syscon_struct.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ typedef volatile struct {
152152
uint32_t val;
153153
} clk_conf1;
154154
uint32_t wifi_bb_cfg;
155+
uint32_t fe_cfg;
155156
uint32_t mem_rf1_conf;
156157
uint32_t mem_rf2_conf;
157158
union {
@@ -166,7 +167,7 @@ typedef volatile struct {
166167
extern modem_syscon_dev_t MODEM_SYSCON;
167168

168169
#ifndef __cplusplus
169-
_Static_assert(sizeof(modem_syscon_dev_t) == 0x28, "Invalid size of modem_syscon_dev_t structure");
170+
_Static_assert(sizeof(modem_syscon_dev_t) == 0x2c, "Invalid size of modem_syscon_dev_t structure");
170171
#endif
171172

172173
#ifdef __cplusplus

0 commit comments

Comments
 (0)