Merge branch 'refactor/pack_driver_source_files' into 'master'

components/driver: pack peripherals

See merge request espressif/esp-idf!22173

components/driver/CMakeLists.txt

@@ -1,33 +1,35 @@
 idf_build_get_property(target IDF_TARGET)
 
+# Always compiled source files
 set(srcs
     "gpio/gpio.c"
-    "gpio/rtc_io.c"
     "gpio/gpio_glitch_filter_ops.c"
-    "spi_bus_lock.c"
+    "gpio/rtc_io.c"
-    "uart.c")
+    "spi/spi_bus_lock.c")
 
-set(includes "include" "deprecated")
+# Always included headers
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target}/include")
+set(includes "include"
-    list(APPEND includes "${target}/include")
+             "deprecated"
-endif()
+             "dac/include"
-
+             "gpio/include"
-if(CONFIG_SOC_LEDC_SUPPORTED)
+             "gptimer/include"
-    list(APPEND srcs "ledc.c")
+             "i2c/include"
-endif()
+             "i2s/include"
-
+             "ledc/include"
-if(CONFIG_SOC_GPTIMER_SUPPORTED)
+             "mcpwm/include"
-    list(APPEND srcs "gptimer/gptimer.c" "deprecated/timer_legacy.c")
+             "pcnt/include"
-endif()
+             "rmt/include"
-
+             "sdio_slave/include"
-if(CONFIG_SOC_TIMER_SUPPORT_ETM)
+             "sdmmc/include"
-    list(APPEND srcs "gptimer/gptimer_etm.c")
+             "sigma_delta/include"
-endif()
+             "spi/include"
-
+             "temperature_sensor/include"
-if(CONFIG_SOC_I2C_SUPPORTED)
+             "touch_sensor/include"
-    list(APPEND srcs "i2c.c")
+             "twai/include"
-endif()
+             "uart/include"
+             "usb_serial_jtag/include")
 
+# ADC related source files (dprecated)
 if(CONFIG_SOC_ADC_SUPPORTED)
     list(APPEND srcs "deprecated/adc_legacy.c")
 endif()
@@ -36,18 +38,18 @@ if(CONFIG_SOC_ADC_DMA_SUPPORTED)
     list(APPEND srcs "deprecated/adc_dma_legacy.c")
 endif()
 
-if(CONFIG_SOC_MCPWM_SUPPORTED)
+# DAC related source files
-    list(APPEND srcs "mcpwm/mcpwm_cap.c"
+if(CONFIG_SOC_DAC_SUPPORTED)
-                     "mcpwm/mcpwm_cmpr.c"
+    list(APPEND srcs "dac/dac_oneshot.c"
-                     "mcpwm/mcpwm_com.c"
+                     "dac/dac_cosine.c"
-                     "mcpwm/mcpwm_fault.c"
+                     "dac/dac_continuous.c"
-                     "mcpwm/mcpwm_gen.c"
+                     "dac/dac_common.c"
-                     "mcpwm/mcpwm_oper.c"
+                     "dac/${target}/dac_dma.c"
-                     "mcpwm/mcpwm_sync.c"
+                     "deprecated/dac_common_legacy.c"
-                     "mcpwm/mcpwm_timer.c"
+                     "deprecated/${target}/dac_legacy.c")
-                     "deprecated/mcpwm_legacy.c")
 endif()
 
+# GPIO related source files
 if(CONFIG_SOC_DEDICATED_GPIO_SUPPORTED)
     list(APPEND srcs "gpio/dedic_gpio.c")
 endif()
@@ -60,26 +62,26 @@ if(CONFIG_SOC_GPIO_FLEX_GLITCH_FILTER_NUM GREATER 0)
     list(APPEND srcs "gpio/gpio_flex_glitch_filter.c")
 endif()
 
