From d4a821a03ea4f16fc01d19ab14563e716e060fb2 Mon Sep 17 00:00:00 2001
From: "yanzihan@espressif.com" <yanzihan@espressif.com>
Date: Tue, 19 Aug 2025 15:58:56 +0800
Subject: [PATCH 1/2] feat(clk): add 100m/200m/400m cpu freq & change clk cal &
 change blk version

---
 components/bootloader/Kconfig.projbuild       |  3 +-
 .../esp_hw_support/port/esp32p4/pmu_param.c   |  4 +-
 .../esp_hw_support/port/esp32p4/pmu_pvt.c     |  6 +--
 .../esp_hw_support/port/esp32p4/rtc_clk.c     | 50 ++++++++++++++++++-
 .../esp_hw_support/port/esp32p4/rtc_time.c    |  2 +-
 .../esp_system/port/soc/esp32p4/Kconfig.cpu   |  7 ++-
 .../hal/esp32p4/include/hal/clk_tree_ll.h     |  3 ++
 .../soc/esp32p4/include/soc/clk_tree_defs.h   |  1 +
 8 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild
index e63a67da5b..4076357b2a 100644
--- a/components/bootloader/Kconfig.projbuild
+++ b/components/bootloader/Kconfig.projbuild
@@ -43,7 +43,8 @@ menu "Bootloader config"
         int
         default 64 if IDF_TARGET_ESP32H2
         default 48 if IDF_TARGET_ESP32H21 || IDF_TARGET_ESP32H4
-        default 90 if IDF_TARGET_ESP32P4
+        default 90 if IDF_TARGET_ESP32P4 && ESP32P4_SELECTS_REV_LESS_V2
+        default 100 if IDF_TARGET_ESP32P4 && !ESP32P4_SELECTS_REV_LESS_V2
         default 80
         help
             The CPU clock frequency to be at least raised to in 2nd bootloader. Invisible for users.
diff --git a/components/esp_hw_support/port/esp32p4/pmu_param.c b/components/esp_hw_support/port/esp32p4/pmu_param.c
index d49ed3a67b..f1dbecfb8b 100644
--- a/components/esp_hw_support/port/esp32p4/pmu_param.c
+++ b/components/esp_hw_support/port/esp32p4/pmu_param.c
@@ -336,7 +336,7 @@ uint32_t get_act_hp_dbias(void)
     uint32_t hp_cali_dbias = HP_CALI_ACTIVE_DBIAS_DEFAULT;
     uint32_t blk_version = efuse_hal_blk_version();
     uint32_t hp_cali_dbias_efuse = 0;
