all: Using xxx_periph.h

Using xxx_periph.h in whole IDF instead of xxx_reg.h, xxx_struct.h, xxx_channel.h ... .

Cleaned up header files from unnecessary headers (releated to soc/... headers).

components/app_trace/app_trace.c

@@ -160,8 +160,7 @@
 #include "soc/dport_reg.h"
 #include "eri.h"
 #include "trax.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "freertos/FreeRTOS.h"
 #include "esp_app_trace.h"
 

components/app_trace/gcov/gcov_rtio.c

@@ -18,8 +18,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "soc/cpu.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "esp_app_trace.h"
 #include "esp_private/dbg_stubs.h"
 

components/app_update/esp_ota_ops.c

@@ -34,7 +34,6 @@
 #include "esp_ota_ops.h"
 #include "sys/queue.h"
 #include "esp32/rom/crc.h"
-#include "soc/dport_reg.h"
 #include "esp_log.h"
 #include "esp_flash_partitions.h"
 #include "bootloader_common.h"

components/bootloader_support/include/esp_flash_encrypt.h

@@ -20,7 +20,7 @@
 #ifndef BOOTLOADER_BUILD
 #include "esp_spi_flash.h"
 #endif
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 /**
  * @file esp_partition.h

components/bootloader_support/include/esp_secure_boot.h

@@ -15,7 +15,7 @@
 
 #include <stdbool.h>
 #include <esp_err.h>
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 #include "sdkconfig.h"
 

components/bootloader_support/src/bootloader_clock.c

@@ -16,8 +16,7 @@
 #include "soc/soc.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/efuse_periph.h"
 
 void bootloader_clock_configure()
 {

components/bootloader_support/src/bootloader_common.c

@@ -17,16 +17,13 @@
 #include "sdkconfig.h"
 #include "esp_err.h"
 #include "esp_log.h"
-#include "esp32/rom/spi_flash.h"
 #include "esp32/rom/crc.h"
-#include "esp32/rom/ets_sys.h"
 #include "esp32/rom/gpio.h"
 #include "esp_secure_boot.h"
 #include "esp_flash_partitions.h"
 #include "bootloader_flash.h"
 #include "bootloader_common.h"
 #include "soc/gpio_periph.h"
-#include "soc/efuse_reg.h"
 #include "soc/rtc.h"
 #include "esp_image_format.h"
 #include "bootloader_sha.h"

components/bootloader_support/src/bootloader_init.c

@@ -33,12 +33,12 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
 #include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/rtc_wdt.h"
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 
 #include "sdkconfig.h"
 #include "esp_image_format.h"

components/bootloader_support/src/bootloader_random.c

@@ -14,11 +14,11 @@
 #include "bootloader_random.h"
 #include "soc/cpu.h"
 #include "soc/wdev_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
-#include "soc/syscon_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/syscon_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/i2s_periph.h"
 #include "esp_log.h"
 
 #ifndef BOOTLOADER_BUILD

components/bootloader_support/src/bootloader_utility.c

@@ -33,12 +33,10 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 
 #include "sdkconfig.h"
 #include "esp_image_format.h"

components/bootloader_support/src/esp32/bootloader_sha.c

@@ -17,8 +17,7 @@
 #include <assert.h>
 #include <sys/param.h>
 #include "esp32/rom/sha.h"
-#include "soc/dport_reg.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include "esp32/rom/ets_sys.h" // TO REMOVE
 
 static uint32_t words_hashed;

components/bootloader_support/src/esp32/secure_boot.c

@@ -22,10 +22,8 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/secure_boot.h"
 
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
 
 #include "sdkconfig.h"
 

components/bootloader_support/src/flash_qio_mode.c

@@ -18,9 +18,8 @@
 #include "esp_err.h"
 #include "esp32/rom/spi_flash.h"
 #include "esp32/rom/efuse.h"
-#include "soc/spi_struct.h"
-#include "soc/spi_reg.h"
-#include "soc/efuse_reg.h"
+#include "soc/spi_periph.h"
+#include "soc/efuse_periph.h"
 #include "sdkconfig.h"
 
 /* SPI flash controller */