-if(CONFIG_SOC_SDM_SUPPORTED)
-    list(APPEND srcs "sdm.c" "deprecated/sigma_delta_legacy.c")
-endif()
-
-if(CONFIG_SOC_RMT_SUPPORTED)
-    list(APPEND srcs "rmt/rmt_common.c" "rmt/rmt_encoder.c" "rmt/rmt_rx.c" "rmt/rmt_tx.c" "deprecated/rmt_legacy.c")
-endif()
-
-if(CONFIG_SOC_PCNT_SUPPORTED)
-    list(APPEND srcs "pulse_cnt.c" "deprecated/pcnt_legacy.c")
-endif()
-
 if(CONFIG_SOC_GPIO_SUPPORT_ETM)
     list(APPEND srcs "gpio/gpio_etm.c")
 endif()
 
-if(CONFIG_SOC_SDMMC_HOST_SUPPORTED)
+# GPTimer related source files
-    list(APPEND srcs "sdmmc_transaction.c" "sdmmc_host.c")
+if(CONFIG_SOC_GPTIMER_SUPPORTED)
+    list(APPEND srcs "gptimer/gptimer.c"
+                     "deprecated/timer_legacy.c")
 endif()
 
+if(CONFIG_SOC_TIMER_SUPPORT_ETM)
+    list(APPEND srcs "gptimer/gptimer_etm.c")
+endif()
+
+# I2C related source files
+if(CONFIG_SOC_I2C_SUPPORTED)
+    list(APPEND srcs "i2c/i2c.c")
+endif()
+
+# I2S related source files
 if(CONFIG_SOC_I2S_SUPPORTED)
     list(APPEND srcs "i2s/i2s_common.c"
                      "i2s/i2s_std.c"
@@ -92,52 +94,99 @@ if(CONFIG_SOC_I2S_SUPPORTED)
     endif()
 endif()
 
-if(CONFIG_SOC_TEMP_SENSOR_SUPPORTED)
+# LEDC related source files
-    list(APPEND srcs "temperature_sensor.c"
+if(CONFIG_SOC_LEDC_SUPPORTED)
-                     "deprecated/rtc_temperature_legacy.c")
+    list(APPEND srcs "ledc/ledc.c")
 endif()
 
-if(CONFIG_SOC_TWAI_SUPPORTED)
+# MCPWM related source files
-    list(APPEND srcs "twai.c")
+if(CONFIG_SOC_MCPWM_SUPPORTED)
+    list(APPEND srcs "mcpwm/mcpwm_cap.c"
+                     "mcpwm/mcpwm_cmpr.c"
+                     "mcpwm/mcpwm_com.c"
+                     "mcpwm/mcpwm_fault.c"
+                     "mcpwm/mcpwm_gen.c"
+                     "mcpwm/mcpwm_oper.c"
+                     "mcpwm/mcpwm_sync.c"
+                     "mcpwm/mcpwm_timer.c"
+                     "deprecated/mcpwm_legacy.c")
 endif()
 
-if(CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED)
+# PCNT related source files
-    list(APPEND srcs "usb_serial_jtag.c")
+if(CONFIG_SOC_PCNT_SUPPORTED)
+    list(APPEND srcs "pcnt/pulse_cnt.c"
+                     "deprecated/pcnt_legacy.c")
 endif()
 
+# RMT related source files
+if(CONFIG_SOC_RMT_SUPPORTED)
+    list(APPEND srcs "rmt/rmt_common.c"
+                     "rmt/rmt_encoder.c"
+                     "rmt/rmt_rx.c"
+                     "rmt/rmt_tx.c"
+                     "deprecated/rmt_legacy.c")
+endif()
+
+# SDIO Slave related source files
+if(CONFIG_SOC_SDIO_SLAVE_SUPPORTED)
+    list(APPEND srcs "sdio_slave/sdio_slave.c")
+endif()
+
+# SDMMC related source files
+if(CONFIG_SOC_SDMMC_HOST_SUPPORTED)
+    list(APPEND srcs "sdmmc/sdmmc_transaction.c"
+                     "sdmmc/sdmmc_host.c")
+endif()
+
+# Sigma-Delta Modulation related source files
+if(CONFIG_SOC_SDM_SUPPORTED)
+    list(APPEND srcs "sigma_delta/sdm.c"
+                     "deprecated/sigma_delta_legacy.c")
+endif()
+
+# SPI related source files
 if(CONFIG_SOC_GPSPI_SUPPORTED)
-    list(APPEND srcs
+    list(APPEND srcs "spi/gpspi/spi_common.c"
-                "spi_common.c"
+                     "spi/gpspi/spi_master.c"
-                "spi_master.c"
+                     "spi/gpspi/spi_slave.c"
-                "spi_slave.c"
+                     "spi/sdspi/sdspi_crc.c"
-                "sdspi_crc.c"
+                     "spi/sdspi/sdspi_host.c"
-                "sdspi_host.c"
+                     "spi/sdspi/sdspi_transaction.c")
-                "sdspi_transaction.c")
 endif()
 
 if(CONFIG_SOC_SPI_SUPPORT_SLAVE_HD_VER2)
-    list(APPEND srcs "spi_slave_hd.c")
+    list(APPEND srcs "spi/gpspi/spi_slave_hd.c")
 endif()
 
+# Temperature Sensor related source files
+if(CONFIG_SOC_TEMP_SENSOR_SUPPORTED)
+    list(APPEND srcs "temperature_sensor/temperature_sensor.c"
+                     "deprecated/rtc_temperature_legacy.c")
+endif()
+
+# Touch Sensor related source files
 if(CONFIG_SOC_TOUCH_SENSOR_SUPPORTED)
-    list(APPEND srcs "touch_sensor_common.c"
+    list(APPEND srcs "touch_sensor/touch_sensor_common.c"
-                     "${target}/touch_sensor.c")
+                     "touch_sensor/${target}/touch_sensor.c")
+    list(APPEND includes "touch_sensor/${target}/include")
 endif()
 
-if(CONFIG_SOC_SDIO_SLAVE_SUPPORTED)
+# TWAI related source files
-    list(APPEND srcs "sdio_slave.c")
+if(CONFIG_SOC_TWAI_SUPPORTED)
+    list(APPEND srcs "twai/twai.c")
 endif()
 
-if(CONFIG_SOC_DAC_SUPPORTED)
+# UART related source files
-    list(APPEND srcs "dac/dac_oneshot.c"
+if(CONFIG_SOC_UART_SUPPORTED)
-                     "dac/dac_cosine.c"
+    list(APPEND srcs "uart/uart.c")
-                     "dac/dac_continuous.c"
-                     "dac/dac_common.c"
-                     "dac/${target}/dac_dma.c"
-                     "deprecated/dac_common_legacy.c"
-                     "deprecated/${target}/dac_legacy.c")
 endif()
 
+# USB Serial JTAG related source files
+if(CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED)
+    list(APPEND srcs "usb_serial_jtag/usb_serial_jtag.c")
+endif()
+
+# Other source files
 if(${target} STREQUAL "esp32")
     list(APPEND srcs "deprecated/adc_i2s_deprecated.c")
 endif()
@@ -151,7 +200,6 @@ else()
     # Can be removed together with legacy drivers)
     idf_component_register(SRCS "${srcs}"
                         INCLUDE_DIRS ${includes}
-                        PRIV_INCLUDE_DIRS "include/driver"
                         PRIV_REQUIRES efuse esp_timer
                         REQUIRES esp_pm esp_ringbuf freertos soc hal esp_hw_support
                         LDFRAGMENTS linker.lf)

components/driver/dac/include/driver/dac_types.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/gpio/include/driver/gpio_etm.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/gpio/include/driver/gpio_filter.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/gptimer/include/driver/gptimer.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/gptimer/include/driver/gptimer_etm.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/gptimer/include/driver/gptimer_types.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/i2s/include/driver/i2s_pdm.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/i2s/include/driver/i2s_std.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/i2s/include/driver/i2s_tdm.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/mcpwm/include/driver/mcpwm_cap.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/mcpwm/include/driver/mcpwm_cmpr.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/mcpwm/include/driver/mcpwm_fault.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/mcpwm/include/driver/mcpwm_oper.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/mcpwm/include/driver/mcpwm_prelude.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/mcpwm/include/driver/mcpwm_sync.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/mcpwm/include/driver/mcpwm_timer.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/mcpwm/include/driver/mcpwm_types.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/pcnt/include/driver/pulse_cnt.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/rmt/include/driver/rmt_rx.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/rmt/include/driver/rmt_tx.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/rmt/include/driver/rmt_types.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/driver/spi/include/driver/sdspi_host.h

@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include "esp_err.h"
-#include "sdmmc_types.h"
+#include "driver/sdmmc_types.h"
 #include "driver/gpio.h"
 #include "driver/spi_master.h"
 

components/driver/spi/include/driver/spi_common.h

@@ -11,7 +11,7 @@
 #include "sdkconfig.h"
 #include "esp_err.h"
 #include "esp_ipc.h"
-#include "intr_types.h"
+#include "driver/intr_types.h"
 #include "hal/spi_types.h"
 
 #ifdef __cplusplus

components/driver/temperature_sensor/temperature_sensor.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */

components/soc/esp32/include/soc/Kconfig.soc_caps.in

@@ -27,6 +27,10 @@ config SOC_DAC_SUPPORTED
     bool
     default y
 
+config SOC_UART_SUPPORTED
+    bool
+    default y
+
 config SOC_MCPWM_SUPPORTED
     bool
     default y

components/soc/esp32/include/soc/soc_caps.h

@@ -66,6 +66,7 @@
 
 #define SOC_ADC_SUPPORTED           1
 #define SOC_DAC_SUPPORTED           1
+#define SOC_UART_SUPPORTED          1
 #define SOC_MCPWM_SUPPORTED         1
 #define SOC_GPTIMER_SUPPORTED       1
 #define SOC_SDMMC_HOST_SUPPORTED    1

components/soc/esp32c2/include/soc/Kconfig.soc_caps.in

@@ -11,6 +11,10 @@ config SOC_DEDICATED_GPIO_SUPPORTED
     bool
     default y
 
+config SOC_UART_SUPPORTED
+    bool
+    default y
+
 config SOC_GDMA_SUPPORTED
     bool
     default y

components/soc/esp32c2/include/soc/soc_caps.h

@@ -27,6 +27,7 @@
 /*-------------------------- COMMON CAPS ---------------------------------------*/
 #define SOC_ADC_SUPPORTED               1
 #define SOC_DEDICATED_GPIO_SUPPORTED    1
+#define SOC_UART_SUPPORTED              1
 #define SOC_GDMA_SUPPORTED              1
 #define SOC_GPTIMER_SUPPORTED           1
 #define SOC_BT_SUPPORTED                1

components/soc/esp32c3/include/soc/Kconfig.soc_caps.in

@@ -11,6 +11,10 @@ config SOC_DEDICATED_GPIO_SUPPORTED
     bool
     default y
 
+config SOC_UART_SUPPORTED
+    bool
+    default y
+
 config SOC_GDMA_SUPPORTED
     bool
     default y

components/soc/esp32c3/include/soc/soc_caps.h

@@ -27,6 +27,7 @@
 /*-------------------------- COMMON CAPS ---------------------------------------*/
 #define SOC_ADC_SUPPORTED               1
 #define SOC_DEDICATED_GPIO_SUPPORTED    1
+#define SOC_UART_SUPPORTED              1
 #define SOC_GDMA_SUPPORTED              1
 #define SOC_GPTIMER_SUPPORTED           1
 #define SOC_TWAI_SUPPORTED              1

components/soc/esp32c6/include/soc/Kconfig.soc_caps.in

@@ -11,6 +11,10 @@ config SOC_DEDICATED_GPIO_SUPPORTED
     bool
     default y
 
+config SOC_UART_SUPPORTED
+    bool
+    default y
+
 config SOC_GDMA_SUPPORTED
     bool
     default y

components/soc/esp32c6/include/soc/soc_caps.h

@@ -27,6 +27,7 @@
 /*-------------------------- COMMON CAPS ---------------------------------------*/
 #define SOC_ADC_SUPPORTED               1
 #define SOC_DEDICATED_GPIO_SUPPORTED    1
+#define SOC_UART_SUPPORTED              1
 #define SOC_GDMA_SUPPORTED              1
 #define SOC_GPTIMER_SUPPORTED           1
 #define SOC_PCNT_SUPPORTED              1

components/soc/esp32h2/include/soc/Kconfig.soc_caps.in

@@ -3,6 +3,10 @@
 # using gen_soc_caps_kconfig.py, do not edit manually
 #####################################################
 
+config SOC_UART_SUPPORTED
+    bool
+    default y
+
 config SOC_GDMA_SUPPORTED
     bool
     default y

components/soc/esp32h2/include/soc/soc_caps.h

@@ -27,6 +27,7 @@
 /*-------------------------- COMMON CAPS ---------------------------------------*/
 // #define SOC_ADC_SUPPORTED               1 // TODO: IDF-6214
 // #define SOC_DEDICATED_GPIO_SUPPORTED    1 // TODO: IDF-6241
+#define SOC_UART_SUPPORTED              1
 #define SOC_GDMA_SUPPORTED              1
 #define SOC_ASYNC_MEMCPY_SUPPORTED      1
 #define SOC_PCNT_SUPPORTED              1

components/soc/esp32h4/include/soc/Kconfig.soc_caps.in

@@ -11,6 +11,10 @@ config SOC_DEDICATED_GPIO_SUPPORTED
     bool
     default y
 
+config SOC_UART_SUPPORTED
+    bool
+    default y
+
 config SOC_GDMA_SUPPORTED
     bool
     default y

components/soc/esp32h4/include/soc/soc_caps.h

@@ -35,6 +35,7 @@
 /*-------------------------- COMMON CAPS ---------------------------------------*/
 #define SOC_ADC_SUPPORTED               1
 #define SOC_DEDICATED_GPIO_SUPPORTED    1
+#define SOC_UART_SUPPORTED              1
 #define SOC_GDMA_SUPPORTED              1
 #define SOC_GPTIMER_SUPPORTED           1
 #define SOC_BT_SUPPORTED                1

components/soc/esp32s2/include/soc/Kconfig.soc_caps.in

@@ -11,6 +11,10 @@ config SOC_DAC_SUPPORTED
     bool
     default y
 
+config SOC_UART_SUPPORTED
+    bool
+    default y
+
 config SOC_TWAI_SUPPORTED
     bool
     default y

components/soc/esp32s2/include/soc/soc_caps.h

@@ -41,6 +41,7 @@
 /*-------------------------- COMMON CAPS ---------------------------------------*/
 #define SOC_ADC_SUPPORTED               1
 #define SOC_DAC_SUPPORTED               1
+#define SOC_UART_SUPPORTED              1
 #define SOC_TWAI_SUPPORTED              1
 #define SOC_CP_DMA_SUPPORTED            1
 #define SOC_DEDICATED_GPIO_SUPPORTED    1

components/soc/esp32s3/include/soc/Kconfig.soc_caps.in

@@ -27,6 +27,10 @@ config SOC_ADC_SUPPORTED
     bool
     default y
 
+config SOC_UART_SUPPORTED
+    bool
+    default y
+
 config SOC_PCNT_SUPPORTED
     bool
     default y

components/soc/esp32s3/include/soc/soc_caps.h

@@ -26,6 +26,7 @@
 
 /*-------------------------- COMMON CAPS ---------------------------------------*/
 #define SOC_ADC_SUPPORTED               1
+#define SOC_UART_SUPPORTED              1
 #define SOC_PCNT_SUPPORTED              1
 #define SOC_WIFI_SUPPORTED              1
 #define SOC_TWAI_SUPPORTED              1

docs/doxygen/Doxyfile

@@ -61,52 +61,52 @@ INPUT = \
     $(PROJECT_PATH)/components/bt/host/nimble/esp-hci/include/esp_nimble_hci.h \
     $(PROJECT_PATH)/components/bt/include/esp32/include/esp_bt.h \
     $(PROJECT_PATH)/components/console/esp_console.h \
-    $(PROJECT_PATH)/components/driver/include/driver/dac_continuous.h \
+    $(PROJECT_PATH)/components/driver/dac/include/driver/dac_continuous.h \
-    $(PROJECT_PATH)/components/driver/include/driver/dac_cosine.h \
+    $(PROJECT_PATH)/components/driver/dac/include/driver/dac_cosine.h \
-    $(PROJECT_PATH)/components/driver/include/driver/dac_oneshot.h \
+    $(PROJECT_PATH)/components/driver/dac/include/driver/dac_oneshot.h \
-    $(PROJECT_PATH)/components/driver/include/driver/dac_types.h \
+    $(PROJECT_PATH)/components/driver/dac/include/driver/dac_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/dedic_gpio.h \
+    $(PROJECT_PATH)/components/driver/gpio/include/driver/dedic_gpio.h \
-    $(PROJECT_PATH)/components/driver/include/driver/gpio.h \
+    $(PROJECT_PATH)/components/driver/gpio/include/driver/gpio.h \
-    $(PROJECT_PATH)/components/driver/include/driver/gpio_etm.h \
+    $(PROJECT_PATH)/components/driver/gpio/include/driver/gpio_etm.h \
-    $(PROJECT_PATH)/components/driver/include/driver/gpio_filter.h \
+    $(PROJECT_PATH)/components/driver/gpio/include/driver/gpio_filter.h \
-    $(PROJECT_PATH)/components/driver/include/driver/gptimer.h \
+    $(PROJECT_PATH)/components/driver/gpio/include/driver/rtc_io.h \
-    $(PROJECT_PATH)/components/driver/include/driver/gptimer_etm.h \
+    $(PROJECT_PATH)/components/driver/gptimer/include/driver/gptimer.h \
-    $(PROJECT_PATH)/components/driver/include/driver/gptimer_types.h \
+    $(PROJECT_PATH)/components/driver/gptimer/include/driver/gptimer_etm.h \
-    $(PROJECT_PATH)/components/driver/include/driver/i2c.h \
+    $(PROJECT_PATH)/components/driver/gptimer/include/driver/gptimer_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/i2s_common.h \
+    $(PROJECT_PATH)/components/driver/i2c/include/driver/i2c.h \
-    $(PROJECT_PATH)/components/driver/include/driver/i2s_pdm.h \
+    $(PROJECT_PATH)/components/driver/i2s/include/driver/i2s_common.h \
-    $(PROJECT_PATH)/components/driver/include/driver/i2s_std.h \
+    $(PROJECT_PATH)/components/driver/i2s/include/driver/i2s_pdm.h \
-    $(PROJECT_PATH)/components/driver/include/driver/i2s_tdm.h \
+    $(PROJECT_PATH)/components/driver/i2s/include/driver/i2s_std.h \
-    $(PROJECT_PATH)/components/driver/include/driver/i2s_types.h \
+    $(PROJECT_PATH)/components/driver/i2s/include/driver/i2s_tdm.h \
-    $(PROJECT_PATH)/components/driver/include/driver/ledc.h \
+    $(PROJECT_PATH)/components/driver/i2s/include/driver/i2s_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/mcpwm_cap.h \
+    $(PROJECT_PATH)/components/driver/ledc/include/driver/ledc.h \
-    $(PROJECT_PATH)/components/driver/include/driver/mcpwm_cmpr.h \
+    $(PROJECT_PATH)/components/driver/mcpwm/include/driver/mcpwm_cap.h \
-    $(PROJECT_PATH)/components/driver/include/driver/mcpwm_fault.h \
+    $(PROJECT_PATH)/components/driver/mcpwm/include/driver/mcpwm_cmpr.h \
-    $(PROJECT_PATH)/components/driver/include/driver/mcpwm_gen.h \
+    $(PROJECT_PATH)/components/driver/mcpwm/include/driver/mcpwm_fault.h \
-    $(PROJECT_PATH)/components/driver/include/driver/mcpwm_oper.h \
+    $(PROJECT_PATH)/components/driver/mcpwm/include/driver/mcpwm_gen.h \
-    $(PROJECT_PATH)/components/driver/include/driver/mcpwm_sync.h \
+    $(PROJECT_PATH)/components/driver/mcpwm/include/driver/mcpwm_oper.h \
-    $(PROJECT_PATH)/components/driver/include/driver/mcpwm_timer.h \
+    $(PROJECT_PATH)/components/driver/mcpwm/include/driver/mcpwm_sync.h \
-    $(PROJECT_PATH)/components/driver/include/driver/mcpwm_types.h \
+    $(PROJECT_PATH)/components/driver/mcpwm/include/driver/mcpwm_timer.h \
-    $(PROJECT_PATH)/components/driver/include/driver/pulse_cnt.h \
+    $(PROJECT_PATH)/components/driver/mcpwm/include/driver/mcpwm_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/rmt_common.h \
+    $(PROJECT_PATH)/components/driver/pcnt/include/driver/pulse_cnt.h \
-    $(PROJECT_PATH)/components/driver/include/driver/rmt_encoder.h \
+    $(PROJECT_PATH)/components/driver/rmt/include/driver/rmt_common.h \
-    $(PROJECT_PATH)/components/driver/include/driver/rmt_rx.h \
+    $(PROJECT_PATH)/components/driver/rmt/include/driver/rmt_encoder.h \
-    $(PROJECT_PATH)/components/driver/include/driver/rmt_tx.h \
+    $(PROJECT_PATH)/components/driver/rmt/include/driver/rmt_rx.h \
-    $(PROJECT_PATH)/components/driver/include/driver/rmt_types.h \
+    $(PROJECT_PATH)/components/driver/rmt/include/driver/rmt_tx.h \
-    $(PROJECT_PATH)/components/driver/include/driver/rtc_io.h \
+    $(PROJECT_PATH)/components/driver/rmt/include/driver/rmt_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdio_slave.h \
+    $(PROJECT_PATH)/components/driver/sdio_slave/include/driver/sdio_slave.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdm.h \
+    $(PROJECT_PATH)/components/driver/sigma_delta/include/driver/sdm.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdmmc_host.h \
+    $(PROJECT_PATH)/components/driver/sdmmc/include/driver/sdmmc_host.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdmmc_types.h \
+    $(PROJECT_PATH)/components/driver/sdmmc/include/driver/sdmmc_types.h \
-    $(PROJECT_PATH)/components/driver/include/driver/sdspi_host.h \
+    $(PROJECT_PATH)/components/driver/spi/include/driver/sdspi_host.h \
-    $(PROJECT_PATH)/components/driver/include/driver/spi_common.h \
+    $(PROJECT_PATH)/components/driver/spi/include/driver/spi_common.h \
-    $(PROJECT_PATH)/components/driver/include/driver/spi_master.h \
+    $(PROJECT_PATH)/components/driver/spi/include/driver/spi_master.h \
-    $(PROJECT_PATH)/components/driver/include/driver/spi_slave_hd.h \
+    $(PROJECT_PATH)/components/driver/spi/include/driver/spi_slave_hd.h \
-    $(PROJECT_PATH)/components/driver/include/driver/spi_slave.h \
+    $(PROJECT_PATH)/components/driver/spi/include/driver/spi_slave.h \
-    $(PROJECT_PATH)/components/driver/include/driver/temperature_sensor.h \
+    $(PROJECT_PATH)/components/driver/temperature_sensor/include/driver/temperature_sensor.h \
-    $(PROJECT_PATH)/components/driver/include/driver/touch_sensor_common.h \
+    $(PROJECT_PATH)/components/driver/touch_sensor/include/driver/touch_sensor_common.h \
-    $(PROJECT_PATH)/components/driver/include/driver/twai.h \
+    $(PROJECT_PATH)/components/driver/twai/include/driver/twai.h \
-    $(PROJECT_PATH)/components/driver/include/driver/uart.h \
+    $(PROJECT_PATH)/components/driver/uart/include/driver/uart.h \
     $(PROJECT_PATH)/components/driver/test_apps/components/esp_serial_slave_link/include/esp_serial_slave_link/essl_sdio.h \
     $(PROJECT_PATH)/components/driver/test_apps/components/esp_serial_slave_link/include/esp_serial_slave_link/essl_spi.h \
     $(PROJECT_PATH)/components/driver/test_apps/components/esp_serial_slave_link/include/esp_serial_slave_link/essl.h \

docs/doxygen/Doxyfile_esp32

@@ -1,5 +1,5 @@
 INPUT += \
-         $(PROJECT_PATH)/components/driver/$(IDF_TARGET)/include/driver/touch_sensor.h \
+         $(PROJECT_PATH)/components/driver/touch_sensor/$(IDF_TARGET)/include/driver/touch_sensor.h \
          $(PROJECT_PATH)/components/esp_psram/include/esp32/himem.h \
          $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/dac_channel.h \
          $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/rtc_io_channel.h \