Skip to content

Commit 3655d4c

Browse files
committed
Merge branch 'feat/mipi_dsi_p4_eco5' into 'master'
ESP32P4 ECO5 register update: DSI/TIMG/ETM/DW_GDMA Closes IDF-13735, IDF-13429, IDF-13422, and IDF-13428 See merge request espressif/esp-idf!41568
2 parents 6acdf78 + 626fad9 commit 3655d4c

File tree

11 files changed

+64
-9365
lines changed

11 files changed

+64
-9365
lines changed

components/soc/esp32p4/include/soc/soc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#define REG_UHCI_BASE(i) (DR_REG_UHCI0_BASE) // only one UHCI on C6
2020
#define REG_UART_BASE(i) (DR_REG_UART_BASE + (i) * 0x1000) // UART0 and UART1
2121
#define UART_FIFO_AHB_REG(i) (REG_UART_BASE(i) + 0x0)
22-
#define REG_TIMG_BASE(i) (DR_REG_TIMERGROUP0_BASE + (i) * 0x1000) // TIMERG0 and TIMERG1
2322
#define REG_SPI_MEM_BASE(i) (DR_REG_FLASH_SPI0_BASE + (i) * 0x1000) // SPIMEM0 and SPIMEM1
2423
#define REG_SPI_BASE(i) (((i)>=2) ? (DR_REG_SPI2_BASE + (i-2) * 0x1000) : (0)) // GPSPI2 and GPSPI3
2524
#define REG_I2C_BASE(i) (DR_REG_I2C0_BASE + (i) * 0x1000)

components/soc/esp32p4/register/hw_ver1/soc/timer_group_reg.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
extern "C" {
1212
#endif
1313

14+
#define REG_TIMG_BASE(i) (DR_REG_TIMG0_BASE + (i) * 0x1000)
15+
1416
/** TIMG_T0CONFIG_REG register
1517
* Timer 0 configuration register
1618
*/

0 commit comments

Comments
 (0)