components/bt/bt.c

@@ -40,7 +40,6 @@
 #include "esp_ipc.h"
 #include "driver/periph_ctrl.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 #include "soc/soc_memory_layout.h"
 #include "esp32/clk.h"
 #include "esp_coexist_internal.h"

components/driver/can.c

@@ -21,8 +21,7 @@
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "esp_pm.h"
-#include "soc/dport_reg.h"
-#include "soc/can_struct.h"
+#include "soc/can_periph.h"
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"
 #include "driver/can.h"

components/driver/gpio.c

@@ -13,15 +13,13 @@
 // limitations under the License.
 #include <esp_types.h>
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/xtensa_api.h"
 #include "driver/gpio.h"
 #include "driver/rtc_io.h"
 #include "soc/soc.h"
-#include "esp_log.h"
 #include "soc/gpio_periph.h"
+#include "esp_log.h"
 
 static const char* GPIO_TAG = "gpio";
 #define GPIO_CHECK(a, str, ret_val) \

components/driver/i2c.c

@@ -23,9 +23,7 @@
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
 #include "freertos/ringbuf.h"
-#include "soc/dport_reg.h"
-#include "soc/i2c_struct.h"
-#include "soc/i2c_reg.h"
+#include "soc/i2c_periph.h"
 #include "driver/i2c.h"
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"

components/driver/i2s.c

@@ -19,12 +19,9 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 
-#include "soc/dport_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
 #include "soc/rtc.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp32/rom/lldesc.h"
 
 #include "driver/gpio.h"

components/driver/include/driver/adc.h

