From 4ea2ea5f025b785ff4a04ce8484ea77910393d89 Mon Sep 17 00:00:00 2001
From: armando <douyiwen@espressif.com>
Date: Fri, 11 Jul 2025 14:31:11 +0800
Subject: [PATCH 1/3] p4: move hw ver1 registers

---
 components/hal/esp32p4/include/hal/uart_ll.h       |  1 +
 components/soc/CMakeLists.txt                      | 14 +++++++++++---
 .../esp32p4/register/{ => hw_ver1}/soc/adc_reg.h   |  0
 .../register/{ => hw_ver1}/soc/adc_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/aes_reg.h   |  0
 .../register/{ => hw_ver1}/soc/aes_struct.h        |  0
 .../register/{ => hw_ver1}/soc/ahb_dma_reg.h       |  0
 .../register/{ => hw_ver1}/soc/ahb_dma_struct.h    |  0
 .../register/{ => hw_ver1}/soc/assist_debug_reg.h  |  0
 .../{ => hw_ver1}/soc/assist_debug_struct.h        |  0
 .../register/{ => hw_ver1}/soc/axi_dma_reg.h       |  0
 .../register/{ => hw_ver1}/soc/axi_dma_struct.h    |  0
 .../register/{ => hw_ver1}/soc/bitscrambler_reg.h  |  0
 .../{ => hw_ver1}/soc/bitscrambler_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/cache_reg.h |  0
 .../register/{ => hw_ver1}/soc/cache_struct.h      |  0
 .../esp32p4/register/{ => hw_ver1}/soc/dma2d_reg.h |  0
 .../register/{ => hw_ver1}/soc/dma2d_struct.h      |  0
 .../register/{ => hw_ver1}/soc/dma_pms_reg.h       |  0
 .../register/{ => hw_ver1}/soc/dma_pms_struct.h    |  0
 .../esp32p4/register/{ => hw_ver1}/soc/ds_reg.h    |  0
 .../esp32p4/register/{ => hw_ver1}/soc/ds_struct.h |  0
 .../register/{ => hw_ver1}/soc/dw_gdma_reg.h       |  0
 .../register/{ => hw_ver1}/soc/dw_gdma_struct.h    |  0
 .../register/{ => hw_ver1}/soc/ecc_mult_reg.h      |  0
 .../register/{ => hw_ver1}/soc/ecc_mult_struct.h   |  0
 .../esp32p4/register/{ => hw_ver1}/soc/ecdsa_reg.h |  0
 .../register/{ => hw_ver1}/soc/ecdsa_struct.h      |  0
 .../esp32p4/register/{ => hw_ver1}/soc/efuse_reg.h |  0
 .../register/{ => hw_ver1}/soc/efuse_struct.h      |  0
 .../register/{ => hw_ver1}/soc/emac_dma_struct.h   |  0
 .../register/{ => hw_ver1}/soc/emac_mac_struct.h   |  0
 .../register/{ => hw_ver1}/soc/emac_ptp_struct.h   |  0
 .../register/{ => hw_ver1}/soc/gpio_ext_reg.h      |  0
 .../register/{ => hw_ver1}/soc/gpio_ext_struct.h   |  0
 .../esp32p4/register/{ => hw_ver1}/soc/gpio_reg.h  |  0
 .../register/{ => hw_ver1}/soc/gpio_struct.h       |  0
 .../register/{ => hw_ver1}/soc/h264_dma_reg.h      |  0
 .../register/{ => hw_ver1}/soc/h264_dma_struct.h   |  0
 .../esp32p4/register/{ => hw_ver1}/soc/h264_reg.h  |  0
 .../register/{ => hw_ver1}/soc/h264_struct.h       |  0
 .../esp32p4/register/{ => hw_ver1}/soc/hmac_reg.h  |  0
 .../register/{ => hw_ver1}/soc/hmac_struct.h       |  0
 .../{ => hw_ver1}/soc/hp2lp_peri_pms_reg.h         |  0
 .../{ => hw_ver1}/soc/hp2lp_peri_pms_struct.h      |  0
 .../register/{ => hw_ver1}/soc/hp_peri_pms_reg.h   |  0
 .../{ => hw_ver1}/soc/hp_peri_pms_struct.h         |  0
 .../register/{ => hw_ver1}/soc/hp_sys_clkrst_reg.h |  0
 .../{ => hw_ver1}/soc/hp_sys_clkrst_struct.h       |  0
 .../register/{ => hw_ver1}/soc/hp_system_reg.h     |  0
 .../register/{ => hw_ver1}/soc/hp_system_struct.h  |  0
 .../esp32p4/register/{ => hw_ver1}/soc/huk_reg.h   |  0
 .../register/{ => hw_ver1}/soc/huk_struct.h        |  0
 .../register/{ => hw_ver1}/soc/i2c_ana_mst_reg.h   |  0
 .../{ => hw_ver1}/soc/i2c_ana_mst_struct.h         |  0
 .../esp32p4/register/{ => hw_ver1}/soc/i2c_reg.h   |  0
 .../register/{ => hw_ver1}/soc/i2c_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/i2s_reg.h   |  0
 .../register/{ => hw_ver1}/soc/i2s_struct.h        |  0
 .../register/{ => hw_ver1}/soc/i3c_mst_mem_reg.h   |  0
 .../{ => hw_ver1}/soc/i3c_mst_mem_struct.h         |  0
 .../register/{ => hw_ver1}/soc/i3c_mst_reg.h       |  0
 .../register/{ => hw_ver1}/soc/i3c_mst_struct.h    |  0
 .../register/{ => hw_ver1}/soc/i3c_slv_reg.h       |  0
 .../register/{ => hw_ver1}/soc/i3c_slv_struct.h    |  0
 .../register/{ => hw_ver1}/soc/icm_sys_qos_reg.h   |  0
 .../{ => hw_ver1}/soc/icm_sys_qos_struct.h         |  0
 .../register/{ => hw_ver1}/soc/icm_sys_reg.h       |  0
 .../register/{ => hw_ver1}/soc/icm_sys_struct.h    |  0
 .../{ => hw_ver1}/soc/interrupt_core0_reg.h        |  0
 .../{ => hw_ver1}/soc/interrupt_core0_struct.h     |  0
 .../{ => hw_ver1}/soc/interrupt_core1_reg.h        |  0
 .../{ => hw_ver1}/soc/interrupt_core1_struct.h     |  0
 .../register/{ => hw_ver1}/soc/io_mux_reg.h        |  0
 .../register/{ => hw_ver1}/soc/io_mux_struct.h     |  0
 .../{ => hw_ver1}/soc/iomux_mspi_pin_reg.h         |  0
 .../{ => hw_ver1}/soc/iomux_mspi_pin_struct.h      |  0
 .../esp32p4/register/{ => hw_ver1}/soc/isp_reg.h   |  0
 .../register/{ => hw_ver1}/soc/isp_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/jpeg_reg.h  |  0
 .../register/{ => hw_ver1}/soc/jpeg_struct.h       |  0
 .../register/{ => hw_ver1}/soc/keymng_reg.h        |  0
 .../register/{ => hw_ver1}/soc/keymng_struct.h     |  0
 .../register/{ => hw_ver1}/soc/l2mem_monitor_reg.h |  0
 .../{ => hw_ver1}/soc/l2mem_monitor_struct.h       |  0
 .../register/{ => hw_ver1}/soc/lcd_cam_reg.h       |  0
 .../register/{ => hw_ver1}/soc/lcd_cam_struct.h    |  0
 .../esp32p4/register/{ => hw_ver1}/soc/ledc_reg.h  |  0
 .../register/{ => hw_ver1}/soc/ledc_struct.h       |  0
 .../{ => hw_ver1}/soc/lp2hp_peri_pms_reg.h         |  0
 .../{ => hw_ver1}/soc/lp2hp_peri_pms_struct.h      |  0
 .../register/{ => hw_ver1}/soc/lp_adc_reg.h        |  0
 .../register/{ => hw_ver1}/soc/lp_adc_struct.h     |  0
 .../{ => hw_ver1}/soc/lp_analog_peri_reg.h         |  0
 .../{ => hw_ver1}/soc/lp_analog_peri_struct.h      |  0
 .../register/{ => hw_ver1}/soc/lp_clkrst_reg.h     |  0
 .../register/{ => hw_ver1}/soc/lp_clkrst_struct.h  |  0
 .../register/{ => hw_ver1}/soc/lp_gpio_reg.h       |  0
 .../register/{ => hw_ver1}/soc/lp_gpio_struct.h    |  0
 .../register/{ => hw_ver1}/soc/lp_i2c_reg.h        |  0
 .../register/{ => hw_ver1}/soc/lp_i2c_struct.h     |  0
 .../register/{ => hw_ver1}/soc/lp_i2s_reg.h        |  0
 .../register/{ => hw_ver1}/soc/lp_i2s_struct.h     |  0
 .../register/{ => hw_ver1}/soc/lp_intr_reg.h       |  0
 .../register/{ => hw_ver1}/soc/lp_intr_struct.h    |  0
 .../register/{ => hw_ver1}/soc/lp_iomux_reg.h      |  0
 .../register/{ => hw_ver1}/soc/lp_iomux_struct.h   |  0
 .../register/{ => hw_ver1}/soc/lp_mailbox_reg.h    |  0
 .../register/{ => hw_ver1}/soc/lp_mailbox_struct.h |  0
 .../register/{ => hw_ver1}/soc/lp_peri_pms_reg.h   |  0
 .../{ => hw_ver1}/soc/lp_peri_pms_struct.h         |  0
 .../register/{ => hw_ver1}/soc/lp_spi_reg.h        |  0
 .../register/{ => hw_ver1}/soc/lp_spi_struct.h     |  0
 .../register/{ => hw_ver1}/soc/lp_system_reg.h     |  0
 .../register/{ => hw_ver1}/soc/lp_system_struct.h  |  0
 .../register/{ => hw_ver1}/soc/lp_timer_reg.h      |  0
 .../register/{ => hw_ver1}/soc/lp_timer_struct.h   |  0
 .../register/{ => hw_ver1}/soc/lp_uart_reg.h       |  0
 .../register/{ => hw_ver1}/soc/lp_uart_struct.h    |  0
 .../register/{ => hw_ver1}/soc/lp_wdt_reg.h        |  0
 .../register/{ => hw_ver1}/soc/lp_wdt_struct.h     |  0
 .../register/{ => hw_ver1}/soc/lpperi_reg.h        |  0
 .../register/{ => hw_ver1}/soc/lpperi_struct.h     |  0
 .../esp32p4/register/{ => hw_ver1}/soc/mcpwm_reg.h |  0
 .../register/{ => hw_ver1}/soc/mcpwm_struct.h      |  0
 .../{ => hw_ver1}/soc/mipi_csi_bridge_reg.h        |  0
 .../{ => hw_ver1}/soc/mipi_csi_bridge_struct.h     |  0
 .../register/{ => hw_ver1}/soc/mipi_csi_host_reg.h |  0
 .../{ => hw_ver1}/soc/mipi_csi_host_struct.h       |  0
 .../{ => hw_ver1}/soc/mipi_dsi_bridge_reg.h        |  0
 .../{ => hw_ver1}/soc/mipi_dsi_bridge_struct.h     |  0
 .../register/{ => hw_ver1}/soc/mipi_dsi_host_reg.h |  0
 .../{ => hw_ver1}/soc/mipi_dsi_host_struct.h       |  0
 .../register/{ => hw_ver1}/soc/parl_io_reg.h       |  0
 .../register/{ => hw_ver1}/soc/parl_io_struct.h    |  0
 .../esp32p4/register/{ => hw_ver1}/soc/pau_reg.h   |  0
 .../register/{ => hw_ver1}/soc/pau_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/pcnt_reg.h  |  0
 .../register/{ => hw_ver1}/soc/pcnt_struct.h       |  0
 .../esp32p4/register/{ => hw_ver1}/soc/pmu_reg.h   |  0
 .../register/{ => hw_ver1}/soc/pmu_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/ppa_reg.h   |  0
 .../register/{ => hw_ver1}/soc/ppa_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/pvt_reg.h   |  0
 .../register/{ => hw_ver1}/soc/pvt_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/reg_base.h  |  0
 .../esp32p4/register/{ => hw_ver1}/soc/rmt_reg.h   |  0
 .../register/{ => hw_ver1}/soc/rmt_struct.h        |  0
 .../esp32p4/register/{ => hw_ver1}/soc/rsa_reg.h   |  0
 .../register/{ => hw_ver1}/soc/rsa_struct.h        |  0
 .../register/{ => hw_ver1}/soc/rtclockcali_reg.h   |  0
 .../{ => hw_ver1}/soc/rtclockcali_struct.h         |  0
 .../esp32p4/register/{ => hw_ver1}/soc/sdmmc_reg.h |  0
 .../register/{ => hw_ver1}/soc/sdmmc_struct.h      |  0
 .../esp32p4/register/{ => hw_ver1}/soc/sha_reg.h   |  0
 .../register/{ => hw_ver1}/soc/sha_struct.h        |  0
 .../register/{ => hw_ver1}/soc/soc_etm_reg.h       |  0
 .../register/{ => hw_ver1}/soc/soc_etm_struct.h    |  0
 .../register/{ => hw_ver1}/soc/spi1_mem_c_reg.h    |  0
 .../register/{ => hw_ver1}/soc/spi1_mem_c_struct.h |  0
 .../register/{ => hw_ver1}/soc/spi1_mem_s_reg.h    |  0
 .../register/{ => hw_ver1}/soc/spi1_mem_s_struct.h |  0
 .../register/{ => hw_ver1}/soc/spi_mem_c_reg.h     |  0
 .../register/{ => hw_ver1}/soc/spi_mem_c_struct.h  |  0
 .../register/{ => hw_ver1}/soc/spi_mem_s_reg.h     |  0
 .../register/{ => hw_ver1}/soc/spi_mem_s_struct.h  |  0
 .../esp32p4/register/{ => hw_ver1}/soc/spi_reg.h   |  0
 .../register/{ => hw_ver1}/soc/spi_struct.h        |  0
 .../register/{ => hw_ver1}/soc/systimer_reg.h      |  0
 .../register/{ => hw_ver1}/soc/systimer_struct.h   |  0
 .../register/{ => hw_ver1}/soc/tcm_monitor_reg.h   |  0
 .../{ => hw_ver1}/soc/tcm_monitor_struct.h         |  0
 .../register/{ => hw_ver1}/soc/timer_group_reg.h   |  0
 .../{ => hw_ver1}/soc/timer_group_struct.h         |  0
 .../esp32p4/register/{ => hw_ver1}/soc/touch_reg.h |  0
 .../register/{ => hw_ver1}/soc/touch_struct.h      |  0
 .../esp32p4/register/{ => hw_ver1}/soc/trace_reg.h |  0
 .../register/{ => hw_ver1}/soc/trace_struct.h      |  0
 .../esp32p4/register/{ => hw_ver1}/soc/tsens_reg.h |  0
 .../register/{ => hw_ver1}/soc/tsens_struct.h      |  0
 .../esp32p4/register/{ => hw_ver1}/soc/twai_reg.h  |  0
 .../register/{ => hw_ver1}/soc/twai_struct.h       |  0
 .../esp32p4/register/{ => hw_ver1}/soc/uart_reg.h  |  0
 .../register/{ => hw_ver1}/soc/uart_struct.h       |  0
 .../esp32p4/register/{ => hw_ver1}/soc/uhci_reg.h  |  0
 .../register/{ => hw_ver1}/soc/uhci_struct.h       |  0
 .../{ => hw_ver1}/soc/usb_serial_jtag_reg.h        |  0
 .../{ => hw_ver1}/soc/usb_serial_jtag_struct.h     |  0
 .../register/{ => hw_ver1}/soc/usb_utmi_struct.h   |  0
 .../register/{ => hw_ver1}/soc/usb_wrap_reg.h      |  0
 .../register/{ => hw_ver1}/soc/usb_wrap_struct.h   |  0
 tools/ci/astyle-rules.yml                          |  1 +
 192 files changed, 13 insertions(+), 3 deletions(-)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/adc_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/adc_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/aes_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/aes_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ahb_dma_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ahb_dma_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/assist_debug_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/assist_debug_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/axi_dma_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/axi_dma_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/bitscrambler_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/bitscrambler_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/cache_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/cache_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/dma2d_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/dma2d_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/dma_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/dma_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ds_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ds_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/dw_gdma_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/dw_gdma_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ecc_mult_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ecc_mult_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ecdsa_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ecdsa_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/efuse_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/efuse_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/emac_dma_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/emac_mac_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/emac_ptp_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/gpio_ext_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/gpio_ext_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/gpio_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/gpio_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/h264_dma_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/h264_dma_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/h264_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/h264_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hmac_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hmac_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hp2lp_peri_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hp2lp_peri_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hp_peri_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hp_peri_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hp_sys_clkrst_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hp_sys_clkrst_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hp_system_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/hp_system_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/huk_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/huk_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i2c_ana_mst_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i2c_ana_mst_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i2c_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i2c_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i2s_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i2s_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i3c_mst_mem_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i3c_mst_mem_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i3c_mst_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i3c_mst_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i3c_slv_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/i3c_slv_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/icm_sys_qos_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/icm_sys_qos_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/icm_sys_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/icm_sys_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/interrupt_core0_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/interrupt_core0_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/interrupt_core1_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/interrupt_core1_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/io_mux_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/io_mux_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/iomux_mspi_pin_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/iomux_mspi_pin_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/isp_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/isp_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/jpeg_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/jpeg_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/keymng_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/keymng_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/l2mem_monitor_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/l2mem_monitor_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lcd_cam_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lcd_cam_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ledc_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ledc_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp2hp_peri_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp2hp_peri_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_adc_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_adc_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_analog_peri_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_analog_peri_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_clkrst_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_clkrst_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_gpio_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_gpio_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_i2c_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_i2c_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_i2s_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_i2s_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_intr_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_intr_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_iomux_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_iomux_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_mailbox_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_mailbox_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_peri_pms_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_peri_pms_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_spi_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_spi_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_system_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_system_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_timer_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_timer_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_uart_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_uart_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_wdt_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lp_wdt_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lpperi_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/lpperi_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mcpwm_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mcpwm_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mipi_csi_bridge_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mipi_csi_bridge_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mipi_csi_host_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mipi_csi_host_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mipi_dsi_bridge_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mipi_dsi_bridge_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mipi_dsi_host_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/mipi_dsi_host_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/parl_io_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/parl_io_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/pau_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/pau_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/pcnt_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/pcnt_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/pmu_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/pmu_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ppa_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/ppa_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/pvt_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/pvt_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/reg_base.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/rmt_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/rmt_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/rsa_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/rsa_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/rtclockcali_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/rtclockcali_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/sdmmc_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/sdmmc_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/sha_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/sha_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/soc_etm_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/soc_etm_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi1_mem_c_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi1_mem_c_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi1_mem_s_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi1_mem_s_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi_mem_c_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi_mem_c_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi_mem_s_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi_mem_s_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/spi_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/systimer_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/systimer_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/tcm_monitor_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/tcm_monitor_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/timer_group_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/timer_group_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/touch_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/touch_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/trace_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/trace_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/tsens_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/tsens_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/twai_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/twai_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/uart_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/uart_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/uhci_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/uhci_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/usb_serial_jtag_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/usb_serial_jtag_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/usb_utmi_struct.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/usb_wrap_reg.h (100%)
 rename components/soc/esp32p4/register/{ => hw_ver1}/soc/usb_wrap_struct.h (100%)

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"

