diff --git a/components/hal/esp32p4/include/hal/uart_ll.h b/components/hal/esp32p4/include/hal/uart_ll.h
index bf3bc9f879..47322a4ae4 100644
--- a/components/hal/esp32p4/include/hal/uart_ll.h
+++ b/components/hal/esp32p4/include/hal/uart_ll.h
@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include <stdint.h>
 #include "esp_attr.h"
 #include "hal/misc.h"
 #include "hal/assert.h"
diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt
index 5c95fddb84..21ee851006 100644
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -18,9 +18,17 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target_folder}/include")
     list(APPEND includes "${target_folder}/include")
 endif()
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target_folder}/register")
-    # register headers that generated by script from CSV
-    list(APPEND includes "${target_folder}/register")
+# register headers that generated by script from CSV
+if(CONFIG_IDF_TARGET_ESP32P4)
+    if(CONFIG_ESP32P4_SELECTS_REV_LESS_V2)
+        list(APPEND includes "${target_folder}/register/hw_ver1")
+    else()
+        list(APPEND includes "${target_folder}/register/hw_ver2")
+    endif()
+else()
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target_folder}/register")
+        list(APPEND includes "${target_folder}/register")
+    endif()
 endif()
 
 if(target STREQUAL "esp32")
diff --git a/components/soc/esp32p4/register/soc/adc_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/adc_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/adc_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/adc_reg.h
diff --git a/components/soc/esp32p4/register/soc/adc_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/adc_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/adc_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/adc_struct.h
diff --git a/components/soc/esp32p4/register/soc/aes_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/aes_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/aes_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/aes_reg.h
diff --git a/components/soc/esp32p4/register/soc/aes_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/aes_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/aes_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/aes_struct.h
diff --git a/components/soc/esp32p4/register/soc/ahb_dma_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/ahb_dma_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ahb_dma_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ahb_dma_reg.h
diff --git a/components/soc/esp32p4/register/soc/ahb_dma_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/ahb_dma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ahb_dma_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ahb_dma_struct.h
diff --git a/components/soc/esp32p4/register/soc/assist_debug_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/assist_debug_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/assist_debug_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/assist_debug_reg.h
diff --git a/components/soc/esp32p4/register/soc/assist_debug_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/assist_debug_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/assist_debug_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/assist_debug_struct.h
diff --git a/components/soc/esp32p4/register/soc/axi_dma_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/axi_dma_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/axi_dma_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/axi_dma_reg.h
diff --git a/components/soc/esp32p4/register/soc/axi_dma_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/axi_dma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/axi_dma_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/axi_dma_struct.h
diff --git a/components/soc/esp32p4/register/soc/bitscrambler_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/bitscrambler_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/bitscrambler_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/bitscrambler_reg.h
diff --git a/components/soc/esp32p4/register/soc/bitscrambler_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/bitscrambler_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/bitscrambler_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/bitscrambler_struct.h
diff --git a/components/soc/esp32p4/register/soc/cache_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/cache_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/cache_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/cache_reg.h
diff --git a/components/soc/esp32p4/register/soc/cache_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/cache_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/cache_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/cache_struct.h
diff --git a/components/soc/esp32p4/register/soc/dma2d_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/dma2d_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/dma2d_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/dma2d_reg.h
diff --git a/components/soc/esp32p4/register/soc/dma2d_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/dma2d_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/dma2d_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/dma2d_struct.h
diff --git a/components/soc/esp32p4/register/soc/dma_pms_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/dma_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/dma_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/dma_pms_reg.h
diff --git a/components/soc/esp32p4/register/soc/dma_pms_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/dma_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/dma_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/dma_pms_struct.h
diff --git a/components/soc/esp32p4/register/soc/ds_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/ds_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ds_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ds_reg.h
diff --git a/components/soc/esp32p4/register/soc/ds_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/ds_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ds_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ds_struct.h
diff --git a/components/soc/esp32p4/register/soc/dw_gdma_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/dw_gdma_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/dw_gdma_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/dw_gdma_reg.h
diff --git a/components/soc/esp32p4/register/soc/dw_gdma_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/dw_gdma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/dw_gdma_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/dw_gdma_struct.h
diff --git a/components/soc/esp32p4/register/soc/ecc_mult_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/ecc_mult_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ecc_mult_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ecc_mult_reg.h
diff --git a/components/soc/esp32p4/register/soc/ecc_mult_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/ecc_mult_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ecc_mult_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ecc_mult_struct.h
diff --git a/components/soc/esp32p4/register/soc/ecdsa_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/ecdsa_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ecdsa_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ecdsa_reg.h
diff --git a/components/soc/esp32p4/register/soc/ecdsa_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/ecdsa_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ecdsa_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ecdsa_struct.h
diff --git a/components/soc/esp32p4/register/soc/efuse_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/efuse_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/efuse_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/efuse_reg.h
diff --git a/components/soc/esp32p4/register/soc/efuse_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/efuse_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/efuse_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/efuse_struct.h
diff --git a/components/soc/esp32p4/register/soc/emac_dma_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/emac_dma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/emac_dma_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/emac_dma_struct.h
diff --git a/components/soc/esp32p4/register/soc/emac_mac_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/emac_mac_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/emac_mac_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/emac_mac_struct.h
diff --git a/components/soc/esp32p4/register/soc/emac_ptp_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/emac_ptp_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/emac_ptp_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/emac_ptp_struct.h
diff --git a/components/soc/esp32p4/register/soc/gpio_ext_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/gpio_ext_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_reg.h
diff --git a/components/soc/esp32p4/register/soc/gpio_ext_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/gpio_ext_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h
diff --git a/components/soc/esp32p4/register/soc/gpio_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/gpio_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/gpio_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/gpio_reg.h
diff --git a/components/soc/esp32p4/register/soc/gpio_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/gpio_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/gpio_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/gpio_struct.h
diff --git a/components/soc/esp32p4/register/soc/h264_dma_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/h264_dma_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/h264_dma_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/h264_dma_reg.h
diff --git a/components/soc/esp32p4/register/soc/h264_dma_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/h264_dma_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/h264_dma_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/h264_dma_struct.h
diff --git a/components/soc/esp32p4/register/soc/h264_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/h264_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/h264_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/h264_reg.h
diff --git a/components/soc/esp32p4/register/soc/h264_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/h264_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/h264_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/h264_struct.h
diff --git a/components/soc/esp32p4/register/soc/hmac_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/hmac_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hmac_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hmac_reg.h
diff --git a/components/soc/esp32p4/register/soc/hmac_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/hmac_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hmac_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hmac_struct.h
diff --git a/components/soc/esp32p4/register/soc/hp2lp_peri_pms_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/hp2lp_peri_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hp2lp_peri_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hp2lp_peri_pms_reg.h
diff --git a/components/soc/esp32p4/register/soc/hp2lp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/hp2lp_peri_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hp2lp_peri_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hp2lp_peri_pms_struct.h
diff --git a/components/soc/esp32p4/register/soc/hp_peri_pms_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hp_peri_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_reg.h
diff --git a/components/soc/esp32p4/register/soc/hp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hp_peri_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_struct.h
diff --git a/components/soc/esp32p4/register/soc/hp_sys_clkrst_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/hp_sys_clkrst_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hp_sys_clkrst_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hp_sys_clkrst_reg.h
diff --git a/components/soc/esp32p4/register/soc/hp_sys_clkrst_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/hp_sys_clkrst_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hp_sys_clkrst_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hp_sys_clkrst_struct.h
diff --git a/components/soc/esp32p4/register/soc/hp_system_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/hp_system_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hp_system_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hp_system_reg.h
diff --git a/components/soc/esp32p4/register/soc/hp_system_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/hp_system_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/hp_system_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/hp_system_struct.h
diff --git a/components/soc/esp32p4/register/soc/huk_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/huk_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/huk_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/huk_reg.h
diff --git a/components/soc/esp32p4/register/soc/huk_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/huk_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/huk_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/huk_struct.h
diff --git a/components/soc/esp32p4/register/soc/i2c_ana_mst_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/i2c_ana_mst_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i2c_ana_mst_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i2c_ana_mst_reg.h
diff --git a/components/soc/esp32p4/register/soc/i2c_ana_mst_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/i2c_ana_mst_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i2c_ana_mst_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i2c_ana_mst_struct.h
diff --git a/components/soc/esp32p4/register/soc/i2c_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/i2c_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i2c_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i2c_reg.h
diff --git a/components/soc/esp32p4/register/soc/i2c_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/i2c_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i2c_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i2c_struct.h
diff --git a/components/soc/esp32p4/register/soc/i2s_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/i2s_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i2s_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i2s_reg.h
diff --git a/components/soc/esp32p4/register/soc/i2s_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/i2s_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i2s_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i2s_struct.h
diff --git a/components/soc/esp32p4/register/soc/i3c_mst_mem_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_mem_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i3c_mst_mem_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_mem_reg.h
diff --git a/components/soc/esp32p4/register/soc/i3c_mst_mem_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_mem_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i3c_mst_mem_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_mem_struct.h
diff --git a/components/soc/esp32p4/register/soc/i3c_mst_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i3c_mst_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_reg.h
diff --git a/components/soc/esp32p4/register/soc/i3c_mst_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i3c_mst_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_struct.h
diff --git a/components/soc/esp32p4/register/soc/i3c_slv_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/i3c_slv_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i3c_slv_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i3c_slv_reg.h
diff --git a/components/soc/esp32p4/register/soc/i3c_slv_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/i3c_slv_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/i3c_slv_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/i3c_slv_struct.h
diff --git a/components/soc/esp32p4/register/soc/icm_sys_qos_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_qos_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/icm_sys_qos_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/icm_sys_qos_reg.h
diff --git a/components/soc/esp32p4/register/soc/icm_sys_qos_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_qos_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/icm_sys_qos_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/icm_sys_qos_struct.h
diff --git a/components/soc/esp32p4/register/soc/icm_sys_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/icm_sys_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/icm_sys_reg.h
diff --git a/components/soc/esp32p4/register/soc/icm_sys_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/icm_sys_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/icm_sys_struct.h
diff --git a/components/soc/esp32p4/register/soc/interrupt_core0_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core0_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/interrupt_core0_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/interrupt_core0_reg.h
diff --git a/components/soc/esp32p4/register/soc/interrupt_core0_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core0_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/interrupt_core0_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/interrupt_core0_struct.h
diff --git a/components/soc/esp32p4/register/soc/interrupt_core1_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core1_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/interrupt_core1_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/interrupt_core1_reg.h
diff --git a/components/soc/esp32p4/register/soc/interrupt_core1_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core1_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/interrupt_core1_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/interrupt_core1_struct.h
diff --git a/components/soc/esp32p4/register/soc/io_mux_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/io_mux_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h
diff --git a/components/soc/esp32p4/register/soc/io_mux_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/io_mux_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/io_mux_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/io_mux_struct.h
diff --git a/components/soc/esp32p4/register/soc/iomux_mspi_pin_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/iomux_mspi_pin_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/iomux_mspi_pin_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/iomux_mspi_pin_reg.h
diff --git a/components/soc/esp32p4/register/soc/iomux_mspi_pin_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/iomux_mspi_pin_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/iomux_mspi_pin_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/iomux_mspi_pin_struct.h
diff --git a/components/soc/esp32p4/register/soc/isp_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/isp_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/isp_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/isp_reg.h
diff --git a/components/soc/esp32p4/register/soc/isp_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/isp_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/isp_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/isp_struct.h
diff --git a/components/soc/esp32p4/register/soc/jpeg_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/jpeg_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/jpeg_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/jpeg_reg.h
diff --git a/components/soc/esp32p4/register/soc/jpeg_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/jpeg_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/jpeg_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/jpeg_struct.h
diff --git a/components/soc/esp32p4/register/soc/keymng_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/keymng_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/keymng_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/keymng_reg.h
diff --git a/components/soc/esp32p4/register/soc/keymng_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/keymng_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/keymng_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/keymng_struct.h
diff --git a/components/soc/esp32p4/register/soc/l2mem_monitor_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/l2mem_monitor_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/l2mem_monitor_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/l2mem_monitor_reg.h
diff --git a/components/soc/esp32p4/register/soc/l2mem_monitor_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/l2mem_monitor_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/l2mem_monitor_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/l2mem_monitor_struct.h
diff --git a/components/soc/esp32p4/register/soc/lcd_cam_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lcd_cam_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lcd_cam_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lcd_cam_reg.h
diff --git a/components/soc/esp32p4/register/soc/lcd_cam_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lcd_cam_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lcd_cam_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lcd_cam_struct.h
diff --git a/components/soc/esp32p4/register/soc/ledc_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/ledc_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ledc_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ledc_reg.h
diff --git a/components/soc/esp32p4/register/soc/ledc_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/ledc_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ledc_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ledc_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp2hp_peri_pms_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp2hp_peri_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp2hp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp2hp_peri_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_adc_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_adc_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_adc_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_adc_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_adc_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_adc_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_adc_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_adc_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_analog_peri_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_analog_peri_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_analog_peri_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_analog_peri_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_analog_peri_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_analog_peri_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_analog_peri_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_analog_peri_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_clkrst_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_clkrst_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_clkrst_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_clkrst_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_clkrst_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_clkrst_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_clkrst_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_clkrst_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_gpio_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_gpio_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_gpio_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_gpio_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_gpio_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_gpio_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_gpio_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_gpio_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_i2c_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_i2c_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_i2c_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_i2c_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_i2c_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_i2c_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_i2c_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_i2c_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_i2s_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_i2s_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_i2s_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_i2s_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_i2s_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_i2s_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_i2s_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_i2s_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_intr_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_intr_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_intr_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_intr_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_intr_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_intr_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_intr_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_intr_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_iomux_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_iomux_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_iomux_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_iomux_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_iomux_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_iomux_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_iomux_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_iomux_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_mailbox_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_mailbox_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_mailbox_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_mailbox_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_mailbox_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_mailbox_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_mailbox_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_mailbox_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_peri_pms_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_peri_pms_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_peri_pms_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_peri_pms_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_peri_pms_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_peri_pms_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_peri_pms_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_spi_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_spi_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_spi_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_spi_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_spi_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_spi_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_spi_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_spi_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_system_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_system_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_system_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_system_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_system_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_system_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_system_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_system_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_timer_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_timer_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_timer_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_timer_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_timer_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_timer_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_timer_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_timer_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_uart_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_uart_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_uart_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_uart_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_uart_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_uart_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_uart_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_uart_struct.h
diff --git a/components/soc/esp32p4/register/soc/lp_wdt_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_wdt_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_wdt_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_wdt_reg.h
diff --git a/components/soc/esp32p4/register/soc/lp_wdt_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp_wdt_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lp_wdt_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lp_wdt_struct.h
diff --git a/components/soc/esp32p4/register/soc/lpperi_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/lpperi_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lpperi_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lpperi_reg.h
diff --git a/components/soc/esp32p4/register/soc/lpperi_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lpperi_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/lpperi_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/lpperi_struct.h
diff --git a/components/soc/esp32p4/register/soc/mcpwm_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/mcpwm_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mcpwm_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mcpwm_reg.h
diff --git a/components/soc/esp32p4/register/soc/mcpwm_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/mcpwm_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mcpwm_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mcpwm_struct.h
diff --git a/components/soc/esp32p4/register/soc/mipi_csi_bridge_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/mipi_csi_bridge_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mipi_csi_bridge_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mipi_csi_bridge_reg.h
diff --git a/components/soc/esp32p4/register/soc/mipi_csi_bridge_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/mipi_csi_bridge_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mipi_csi_bridge_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mipi_csi_bridge_struct.h
diff --git a/components/soc/esp32p4/register/soc/mipi_csi_host_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/mipi_csi_host_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mipi_csi_host_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mipi_csi_host_reg.h
diff --git a/components/soc/esp32p4/register/soc/mipi_csi_host_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/mipi_csi_host_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mipi_csi_host_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mipi_csi_host_struct.h
diff --git a/components/soc/esp32p4/register/soc/mipi_dsi_bridge_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/mipi_dsi_bridge_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mipi_dsi_bridge_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mipi_dsi_bridge_reg.h
diff --git a/components/soc/esp32p4/register/soc/mipi_dsi_bridge_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/mipi_dsi_bridge_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mipi_dsi_bridge_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mipi_dsi_bridge_struct.h
diff --git a/components/soc/esp32p4/register/soc/mipi_dsi_host_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/mipi_dsi_host_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mipi_dsi_host_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mipi_dsi_host_reg.h
diff --git a/components/soc/esp32p4/register/soc/mipi_dsi_host_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/mipi_dsi_host_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/mipi_dsi_host_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/mipi_dsi_host_struct.h
diff --git a/components/soc/esp32p4/register/soc/parl_io_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/parl_io_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/parl_io_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/parl_io_reg.h
diff --git a/components/soc/esp32p4/register/soc/parl_io_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/parl_io_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/parl_io_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/parl_io_struct.h
diff --git a/components/soc/esp32p4/register/soc/pau_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/pau_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/pau_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/pau_reg.h
diff --git a/components/soc/esp32p4/register/soc/pau_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/pau_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/pau_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/pau_struct.h
diff --git a/components/soc/esp32p4/register/soc/pcnt_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/pcnt_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/pcnt_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/pcnt_reg.h
diff --git a/components/soc/esp32p4/register/soc/pcnt_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/pcnt_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/pcnt_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/pcnt_struct.h
diff --git a/components/soc/esp32p4/register/soc/pmu_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/pmu_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/pmu_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/pmu_reg.h
diff --git a/components/soc/esp32p4/register/soc/pmu_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/pmu_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/pmu_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/pmu_struct.h
diff --git a/components/soc/esp32p4/register/soc/ppa_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/ppa_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ppa_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ppa_reg.h
diff --git a/components/soc/esp32p4/register/soc/ppa_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/ppa_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/ppa_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/ppa_struct.h
diff --git a/components/soc/esp32p4/register/soc/pvt_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/pvt_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/pvt_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/pvt_reg.h
diff --git a/components/soc/esp32p4/register/soc/pvt_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/pvt_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/pvt_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/pvt_struct.h
diff --git a/components/soc/esp32p4/register/soc/reg_base.h b/components/soc/esp32p4/register/hw_ver1/soc/reg_base.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/reg_base.h
rename to components/soc/esp32p4/register/hw_ver1/soc/reg_base.h
diff --git a/components/soc/esp32p4/register/soc/rmt_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/rmt_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/rmt_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/rmt_reg.h
diff --git a/components/soc/esp32p4/register/soc/rmt_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/rmt_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/rmt_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/rmt_struct.h
diff --git a/components/soc/esp32p4/register/soc/rsa_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/rsa_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/rsa_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/rsa_reg.h
diff --git a/components/soc/esp32p4/register/soc/rsa_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/rsa_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/rsa_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/rsa_struct.h
diff --git a/components/soc/esp32p4/register/soc/rtclockcali_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/rtclockcali_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/rtclockcali_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/rtclockcali_reg.h
diff --git a/components/soc/esp32p4/register/soc/rtclockcali_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/rtclockcali_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/rtclockcali_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/rtclockcali_struct.h
diff --git a/components/soc/esp32p4/register/soc/sdmmc_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/sdmmc_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/sdmmc_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/sdmmc_reg.h
diff --git a/components/soc/esp32p4/register/soc/sdmmc_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/sdmmc_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/sdmmc_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/sdmmc_struct.h
diff --git a/components/soc/esp32p4/register/soc/sha_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/sha_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/sha_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/sha_reg.h
diff --git a/components/soc/esp32p4/register/soc/sha_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/sha_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/sha_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/sha_struct.h
diff --git a/components/soc/esp32p4/register/soc/soc_etm_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/soc_etm_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/soc_etm_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/soc_etm_reg.h
diff --git a/components/soc/esp32p4/register/soc/soc_etm_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/soc_etm_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/soc_etm_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/soc_etm_struct.h
diff --git a/components/soc/esp32p4/register/soc/spi1_mem_c_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/spi1_mem_c_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi1_mem_c_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi1_mem_c_reg.h
diff --git a/components/soc/esp32p4/register/soc/spi1_mem_c_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/spi1_mem_c_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi1_mem_c_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi1_mem_c_struct.h
diff --git a/components/soc/esp32p4/register/soc/spi1_mem_s_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/spi1_mem_s_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi1_mem_s_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi1_mem_s_reg.h
diff --git a/components/soc/esp32p4/register/soc/spi1_mem_s_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/spi1_mem_s_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi1_mem_s_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi1_mem_s_struct.h
diff --git a/components/soc/esp32p4/register/soc/spi_mem_c_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/spi_mem_c_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi_mem_c_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi_mem_c_reg.h
diff --git a/components/soc/esp32p4/register/soc/spi_mem_c_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/spi_mem_c_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi_mem_c_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi_mem_c_struct.h
diff --git a/components/soc/esp32p4/register/soc/spi_mem_s_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/spi_mem_s_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi_mem_s_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi_mem_s_reg.h
diff --git a/components/soc/esp32p4/register/soc/spi_mem_s_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/spi_mem_s_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi_mem_s_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi_mem_s_struct.h
diff --git a/components/soc/esp32p4/register/soc/spi_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/spi_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi_reg.h
diff --git a/components/soc/esp32p4/register/soc/spi_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/spi_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/spi_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/spi_struct.h
diff --git a/components/soc/esp32p4/register/soc/systimer_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/systimer_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/systimer_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/systimer_reg.h
diff --git a/components/soc/esp32p4/register/soc/systimer_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/systimer_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/systimer_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/systimer_struct.h
diff --git a/components/soc/esp32p4/register/soc/tcm_monitor_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/tcm_monitor_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/tcm_monitor_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/tcm_monitor_reg.h
diff --git a/components/soc/esp32p4/register/soc/tcm_monitor_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/tcm_monitor_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/tcm_monitor_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/tcm_monitor_struct.h
diff --git a/components/soc/esp32p4/register/soc/timer_group_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/timer_group_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/timer_group_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/timer_group_reg.h
diff --git a/components/soc/esp32p4/register/soc/timer_group_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/timer_group_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/timer_group_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/timer_group_struct.h
diff --git a/components/soc/esp32p4/register/soc/touch_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/touch_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/touch_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/touch_reg.h
diff --git a/components/soc/esp32p4/register/soc/touch_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/touch_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/touch_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/touch_struct.h
diff --git a/components/soc/esp32p4/register/soc/trace_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/trace_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/trace_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/trace_reg.h
diff --git a/components/soc/esp32p4/register/soc/trace_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/trace_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/trace_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/trace_struct.h
diff --git a/components/soc/esp32p4/register/soc/tsens_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/tsens_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/tsens_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/tsens_reg.h
diff --git a/components/soc/esp32p4/register/soc/tsens_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/tsens_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/tsens_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/tsens_struct.h
diff --git a/components/soc/esp32p4/register/soc/twai_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/twai_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/twai_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/twai_reg.h
diff --git a/components/soc/esp32p4/register/soc/twai_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/twai_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/twai_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/twai_struct.h
diff --git a/components/soc/esp32p4/register/soc/uart_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/uart_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/uart_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/uart_reg.h
diff --git a/components/soc/esp32p4/register/soc/uart_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/uart_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/uart_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/uart_struct.h
diff --git a/components/soc/esp32p4/register/soc/uhci_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/uhci_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/uhci_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/uhci_reg.h
diff --git a/components/soc/esp32p4/register/soc/uhci_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/uhci_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/uhci_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/uhci_struct.h
diff --git a/components/soc/esp32p4/register/soc/usb_serial_jtag_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/usb_serial_jtag_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/usb_serial_jtag_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/usb_serial_jtag_reg.h
diff --git a/components/soc/esp32p4/register/soc/usb_serial_jtag_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/usb_serial_jtag_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/usb_serial_jtag_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/usb_serial_jtag_struct.h
diff --git a/components/soc/esp32p4/register/soc/usb_utmi_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/usb_utmi_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/usb_utmi_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/usb_utmi_struct.h
diff --git a/components/soc/esp32p4/register/soc/usb_wrap_reg.h b/components/soc/esp32p4/register/hw_ver1/soc/usb_wrap_reg.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/usb_wrap_reg.h
rename to components/soc/esp32p4/register/hw_ver1/soc/usb_wrap_reg.h
diff --git a/components/soc/esp32p4/register/soc/usb_wrap_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/usb_wrap_struct.h
similarity index 100%
rename from components/soc/esp32p4/register/soc/usb_wrap_struct.h
rename to components/soc/esp32p4/register/hw_ver1/soc/usb_wrap_struct.h
diff --git a/tools/ci/astyle-rules.yml b/tools/ci/astyle-rules.yml
index de8a111bb2..e5dda826c5 100644
--- a/tools/ci/astyle-rules.yml
+++ b/tools/ci/astyle-rules.yml
@@ -154,6 +154,7 @@ components_not_formatted_permanent:
     - "/components/rt/"
     # SoC header files (generated)
     - "/components/soc/*/register/soc/"
+    - "/components/soc/*/register/hw_ver*/soc/"
     # Example resource files (generated)
     - "/examples/peripherals/lcd/i80_controller/main/images/"
     - "/examples/peripherals/dac/dac_continuous/dac_audio/main/audio_example_file.h"