@@ -23,7 +23,7 @@ extern "C" {
 #include <stdbool.h>
 #include "esp_err.h"
 #include "driver/gpio.h"
-#include "soc/adc_channel.h"
+#include "soc/adc_periph.h"
 
 typedef enum {
     ADC_ATTEN_DB_0   = 0,  /*!<The input voltage of ADC will be reduced to about 1/1 */

components/driver/include/driver/dac.h

@@ -21,7 +21,7 @@ extern "C" {
 
 #include <stdint.h>
 #include "esp_err.h"
-#include "soc/dac_channel.h"
+#include "soc/dac_periph.h"
 
 typedef enum {
     DAC_CHANNEL_1 = 1,  /*!< DAC channel 1 is GPIO25 */

components/driver/include/driver/i2s.h

@@ -16,12 +16,10 @@
 #define _DRIVER_I2S_H_
 #include "esp_err.h"
 #include <esp_types.h>
-#include "soc/gpio_reg.h"
 #include "soc/soc.h"
-#include "soc/i2s_struct.h"
-#include "soc/i2s_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/gpio.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"

components/driver/include/driver/mcpwm.h

@@ -20,7 +20,6 @@
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 
 #ifdef __cplusplus
 extern "C" {

components/driver/include/driver/pcnt.h

@@ -8,11 +8,8 @@
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "soc/soc.h"
-#include "soc/pcnt_reg.h"
-#include "soc/pcnt_struct.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/pcnt_periph.h"
 #include "driver/gpio.h"
-#include "esp_intr_alloc.h"
 
 #ifdef __cplusplus
 extern "C" {

components/driver/include/driver/periph_ctrl.h

@@ -15,9 +15,6 @@
 #ifndef _DRIVER_PERIPH_CTRL_H_
 #define _DRIVER_PERIPH_CTRL_H_
 
-#include "esp_err.h"
-#include "soc/soc.h"
-#include "soc/dport_reg.h"
 #include "soc/periph_defs.h"
 
 #ifdef __cplusplus

components/driver/include/driver/rmt.h

@@ -15,9 +15,7 @@
 #ifndef _DRIVER_RMT_CTRL_H_
 #define _DRIVER_RMT_CTRL_H_
 #include "esp_err.h"
-#include "soc/rmt_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/rmt_struct.h"
+#include "soc/rmt_periph.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"

components/driver/include/driver/rtc_io.h

@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include "esp_err.h"
 #include "driver/gpio.h"
-#include "soc/rtc_gpio_channel.h"
 #include "soc/rtc_periph.h"
 #ifdef __cplusplus
 extern "C" {

components/driver/include/driver/sigmadelta.h

@@ -15,8 +15,7 @@
 #ifndef __DRIVER_SIGMADELTA_H__
 #define __DRIVER_SIGMADELTA_H__
 #include <esp_types.h>
-#include "soc/gpio_sd_struct.h"
-#include "soc/gpio_sd_reg.h"
+#include "soc/sigmadelta_periph.h"
 #include "driver/gpio.h"
 
 #ifdef _cplusplus

components/driver/include/driver/timer.h

@@ -17,8 +17,7 @@
 #include "esp_err.h"
 #include "esp_attr.h"
 #include "soc/soc.h"
-#include "soc/timer_group_reg.h"
-#include "soc/timer_group_struct.h"
+#include "soc/timer_periph.h"
 #include "esp_intr_alloc.h"
 
 #ifdef __cplusplus

components/driver/include/driver/touch_pad.h

@@ -17,10 +17,9 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "esp_intr_alloc.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "soc/touch_channel.h"
+#include "soc/touch_periph.h"
 
 typedef enum {
     TOUCH_PAD_NUM0 = 0, /*!< Touch pad channel 0 is GPIO4 */

components/driver/include/driver/uart.h

@@ -20,8 +20,7 @@
 extern "C" {
 #endif
 
-#include "soc/uart_reg.h"
-#include "soc/uart_struct.h"
+#include "soc/uart_periph.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
 #include "driver/periph_ctrl.h"
@@ -32,7 +31,6 @@ extern "C" {
 #include "freertos/queue.h"
 #include "freertos/ringbuf.h"
 #include <esp_types.h>
-#include "soc/uart_channel.h"
 
 #define UART_FIFO_LEN           (128)        /*!< Length of the hardware FIFO buffers */
 #define UART_INTR_MASK          0x1ff        /*!< Mask of all UART interrupts */

components/driver/ledc.c

@@ -13,15 +13,12 @@
 // limitations under the License.
 #include <esp_types.h>
 #include <string.h>
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
 #include "driver/ledc.h"
-#include "soc/ledc_reg.h"
-#include "soc/ledc_struct.h"
+#include "soc/ledc_periph.h"
 #include "esp_log.h"
 
 static const char* LEDC_TAG = "ledc";

components/driver/mcpwm.c

@@ -15,16 +15,12 @@
 #include <stdio.h>
 #include "esp_log.h"
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/mcpwm_periph.h"
+#include "soc/gpio_periph.h"
 #include "driver/mcpwm.h"
 #include "driver/periph_ctrl.h"
 

components/driver/pcnt.c

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "esp_log.h"
-#include "esp_intr_alloc.h"
 #include "driver/pcnt.h"
 #include "driver/periph_ctrl.h"
 

components/driver/periph_ctrl.c

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <esp_types.h>
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"

components/driver/rmt.c

@@ -21,9 +21,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/rmt_struct.h"
+#include "soc/gpio_periph.h"
 #include "driver/periph_ctrl.h"
 #include "driver/rmt.h"
 #include "soc/soc_memory_layout.h"

components/driver/rtc_module.c

@@ -17,14 +17,9 @@
 #include <ctype.h>
 #include "esp32/rom/ets_sys.h"
 #include "esp_log.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/rtc_io_struct.h"
-#include "soc/sens_reg.h"
-#include "soc/sens_struct.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_cntl_struct.h"
-#include "soc/syscon_reg.h"
-#include "soc/syscon_struct.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/syscon_periph.h"
 #include "soc/rtc.h"
 #include "rtc_io.h"
 #include "touch_pad.h"

components/driver/sdio_slave.c

@@ -91,10 +91,8 @@ The driver of FIFOs works as below:
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
-#include "soc/dport_access.h"
-#include "soc/dport_reg.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "freertos/semphr.h"
 #include "xtensa/core-macros.h"
 #include "driver/periph_ctrl.h"

components/driver/sdmmc_host.c

@@ -17,7 +17,7 @@
 #include <sys/param.h>
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "esp32/rom/gpio.h"
 #include "driver/gpio.h"
 #include "driver/sdmmc_host.h"

components/driver/sdspi_transaction.c

@@ -16,8 +16,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "sys/lock.h"
-#include "soc/sdmmc_reg.h"
-#include "soc/sdmmc_periph.h"
 #include "driver/sdmmc_types.h"
 #include "driver/sdmmc_defs.h"
 #include "driver/sdmmc_host.h"

components/driver/sigmadelta.c

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "esp_log.h"
-#include "soc/soc.h"
-#include "driver/periph_ctrl.h"
 #include "driver/sigmadelta.h"
 
 static const char* SIGMADELTA_TAG = "SIGMADELTA";

components/driver/spi_common.c

@@ -15,13 +15,10 @@
 
 #include <string.h>
 #include "driver/spi_master.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "soc/soc.h"

components/driver/spi_master.c

@@ -121,13 +121,11 @@ We have two bits to control the interrupt:
 #include <string.h>
 #include "driver/spi_common.h"
 #include "driver/spi_master.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_pm.h"
@@ -135,12 +133,9 @@ We have two bits to control the interrupt:
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/soc.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/dport_reg.h"
 #include "esp32/rom/lldesc.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
 #include "esp_heap_caps.h"
 #include "stdatomic.h"
 #include "sdkconfig.h"

components/driver/spi_slave.c

@@ -18,13 +18,11 @@
 #include <soc/lldesc.h>
 #include "driver/spi_common.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_pm.h"
@@ -32,12 +30,9 @@
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/soc.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/dport_reg.h"
 #include "esp32/rom/lldesc.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
 #include "esp_heap_caps.h"
 
 static const char *SPI_TAG = "spi_slave";

components/driver/test/test_i2c.c

@@ -11,9 +11,8 @@
 #include "driver/i2c.h"
 #include "esp_attr.h"
 #include "esp_log.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/i2c_struct.h"
-#include "soc/i2c_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2c_periph.h"
 #include "esp_system.h"
 #include "driver/pcnt.h"
 

components/driver/test/test_ledc.c

@@ -20,8 +20,7 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/ledc_reg.h"
-#include "soc/ledc_struct.h"
+#include "soc/ledc_periph.h"
 #include "esp_system.h"
 #include "driver/pcnt.h"
 #include "driver/ledc.h"

components/driver/test/test_pcnt.c

@@ -20,7 +20,7 @@
 #include "driver/ledc.h"
 #include "esp_attr.h"
 #include "esp_log.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
 #include "unity.h"
 #include "esp32/rom/ets_sys.h"
 

components/driver/test/test_pwm.c

@@ -20,8 +20,7 @@
 #include "test_utils.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 #include "freertos/queue.h"
 #include "esp_attr.h"
 #include "esp_log.h"

components/driver/test/test_rmt.c

@@ -13,7 +13,7 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "driver/periph_ctrl.h"
-#include "soc/rmt_reg.h"
+#include "soc/rmt_periph.h"
 
 static const char* TAG = "RMT";
 

components/driver/test/test_spi_master.c

@@ -16,7 +16,6 @@
 #include "unity.h"
 #include "driver/spi_master.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "soc/spi_periph.h"

components/driver/test/test_spi_sio.c

@@ -16,7 +16,6 @@
 #include "unity.h"
 #include "driver/spi_master.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "soc/spi_periph.h"

components/driver/timer.c

@@ -15,7 +15,6 @@
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/xtensa_api.h"
 #include "driver/timer.h"

components/driver/uart.c

@@ -15,7 +15,6 @@
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp32/clk.h"
@@ -25,8 +24,7 @@
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
 #include "freertos/ringbuf.h"
-#include "soc/dport_reg.h"
-#include "soc/uart_struct.h"
+#include "soc/uart_periph.h"
 #include "driver/uart.h"
 #include "driver/gpio.h"
 #include "driver/uart_select.h"

components/efuse/src/esp_efuse_api.c

@@ -14,7 +14,7 @@
 
 #include "esp_efuse.h"
 #include "esp_efuse_utility.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "assert.h"
 #include "sdkconfig.h"
 #include "esp_efuse_table.h"

components/efuse/src/esp_efuse_fields.c

@@ -21,7 +21,7 @@
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "bootloader_random.h"
 
 const static char *TAG = "efuse";

components/efuse/src/esp_efuse_utility.c

@@ -14,7 +14,7 @@
 
 #include "esp_efuse_utility.h"
 
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp_log.h"
 #include "assert.h"
 #include "sdkconfig.h"

components/efuse/test/test_efuse_coding_scheme.c

@@ -2,7 +2,7 @@
 #include <strings.h>
 #include "esp_efuse.h"
 #include "../src/esp_efuse_utility.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "unity.h"
 #include "bootloader_random.h"
 

components/esp32/brownout.c

@@ -19,7 +19,7 @@
 #include "sdkconfig.h"
 #include "soc/soc.h"
 #include "soc/cpu.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_private/system_internal.h"
 #include "driver/rtc_cntl.h"

components/esp32/cache_err_int.c

@@ -29,7 +29,6 @@
 #include "esp_attr.h"
 #include "soc/dport_reg.h"
 #include "sdkconfig.h"
-#include "esp32/dport_access.h"
 
 void esp_cache_err_int_init()
 {

components/esp32/clk.c

@@ -25,10 +25,11 @@
 #include "esp32/rom/uart.h"
 #include "esp32/rom/rtc.h"
 #include "soc/soc.h"
+#include "soc/dport_reg.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/i2s_periph.h"
 #include "driver/periph_ctrl.h"
 #include "xtensa/core-macros.h"
 #include "bootloader_clock.h"

components/esp32/cpu_start.c

@@ -26,11 +26,10 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/rtc_wdt.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 #include "driver/rtc_io.h"
 
@@ -48,7 +47,6 @@
 #include "esp_event.h"
 #include "esp_spi_flash.h"
 #include "esp_ipc.h"
-#include "esp32/dport_access.h"
 #include "esp_private/crosscore_int.h"
 #include "esp_log.h"
 #include "esp_vfs_dev.h"

components/esp32/crosscore_int.c

@@ -17,15 +17,14 @@
 #include "esp_attr.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/uart.h"
 
 #include "soc/cpu.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/rtc_periph.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"

components/esp32/dport_access.c

@@ -31,7 +31,7 @@
 
 #include "soc/cpu.h"
 #include "soc/dport_reg.h"
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"

components/esp32/gdbstub.c

@@ -20,8 +20,8 @@
 
 #include <string.h>
 #include "esp32/rom/ets_sys.h"
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "esp_private/gdbstub.h"
 #include "esp_debug_helpers.h"
 #include "driver/gpio.h"

components/esp32/int_wdt.c

@@ -26,8 +26,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"
 #include "esp_freertos_hooks.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "driver/timer.h"
 #include "driver/periph_ctrl.h"
 #include "esp_int_wdt.h"

components/esp32/intr_alloc.c

@@ -28,7 +28,6 @@
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"
-#include "esp_intr_alloc.h"
 #include "esp_ipc.h"
 #include <limits.h>
 #include <assert.h>

components/esp32/panic.c

@@ -22,12 +22,11 @@
 #include "freertos/task.h"
 #include "freertos/xtensa_api.h"
 
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"

components/esp32/pm_trace.c

@@ -15,7 +15,6 @@
 
 #include "esp_private/pm_trace.h"
 #include "driver/gpio.h"
-#include "soc/gpio_reg.h"
 
 /* GPIOs to use for tracing of esp_pm events.
  * Two entries in the array for each type, one for each CPU.

components/esp32/reset_reason.c

@@ -15,7 +15,7 @@
 #include "esp_system.h"
 #include "esp32/rom/rtc.h"
 #include "esp_private/system_internal.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 
 static void esp_reset_reason_clear_hint();
 

components/esp32/sleep_modes.c

@@ -27,10 +27,7 @@
 #include "esp32/rom/uart.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/spi_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/spi_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc_wdt.h"
 #include "soc/soc_memory_layout.h"

components/esp32/spiram_psram.c

@@ -29,10 +29,8 @@
 #include "esp32/rom/gpio.h"
 #include "esp32/rom/cache.h"
 #include "esp32/rom/efuse.h"
-#include "soc/io_mux_reg.h"
 #include "soc/dport_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "driver/gpio.h"
 #include "driver/spi_common.h"
 #include "driver/periph_ctrl.h"

components/esp32/spiram_psram.h

@@ -15,7 +15,7 @@
 
 #ifndef _PSRAM_H
 #define _PSRAM_H
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 #include "esp_err.h"
 #include "sdkconfig.h"
 

components/esp32/system_api.c

@@ -24,11 +24,10 @@
 #include "esp32/rom/cache.h"
 #include "esp32/rom/uart.h"
 #include "soc/dport_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
-#include "soc/timer_group_struct.h"
+#include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"

components/esp32/task_wdt.c

@@ -26,11 +26,9 @@
 #include <esp_types.h>
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_attr.h"
 #include "esp_freertos_hooks.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "esp_log.h"
 #include "driver/timer.h"
 #include "driver/periph_ctrl.h"

components/esp32/test/test_aes_sha_rsa.c

@@ -13,7 +13,7 @@
 #include "test_utils.h"
 #include "esp32/rom/uart.h"
 #include "esp32/rom/sha.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc.h"
 #include "esp_log.h"

components/esp32/test/test_ahb_arb.c

@@ -14,12 +14,10 @@
 
 #include "unity.h"
 
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/gpio_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
 
 
 

components/esp32/test/test_dport.c

@@ -11,7 +11,7 @@
 #include "unity.h"
 #include "test_utils.h"
 #include "esp32/rom/uart.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc.h"
 

components/esp32/test/test_fastbus.c

@@ -9,9 +9,8 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "driver/gpio.h"
 
 

components/esp32/test/test_intr_alloc.c

@@ -12,9 +12,9 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "esp_intr_alloc.h"
 #include "driver/periph_ctrl.h"
 #include "driver/timer.h"
@@ -334,4 +334,4 @@ TEST_CASE("alloc and free isr handle on different core", "[esp32]")
     isr_alloc_free_test();
 }
 
-#endif
+#endif

components/esp32/test/test_pm.c

@@ -13,9 +13,7 @@
 #include "driver/timer.h"
 #include "driver/rtc_io.h"
 #include "esp32/ulp.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_gpio_channel.h"
+#include "soc/rtc_periph.h"
 
 TEST_CASE("Can dump power management lock stats", "[pm]")
 {

components/esp32/test/test_reset_reason.c

@@ -2,7 +2,7 @@
 #include "esp_system.h"
 #include "esp_task_wdt.h"
 #include "esp_attr.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "driver/timer.h"
 #include "esp32/rom/rtc.h"
 #include "esp_sleep.h"

components/esp32/test/test_sleep.c

@@ -4,15 +4,14 @@
 #include "esp_sleep.h"
 #include "esp32/clk.h"
 #include "driver/rtc_io.h"
-#include "soc/gpio_reg.h"
-#include "soc/rtc.h"
-#include "soc/uart_reg.h"
 #include "esp32/rom/uart.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
+#include "soc/gpio_periph.h"
+#include "soc/uart_periph.h"
 #include "soc/rtc.h"            // for wakeup trigger defines
-#include "soc/rtc_cntl_reg.h"   // for read rtc registers directly (cause)
+#include "soc/rtc_periph.h"     // for read rtc registers directly (cause)
 #include "soc/soc.h"            // for direct register read macros
 #include "esp32/rom/rtc.h"
 #include "esp_newlib.h"

components/esp32/test/test_spiram_cache_flush.c

@@ -11,8 +11,6 @@ This code tests the interaction between PSRAM and SPI flash routines.
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>

components/esp32/test/test_tsens.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include "unity.h"
 #include "esp32/rom/ets_sys.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 
 TEST_CASE("can control TSENS using registers", "[rtc][ignore]")
 {

components/esp32/test/test_unal_dma.c

@@ -14,12 +14,9 @@
 #include "freertos/xtensa_api.h"
 #include "unity.h"
 
-#include "soc/uart_reg.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/gpio_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
 
 
 #define DPORT_I2S0_CLK_EN   (BIT(4))

components/esp_adc_cal/esp_adc_cal.c

@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include "esp_types.h"
 #include "driver/adc.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp_err.h"
 #include "assert.h"
 #include "esp_adc_cal.h"

components/esp_event/test/test_event.c

@@ -9,7 +9,6 @@
 #include "freertos/task.h"
 #include "freertos/portmacro.h"
 #include "esp_log.h"
-#include "soc/timer_group_struct.h"
 #include "driver/periph_ctrl.h"
 #include "driver/timer.h"
 

components/esp_rom/include/esp32/rom/uart.h

@@ -19,7 +19,7 @@
 #include "esp_attr.h"
 #include "ets_sys.h"
 #include "soc/soc.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 
 #ifdef __cplusplus
 extern "C" {

components/esp_wifi/src/phy_init.c

@@ -22,7 +22,6 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/rtc.h"
 #include "soc/rtc.h"
-#include "soc/dport_reg.h"
 
 #include "esp_err.h"
 #include "esp_phy_init.h"

components/espcoredump/src/core_dump_uart.c

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <string.h>
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "driver/gpio.h"
 #include "esp32/clk.h"
 #include "esp_core_dump_priv.h"

components/ethernet/emac_dev.c

@@ -19,12 +19,8 @@
 #include "esp32/rom/gpio.h"
 
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/emac_reg_v2.h"
-#include "soc/emac_ex_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/gpio_periph.h"
 
 #include "esp_log.h"
 #include "driver/gpio.h"

components/ethernet/emac_dev.h

@@ -20,7 +20,7 @@ extern "C" {
 #endif
 
 #include "esp_types.h"
-#include "soc/emac_reg_v2.h"
+#include "soc/emac_periph.h"
 
 #define EMAC_INTR_ENABLE_BIT (EMAC_DMAIN_TIE | EMAC_DMAIN_RIE | EMAC_DMAIN_RBUE | EMAC_DMAIN_NISE)
 

components/ethernet/emac_main.c

@@ -19,13 +19,10 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/gpio.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/gpio_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/gpio_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/emac_ex_reg.h"
-#include "soc/emac_reg_v2.h"
 #include "soc/soc.h"
 
 #include "tcpip_adapter.h"

components/freemodbus/port/portserial.c

@@ -44,7 +44,7 @@
 #include "port.h"
 #include "driver/uart.h"
 #include "freertos/queue.h" // for queue support
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "driver/gpio.h"
 #include "esp_log.h"        // for esp_log
 #include "esp_err.h"        // for ESP_ERROR_CHECK macro

components/freertos/test/test_freertos.c

@@ -12,9 +12,8 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "driver/gpio.h"
 
 

components/freertos/test/test_newlib_reent.c

@@ -13,10 +13,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-
 
 volatile static int done;
 volatile static int error;

components/freertos/test/test_panic.c

@@ -12,10 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-
 
 TEST_CASE("Panic handler", "[freertos][ignore]")
 {

components/freertos/test/test_spinlocks.c

@@ -12,9 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "soc/cpu.h"
 
 #include "test_utils.h"

components/freertos/xtensa_vectors.S

@@ -94,7 +94,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "esp_private/panic_reason.h"
 #include "sdkconfig.h"
 #include "soc/soc.h"
-#include "soc/dport_reg.h"
 
 /*
   Define for workaround: pin no-cpu-affinity tasks to a cpu when fpu is used.

components/heap/test/test_malloc.c

@@ -12,9 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "esp_heap_caps.h"
 
 #include "esp_debug_helpers.h"

components/mbedtls/port/esp32/aes.c

@@ -29,8 +29,7 @@
 #include "mbedtls/aes.h"
 #include "mbedtls/platform_util.h"
 #include "esp32/aes.h"
-#include "soc/dport_reg.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include <sys/lock.h>
 
 #include <freertos/FreeRTOS.h>