From df7cd41765800ddb681772eaaeb50bb0fe37bfab Mon Sep 17 00:00:00 2001
From: armando <douyiwen@espressif.com>
Date: Mon, 14 Jul 2025 11:46:26 +0800
Subject: [PATCH 2/3] change(ci): update regex to match soc headers in
 check_public_header.py

---
 tools/ci/check_public_headers.py | 99 +++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 33 deletions(-)

diff --git a/tools/ci/check_public_headers.py b/tools/ci/check_public_headers.py
index 2b21bae1e1..72b4fefdb9 100644
--- a/tools/ci/check_public_headers.py
+++ b/tools/ci/check_public_headers.py
@@ -2,7 +2,7 @@
 #
 # Checks all public headers in IDF in the ci
 #
-# SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 #
 import argparse
@@ -24,6 +24,7 @@ from typing import Union
 
 class HeaderFailed(Exception):
     """Base header failure exception"""
+
     pass
 
 
@@ -62,7 +63,7 @@ class HeaderFailedContainsStaticAssert(HeaderFailed):
 
 #   Creates a temp file and returns both output as a string and a file name
 #
-def exec_cmd_to_temp_file(what: List, suffix: str='') -> Tuple[int, str, str, str, str]:
+def exec_cmd_to_temp_file(what: List, suffix: str = '') -> Tuple[int, str, str, str, str]:
     out_file = tempfile.NamedTemporaryFile(suffix=suffix, delete=False)
     rc, out, err, cmd = exec_cmd(what, out_file)
     with open(out_file.name, 'r', encoding='utf-8') as f:
@@ -70,7 +71,9 @@ def exec_cmd_to_temp_file(what: List, suffix: str='') -> Tuple[int, str, str, st
     return rc, out, err, out_file.name, cmd
 
 
-def exec_cmd(what: List, out_file: Union['tempfile._TemporaryFileWrapper[bytes]', int]=subprocess.PIPE) -> Tuple[int, str, str, str]:
+def exec_cmd(
+    what: List, out_file: Union['tempfile._TemporaryFileWrapper[bytes]', int] = subprocess.PIPE
+) -> Tuple[int, str, str, str]:
     p = subprocess.Popen(what, stdin=subprocess.PIPE, stdout=out_file, stderr=subprocess.PIPE)
     output_b, err_b = p.communicate()
     rc = p.returncode
@@ -80,12 +83,11 @@ def exec_cmd(what: List, out_file: Union['tempfile._TemporaryFileWrapper[bytes]'
 
 
 class PublicHeaderChecker:
-
-    def log(self, message: str, debug: bool=False) -> None:
+    def log(self, message: str, debug: bool = False) -> None:
         if self.verbose or debug:
             print(message)
 
-    def __init__(self, verbose: bool=False, jobs: int=1, prefix: Optional[str]=None) -> None:
+    def __init__(self, verbose: bool = False, jobs: int = 1, prefix: Optional[str] = None) -> None:
         self.gcc = '{}gcc'.format(prefix)
         self.gpp = '{}g++'.format(prefix)
         self.verbose = verbose
@@ -97,7 +99,9 @@ class PublicHeaderChecker:
         self.kconfig_macro = re.compile(r'\bCONFIG_[A-Z0-9_]+')
         self.static_assert = re.compile(r'(_Static_assert|static_assert)')
         self.defines_assert = re.compile(r'#define[ \t]+ESP_STATIC_ASSERT')
-        self.auto_soc_header = re.compile(r'components/soc/esp[a-z0-9_]+(?:/\w+)?/(include|register)/(soc|modem)/[a-zA-Z0-9_]+.h')
+        self.auto_soc_header = re.compile(
+            r'components/soc/esp[a-z0-9_]+(?:/\w+)?/(include|register)/(soc|modem|hw_ver\d+/soc)/[a-zA-Z0-9_]+.h'
+        )
         self.assembly_nocode = r'^\s*(\.file|\.text|\.ident|\.option|\.attribute|(\.section)?).*$'
         self.check_threads: List[Thread] = []
         self.stdc = '--std=c99'
@@ -109,7 +113,7 @@ class PublicHeaderChecker:
 
     def __enter__(self) -> 'PublicHeaderChecker':
         for i in range(self.jobs):
-            t = Thread(target=self.check_headers, args=(i, ))
+            t = Thread(target=self.check_headers, args=(i,))
             self.check_threads.append(t)
             t.start()
         return self
@@ -155,7 +159,9 @@ class PublicHeaderChecker:
 
     # Checks if the header contains some assembly code and whether it is compilable
     def compile_one_header_with(self, compiler: str, std_flags: str, header: str) -> None:
-        rc, out, err, cmd = exec_cmd([compiler, std_flags, '-S', '-o-', '-include', header, self.main_c] + self.include_dir_flags)
+        rc, out, err, cmd = exec_cmd(
+            [compiler, std_flags, '-S', '-o-', '-include', header, self.main_c] + self.include_dir_flags
+        )
         if rc == 0:
             if not re.sub(self.assembly_nocode, '', out, flags=re.M).isspace():
                 raise HeaderFailedContainsCode()
@@ -185,16 +191,25 @@ class PublicHeaderChecker:
     #                               - We still have some code? -> FAIL the test (our header needs extern "C")
     #                               - Only whitespaces -> header is OK (it contains only macros and directives)
     def preprocess_one_header(self, header: str, num: int) -> None:
-        all_compilation_flags = ['-w', '-P', '-E', '-DESP_PLATFORM', '-include', header, self.main_c] + self.include_dir_flags
+        all_compilation_flags = [
+            '-w',
+            '-P',
+            '-E',
+            '-DESP_PLATFORM',
+            '-include',
+            header,
+            self.main_c,
+        ] + self.include_dir_flags
         # just strip comments to check for CONFIG_... macros or static asserts
-        rc, out, err, _ = exec_cmd([self.gcc, '-fpreprocessed', '-dD',  '-P',  '-E', header] + self.include_dir_flags)
-        # we ignore the rc here, as the `-fpreprocessed` flag expects the file to have macros already expanded, so we might get some errors
-        # here we use it only to remove comments (even if the command returns non-zero code it produces the correct output)
+        rc, out, err, _ = exec_cmd([self.gcc, '-fpreprocessed', '-dD', '-P', '-E', header] + self.include_dir_flags)
+        # we ignore the rc here, as the `-fpreprocessed` flag expects the file to have macros already expanded,
+        # so we might get some errors here we use it only to remove comments (even if the command returns non-zero
+        # code it produces the correct output)
         if re.search(self.kconfig_macro, out):
             # enable defined #error if sdkconfig.h not included
             all_compilation_flags.append('-DIDF_CHECK_SDKCONFIG_INCLUDED')
-        # If the file contain _Static_assert or static_assert, make sure it doesn't not define ESP_STATIC_ASSERT and that it
-        # is not an automatically generated soc header file
+        # If the file contain _Static_assert or static_assert, make sure it doesn't not define ESP_STATIC_ASSERT
+        # and that it is not an automatically generated soc header file
         grp = re.search(self.static_assert, out)
         # Normalize the potential A//B, A/./B, A/../A, from the name
         normalized_path = os.path.normpath(header)
@@ -234,19 +249,22 @@ class PublicHeaderChecker:
                 if re.search(self.extern_c, out):
                     self.log('{} extern C present in the actual header, too - OK'.format(header))
                     return
-                # at this point we know that the header itself is missing extern-C, so we need to check if it contains an actual *code*
-                # we remove all preprocessor's directive to check if there's any code besides macros
+                # at this point we know that the header itself is missing extern-C, so we need to check if it
+                # contains an actual *code* we remove all preprocessor's directive to check if there's any code
+                # besides macros
                 macros = re.compile(r'(?m)^\s*#(?:.*\\\r?\n)*.*$')  # Matches multiline preprocessor directives
                 without_macros = macros.sub('', out)
                 if without_macros.isspace():
                     self.log("{} Header doesn't need extern-C, it's all just macros - OK".format(header))
                     return
-                # at this point we know that the header is not only composed of macro definitions, but could just contain some "harmless" macro calls
-                # let's remove them and check again
-                macros_calls = r'(.*?)ESP_STATIC_ASSERT[^;]+;'   # static assert macro only, we could add more if needed
+                # at this point we know that the header is not only composed of macro definitions, but could
+                # just contain some "harmless" macro calls let's remove them and check again
+                macros_calls = r'(.*?)ESP_STATIC_ASSERT[^;]+;'  # static assert macro only, we could add more if needed
                 without_macros = re.sub(macros_calls, '', without_macros, flags=re.DOTALL)
                 if without_macros.isspace():
-                    self.log("{} Header doesn't need extern-C, it's all macros definitions and calls - OK".format(header))
+                    self.log(
+                        "{} Header doesn't need extern-C, it's all macros definitions and calls - OK".format(header)
+                    )
                     return
 
             self.log('{} Different but no extern C - FAILED'.format(header), True)
@@ -259,7 +277,9 @@ class PublicHeaderChecker:
                 pass
 
     # Get compilation data from an example to list all public header files
-    def list_public_headers(self, ignore_dirs: List, ignore_files: Union[List, Set], only_dir: Optional[str]=None) -> None:
+    def list_public_headers(
+        self, ignore_dirs: List, ignore_files: Union[List, Set], only_dir: Optional[str] = None
+    ) -> None:
         idf_path = os.getenv('IDF_PATH')
         if idf_path is None:
             raise RuntimeError("Environment variable 'IDF_PATH' wasn't set.")
@@ -270,13 +290,14 @@ class PublicHeaderChecker:
             os.unlink(os.path.join(project_dir, 'sdkconfig'))
         except FileNotFoundError:
             pass
-        subprocess.check_call(['idf.py', '-B', build_dir, f'-DSDKCONFIG={sdkconfig}', '-DCOMPONENTS=', 'reconfigure'],
-                              cwd=project_dir)
+        subprocess.check_call(
+            ['idf.py', '-B', build_dir, f'-DSDKCONFIG={sdkconfig}', '-DCOMPONENTS=', 'reconfigure'], cwd=project_dir
+        )
 
         def get_std(json: List, extension: str) -> str:
             # compile commands for the files with specified extension, containing C(XX) standard flag
             command = [c for c in j if c['file'].endswith('.' + extension) and '-std=' in c['command']][0]
-            return str([s for s in command['command'].split() if 'std=' in s][0])     # grab the std flag
+            return str([s for s in command['command'].split() if 'std=' in s][0])  # grab the std flag
 
         build_commands_json = os.path.join(build_dir, 'compile_commands.json')
         with open(build_commands_json, 'r', encoding='utf-8') as f:
@@ -293,7 +314,9 @@ class PublicHeaderChecker:
                 if 'components' in item:
                     include_dirs.append(item[2:])  # Removing the leading "-I"
             if item.startswith('-D'):
-                include_dir_flags.append(item.replace('\\',''))  # removes escaped quotes, eg: -DMBEDTLS_CONFIG_FILE=\\\"mbedtls/esp_config.h\\\"
+                include_dir_flags.append(
+                    item.replace('\\', '')
+                )  # removes escaped quotes, eg: -DMBEDTLS_CONFIG_FILE=\\\"mbedtls/esp_config.h\\\"
         include_dir_flags.append('-I' + os.path.join(build_dir, 'config'))
         include_dir_flags.append('-DCI_HEADER_CHECK')
         sdkconfig_h = os.path.join(build_dir, 'config', 'sdkconfig.h')
@@ -302,14 +325,18 @@ class PublicHeaderChecker:
             f.write('#define IDF_SDKCONFIG_INCLUDED')
         main_c = os.path.join(build_dir, 'compile.c')
         with open(main_c, 'w') as f:
-            f.write('#if defined(IDF_CHECK_SDKCONFIG_INCLUDED) && ! defined(IDF_SDKCONFIG_INCLUDED)\n'
-                    '#error CONFIG_VARS_USED_WHILE_SDKCONFIG_NOT_INCLUDED\n'
-                    '#endif')
+            f.write(
+                '#if defined(IDF_CHECK_SDKCONFIG_INCLUDED) && ! defined(IDF_SDKCONFIG_INCLUDED)\n'
+                '#error CONFIG_VARS_USED_WHILE_SDKCONFIG_NOT_INCLUDED\n'
+                '#endif'
+            )
         # processes public include dirs, removing ignored files
         all_include_files = []
         files_to_check = []
         for d in include_dirs:
-            if only_dir is not None and not os.path.relpath(d, idf_path).startswith(os.path.relpath(only_dir, idf_path)):
+            if only_dir is not None and not os.path.relpath(d, idf_path).startswith(
+                os.path.relpath(only_dir, idf_path)
+            ):
                 self.log('{} - directory ignored (not in "{}")'.format(d, only_dir))
                 continue
             if os.path.relpath(d, idf_path).startswith(tuple(ignore_dirs)):
@@ -338,7 +365,10 @@ class PublicHeaderChecker:
 
 
 def check_all_headers() -> None:
-    parser = argparse.ArgumentParser('Public header checker file', formatter_class=argparse.RawDescriptionHelpFormatter, epilog='''\
+    parser = argparse.ArgumentParser(
+        'Public header checker file',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""\
     Tips for fixing failures reported by this script
     ------------------------------------------------
     This checker validates all public headers to detect these types of issues:
@@ -367,11 +397,14 @@ def check_all_headers() -> None:
     * Use "-v" argument to produce more verbose output
     * Copy, paste and execute the compilation commands to reproduce build errors (script prints out
       the entire compilation command line with absolute paths)
-    ''')
+    """,
+    )
     parser.add_argument('--verbose', '-v', help='enables verbose mode', action='store_true')
     parser.add_argument('--jobs', '-j', help='number of jobs to run checker', default=1, type=int)
     parser.add_argument('--prefix', '-p', help='compiler prefix', default='xtensa-esp32-elf-', type=str)
-    parser.add_argument('--exclude-file', '-e', help='exception file', default='check_public_headers_exceptions.txt', type=str)
+    parser.add_argument(
+        '--exclude-file', '-e', help='exception file', default='check_public_headers_exceptions.txt', type=str
+    )
     parser.add_argument('--only-dir', '-d', help='reduce the analysis to this directory only', default=None, type=str)
     args = parser.parse_args()
 

From 9477f88a0d1450a5ff6b7e1d832e14b699077a16 Mon Sep 17 00:00:00 2001
From: armando <douyiwen@espressif.com>
Date: Mon, 14 Jul 2025 14:45:48 +0800
Subject: [PATCH 3/3] change(g0): use hw_ver1 to build g0 components test app

---
 components/soc/CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt
index 21ee851006..2814539972 100644
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -20,10 +20,14 @@ endif()
 
 # 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")
+    if(DEFINED COMPONENTS AND "esp_hw_support" IN_LIST COMPONENTS)
+        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()
-        list(APPEND includes "${target_folder}/register/hw_ver2")
+        list(APPEND includes "${target_folder}/register/hw_ver1")
     endif()
 else()
     if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target_folder}/register")