-    if (blk_version >= 2) {
+    if (blk_version >= 2 && blk_version < 100) {
         hp_cali_dbias_efuse = efuse_ll_get_active_hp_dbias();
     }
     if (hp_cali_dbias_efuse > 0) {
@@ -357,7 +357,7 @@ uint32_t get_act_lp_dbias(void)
     uint32_t lp_cali_dbias = LP_CALI_ACTIVE_DBIAS_DEFAULT;
     uint32_t blk_version = efuse_hal_blk_version();
     uint32_t lp_cali_dbias_efuse = 0;
-    if (blk_version >= 2) {
+    if (blk_version >= 2 && blk_version < 100) {
         lp_cali_dbias_efuse = efuse_ll_get_active_lp_dbias();
     }
     if (lp_cali_dbias_efuse > 0) {
diff --git a/components/esp_hw_support/port/esp32p4/pmu_pvt.c b/components/esp_hw_support/port/esp32p4/pmu_pvt.c
index 4c99b938c6..1eda49d0cc 100644
--- a/components/esp_hw_support/port/esp32p4/pmu_pvt.c
+++ b/components/esp_hw_support/port/esp32p4/pmu_pvt.c
@@ -33,7 +33,7 @@ static uint8_t get_lp_hp_gap(void)
     int8_t lp_hp_gap = 0;
     uint32_t blk_version = efuse_hal_blk_version();
     uint8_t lp_hp_gap_efuse = 0;
-    if (blk_version >= 2) {
+    if (blk_version >= 2 && blk_version < 100) {
         lp_hp_gap_efuse = efuse_ll_get_dbias_vol_gap();
         bool gap_flag = lp_hp_gap_efuse >> 4;
         uint8_t gap_abs_value = lp_hp_gap_efuse & 0xf;
@@ -77,7 +77,7 @@ static uint32_t pvt_get_lp_dbias(void)
 void pvt_auto_dbias_init(void)
 {
     uint32_t blk_version = efuse_hal_blk_version();
-    if (blk_version >= 2) {
+    if (blk_version >= 2 && blk_version < 100) {
         SET_PERI_REG_MASK(HP_SYS_CLKRST_REF_CLK_CTRL2_REG, HP_SYS_CLKRST_REG_REF_160M_CLK_EN);
         SET_PERI_REG_MASK(HP_SYS_CLKRST_SOC_CLK_CTRL1_REG, HP_SYS_CLKRST_REG_PVT_SYS_CLK_EN);
         /*config for dbias func*/
@@ -120,7 +120,7 @@ void pvt_auto_dbias_init(void)
 void pvt_func_enable(bool enable)
 {
     uint32_t blk_version = efuse_hal_blk_version();
-    if (blk_version >= 2){
+    if (blk_version >= 2 && blk_version < 100){
 
         if (enable) {
             SET_PERI_REG_MASK(HP_SYS_CLKRST_REF_CLK_CTRL2_REG, HP_SYS_CLKRST_REG_REF_160M_CLK_EN);
diff --git a/components/esp_hw_support/port/esp32p4/rtc_clk.c b/components/esp_hw_support/port/esp32p4/rtc_clk.c
index 86931160b9..4c3151f9bf 100644
--- a/components/esp_hw_support/port/esp32p4/rtc_clk.c
+++ b/components/esp_hw_support/port/esp32p4/rtc_clk.c
@@ -224,6 +224,7 @@ static void rtc_clk_cpu_freq_to_cpll_mhz(int cpu_freq_mhz, hal_utils_clk_div_t *
     uint32_t mem_divider = 1;
     uint32_t sys_divider = 1; // We are not going to change this
     uint32_t apb_divider = 1;
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
     switch (cpu_freq_mhz) {
     case 360:
         mem_divider = 2;
@@ -244,6 +245,28 @@ static void rtc_clk_cpu_freq_to_cpll_mhz(int cpu_freq_mhz, hal_utils_clk_div_t *
         // To avoid such case, we will strictly do abort here.
         abort();
     }
+#else
+    switch (cpu_freq_mhz) {
+    case 400:
+        mem_divider = 2;
+        apb_divider = 2;
+        break;
+    case 200:
+        mem_divider = 1;
+        apb_divider = 2;
+        break;
+    case 100:
+        mem_divider = 1;
+        apb_divider = 1;
+        break;
+    default:
+        // Unsupported configuration
+        // This is dangerous to modify dividers. Hardware could automatically correct the divider, and it won't be
+        // reflected to the registers. Therefore, you won't even be able to calculate out the real mem_clk, apb_clk freq.
+        // To avoid such case, we will strictly do abort here.
+        abort();
+    }
+#endif
 
     // If it's upscaling, the divider of MEM/SYS/APB needs to be increased, to avoid illegal intermediate states,
     // the clock divider should be updated in the order from the APB_CLK to CPU_CLK.
@@ -289,6 +312,7 @@ bool rtc_clk_cpu_freq_mhz_to_config(uint32_t freq_mhz, rtc_cpu_freq_config_t *ou
 
     // Keep default CPLL at 360MHz
     uint32_t xtal_freq = (uint32_t)rtc_clk_xtal_freq_get();
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
     if (freq_mhz <= xtal_freq && freq_mhz != 0) {
         divider.integer = xtal_freq / freq_mhz;
         real_freq_mhz = (xtal_freq + divider.integer / 2) / divider.integer; /* round */
@@ -296,7 +320,6 @@ bool rtc_clk_cpu_freq_mhz_to_config(uint32_t freq_mhz, rtc_cpu_freq_config_t *ou
             // no suitable divider
             return false;
         }
-
         source_freq_mhz = xtal_freq;
         source = SOC_CPU_CLK_SRC_XTAL;
     } else if (freq_mhz == 90) {
@@ -314,6 +337,30 @@ bool rtc_clk_cpu_freq_mhz_to_config(uint32_t freq_mhz, rtc_cpu_freq_config_t *ou
         source = SOC_CPU_CLK_SRC_CPLL;
         source_freq_mhz = CLK_LL_PLL_360M_FREQ_MHZ;
         divider.integer = 1;
+    } else {
+        // unsupported frequency
+        return false;
+    }
+#else
+    if (freq_mhz <= xtal_freq && freq_mhz != 0) {
+        divider.integer = xtal_freq / freq_mhz;
+        real_freq_mhz = (xtal_freq + divider.integer / 2) / divider.integer; /* round */
+        if (real_freq_mhz != freq_mhz) {
+            // no suitable divider
+            return false;
+        }
+        source_freq_mhz = xtal_freq;
+        source = SOC_CPU_CLK_SRC_XTAL;
+    } else if (freq_mhz == 100) {
+        real_freq_mhz = freq_mhz;
+        source = SOC_CPU_CLK_SRC_CPLL;
+        source_freq_mhz = CLK_LL_PLL_400M_FREQ_MHZ;
+        divider.integer = 4;
+    } else if (freq_mhz == 200) {
+        real_freq_mhz = freq_mhz;
+        source = SOC_CPU_CLK_SRC_CPLL;
+        source_freq_mhz = CLK_LL_PLL_400M_FREQ_MHZ;
+        divider.integer = 2;
     } else if (freq_mhz == 400) {
         // If CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ selects 400MHz, then at app startup stage will need a CPLL calibration to raise its freq from 360MHz to 400MHz
         real_freq_mhz = freq_mhz;
@@ -324,6 +371,7 @@ bool rtc_clk_cpu_freq_mhz_to_config(uint32_t freq_mhz, rtc_cpu_freq_config_t *ou
         // unsupported frequency
         return false;
     }
+#endif
     *out_config = (rtc_cpu_freq_config_t) {
         .source = source,
         .div = divider,
diff --git a/components/esp_hw_support/port/esp32p4/rtc_time.c b/components/esp_hw_support/port/esp32p4/rtc_time.c
index ffbd10ef39..159345ba83 100644
--- a/components/esp_hw_support/port/esp32p4/rtc_time.c
+++ b/components/esp_hw_support/port/esp32p4/rtc_time.c
@@ -182,7 +182,7 @@ static bool rtc_clk_cal_32k_valid(uint32_t xtal_freq, uint32_t slowclk_cycles, u
 
 uint32_t rtc_clk_cal(soc_clk_freq_calculation_src_t cal_clk_sel, uint32_t slowclk_cycles)
 {
-    slowclk_cycles /= (cal_clk_sel == CLK_CAL_RTC_SLOW) ? 1 : CLK_CAL_DIV_VAL(cal_clk_sel);
+    // slowclk_cycles /= (cal_clk_sel == CLK_CAL_RTC_SLOW) ? 1 : CLK_CAL_DIV_VAL(cal_clk_sel);
     assert(slowclk_cycles);
     soc_xtal_freq_t xtal_freq = rtc_clk_xtal_freq_get();
     uint64_t xtal_cycles = rtc_clk_cal_internal(cal_clk_sel, slowclk_cycles);
diff --git a/components/esp_system/port/soc/esp32p4/Kconfig.cpu b/components/esp_system/port/soc/esp32p4/Kconfig.cpu
index 18ad802598..9a9ab5c095 100644
--- a/components/esp_system/port/soc/esp32p4/Kconfig.cpu
+++ b/components/esp_system/port/soc/esp32p4/Kconfig.cpu
@@ -1,7 +1,8 @@
 choice ESP_DEFAULT_CPU_FREQ_MHZ
     prompt "CPU frequency"
     default ESP_DEFAULT_CPU_FREQ_MHZ_40 if IDF_ENV_FPGA || ESP_BRINGUP_BYPASS_CPU_CLK_SETTING
-    default ESP_DEFAULT_CPU_FREQ_MHZ_360
+    default ESP_DEFAULT_CPU_FREQ_MHZ_360 if ESP32P4_SELECTS_REV_LESS_V2
+    default ESP_DEFAULT_CPU_FREQ_MHZ_400
     help
         CPU frequency to be set on application startup.
 
@@ -10,9 +11,13 @@ choice ESP_DEFAULT_CPU_FREQ_MHZ
         depends on IDF_ENV_FPGA || ESP_BRINGUP_BYPASS_CPU_CLK_SETTING
     config ESP_DEFAULT_CPU_FREQ_MHZ_360
         bool "360 MHz"
+        depends on ESP32P4_SELECTS_REV_LESS_V2
+    config ESP_DEFAULT_CPU_FREQ_MHZ_400
+        bool "400 MHz"
 endchoice
 
 config ESP_DEFAULT_CPU_FREQ_MHZ
     int
     default 40 if ESP_DEFAULT_CPU_FREQ_MHZ_40
     default 360 if ESP_DEFAULT_CPU_FREQ_MHZ_360
+    default 400 if ESP_DEFAULT_CPU_FREQ_MHZ_400
diff --git a/components/hal/esp32p4/include/hal/clk_tree_ll.h b/components/hal/esp32p4/include/hal/clk_tree_ll.h
index 6b56df44e7..a3ec789860 100644
--- a/components/hal/esp32p4/include/hal/clk_tree_ll.h
+++ b/components/hal/esp32p4/include/hal/clk_tree_ll.h
@@ -771,6 +771,9 @@ static inline __attribute__((always_inline)) void clk_ll_freq_calulation_set_tar
     case CLK_CAL_LP_PLL:
         timg_cali_clk_sel = 11;
         break;
+    case CLK_CAL_DSI_DPHY:
+        timg_cali_clk_sel = 12;
+        break;
     default:
         // Unsupported CLK_CAL mux input
         abort();
diff --git a/components/soc/esp32p4/include/soc/clk_tree_defs.h b/components/soc/esp32p4/include/soc/clk_tree_defs.h
index c1a0edeb89..765b7032ad 100644
--- a/components/soc/esp32p4/include/soc/clk_tree_defs.h
+++ b/components/soc/esp32p4/include/soc/clk_tree_defs.h
@@ -801,6 +801,7 @@ typedef enum {
     CLK_CAL_RC32K,                                   /*!< Select to calculate frequency of RC32K_CLK */
     CLK_CAL_32K_XTAL,                                /*!< Select to calculate frequency of XTAL32K_CLK */
     CLK_CAL_LP_PLL,                                  /*!< Select to calculate frequency of LP_PLL_CLK */
+    CLK_CAL_DSI_DPHY,                                /*!< Select to calculate frequency of DSI_DPHY_lanebyteclk */
 } soc_clk_freq_calculation_src_t;
 
 #ifdef __cplusplus

From 179d00a6f8d0b031a221240072d346a1136de8b5 Mon Sep 17 00:00:00 2001
From: armando <douyiwen@espressif.com>
Date: Wed, 20 Aug 2025 14:30:35 +0800
Subject: [PATCH 2/2] feat(p4): p4 rev3 real chip support

---
 Kconfig                                       |  2 -
 components/bootloader/Kconfig.projbuild       |  4 +-
 .../bootloader/subproject/CMakeLists.txt      |  4 +-
 ...{bootloader.rev2.ld => bootloader.rev3.ld} |  0
 .../src/bootloader_flash_config_esp32p4.c     |  1 +
 .../bootloader_support/src/esp_image_format.c |  2 +-
 components/esp_hw_support/Kconfig             |  2 -
 .../port/esp32p4/Kconfig.hw_support           | 37 +++++++++++--------
 .../esp_hw_support/port/esp32p4/rtc_clk.c     |  4 +-
 .../esp_hw_support/port/esp32p4/rtc_time.c    |  2 +-
 components/esp_rom/CMakeLists.txt             | 14 +++----
 components/esp_system/CMakeLists.txt          |  2 +-
 components/esp_system/fpga_overrides_clk.c    |  2 +-
 components/esp_system/ld/esp32p4/memory.ld.in |  4 +-
 ...ections.rev2.ld.in => sections.rev3.ld.in} |  0
 components/esp_system/ld/ld.cmake             |  4 +-
 components/esp_system/port/cpu_start.c        |  8 ++--
 .../esp_system/port/soc/esp32p4/Kconfig.cpu   |  4 +-
 components/heap/port/esp32p4/memory_layout.c  |  6 +--
 components/heap/port/memory_layout_utils.c    |  2 +-
 .../include/esp_private/interrupt_clic.h      |  4 +-
 components/soc/CMakeLists.txt                 |  4 +-
 .../{hw_ver2 => hw_ver3}/soc/adc_eco5_reg.h   |  0
 .../soc/adc_eco5_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/adc_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/adc_struct.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/aes_eco5_reg.h   |  0
 .../{hw_ver2 => hw_ver3}/soc/aes_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/aes_struct.h     |  0
 .../soc/ahb_dma_eco5_struct.h                 |  0
 .../{hw_ver2 => hw_ver3}/soc/ahb_dma_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/ahb_dma_struct.h |  0
 .../soc/assist_debug_reg.h                    |  0
 .../soc/assist_debug_struct.h                 |  0
 .../soc/axi_dma_eco5_struct.h                 |  0
 .../{hw_ver2 => hw_ver3}/soc/axi_dma_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/axi_dma_struct.h |  0
 .../soc/axi_perf_mon_reg.h                    |  0
 .../soc/axi_perf_mon_struct.h                 |  0
 .../soc/bitscrambler_eco5_struct.h            |  0
 .../soc/bitscrambler_reg.h                    |  0
 .../soc/bitscrambler_struct.h                 |  0
 .../{hw_ver2 => hw_ver3}/soc/cache_reg.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/cache_struct.h   |  0
 .../{hw_ver2 => hw_ver3}/soc/dma2d_eco5_reg.h |  0
 .../soc/dma2d_eco5_struct.h                   |  0
 .../{hw_ver2 => hw_ver3}/soc/dma2d_reg.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/dma2d_struct.h   |  0
 .../soc/dma_pms_eco5_reg.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/dma_pms_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/dma_pms_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/ds_reg.h         |  0
 .../{hw_ver2 => hw_ver3}/soc/ds_struct.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/dw_gdma_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/dw_gdma_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/ecc_mult_reg.h   |  0
 .../soc/ecc_mult_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/ecdsa_eco5_reg.h |  0
 .../{hw_ver2 => hw_ver3}/soc/ecdsa_reg.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/ecdsa_struct.h   |  0
 .../soc/efuse_eco5_struct.h                   |  0
 .../{hw_ver2 => hw_ver3}/soc/efuse_reg.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/efuse_struct.h   |  0
 .../soc/emac_dma_struct.h                     |  0
 .../soc/emac_mac_struct.h                     |  0
 .../soc/emac_ptp_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/emac_reg.h       |  0
 .../soc/gpio_ext_eco5_struct.h                |  0
 .../{hw_ver2 => hw_ver3}/soc/gpio_ext_reg.h   |  0
 .../soc/gpio_ext_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/gpio_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/gpio_sig_map.h   |  0
 .../{hw_ver2 => hw_ver3}/soc/gpio_struct.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/h264_dma_reg.h   |  0
 .../soc/h264_dma_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/h264_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/h264_struct.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/hmac_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/hmac_struct.h    |  0
 .../soc/hp2lp_peri_pms_eco5_reg.h             |  0
 .../soc/hp2lp_peri_pms_reg.h                  |  0
 .../soc/hp2lp_peri_pms_struct.h               |  0
 .../soc/hp_peri_pms_eco5_reg.h                |  0
 .../soc/hp_peri_pms_reg.h                     |  0
 .../soc/hp_peri_pms_struct.h                  |  0
 .../soc/hp_sys_clkrst_reg.h                   |  0
 .../soc/hp_sys_clkrst_struct.h                |  0
 .../{hw_ver2 => hw_ver3}/soc/hp_system_reg.h  |  0
 .../soc/hp_system_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/huk_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/huk_struct.h     |  0
 .../soc/i2c_ana_mst_reg.h                     |  0
 .../soc/i2c_ana_mst_struct.h                  |  0
 .../{hw_ver2 => hw_ver3}/soc/i2c_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/i2c_struct.h     |  0
 .../soc/i2s_eco5_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/i2s_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/i2s_struct.h     |  0
 .../soc/i3c_mst_mem_reg.h                     |  0
 .../soc/i3c_mst_mem_struct.h                  |  0
 .../{hw_ver2 => hw_ver3}/soc/i3c_mst_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/i3c_mst_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/i3c_slv_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/i3c_slv_struct.h |  0
 .../soc/icm_sys_qos_reg.h                     |  0
 .../soc/icm_sys_qos_struct.h                  |  0
 .../{hw_ver2 => hw_ver3}/soc/icm_sys_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/icm_sys_struct.h |  0
 .../soc/interrupt_core0_reg.h                 |  0
 .../soc/interrupt_core0_struct.h              |  0
 .../soc/interrupt_core1_reg.h                 |  0
 .../soc/interrupt_core1_struct.h              |  0
 .../{hw_ver2 => hw_ver3}/soc/interrupts.h     |  0
 .../soc/io_mux_eco5_reg.h                     |  0
 .../soc/io_mux_eco5_struct.h                  |  0
 .../{hw_ver2 => hw_ver3}/soc/io_mux_reg.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/io_mux_struct.h  |  0
 .../soc/iomux_mspi_pin_reg.h                  |  0
 .../soc/iomux_mspi_pin_struct.h               |  0
 .../soc/isp_eco5_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/isp_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/isp_struct.h     |  0
 .../soc/jpeg_eco5_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/jpeg_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/jpeg_struct.h    |  0
 .../soc/keymng_eco5_reg.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/keymng_reg.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/keymng_struct.h  |  0
 .../soc/lcd_cam_eco5_struct.h                 |  0
 .../{hw_ver2 => hw_ver3}/soc/lcd_cam_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/lcd_cam_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/ledc_eco5_reg.h  |  0
 .../soc/ledc_eco5_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/ledc_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/ledc_struct.h    |  0
 .../soc/lp2hp_peri_pms_eco5_reg.h             |  0
 .../soc/lp2hp_peri_pms_reg.h                  |  0
 .../soc/lp2hp_peri_pms_struct.h               |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_adc_reg.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_adc_struct.h  |  0
 .../soc/lp_analog_peri_reg.h                  |  0
 .../soc/lp_analog_peri_struct.h               |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_clkrst_reg.h  |  0
 .../soc/lp_clkrst_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_gpio_reg.h    |  0
 .../soc/lp_gpio_sig_map.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_gpio_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_i2c_reg.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_i2c_struct.h  |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_i2s_reg.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_i2s_struct.h  |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_intr_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_intr_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_iomux_reg.h   |  0
 .../soc/lp_iomux_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_mailbox_reg.h |  0
 .../soc/lp_mailbox_struct.h                   |  0
 .../soc/lp_peri_pms_eco5_reg.h                |  0
 .../soc/lp_peri_pms_reg.h                     |  0
 .../soc/lp_peri_pms_struct.h                  |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_spi_reg.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_spi_struct.h  |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_system_reg.h  |  0
 .../soc/lp_system_struct.h                    |  6 +--
 .../soc/lp_timer_eco5_struct.h                |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_timer_reg.h   |  0
 .../soc/lp_timer_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_uart_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_uart_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_wdt_reg.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/lp_wdt_struct.h  |  0
 .../{hw_ver2 => hw_ver3}/soc/lpperi_reg.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/lpperi_struct.h  |  0
 .../soc/mcpwm_eco5_struct.h                   |  0
 .../{hw_ver2 => hw_ver3}/soc/mcpwm_reg.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/mcpwm_struct.h   |  0
 .../soc/mem_monitor_reg.h                     |  0
 .../soc/mem_monitor_struct.h                  |  0
 .../soc/mipi_csi_bridge_eco5_struct.h         |  0
 .../soc/mipi_csi_bridge_reg.h                 |  0
 .../soc/mipi_csi_bridge_struct.h              |  0
 .../soc/mipi_csi_host_eco5_struct.h           |  0
 .../soc/mipi_csi_host_reg.h                   |  0
 .../soc/mipi_csi_host_struct.h                |  0
 .../soc/mipi_dsi_bridge_reg.h                 |  0
 .../soc/mipi_dsi_bridge_struct.h              |  0
 .../soc/mipi_dsi_host_reg.h                   |  0
 .../soc/mipi_dsi_host_struct.h                |  0
 .../{hw_ver2 => hw_ver3}/soc/parl_io_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/parl_io_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/pau_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/pau_struct.h     |  0
 .../soc/pcnt_eco5_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/pcnt_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/pcnt_struct.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/pmu_eco5_reg.h   |  0
 .../soc/pmu_eco5_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/pmu_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/pmu_struct.h     |  0
 .../soc/ppa_eco5_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/ppa_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/ppa_struct.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/pvt_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/pvt_struct.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/reg_base.h       |  0
 .../soc/rmt_eco5_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/rmt_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/rmt_struct.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/rsa_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/rsa_struct.h     |  0
 .../soc/rtclockcali_reg.h                     |  0
 .../soc/rtclockcali_struct.h                  |  0
 .../soc/sdmmc_eco5_struct.h                   |  0
 .../{hw_ver2 => hw_ver3}/soc/sdmmc_reg.h      | 28 ++++++++++++++
 .../{hw_ver2 => hw_ver3}/soc/sdmmc_struct.h   |  0
 .../{hw_ver2 => hw_ver3}/soc/sha_eco5_reg.h   |  0
 .../{hw_ver2 => hw_ver3}/soc/sha_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/sha_struct.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/soc_etm_reg.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/soc_etm_struct.h |  0
 .../{hw_ver2 => hw_ver3}/soc/spi1_mem_c_reg.h |  0
 .../soc/spi1_mem_c_struct.h                   |  0
 .../{hw_ver2 => hw_ver3}/soc/spi1_mem_s_reg.h |  0
 .../soc/spi1_mem_s_struct.h                   |  0
 .../soc/spi_eco5_struct.h                     |  0
 .../{hw_ver2 => hw_ver3}/soc/spi_mem_c_reg.h  |  0
 .../soc/spi_mem_c_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/spi_mem_s_reg.h  |  0
 .../soc/spi_mem_s_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/spi_reg.h        |  0
 .../{hw_ver2 => hw_ver3}/soc/spi_struct.h     |  0
 .../{hw_ver2 => hw_ver3}/soc/systimer_reg.h   |  0
 .../soc/systimer_struct.h                     |  0
 .../soc/timer_group_reg.h                     |  0
 .../soc/timer_group_struct.h                  |  0
 .../{hw_ver2 => hw_ver3}/soc/touch_reg.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/touch_struct.h   |  0
 .../{hw_ver2 => hw_ver3}/soc/trace_reg.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/trace_struct.h   |  0
 .../{hw_ver2 => hw_ver3}/soc/trng_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/trng_struct.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/tsens_reg.h      |  0
 .../{hw_ver2 => hw_ver3}/soc/tsens_struct.h   |  0
 .../soc/twai_eco5_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/twai_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/twai_struct.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/uart_eco5_reg.h  |  0
 .../soc/uart_eco5_struct.h                    |  0
 .../{hw_ver2 => hw_ver3}/soc/uart_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/uart_struct.h    |  0
 .../{hw_ver2 => hw_ver3}/soc/uhci_reg.h       |  0
 .../{hw_ver2 => hw_ver3}/soc/uhci_struct.h    |  0
 .../soc/usb_serial_jtag_reg.h                 |  0
 .../soc/usb_serial_jtag_struct.h              |  0
 .../soc/usb_utmi_struct.h                     |  0
 .../soc/usb_wrap_eco5_struct.h                |  0
 .../{hw_ver2 => hw_ver3}/soc/usb_wrap_reg.h   |  0
 .../soc/usb_wrap_struct.h                     |  0
 .../build_test/sdkconfig.ci.esp32p4_rev3      |  3 ++
 259 files changed, 91 insertions(+), 58 deletions(-)
 rename components/bootloader/subproject/main/ld/esp32p4/{bootloader.rev2.ld => bootloader.rev3.ld} (100%)
 rename components/esp_system/ld/esp32p4/{sections.rev2.ld.in => sections.rev3.ld.in} (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/adc_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/adc_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/adc_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/adc_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/aes_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/aes_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/aes_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ahb_dma_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ahb_dma_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ahb_dma_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/assist_debug_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/assist_debug_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/axi_dma_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/axi_dma_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/axi_dma_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/axi_perf_mon_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/axi_perf_mon_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/bitscrambler_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/bitscrambler_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/bitscrambler_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/cache_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/cache_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dma2d_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dma2d_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dma2d_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dma2d_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dma_pms_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dma_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dma_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ds_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ds_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dw_gdma_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/dw_gdma_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ecc_mult_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ecc_mult_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ecdsa_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ecdsa_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ecdsa_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/efuse_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/efuse_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/efuse_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/emac_dma_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/emac_mac_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/emac_ptp_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/emac_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/gpio_ext_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/gpio_ext_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/gpio_ext_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/gpio_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/gpio_sig_map.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/gpio_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/h264_dma_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/h264_dma_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/h264_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/h264_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hmac_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hmac_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp2lp_peri_pms_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp2lp_peri_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp2lp_peri_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp_peri_pms_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp_peri_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp_peri_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp_sys_clkrst_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp_sys_clkrst_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp_system_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/hp_system_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/huk_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/huk_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i2c_ana_mst_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i2c_ana_mst_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i2c_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i2c_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i2s_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i2s_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i2s_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i3c_mst_mem_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i3c_mst_mem_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i3c_mst_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i3c_mst_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i3c_slv_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/i3c_slv_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/icm_sys_qos_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/icm_sys_qos_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/icm_sys_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/icm_sys_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/interrupt_core0_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/interrupt_core0_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/interrupt_core1_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/interrupt_core1_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/interrupts.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/io_mux_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/io_mux_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/io_mux_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/io_mux_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/iomux_mspi_pin_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/iomux_mspi_pin_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/isp_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/isp_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/isp_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/jpeg_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/jpeg_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/jpeg_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/keymng_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/keymng_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/keymng_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lcd_cam_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lcd_cam_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lcd_cam_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ledc_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ledc_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ledc_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ledc_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp2hp_peri_pms_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp2hp_peri_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp2hp_peri_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_adc_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_adc_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_analog_peri_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_analog_peri_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_clkrst_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_clkrst_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_gpio_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_gpio_sig_map.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_gpio_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_i2c_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_i2c_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_i2s_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_i2s_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_intr_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_intr_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_iomux_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_iomux_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_mailbox_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_mailbox_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_peri_pms_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_peri_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_peri_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_spi_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_spi_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_system_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_system_struct.h (99%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_timer_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_timer_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_timer_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_uart_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_uart_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_wdt_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lp_wdt_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lpperi_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/lpperi_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mcpwm_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mcpwm_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mcpwm_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mem_monitor_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mem_monitor_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_csi_bridge_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_csi_bridge_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_csi_bridge_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_csi_host_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_csi_host_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_csi_host_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_dsi_bridge_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_dsi_bridge_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_dsi_host_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/mipi_dsi_host_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/parl_io_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/parl_io_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pau_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pau_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pcnt_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pcnt_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pcnt_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pmu_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pmu_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pmu_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pmu_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ppa_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ppa_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/ppa_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pvt_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/pvt_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/reg_base.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/rmt_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/rmt_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/rmt_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/rsa_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/rsa_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/rtclockcali_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/rtclockcali_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/sdmmc_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/sdmmc_reg.h (98%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/sdmmc_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/sha_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/sha_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/sha_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/soc_etm_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/soc_etm_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi1_mem_c_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi1_mem_c_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi1_mem_s_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi1_mem_s_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi_mem_c_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi_mem_c_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi_mem_s_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi_mem_s_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/spi_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/systimer_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/systimer_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/timer_group_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/timer_group_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/touch_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/touch_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/trace_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/trace_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/trng_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/trng_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/tsens_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/tsens_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/twai_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/twai_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/twai_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/uart_eco5_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/uart_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/uart_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/uart_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/uhci_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/uhci_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/usb_serial_jtag_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/usb_serial_jtag_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/usb_utmi_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/usb_wrap_eco5_struct.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/usb_wrap_reg.h (100%)
 rename components/soc/esp32p4/register/{hw_ver2 => hw_ver3}/soc/usb_wrap_struct.h (100%)
 create mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.esp32p4_rev3

diff --git a/Kconfig b/Kconfig
index 8ad408bea2..5e19164a5e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -123,8 +123,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
         bool
         default "y" if IDF_TARGET="esp32p4"
         select IDF_TARGET_ARCH_RISCV
-        select IDF_ENV_FPGA if ESP32P4_REV_MIN_200
-        select IDF_ENV_BRINGUP if ESP32P4_REV_MIN_200
 
     config IDF_TARGET_ESP32H2
         bool
diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild
index 4076357b2a..fdd30c9223 100644
--- a/components/bootloader/Kconfig.projbuild
+++ b/components/bootloader/Kconfig.projbuild
@@ -43,8 +43,8 @@ menu "Bootloader config"
         int
         default 64 if IDF_TARGET_ESP32H2
         default 48 if IDF_TARGET_ESP32H21 || IDF_TARGET_ESP32H4
-        default 90 if IDF_TARGET_ESP32P4 && ESP32P4_SELECTS_REV_LESS_V2
-        default 100 if IDF_TARGET_ESP32P4 && !ESP32P4_SELECTS_REV_LESS_V2
+        default 90 if IDF_TARGET_ESP32P4 && ESP32P4_SELECTS_REV_LESS_V3
+        default 100 if IDF_TARGET_ESP32P4 && !ESP32P4_SELECTS_REV_LESS_V3
         default 80
         help
             The CPU clock frequency to be at least raised to in 2nd bootloader. Invisible for users.
diff --git a/components/bootloader/subproject/CMakeLists.txt b/components/bootloader/subproject/CMakeLists.txt
index 1ae6bec7f4..5503db2ddb 100644
--- a/components/bootloader/subproject/CMakeLists.txt
+++ b/components/bootloader/subproject/CMakeLists.txt
@@ -69,8 +69,8 @@ idf_build_set_property(__OUTPUT_SDKCONFIG 0)
 set(LD_DEFAULT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/main/ld/${IDF_TARGET}")
 idf_build_set_property(BOOTLOADER_LINKER_SCRIPT "${LD_DEFAULT_PATH}/bootloader.rom.ld" APPEND)
 project(bootloader)
-if(CONFIG_ESP32P4_REV_MIN_200)
-    target_linker_script("__idf_main" INTERFACE "${LD_DEFAULT_PATH}/bootloader.rev2.ld")
+if(CONFIG_ESP32P4_REV_MIN_300)
+    target_linker_script("__idf_main" INTERFACE "${LD_DEFAULT_PATH}/bootloader.rev3.ld")
 else()
     target_linker_script("__idf_main" INTERFACE "${LD_DEFAULT_PATH}/bootloader.ld")
 endif()
diff --git a/components/bootloader/subproject/main/ld/esp32p4/bootloader.rev2.ld b/components/bootloader/subproject/main/ld/esp32p4/bootloader.rev3.ld
similarity index 100%
rename from components/bootloader/subproject/main/ld/esp32p4/bootloader.rev2.ld
rename to components/bootloader/subproject/main/ld/esp32p4/bootloader.rev3.ld
diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32p4.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32p4.c
index bcfa71ff9a..d9ed551c3f 100644
--- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32p4.c
+++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32p4.c
@@ -224,6 +224,7 @@ static void bootloader_spi_flash_resume(void)
 
 esp_err_t bootloader_init_spi_flash(void)
 {
+    bootloader_init_mspi_clock();
     bootloader_init_flash_configure();
 
 #if CONFIG_BOOTLOADER_FLASH_DC_AWARE
diff --git a/components/bootloader_support/src/esp_image_format.c b/components/bootloader_support/src/esp_image_format.c
index b31e705f7b..90aa13b491 100644
--- a/components/bootloader_support/src/esp_image_format.c
+++ b/components/bootloader_support/src/esp_image_format.c
@@ -386,7 +386,7 @@ err:
 }
 
 #ifdef BOOTLOADER_BUILD
-#if CONFIG_IDF_TARGET_ESP32P4 && !CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_IDF_TARGET_ESP32P4 && !CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 #define ROM_STACK_START         (SOC_ROM_STACK_START_REV2)
 #else
 #define ROM_STACK_START         (SOC_ROM_STACK_START)
diff --git a/components/esp_hw_support/Kconfig b/components/esp_hw_support/Kconfig
index 7d20a580f5..0c76ca064c 100644
--- a/components/esp_hw_support/Kconfig
+++ b/components/esp_hw_support/Kconfig
@@ -255,7 +255,6 @@ menu "Hardware Settings"
     config ESP_BRINGUP_BYPASS_CPU_CLK_SETTING
         bool
         default y if !SOC_CLK_TREE_SUPPORTED
-        default y if ESP32P4_REV_MIN_200 # TODO: IDF-13574
         default n
         help
             This option is only used for new chip bringup, when
@@ -265,7 +264,6 @@ menu "Hardware Settings"
     config ESP_BRINGUP_BYPASS_RANDOM_SETTING
         bool
         default y if !SOC_RNG_SUPPORTED
-        default y if ESP32P4_REV_MIN_200 # TODO: IDF-13574
         default n
         help
             This option is only used for new chip bringup, when
diff --git a/components/esp_hw_support/port/esp32p4/Kconfig.hw_support b/components/esp_hw_support/port/esp32p4/Kconfig.hw_support
index b10677d99b..2b8bda7b90 100644
--- a/components/esp_hw_support/port/esp32p4/Kconfig.hw_support
+++ b/components/esp_hw_support/port/esp32p4/Kconfig.hw_support
@@ -1,13 +1,14 @@
-comment "NOTE! Support of ESP32-P4 rev. <2.0 and >=2.0 is mutually exclusive"
+comment "NOTE! Support of ESP32-P4 rev. <3.0 and >=3.0 is mutually exclusive"
 comment "Read the help text of the option below for explanation"
 
-config ESP32P4_SELECTS_REV_LESS_V2
-    bool "Select ESP32-P4 revisions <2.0 (No >=2.x Support)"
+config ESP32P4_SELECTS_REV_LESS_V3
+    bool "Select ESP32-P4 revisions <3.0 (No >=3.x Support)"
     default y
     help
         Select this option to support ESP32-P4 revisions 0.x and 1.x.
-        Revision 2.0 and revisions less than 2.0 have huge hardware difference.
-        Revisions higher than 2.0 (included) is not compatible with 0.x and 1.x.
+        Revisions higher than 3.0 (included) and revisions less than 3.0
+        have huge hardware difference.
+        Revisions higher than 3.0 (included) is not compatible with 0.x and 1.x.
 
 choice ESP32P4_REV_MIN
     prompt "Minimum Supported ESP32-P4 Revision"
@@ -21,18 +22,18 @@ choice ESP32P4_REV_MIN
         this will also help to reduce binary size.
 
     config ESP32P4_REV_MIN_0
-        depends on ESP32P4_SELECTS_REV_LESS_V2
+        depends on ESP32P4_SELECTS_REV_LESS_V3
         bool "Rev v0.0"
     config ESP32P4_REV_MIN_1
-        depends on ESP32P4_SELECTS_REV_LESS_V2
+        depends on ESP32P4_SELECTS_REV_LESS_V3
         bool "Rev v0.1"
     config ESP32P4_REV_MIN_100
-        depends on ESP32P4_SELECTS_REV_LESS_V2
+        depends on ESP32P4_SELECTS_REV_LESS_V3
         bool "Rev v1.0"
-    config ESP32P4_REV_MIN_200
-        bool "Rev v2.0"
-        depends on !ESP32P4_SELECTS_REV_LESS_V2
-        select ESPTOOLPY_NO_STUB if (IDF_ENV_FPGA || IDF_ENV_BRINGUP)
+    config ESP32P4_REV_MIN_300
+        bool "Rev v3.0"
+        depends on !ESP32P4_SELECTS_REV_LESS_V3
+        select ESPTOOLPY_NO_STUB # TODO: IDF-13911
 endchoice
 
 config ESP32P4_REV_MIN_FULL
@@ -40,7 +41,7 @@ config ESP32P4_REV_MIN_FULL
     default 0 if ESP32P4_REV_MIN_0
     default 1 if ESP32P4_REV_MIN_1
     default 100 if ESP32P4_REV_MIN_100
-    default 0 if ESP32P4_REV_MIN_200  # TODO: IDF-13410. To be updated to 200 when chip efuse is burnt
+    default 300 if ESP32P4_REV_MIN_300
 
 config ESP_REV_MIN_FULL
     int
@@ -50,7 +51,10 @@ config ESP_REV_MIN_FULL
     # MAX Revision
     #
 
-    comment "Maximum Supported ESP32-P4 Revision (Rev v2.99)"
+    comment "Maximum Supported ESP32-P4 Revision (Rev v1.99)"
+    depends on ESP32P4_SELECTS_REV_LESS_V3
+    comment "Maximum Supported ESP32-P4 Revision (Rev v3.99)"
+    depends on !ESP32P4_SELECTS_REV_LESS_V3
     # Maximum revision that IDF supports.
     # It can not be changed by user.
     # Only Espressif can change it when a new version will be supported in IDF.
@@ -58,7 +62,8 @@ config ESP_REV_MIN_FULL
 
 config ESP32P4_REV_MAX_FULL
     int
-    default 199 #TODO: IDF-13574
+    default 399 if !ESP32P4_SELECTS_REV_LESS_V3
+    default 199 if ESP32P4_SELECTS_REV_LESS_V3
     # keep in sync the "Maximum Supported Revision" description with this value
 
 config ESP_REV_MAX_FULL
@@ -78,6 +83,6 @@ config ESP_EFUSE_BLOCK_REV_MIN_FULL
 
 config ESP_EFUSE_BLOCK_REV_MAX_FULL
     int
-    default 99
+    default 199
     comment "Maximum Supported ESP32-P4 eFuse Block Revision (eFuse Block Rev v0.99)"
     # The revision in the comment must correspond to the default value of ESP_EFUSE_BLOCK_REV_MAX_FULL
diff --git a/components/esp_hw_support/port/esp32p4/rtc_clk.c b/components/esp_hw_support/port/esp32p4/rtc_clk.c
index 4c3151f9bf..ecfd790c2c 100644
--- a/components/esp_hw_support/port/esp32p4/rtc_clk.c
+++ b/components/esp_hw_support/port/esp32p4/rtc_clk.c
@@ -224,7 +224,7 @@ static void rtc_clk_cpu_freq_to_cpll_mhz(int cpu_freq_mhz, hal_utils_clk_div_t *
     uint32_t mem_divider = 1;
     uint32_t sys_divider = 1; // We are not going to change this
     uint32_t apb_divider = 1;
-#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
     switch (cpu_freq_mhz) {
     case 360:
         mem_divider = 2;
@@ -312,7 +312,7 @@ bool rtc_clk_cpu_freq_mhz_to_config(uint32_t freq_mhz, rtc_cpu_freq_config_t *ou
 
     // Keep default CPLL at 360MHz
     uint32_t xtal_freq = (uint32_t)rtc_clk_xtal_freq_get();
-#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
     if (freq_mhz <= xtal_freq && freq_mhz != 0) {
         divider.integer = xtal_freq / freq_mhz;
         real_freq_mhz = (xtal_freq + divider.integer / 2) / divider.integer; /* round */
diff --git a/components/esp_hw_support/port/esp32p4/rtc_time.c b/components/esp_hw_support/port/esp32p4/rtc_time.c
index 159345ba83..ffbd10ef39 100644
--- a/components/esp_hw_support/port/esp32p4/rtc_time.c
+++ b/components/esp_hw_support/port/esp32p4/rtc_time.c
@@ -182,7 +182,7 @@ static bool rtc_clk_cal_32k_valid(uint32_t xtal_freq, uint32_t slowclk_cycles, u
 
 uint32_t rtc_clk_cal(soc_clk_freq_calculation_src_t cal_clk_sel, uint32_t slowclk_cycles)
 {
-    // slowclk_cycles /= (cal_clk_sel == CLK_CAL_RTC_SLOW) ? 1 : CLK_CAL_DIV_VAL(cal_clk_sel);
+    slowclk_cycles /= (cal_clk_sel == CLK_CAL_RTC_SLOW) ? 1 : CLK_CAL_DIV_VAL(cal_clk_sel);
     assert(slowclk_cycles);
     soc_xtal_freq_t xtal_freq = rtc_clk_xtal_freq_get();
     uint64_t xtal_cycles = rtc_clk_cal_internal(cal_clk_sel, slowclk_cycles);
diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
index 53abdb2ffd..ba368a9cef 100644
--- a/components/esp_rom/CMakeLists.txt
+++ b/components/esp_rom/CMakeLists.txt
@@ -102,7 +102,7 @@ if(target STREQUAL "linux")
     endif()
 else()
     # TODO: IDF-13410. Update to (CONFIG_ESP32P4_REV_MIN_FULL GREATER_EQUAL 200) when chip efuse is correct.
-    if(CONFIG_ESP32P4_REV_MIN_200)
+    if(CONFIG_ESP32P4_REV_MIN_300)
         target_linker_script(${COMPONENT_LIB} INTERFACE "${target_folder}/${ld_folder}/${target}.rom.eco5.ld")
     elseif(CONFIG_IDF_TARGET_ESP32H4 AND NOT CONFIG_ESP32H4_SELECTS_REV_MP) # TODO: ESP32H4 IDF-13835
         target_linker_script(${COMPONENT_LIB} INTERFACE "${target_folder}/${ld_folder}/${target}.rom.beta5.ld")
@@ -117,7 +117,7 @@ else()
     endif()
 
     if(CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB)
-        if(CONFIG_ESP32P4_REV_MIN_200) # TODO: IDF-13410
+        if(CONFIG_ESP32P4_REV_MIN_300) # TODO: IDF-13410
             rom_linker_script("eco5.libgcc")
         elseif(CONFIG_IDF_TARGET_ESP32H4 AND NOT CONFIG_ESP32H4_SELECTS_REV_MP) # TODO: ESP32H4 IDF-13835
             rom_linker_script("beta5.libgcc")
@@ -125,7 +125,7 @@ else()
             rom_linker_script("libgcc")
         endif()
     else()
-        if(CONFIG_ESP32P4_REV_MIN_200) # TODO: IDF-13410.
+        if(CONFIG_ESP32P4_REV_MIN_300) # TODO: IDF-13410.
             rom_linker_script("eco5.rvfp")
         else()
             rom_linker_script("rvfp")
@@ -192,7 +192,7 @@ if(BOOTLOADER_BUILD)
         if(target STREQUAL "esp32" OR target STREQUAL "esp32s2")
             rom_linker_script("libc-funcs")
         else()
-            if(CONFIG_ESP32P4_REV_MIN_200) # TODO: IDF-13410
+            if(CONFIG_ESP32P4_REV_MIN_300) # TODO: IDF-13410
                 rom_linker_script("eco5.libc")
             elseif(CONFIG_IDF_TARGET_ESP32H4 AND NOT CONFIG_ESP32H4_SELECTS_REV_MP) # TODO: ESP32H4 IDF-13835
                 rom_linker_script("beta5.libc")
@@ -204,7 +204,7 @@ if(BOOTLOADER_BUILD)
                 rom_linker_script("libc-suboptimal_for_misaligned_mem")
             endif()
             if(CONFIG_LIBC_NEWLIB)
-                if(CONFIG_ESP32P4_REV_MIN_200) # TODO: IDF-13410
+                if(CONFIG_ESP32P4_REV_MIN_300) # TODO: IDF-13410
                     rom_linker_script("eco5.newlib")
                 elseif(CONFIG_IDF_TARGET_ESP32H4 AND NOT CONFIG_ESP32H4_SELECTS_REV_MP) # TODO: ESP32H4 IDF-13835
                     rom_linker_script("beta5.newlib")
@@ -363,7 +363,7 @@ else() # Regular app build
 
     if(CONFIG_ESP_ROM_HAS_NEWLIB AND NOT target STREQUAL "esp32" AND NOT target STREQUAL "esp32s2")
         # ESP32 and S2 are a bit different, keep them as special cases in the target specific include section
-        if(CONFIG_ESP32P4_REV_MIN_200) # TODO: IDF-13410
+        if(CONFIG_ESP32P4_REV_MIN_300) # TODO: IDF-13410
             rom_linker_script("eco5.libc")
         elseif(CONFIG_IDF_TARGET_ESP32H4 AND NOT CONFIG_ESP32H4_SELECTS_REV_MP) # TODO: ESP32H4 IDF-13835
             rom_linker_script("beta5.libc")
@@ -374,7 +374,7 @@ else() # Regular app build
             rom_linker_script("libc-suboptimal_for_misaligned_mem")
         endif()
         if(CONFIG_LIBC_NEWLIB)
-            if(CONFIG_ESP32P4_REV_MIN_200) # TODO: IDF-13410
+            if(CONFIG_ESP32P4_REV_MIN_300) # TODO: IDF-13410
                 rom_linker_script("eco5.newlib")
             elseif(CONFIG_IDF_TARGET_ESP32H4 AND NOT CONFIG_ESP32H4_SELECTS_REV_MP) # TODO: ESP32H4 IDF-13835
                 rom_linker_script("beta5.newlib")
diff --git a/components/esp_system/CMakeLists.txt b/components/esp_system/CMakeLists.txt
index 59fcc1680e..3a2e9456aa 100644
--- a/components/esp_system/CMakeLists.txt
+++ b/components/esp_system/CMakeLists.txt
@@ -152,7 +152,7 @@ if(NOT BOOTLOADER_BUILD)
 endif()
 
 # For P4, since P4 REV2, the SRAM is contiguous
-if(CONFIG_ESP32P4_SELECTS_REV_LESS_V2)
+if(CONFIG_ESP32P4_SELECTS_REV_LESS_V3)
     target_link_options(${COMPONENT_LIB} INTERFACE "-Wl,--enable-non-contiguous-regions")
 endif()
 
diff --git a/components/esp_system/fpga_overrides_clk.c b/components/esp_system/fpga_overrides_clk.c
index 8be3b2a3e4..f7e1cfdc77 100644
--- a/components/esp_system/fpga_overrides_clk.c
+++ b/components/esp_system/fpga_overrides_clk.c
@@ -55,7 +55,7 @@ void bootloader_clock_configure(void)
 void esp_rtc_init(void)
 {
 #if SOC_PMU_SUPPORTED
-#if CONFIG_ESP32P4_REV_MIN_200
+#if CONFIG_ESP32P4_REV_MIN_300
     //TODO: IDF-13453
     ESP_EARLY_LOGW(TAG, "pmu_init not supported\n");
 #else
diff --git a/components/esp_system/ld/esp32p4/memory.ld.in b/components/esp_system/ld/esp32p4/memory.ld.in
index 682e380a1e..b5e42cfad1 100644
--- a/components/esp_system/ld/esp32p4/memory.ld.in
+++ b/components/esp_system/ld/esp32p4/memory.ld.in
@@ -15,7 +15,7 @@
 #include "sdkconfig.h"
 #include "ld.common"
 
-#if CONFIG_ESP32P4_REV_MIN_200
+#if !CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 #define SRAM_START       0x4FF00000 + CONFIG_CACHE_L2_CACHE_SIZE
 #define SRAM_END         0x4FFAEFC0  /* 2nd stage bootloader iram_loader_seg start address */
 #define SRAM_SIZE        SRAM_END - SRAM_START
@@ -71,7 +71,7 @@ MEMORY
    * Shared data RAM, excluding memory reserved for ROM bss/data/stack.
    * Enabling Bluetooth & Trace Memory features in menuconfig will decrease the amount of RAM available.
    */
-#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
   sram_low (RWX) :                 org = SRAM_LOW_START, len = SRAM_LOW_SIZE
   sram_high (RW) :                org = SRAM_HIGH_START, len = SRAM_HIGH_SIZE
 #else
diff --git a/components/esp_system/ld/esp32p4/sections.rev2.ld.in b/components/esp_system/ld/esp32p4/sections.rev3.ld.in
similarity index 100%
rename from components/esp_system/ld/esp32p4/sections.rev2.ld.in
rename to components/esp_system/ld/esp32p4/sections.rev3.ld.in
diff --git a/components/esp_system/ld/ld.cmake b/components/esp_system/ld/ld.cmake
index 7caba6af77..7ddc776c9a 100644
--- a/components/esp_system/ld/ld.cmake
+++ b/components/esp_system/ld/ld.cmake
@@ -48,8 +48,8 @@ preprocess_linker_file("memory.ld.in" "memory.ld" ld_out_path)
 target_linker_script(${COMPONENT_LIB} INTERFACE "${ld_out_path}")
 
 # Generate sections.ld.in and pass it through linker script generator
-if(CONFIG_ESP32P4_REV_MIN_200) # TODO: IDF-13410
-    preprocess_linker_file("sections.rev2.ld.in" "sections.ld.in" ld_out_path)
+if(CONFIG_ESP32P4_REV_MIN_300)
+    preprocess_linker_file("sections.rev3.ld.in" "sections.ld.in" ld_out_path)
 else()
     preprocess_linker_file("sections.ld.in" "sections.ld.in" ld_out_path)
 endif()
diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c
index dae1e0dbd2..60d4551782 100644
--- a/components/esp_system/port/cpu_start.c
+++ b/components/esp_system/port/cpu_start.c
@@ -124,13 +124,13 @@
 #include "esp_private/startup_internal.h"
 #include "esp_private/system_internal.h"
 
-#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 extern int _bss_start_low, _bss_start_high;
 extern int _bss_end_low, _bss_end_high;
 #else
 extern int _bss_start;
 extern int _bss_end;
-#endif // CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#endif // CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 extern int _rtc_bss_start;
 extern int _rtc_bss_end;
 #if CONFIG_BT_LE_RELEASE_IRAM_SUPPORTED
@@ -426,12 +426,12 @@ FORCE_INLINE_ATTR IRAM_ATTR void get_reset_reason(soc_reset_reason_t *rst_reas)
 
 FORCE_INLINE_ATTR IRAM_ATTR void init_bss(const soc_reset_reason_t *rst_reas)
 {
-#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
     memset(&_bss_start_low, 0, (uintptr_t)&_bss_end_low - (uintptr_t)&_bss_start_low);
     memset(&_bss_start_high, 0, (uintptr_t)&_bss_end_high - (uintptr_t)&_bss_start_high);
 #else
     memset(&_bss_start, 0, (uintptr_t)&_bss_end - (uintptr_t)&_bss_start);
-#endif // CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#endif // CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 
 #if CONFIG_BT_LE_RELEASE_IRAM_SUPPORTED
     // Clear Bluetooth bss
diff --git a/components/esp_system/port/soc/esp32p4/Kconfig.cpu b/components/esp_system/port/soc/esp32p4/Kconfig.cpu
index 9a9ab5c095..d88464cc99 100644
--- a/components/esp_system/port/soc/esp32p4/Kconfig.cpu
+++ b/components/esp_system/port/soc/esp32p4/Kconfig.cpu
@@ -1,7 +1,7 @@
 choice ESP_DEFAULT_CPU_FREQ_MHZ
     prompt "CPU frequency"
     default ESP_DEFAULT_CPU_FREQ_MHZ_40 if IDF_ENV_FPGA || ESP_BRINGUP_BYPASS_CPU_CLK_SETTING
-    default ESP_DEFAULT_CPU_FREQ_MHZ_360 if ESP32P4_SELECTS_REV_LESS_V2
+    default ESP_DEFAULT_CPU_FREQ_MHZ_360 if ESP32P4_SELECTS_REV_LESS_V3
     default ESP_DEFAULT_CPU_FREQ_MHZ_400
     help
         CPU frequency to be set on application startup.
@@ -11,7 +11,7 @@ choice ESP_DEFAULT_CPU_FREQ_MHZ
         depends on IDF_ENV_FPGA || ESP_BRINGUP_BYPASS_CPU_CLK_SETTING
     config ESP_DEFAULT_CPU_FREQ_MHZ_360
         bool "360 MHz"
-        depends on ESP32P4_SELECTS_REV_LESS_V2
+        depends on ESP32P4_SELECTS_REV_LESS_V3
     config ESP_DEFAULT_CPU_FREQ_MHZ_400
         bool "400 MHz"
 endchoice
diff --git a/components/heap/port/esp32p4/memory_layout.c b/components/heap/port/esp32p4/memory_layout.c
index 77526fec59..1ad726bb62 100644
--- a/components/heap/port/esp32p4/memory_layout.c
+++ b/components/heap/port/esp32p4/memory_layout.c
@@ -74,7 +74,7 @@ const size_t soc_memory_type_count = sizeof(soc_memory_types) / sizeof(soc_memor
 /**
  * Register the shared buffer area of the last memory block into the heap during heap initialization
  */
-#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 #define ROM_STACK_START         (SOC_ROM_STACK_START)
 #define APP_USABLE_DIRAM_END    (ROM_STACK_START - SOC_ROM_STACK_SIZE) // 0x4ff3cfc0 - 0x2000 = 0x4ff3afc0
 #define STARTUP_DATA_SIZE       (SOC_DRAM_HIGH - CONFIG_CACHE_L2_CACHE_SIZE - APP_USABLE_DIRAM_END) // 0x4ffc0000 - 0x20000/0x40000/0x80000 - 0x4ff3afc0 = 0x65040 / 0x45040 / 0x5040
@@ -108,7 +108,7 @@ const soc_memory_region_t soc_memory_regions[] = {
 
 const size_t soc_memory_region_count = sizeof(soc_memory_regions) / sizeof(soc_memory_region_t);
 
-#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 extern int _data_start_low, _data_start_high, _heap_start_low, _heap_start_high, _iram_start, _iram_end, _rtc_force_slow_end;
 #else
 extern int _data_start, _heap_start, _iram_start, _iram_end, _rtc_force_slow_end;
@@ -124,7 +124,7 @@ extern int _rtc_ulp_memory_start;
  */
 
 // Static data region. DRAM used by data+bss and possibly rodata
-#if CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 SOC_RESERVE_MEMORY_REGION((intptr_t)&_data_start_low, (intptr_t)&_heap_start_low, dram_data_low);
 SOC_RESERVE_MEMORY_REGION((intptr_t)&_data_start_high, (intptr_t)&_heap_start_high, dram_data_high);
 #else
diff --git a/components/heap/port/memory_layout_utils.c b/components/heap/port/memory_layout_utils.c
index 8c4cc58d9b..03bf3a9a8c 100644
--- a/components/heap/port/memory_layout_utils.c
+++ b/components/heap/port/memory_layout_utils.c
@@ -60,7 +60,7 @@ static void s_prepare_reserved_regions(soc_reserved_region_t *reserved, size_t c
     /* Get the ROM layout to find which part of DRAM is reserved */
     const ets_rom_layout_t *layout = ets_rom_layout_p;
     reserved[0].start = (intptr_t)layout->dram0_rtos_reserved_start;
-#if SOC_DIRAM_ROM_RESERVE_HIGH && CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if SOC_DIRAM_ROM_RESERVE_HIGH && CONFIG_ESP32P4_SELECTS_REV_LESS_V3
     reserved[0].end = SOC_DIRAM_ROM_RESERVE_HIGH;
 #else
     reserved[0].end = SOC_DIRAM_DRAM_HIGH;
diff --git a/components/riscv/include/esp_private/interrupt_clic.h b/components/riscv/include/esp_private/interrupt_clic.h
index 695edf9c17..e5aed509e6 100644
--- a/components/riscv/include/esp_private/interrupt_clic.h
+++ b/components/riscv/include/esp_private/interrupt_clic.h
@@ -47,7 +47,7 @@ extern "C" {
 #define UTVT_CSR    0x007
 
 
-#if CONFIG_IDF_TARGET_ESP32P4 && CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#if CONFIG_IDF_TARGET_ESP32P4 && CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 
 /**
  * The ESP32-P4 and the beta version of the ESP32-C5 implement a non-standard version of the CLIC:
@@ -57,7 +57,7 @@ extern "C" {
 #define INTTHRESH_STANDARD  0
 #define MINTSTATUS_CSR      0x346
 
-#elif CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C61 || CONFIG_IDF_TARGET_ESP32H4 || !CONFIG_ESP32P4_SELECTS_REV_LESS_V2
+#elif CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C61 || CONFIG_IDF_TARGET_ESP32H4 || !CONFIG_ESP32P4_SELECTS_REV_LESS_V3
 
 /* The ESP32-C5 (MP), C61, H4 and P4 (since REV2) use the standard CLIC specification, for example, it defines the mintthresh CSR */
 #define INTTHRESH_STANDARD  1
diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt
index 7782f24e8d..cae0388db7 100644
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -35,10 +35,10 @@ endif()
 
 # register headers that generated by script from CSV
 if(CONFIG_IDF_TARGET_ESP32P4)
-    if(CONFIG_ESP32P4_SELECTS_REV_LESS_V2)
+    if(CONFIG_ESP32P4_SELECTS_REV_LESS_V3)
         list(APPEND includes "${target_folder}/register/hw_ver1")
     else()
-        list(APPEND includes "${target_folder}/register/hw_ver2")
+        list(APPEND includes "${target_folder}/register/hw_ver3")
     endif()
 elseif(CONFIG_IDF_TARGET_ESP32H21) # TODO: ESP32H21 IDF-13923
     list(APPEND includes "${target_folder}/register")
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/adc_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/adc_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/adc_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/adc_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/adc_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/adc_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/adc_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/adc_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/adc_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/adc_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/adc_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/adc_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/adc_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/adc_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/adc_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/adc_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/aes_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/aes_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/aes_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/aes_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/aes_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/aes_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/aes_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/aes_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/aes_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/aes_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/aes_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/aes_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ahb_dma_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ahb_dma_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ahb_dma_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ahb_dma_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ahb_dma_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/ahb_dma_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ahb_dma_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ahb_dma_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ahb_dma_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ahb_dma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ahb_dma_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ahb_dma_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/assist_debug_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/assist_debug_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/assist_debug_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/assist_debug_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/assist_debug_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/assist_debug_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/assist_debug_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/assist_debug_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/axi_dma_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/axi_dma_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/axi_dma_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/axi_dma_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/axi_dma_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/axi_dma_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/axi_dma_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/axi_dma_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/axi_dma_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/axi_dma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/axi_dma_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/axi_dma_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/axi_perf_mon_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/axi_perf_mon_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/axi_perf_mon_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/axi_perf_mon_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/axi_perf_mon_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/axi_perf_mon_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/axi_perf_mon_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/axi_perf_mon_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/bitscrambler_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/bitscrambler_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/bitscrambler_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/bitscrambler_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/bitscrambler_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/bitscrambler_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/bitscrambler_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/bitscrambler_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/bitscrambler_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/bitscrambler_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/bitscrambler_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/bitscrambler_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/cache_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/cache_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/cache_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/cache_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/cache_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/cache_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/cache_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/cache_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dma2d_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/dma2d_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dma2d_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dma2d_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dma2d_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/dma2d_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dma2d_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dma2d_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dma2d_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/dma2d_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dma2d_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dma2d_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dma2d_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/dma2d_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dma2d_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dma2d_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dma_pms_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/dma_pms_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dma_pms_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dma_pms_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dma_pms_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/dma_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dma_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dma_pms_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dma_pms_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/dma_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dma_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dma_pms_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ds_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/ds_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ds_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ds_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ds_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ds_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ds_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ds_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dw_gdma_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/dw_gdma_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dw_gdma_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dw_gdma_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/dw_gdma_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/dw_gdma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/dw_gdma_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/dw_gdma_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ecc_mult_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/ecc_mult_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ecc_mult_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ecc_mult_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ecc_mult_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ecc_mult_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ecc_mult_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ecc_mult_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ecdsa_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/ecdsa_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ecdsa_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ecdsa_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ecdsa_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/ecdsa_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ecdsa_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ecdsa_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ecdsa_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ecdsa_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ecdsa_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ecdsa_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/efuse_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/efuse_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/efuse_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/efuse_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/efuse_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/efuse_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/efuse_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/efuse_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/efuse_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/efuse_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/efuse_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/efuse_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/emac_dma_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/emac_dma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/emac_dma_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/emac_dma_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/emac_mac_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/emac_mac_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/emac_mac_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/emac_mac_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/emac_ptp_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/emac_ptp_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/emac_ptp_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/emac_ptp_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/emac_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/emac_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/emac_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/emac_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/gpio_ext_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/gpio_ext_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/gpio_ext_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/gpio_ext_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/gpio_ext_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/gpio_ext_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/gpio_ext_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/gpio_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/gpio_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/gpio_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/gpio_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/gpio_sig_map.h b/components/soc/esp32p4/register/hw_ver3/soc/gpio_sig_map.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/gpio_sig_map.h
rename to components/soc/esp32p4/register/hw_ver3/soc/gpio_sig_map.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/gpio_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/gpio_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/gpio_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/gpio_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/h264_dma_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/h264_dma_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/h264_dma_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/h264_dma_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/h264_dma_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/h264_dma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/h264_dma_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/h264_dma_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/h264_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/h264_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/h264_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/h264_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/h264_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/h264_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/h264_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/h264_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hmac_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/hmac_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hmac_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hmac_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hmac_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/hmac_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hmac_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hmac_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp2lp_peri_pms_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/hp2lp_peri_pms_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp2lp_peri_pms_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp2lp_peri_pms_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp2lp_peri_pms_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/hp2lp_peri_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp2lp_peri_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp2lp_peri_pms_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp2lp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/hp2lp_peri_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp2lp_peri_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp2lp_peri_pms_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp_peri_pms_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp_peri_pms_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp_peri_pms_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp_peri_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp_peri_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp_sys_clkrst_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/hp_sys_clkrst_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp_sys_clkrst_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp_sys_clkrst_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp_sys_clkrst_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/hp_sys_clkrst_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp_sys_clkrst_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp_sys_clkrst_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp_system_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/hp_system_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp_system_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp_system_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/hp_system_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/hp_system_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/hp_system_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/hp_system_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/huk_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/huk_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/huk_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/huk_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/huk_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/huk_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/huk_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/huk_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i2c_ana_mst_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/i2c_ana_mst_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i2c_ana_mst_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i2c_ana_mst_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i2c_ana_mst_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/i2c_ana_mst_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i2c_ana_mst_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i2c_ana_mst_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i2c_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/i2c_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i2c_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i2c_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i2c_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/i2c_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i2c_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i2c_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i2s_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/i2s_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i2s_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i2s_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i2s_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/i2s_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i2s_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i2s_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i2s_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/i2s_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i2s_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i2s_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i3c_mst_mem_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/i3c_mst_mem_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i3c_mst_mem_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i3c_mst_mem_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i3c_mst_mem_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/i3c_mst_mem_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i3c_mst_mem_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i3c_mst_mem_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i3c_mst_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/i3c_mst_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i3c_mst_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i3c_mst_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i3c_mst_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/i3c_mst_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i3c_mst_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i3c_mst_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i3c_slv_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/i3c_slv_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i3c_slv_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i3c_slv_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/i3c_slv_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/i3c_slv_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/i3c_slv_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/i3c_slv_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/icm_sys_qos_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/icm_sys_qos_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/icm_sys_qos_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/icm_sys_qos_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/icm_sys_qos_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/icm_sys_qos_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/icm_sys_qos_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/icm_sys_qos_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/icm_sys_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/icm_sys_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/icm_sys_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/icm_sys_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/icm_sys_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/icm_sys_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/icm_sys_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/icm_sys_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/interrupt_core0_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/interrupt_core0_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/interrupt_core0_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/interrupt_core0_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/interrupt_core0_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/interrupt_core0_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/interrupt_core0_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/interrupt_core0_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/interrupt_core1_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/interrupt_core1_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/interrupt_core1_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/interrupt_core1_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/interrupt_core1_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/interrupt_core1_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/interrupt_core1_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/interrupt_core1_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/interrupts.h b/components/soc/esp32p4/register/hw_ver3/soc/interrupts.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/interrupts.h
rename to components/soc/esp32p4/register/hw_ver3/soc/interrupts.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/io_mux_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/io_mux_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/io_mux_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/io_mux_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/io_mux_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/io_mux_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/io_mux_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/io_mux_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/io_mux_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/io_mux_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/io_mux_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/io_mux_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/io_mux_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/io_mux_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/io_mux_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/io_mux_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/iomux_mspi_pin_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/iomux_mspi_pin_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/iomux_mspi_pin_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/iomux_mspi_pin_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/iomux_mspi_pin_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/iomux_mspi_pin_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/iomux_mspi_pin_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/iomux_mspi_pin_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/isp_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/isp_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/isp_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/isp_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/isp_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/isp_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/isp_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/isp_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/isp_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/isp_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/isp_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/isp_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/jpeg_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/jpeg_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/jpeg_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/jpeg_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/jpeg_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/jpeg_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/jpeg_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/jpeg_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/jpeg_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/jpeg_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/jpeg_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/jpeg_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/keymng_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/keymng_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/keymng_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/keymng_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/keymng_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/keymng_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/keymng_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/keymng_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/keymng_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/keymng_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/keymng_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/keymng_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lcd_cam_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lcd_cam_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lcd_cam_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lcd_cam_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lcd_cam_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lcd_cam_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lcd_cam_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lcd_cam_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lcd_cam_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lcd_cam_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lcd_cam_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lcd_cam_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ledc_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/ledc_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ledc_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ledc_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ledc_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ledc_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ledc_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ledc_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ledc_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/ledc_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ledc_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ledc_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ledc_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ledc_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ledc_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ledc_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp2hp_peri_pms_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp2hp_peri_pms_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp2hp_peri_pms_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp2hp_peri_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp2hp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp2hp_peri_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_adc_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_adc_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_adc_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_adc_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_adc_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_adc_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_adc_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_adc_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_analog_peri_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_analog_peri_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_analog_peri_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_analog_peri_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_analog_peri_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_analog_peri_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_analog_peri_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_analog_peri_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_clkrst_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_clkrst_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_clkrst_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_clkrst_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_clkrst_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_clkrst_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_clkrst_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_clkrst_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_gpio_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_gpio_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_gpio_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_gpio_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_gpio_sig_map.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_gpio_sig_map.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_gpio_sig_map.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_gpio_sig_map.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_gpio_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_gpio_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_gpio_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_gpio_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_i2c_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_i2c_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_i2c_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_i2c_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_i2c_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_i2c_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_i2c_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_i2c_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_i2s_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_i2s_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_i2s_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_i2s_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_i2s_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_i2s_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_i2s_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_i2s_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_intr_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_intr_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_intr_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_intr_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_intr_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_intr_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_intr_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_intr_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_iomux_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_iomux_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_iomux_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_iomux_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_iomux_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_iomux_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_iomux_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_iomux_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_mailbox_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_mailbox_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_mailbox_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_mailbox_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_mailbox_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_mailbox_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_mailbox_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_mailbox_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_peri_pms_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_peri_pms_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_peri_pms_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_peri_pms_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_peri_pms_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_peri_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_peri_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_peri_pms_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_peri_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_peri_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_peri_pms_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_spi_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_spi_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_spi_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_spi_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_spi_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_spi_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_spi_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_spi_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_system_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_system_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_system_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_system_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_system_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_system_struct.h
similarity index 99%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_system_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_system_struct.h
index 56af2b70c0..1b63f5af86 100644
--- a/components/soc/esp32p4/register/hw_ver2/soc/lp_system_struct.h
+++ b/components/soc/esp32p4/register/hw_ver3/soc/lp_system_struct.h
@@ -684,15 +684,15 @@ typedef union {
         /** dref_comp0 : R/W; bitpos: [2:0]; default: 0;
          *  pad comp dref
          */
-        uint32_t dref_comp0:3;
+        uint32_t dref_comp:3;
         /** mode_comp0 : R/W; bitpos: [3]; default: 0;
          *  pad comp mode
          */
-        uint32_t mode_comp0:1;
+        uint32_t mode_comp:1;
         /** xpd_comp0 : R/W; bitpos: [4]; default: 0;
          *  pad comp xpd
          */
-        uint32_t xpd_comp0:1;
+        uint32_t xpd_comp:1;
         uint32_t reserved_5:27;
     };
     uint32_t val;
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_timer_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_timer_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_timer_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_timer_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_timer_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_timer_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_timer_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_timer_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_timer_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_timer_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_timer_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_timer_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_uart_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_uart_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_uart_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_uart_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_uart_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_uart_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_uart_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_uart_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_wdt_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_wdt_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_wdt_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_wdt_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lp_wdt_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp_wdt_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lp_wdt_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lp_wdt_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lpperi_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/lpperi_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lpperi_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lpperi_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/lpperi_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lpperi_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/lpperi_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/lpperi_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mcpwm_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mcpwm_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mcpwm_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mcpwm_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mcpwm_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/mcpwm_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mcpwm_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mcpwm_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mcpwm_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mcpwm_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mcpwm_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mcpwm_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mem_monitor_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/mem_monitor_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mem_monitor_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mem_monitor_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mem_monitor_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mem_monitor_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mem_monitor_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mem_monitor_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_bridge_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_bridge_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_bridge_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_bridge_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_bridge_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_bridge_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_bridge_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_bridge_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_bridge_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_bridge_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_bridge_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_bridge_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_host_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_host_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_host_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_host_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_host_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_host_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_host_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_host_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_host_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_host_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_csi_host_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_csi_host_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_dsi_bridge_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_dsi_bridge_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_dsi_bridge_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_dsi_bridge_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_dsi_bridge_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_dsi_bridge_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_dsi_bridge_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_dsi_bridge_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_dsi_host_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_dsi_host_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_dsi_host_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_dsi_host_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/mipi_dsi_host_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/mipi_dsi_host_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/mipi_dsi_host_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/mipi_dsi_host_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/parl_io_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/parl_io_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/parl_io_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/parl_io_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/parl_io_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/parl_io_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/parl_io_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/parl_io_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pau_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/pau_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pau_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pau_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pau_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/pau_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pau_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pau_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pcnt_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/pcnt_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pcnt_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pcnt_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pcnt_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/pcnt_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pcnt_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pcnt_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pcnt_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/pcnt_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pcnt_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pcnt_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pmu_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/pmu_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pmu_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pmu_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pmu_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/pmu_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pmu_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pmu_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pmu_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/pmu_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pmu_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pmu_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pmu_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/pmu_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pmu_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pmu_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ppa_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ppa_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ppa_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ppa_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ppa_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/ppa_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ppa_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ppa_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/ppa_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/ppa_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/ppa_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/ppa_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pvt_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/pvt_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pvt_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pvt_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/pvt_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/pvt_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/pvt_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/pvt_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/reg_base.h b/components/soc/esp32p4/register/hw_ver3/soc/reg_base.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/reg_base.h
rename to components/soc/esp32p4/register/hw_ver3/soc/reg_base.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/rmt_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/rmt_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/rmt_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/rmt_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/rmt_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/rmt_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/rmt_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/rmt_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/rmt_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/rmt_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/rmt_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/rmt_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/rsa_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/rsa_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/rsa_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/rsa_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/rsa_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/rsa_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/rsa_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/rsa_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/rtclockcali_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/rtclockcali_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/rtclockcali_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/rtclockcali_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/rtclockcali_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/rtclockcali_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/rtclockcali_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/rtclockcali_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/sdmmc_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/sdmmc_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/sdmmc_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/sdmmc_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/sdmmc_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/sdmmc_reg.h
similarity index 98%
rename from components/soc/esp32p4/register/hw_ver2/soc/sdmmc_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/sdmmc_reg.h
index 29edf36547..9002fda91f 100644
--- a/components/soc/esp32p4/register/hw_ver2/soc/sdmmc_reg.h
+++ b/components/soc/esp32p4/register/hw_ver3/soc/sdmmc_reg.h
@@ -1493,6 +1493,34 @@ extern "C" {
 #define SDHOST_DLL_CAL_END_V  0x00000001U
 #define SDHOST_DLL_CAL_END_S  1
 
+#define SDMMC_INTMASK_IO_SLOT1  BIT(17)
+#define SDMMC_INTMASK_IO_SLOT0  BIT(16)
+#define SDMMC_INTMASK_EBE       BIT(15)
+#define SDMMC_INTMASK_ACD       BIT(14)
+#define SDMMC_INTMASK_SBE       BIT(13)
+#define SDMMC_INTMASK_HLE       BIT(12)
+#define SDMMC_INTMASK_FRUN      BIT(11)
+#define SDMMC_INTMASK_HTO       BIT(10)
+#define SDMMC_INTMASK_VOLT_SW   SDMMC_INTMASK_HTO
+#define SDMMC_INTMASK_DTO       BIT(9)
+#define SDMMC_INTMASK_RTO       BIT(8)
+#define SDMMC_INTMASK_DCRC      BIT(7)
+#define SDMMC_INTMASK_RCRC      BIT(6)
+#define SDMMC_INTMASK_RXDR      BIT(5)
+#define SDMMC_INTMASK_TXDR      BIT(4)
+#define SDMMC_INTMASK_DATA_OVER BIT(3)
+#define SDMMC_INTMASK_CMD_DONE  BIT(2)
+#define SDMMC_INTMASK_RESP_ERR  BIT(1)
+#define SDMMC_INTMASK_CD        BIT(0)
+
+#define SDMMC_IDMAC_INTMASK_AI  BIT(9)
+#define SDMMC_IDMAC_INTMASK_NI  BIT(8)
+#define SDMMC_IDMAC_INTMASK_CES BIT(5)
+#define SDMMC_IDMAC_INTMASK_DU  BIT(4)
+#define SDMMC_IDMAC_INTMASK_FBE BIT(2)
+#define SDMMC_IDMAC_INTMASK_RI  BIT(1)
+#define SDMMC_IDMAC_INTMASK_TI  BIT(0)
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/sdmmc_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/sdmmc_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/sdmmc_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/sdmmc_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/sha_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/sha_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/sha_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/sha_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/sha_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/sha_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/sha_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/sha_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/sha_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/sha_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/sha_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/sha_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/soc_etm_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/soc_etm_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/soc_etm_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/soc_etm_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/soc_etm_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/soc_etm_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/soc_etm_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/soc_etm_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi1_mem_c_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/spi1_mem_c_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi1_mem_c_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi1_mem_c_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi1_mem_c_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/spi1_mem_c_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi1_mem_c_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi1_mem_c_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi1_mem_s_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/spi1_mem_s_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi1_mem_s_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi1_mem_s_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi1_mem_s_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/spi1_mem_s_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi1_mem_s_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi1_mem_s_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/spi_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi_mem_c_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/spi_mem_c_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi_mem_c_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi_mem_c_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi_mem_c_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/spi_mem_c_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi_mem_c_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi_mem_c_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi_mem_s_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/spi_mem_s_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi_mem_s_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi_mem_s_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi_mem_s_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/spi_mem_s_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi_mem_s_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi_mem_s_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/spi_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/spi_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/spi_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/spi_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/spi_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/systimer_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/systimer_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/systimer_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/systimer_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/systimer_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/systimer_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/systimer_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/systimer_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/timer_group_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/timer_group_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/timer_group_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/timer_group_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/timer_group_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/timer_group_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/timer_group_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/timer_group_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/touch_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/touch_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/touch_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/touch_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/touch_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/touch_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/touch_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/touch_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/trace_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/trace_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/trace_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/trace_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/trace_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/trace_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/trace_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/trace_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/trng_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/trng_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/trng_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/trng_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/trng_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/trng_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/trng_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/trng_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/tsens_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/tsens_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/tsens_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/tsens_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/tsens_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/tsens_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/tsens_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/tsens_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/twai_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/twai_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/twai_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/twai_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/twai_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/twai_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/twai_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/twai_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/twai_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/twai_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/twai_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/twai_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/uart_eco5_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/uart_eco5_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/uart_eco5_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/uart_eco5_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/uart_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/uart_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/uart_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/uart_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/uart_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/uart_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/uart_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/uart_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/uart_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/uart_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/uart_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/uart_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/uhci_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/uhci_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/uhci_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/uhci_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/uhci_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/uhci_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/uhci_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/uhci_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/usb_serial_jtag_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/usb_serial_jtag_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/usb_serial_jtag_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/usb_serial_jtag_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/usb_serial_jtag_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/usb_serial_jtag_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/usb_serial_jtag_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/usb_serial_jtag_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/usb_utmi_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/usb_utmi_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/usb_utmi_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/usb_utmi_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/usb_wrap_eco5_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/usb_wrap_eco5_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/usb_wrap_eco5_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/usb_wrap_eco5_struct.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/usb_wrap_reg.h b/components/soc/esp32p4/register/hw_ver3/soc/usb_wrap_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/usb_wrap_reg.h
rename to components/soc/esp32p4/register/hw_ver3/soc/usb_wrap_reg.h
diff --git a/components/soc/esp32p4/register/hw_ver2/soc/usb_wrap_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/usb_wrap_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/hw_ver2/soc/usb_wrap_struct.h
rename to components/soc/esp32p4/register/hw_ver3/soc/usb_wrap_struct.h
diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.esp32p4_rev3 b/tools/test_apps/system/build_test/sdkconfig.ci.esp32p4_rev3
new file mode 100644
index 0000000000..2b6fa5463f
--- /dev/null
+++ b/tools/test_apps/system/build_test/sdkconfig.ci.esp32p4_rev3
@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32p4"
+# To be replaced to P4 rev0/1
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=n