diff --git a/components/fatfs/test_fatfs_host/Makefile.files b/components/fatfs/test_fatfs_host/Makefile.files index 73b2774296..e8e9d1f700 100644 --- a/components/fatfs/test_fatfs_host/Makefile.files +++ b/components/fatfs/test_fatfs_host/Makefile.files @@ -27,9 +27,8 @@ INCLUDE_DIRS := \ esp_system/include \ xtensa/include \ xtensa/esp32/include \ - soc/soc/esp32/include \ + soc/esp32/include \ soc/include \ - soc/soc/include \ esp32/include \ esp_common/include \ bootloader_support/include \ diff --git a/components/soc/src/esp32s2/include/hal/memprot_peri_ll.h b/components/hal/esp32s2/include/hal/memprot_peri_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/memprot_peri_ll.h rename to components/hal/esp32s2/include/hal/memprot_peri_ll.h diff --git a/components/soc/include/hal/sha_hal.h b/components/hal/include/hal/sha_hal.h similarity index 100% rename from components/soc/include/hal/sha_hal.h rename to components/hal/include/hal/sha_hal.h diff --git a/components/lwip/test_afl_host/Makefile b/components/lwip/test_afl_host/Makefile index 5a75bcc39f..92e0b14b38 100644 --- a/components/lwip/test_afl_host/Makefile +++ b/components/lwip/test_afl_host/Makefile @@ -2,7 +2,7 @@ COMPONENTS_DIR=../.. COMPILER_ICLUDE_DIR=$(shell echo `which xtensa-esp32-elf-gcc | xargs dirname | xargs dirname`/xtensa-esp32-elf) CFLAGS=-std=gnu99 -Og -ggdb -ffunction-sections -fdata-sections -nostdlib -Wall -Werror=all -Wno-int-to-pointer-cast -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-macro-redefined -Wno-constant-conversion -Wno-incompatible-pointer-types-discards-qualifiers -Wno-typedef-redefinition -Wno-incompatible-pointer-types -Wextra \ -Wno-unused-parameter -Wno-sign-compare -Wno-address -Wno-unused-variable -DESP_PLATFORM -D IDF_VER=\"v3.1\" -MMD -MP -DWITH_POSIX -DLWIP_NO_CTYPE_H=1 -INC_DIRS=-I . -I ./build/config -I $(COMPONENTS_DIR)/newlib/platform_include -I $(COMPONENTS_DIR)/newlib/include -I $(COMPONENTS_DIR)/driver/include -I $(COMPONENTS_DIR)/esp32/include -I $(COMPONENTS_DIR)/ethernet/include -I $(COMPONENTS_DIR)/freertos/include -I $(COMPONENTS_DIR)/heap/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include -I $(COMPONENTS_DIR)/lwip/include/apps -I $(COMPONENTS_DIR)/lwip/lwip/src/include/netif -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/port/esp32/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/include/apps/ping -I $(COMPONENTS_DIR)/lwip/include/apps/sntp -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/tcpip_adapter/include -I $(COMPONENTS_DIR)/esp_rom/include -I $(COMPONENTS_DIR)/esp_common/include -I $(COMPONENTS_DIR)/xtensa/include -I $(COMPONENTS_DIR)/xtensa/esp32/include -I $(COMPONENTS_DIR)/esp_wifi/include -I $(COMPONENTS_DIR)/esp_event/include -I $(COMPONENTS_DIR)/freertos/xtensa/include -I $(COMPONENTS_DIR)/esp_system/include -I $(COMPONENTS_DIR)/esp_timer/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/soc/include -I $(COMPONENTS_DIR)/soc/src/esp32/include -I $(COMPONENTS_DIR)/soc/soc/esp32/include -I $(COMPONENTS_DIR)/esp_netif/include -I $(COMPONENTS_DIR)/esp_eth/include -I $(COMPONENTS_DIR)/esp_netif/lwip -I $(COMPONENTS_DIR)/hal/include -I $(COMPONENTS_DIR)/hal/esp32/include -I $(COMPILER_ICLUDE_DIR)/include +INC_DIRS=-I . -I ./build/config -I $(COMPONENTS_DIR)/newlib/platform_include -I $(COMPONENTS_DIR)/newlib/include -I $(COMPONENTS_DIR)/driver/include -I $(COMPONENTS_DIR)/esp32/include -I $(COMPONENTS_DIR)/ethernet/include -I $(COMPONENTS_DIR)/freertos/include -I $(COMPONENTS_DIR)/heap/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include -I $(COMPONENTS_DIR)/lwip/include/apps -I $(COMPONENTS_DIR)/lwip/lwip/src/include/netif -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/port/esp32/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/include/apps/ping -I $(COMPONENTS_DIR)/lwip/include/apps/sntp -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/tcpip_adapter/include -I $(COMPONENTS_DIR)/esp_rom/include -I $(COMPONENTS_DIR)/esp_common/include -I $(COMPONENTS_DIR)/xtensa/include -I $(COMPONENTS_DIR)/xtensa/esp32/include -I $(COMPONENTS_DIR)/esp_wifi/include -I $(COMPONENTS_DIR)/esp_event/include -I $(COMPONENTS_DIR)/freertos/xtensa/include -I $(COMPONENTS_DIR)/esp_system/include -I $(COMPONENTS_DIR)/esp_timer/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/src/esp32/include -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/esp_netif/include -I $(COMPONENTS_DIR)/esp_eth/include -I $(COMPONENTS_DIR)/esp_netif/lwip -I $(COMPONENTS_DIR)/hal/include -I $(COMPONENTS_DIR)/hal/esp32/include -I $(COMPILER_ICLUDE_DIR)/include TEST_NAME=test FUZZ=afl-fuzz GEN_CFG=generate_config diff --git a/components/mdns/test_afl_fuzz_host/Makefile b/components/mdns/test_afl_fuzz_host/Makefile index e8ad152323..d636e3758a 100644 --- a/components/mdns/test_afl_fuzz_host/Makefile +++ b/components/mdns/test_afl_fuzz_host/Makefile @@ -28,8 +28,8 @@ CFLAGS=-g -Wno-unused-value -Wno-missing-declarations -Wno-pointer-bool-conversi -I$(COMPONENTS_DIR)/lwip/port/esp32/include \ -I$(COMPONENTS_DIR)/lwip/lwip/src/include/lwip/apps \ -I$(COMPONENTS_DIR)/soc/include \ - -I$(COMPONENTS_DIR)/soc/soc/include \ - -I$(COMPONENTS_DIR)/soc/soc/esp32/include \ + -I$(COMPONENTS_DIR)/soc/include \ + -I$(COMPONENTS_DIR)/soc/esp32/include \ -I$(COMPONENTS_DIR)/soc/src/esp32/include \ -I$(COMPONENTS_DIR)/tcpip_adapter/include \ -I$(COMPONENTS_DIR)/xtensa/include \ diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt index 67ef7bc045..47b68ee56c 100644 --- a/components/soc/CMakeLists.txt +++ b/components/soc/CMakeLists.txt @@ -1,13 +1,10 @@ idf_build_get_property(target IDF_TARGET) -idf_component_register(SRCS "src/lldesc.c" - "src/soc_include_legacy_warn.c" - "src/memory_layout_utils.c" +idf_component_register(SRCS "lldesc.c" + "soc_include_legacy_warn.c" + "memory_layout_utils.c" INCLUDE_DIRS include PRIV_REQUIRES hal # [refactor-todo] soc dependency on hal for rtc sources LDFRAGMENTS linker.lf) -add_subdirectory(soc) - -add_subdirectory(src/${target}) -target_link_libraries(${COMPONENT_LIB} PUBLIC "soc_${target}") +add_subdirectory(${target}) \ No newline at end of file diff --git a/components/soc/README.md b/components/soc/README.md index d29d692bd7..6e6d4b127c 100644 --- a/components/soc/README.md +++ b/components/soc/README.md @@ -1,33 +1,10 @@ ## `soc` ## -The `soc` component provides provides hardware description and hardware support functionality for targets supported by ESP-IDF. This is reflected in the component's subdirectories: - -- `soc/include` - abstraction -- `soc/soc` - description -- `soc/src` - implementation - -#### `soc/include` #### - -`soc/include` contains header files which provide a hardware-agnostic interface to the SoC. The interface consists of -function declarations and abstracted types that other, higher level components can make use of in order to have code portable to -all targets ESP-IDF supports. - -The `soc` subdirectory contains other useful interface for SoC-level operations or concepts, such as the memory layout, spinlocks, etc. - -#### `soc/soc` #### - -The `soc/soc` subdirectory contains description of the underlying hardware: +The `soc` component provides hardware description for targets supported by ESP-IDF. - `xxx_reg.h` - defines registers related to the hardware - `xxx_struct.h` - hardware description in C `struct` - `xxx_channel.h` - definitions for hardware with multiple channels - `xxx_caps.h` - features/capabilities of the hardware - `xxx_pins.h` - pin definitions - - `xxx_periph.h/*.c` - includes all headers related to a peripheral; declaration and definition of IO mapping for that hardware - -Since the hardware description is target-specific, there are subdirectories for each target containing copies of the files above. -Furthermore, the files in this directory should be standalone, i.e. should not include files from outside directories. - -#### `soc/src` #### - -Provides the interface about the memory, I2C, and Real_Time Clock functions. \ No newline at end of file + - `xxx_periph.h/*.c` - includes all headers related to a peripheral; declaration and definition of IO mapping for that hardware \ No newline at end of file diff --git a/components/soc/component.mk b/components/soc/component.mk index 23d74c38e1..74c217e192 100644 --- a/components/soc/component.mk +++ b/components/soc/component.mk @@ -1,14 +1,4 @@ -SOC_NAME := $(IDF_TARGET) - -COMPONENT_SRCDIRS := src -COMPONENT_ADD_INCLUDEDIRS := - -# Since there can be chip-specific HAL headers which can include the common -# HAL header via include_next, process the build scripts here first so that -# include directories appear first in the compile command. --include $(COMPONENT_PATH)/src/$(SOC_NAME)/component.mk -COMPONENT_ADD_INCLUDEDIRS += include - --include $(COMPONENT_PATH)/soc/component.mk +COMPONENT_SRCDIRS := . $(IDF_TARGET) +COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET) $(IDF_TARGET)/include COMPONENT_ADD_LDFRAGMENTS += linker.lf diff --git a/components/soc/src/esp32/CMakeLists.txt b/components/soc/esp32/CMakeLists.txt similarity index 63% rename from components/soc/src/esp32/CMakeLists.txt rename to components/soc/esp32/CMakeLists.txt index 3f1279d3f6..71e3aeeb32 100644 --- a/components/soc/src/esp32/CMakeLists.txt +++ b/components/soc/esp32/CMakeLists.txt @@ -1,13 +1,27 @@ set(srcs + "adc_periph.c" + "dac_periph.c" + "gpio_periph.c" + "i2c_periph.c" + "i2s_periph.c" + "interrupts.c" + "pcnt_periph.c" + "ledc_periph.c" "rtc_clk.c" "rtc_clk_init.c" "rtc_init.c" + "rtc_io_periph.c" + "rtc_periph.c" "rtc_pm.c" "rtc_sleep.c" "rtc_time.c" "rtc_wdt.c" + "sdio_slave_periph.c" + "sdmmc_periph.c" "soc_memory_layout.c" -) + "spi_periph.c" + "touch_sensor_periph.c" + "uart_periph.c") add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") diff --git a/components/soc/soc/esp32/adc_periph.c b/components/soc/esp32/adc_periph.c similarity index 100% rename from components/soc/soc/esp32/adc_periph.c rename to components/soc/esp32/adc_periph.c diff --git a/components/soc/soc/esp32/dac_periph.c b/components/soc/esp32/dac_periph.c similarity index 100% rename from components/soc/soc/esp32/dac_periph.c rename to components/soc/esp32/dac_periph.c diff --git a/components/soc/soc/esp32/gpio_periph.c b/components/soc/esp32/gpio_periph.c similarity index 100% rename from components/soc/soc/esp32/gpio_periph.c rename to components/soc/esp32/gpio_periph.c diff --git a/components/soc/soc/esp32/i2c_periph.c b/components/soc/esp32/i2c_periph.c similarity index 100% rename from components/soc/soc/esp32/i2c_periph.c rename to components/soc/esp32/i2c_periph.c diff --git a/components/soc/soc/esp32/i2s_periph.c b/components/soc/esp32/i2s_periph.c similarity index 100% rename from components/soc/soc/esp32/i2s_periph.c rename to components/soc/esp32/i2s_periph.c diff --git a/components/soc/soc/esp32/include/soc/adc_channel.h b/components/soc/esp32/include/soc/adc_channel.h similarity index 100% rename from components/soc/soc/esp32/include/soc/adc_channel.h rename to components/soc/esp32/include/soc/adc_channel.h diff --git a/components/soc/soc/esp32/include/soc/apb_ctrl_reg.h b/components/soc/esp32/include/soc/apb_ctrl_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/apb_ctrl_reg.h rename to components/soc/esp32/include/soc/apb_ctrl_reg.h diff --git a/components/soc/soc/esp32/include/soc/apb_ctrl_struct.h b/components/soc/esp32/include/soc/apb_ctrl_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/apb_ctrl_struct.h rename to components/soc/esp32/include/soc/apb_ctrl_struct.h diff --git a/components/soc/soc/esp32/include/soc/bb_reg.h b/components/soc/esp32/include/soc/bb_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/bb_reg.h rename to components/soc/esp32/include/soc/bb_reg.h diff --git a/components/soc/soc/esp32/include/soc/boot_mode.h b/components/soc/esp32/include/soc/boot_mode.h similarity index 100% rename from components/soc/soc/esp32/include/soc/boot_mode.h rename to components/soc/esp32/include/soc/boot_mode.h diff --git a/components/soc/soc/esp32/include/soc/can_periph.h b/components/soc/esp32/include/soc/can_periph.h similarity index 100% rename from components/soc/soc/esp32/include/soc/can_periph.h rename to components/soc/esp32/include/soc/can_periph.h diff --git a/components/soc/soc/esp32/include/soc/can_struct.h b/components/soc/esp32/include/soc/can_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/can_struct.h rename to components/soc/esp32/include/soc/can_struct.h diff --git a/components/soc/soc/esp32/include/soc/clkout_channel.h b/components/soc/esp32/include/soc/clkout_channel.h similarity index 100% rename from components/soc/soc/esp32/include/soc/clkout_channel.h rename to components/soc/esp32/include/soc/clkout_channel.h diff --git a/components/soc/soc/esp32/include/soc/dac_channel.h b/components/soc/esp32/include/soc/dac_channel.h similarity index 100% rename from components/soc/soc/esp32/include/soc/dac_channel.h rename to components/soc/esp32/include/soc/dac_channel.h diff --git a/components/soc/soc/esp32/include/soc/dport_access.h b/components/soc/esp32/include/soc/dport_access.h similarity index 100% rename from components/soc/soc/esp32/include/soc/dport_access.h rename to components/soc/esp32/include/soc/dport_access.h diff --git a/components/soc/soc/esp32/include/soc/dport_reg.h b/components/soc/esp32/include/soc/dport_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/dport_reg.h rename to components/soc/esp32/include/soc/dport_reg.h diff --git a/components/soc/soc/esp32/include/soc/efuse_reg.h b/components/soc/esp32/include/soc/efuse_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/efuse_reg.h rename to components/soc/esp32/include/soc/efuse_reg.h diff --git a/components/soc/soc/esp32/include/soc/emac_dma_struct.h b/components/soc/esp32/include/soc/emac_dma_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/emac_dma_struct.h rename to components/soc/esp32/include/soc/emac_dma_struct.h diff --git a/components/soc/soc/esp32/include/soc/emac_ext_struct.h b/components/soc/esp32/include/soc/emac_ext_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/emac_ext_struct.h rename to components/soc/esp32/include/soc/emac_ext_struct.h diff --git a/components/soc/soc/esp32/include/soc/emac_mac_struct.h b/components/soc/esp32/include/soc/emac_mac_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/emac_mac_struct.h rename to components/soc/esp32/include/soc/emac_mac_struct.h diff --git a/components/soc/soc/esp32/include/soc/fe_reg.h b/components/soc/esp32/include/soc/fe_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/fe_reg.h rename to components/soc/esp32/include/soc/fe_reg.h diff --git a/components/soc/soc/esp32/include/soc/frc_timer_reg.h b/components/soc/esp32/include/soc/frc_timer_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/frc_timer_reg.h rename to components/soc/esp32/include/soc/frc_timer_reg.h diff --git a/components/soc/soc/esp32/include/soc/gpio_pins.h b/components/soc/esp32/include/soc/gpio_pins.h similarity index 100% rename from components/soc/soc/esp32/include/soc/gpio_pins.h rename to components/soc/esp32/include/soc/gpio_pins.h diff --git a/components/soc/soc/esp32/include/soc/gpio_reg.h b/components/soc/esp32/include/soc/gpio_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/gpio_reg.h rename to components/soc/esp32/include/soc/gpio_reg.h diff --git a/components/soc/soc/esp32/include/soc/gpio_sd_reg.h b/components/soc/esp32/include/soc/gpio_sd_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/gpio_sd_reg.h rename to components/soc/esp32/include/soc/gpio_sd_reg.h diff --git a/components/soc/soc/esp32/include/soc/gpio_sd_struct.h b/components/soc/esp32/include/soc/gpio_sd_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/gpio_sd_struct.h rename to components/soc/esp32/include/soc/gpio_sd_struct.h diff --git a/components/soc/soc/esp32/include/soc/gpio_sig_map.h b/components/soc/esp32/include/soc/gpio_sig_map.h similarity index 100% rename from components/soc/soc/esp32/include/soc/gpio_sig_map.h rename to components/soc/esp32/include/soc/gpio_sig_map.h diff --git a/components/soc/soc/esp32/include/soc/gpio_struct.h b/components/soc/esp32/include/soc/gpio_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/gpio_struct.h rename to components/soc/esp32/include/soc/gpio_struct.h diff --git a/components/soc/soc/esp32/include/soc/hinf_reg.h b/components/soc/esp32/include/soc/hinf_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/hinf_reg.h rename to components/soc/esp32/include/soc/hinf_reg.h diff --git a/components/soc/soc/esp32/include/soc/hinf_struct.h b/components/soc/esp32/include/soc/hinf_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/hinf_struct.h rename to components/soc/esp32/include/soc/hinf_struct.h diff --git a/components/soc/soc/esp32/include/soc/host_reg.h b/components/soc/esp32/include/soc/host_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/host_reg.h rename to components/soc/esp32/include/soc/host_reg.h diff --git a/components/soc/soc/esp32/include/soc/host_struct.h b/components/soc/esp32/include/soc/host_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/host_struct.h rename to components/soc/esp32/include/soc/host_struct.h diff --git a/components/soc/soc/esp32/include/soc/hwcrypto_reg.h b/components/soc/esp32/include/soc/hwcrypto_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/hwcrypto_reg.h rename to components/soc/esp32/include/soc/hwcrypto_reg.h diff --git a/components/soc/soc/esp32/include/soc/i2c_reg.h b/components/soc/esp32/include/soc/i2c_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/i2c_reg.h rename to components/soc/esp32/include/soc/i2c_reg.h diff --git a/components/soc/soc/esp32/include/soc/i2c_struct.h b/components/soc/esp32/include/soc/i2c_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/i2c_struct.h rename to components/soc/esp32/include/soc/i2c_struct.h diff --git a/components/soc/soc/esp32/include/soc/i2s_reg.h b/components/soc/esp32/include/soc/i2s_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/i2s_reg.h rename to components/soc/esp32/include/soc/i2s_reg.h diff --git a/components/soc/soc/esp32/include/soc/i2s_struct.h b/components/soc/esp32/include/soc/i2s_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/i2s_struct.h rename to components/soc/esp32/include/soc/i2s_struct.h diff --git a/components/soc/soc/esp32/include/soc/io_mux_reg.h b/components/soc/esp32/include/soc/io_mux_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/io_mux_reg.h rename to components/soc/esp32/include/soc/io_mux_reg.h diff --git a/components/soc/soc/esp32/include/soc/ledc_reg.h b/components/soc/esp32/include/soc/ledc_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/ledc_reg.h rename to components/soc/esp32/include/soc/ledc_reg.h diff --git a/components/soc/soc/esp32/include/soc/ledc_struct.h b/components/soc/esp32/include/soc/ledc_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/ledc_struct.h rename to components/soc/esp32/include/soc/ledc_struct.h diff --git a/components/soc/soc/esp32/include/soc/mcpwm_reg.h b/components/soc/esp32/include/soc/mcpwm_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/mcpwm_reg.h rename to components/soc/esp32/include/soc/mcpwm_reg.h diff --git a/components/soc/soc/esp32/include/soc/mcpwm_struct.h b/components/soc/esp32/include/soc/mcpwm_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/mcpwm_struct.h rename to components/soc/esp32/include/soc/mcpwm_struct.h diff --git a/components/soc/soc/esp32/include/soc/nrx_reg.h b/components/soc/esp32/include/soc/nrx_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/nrx_reg.h rename to components/soc/esp32/include/soc/nrx_reg.h diff --git a/components/soc/soc/esp32/include/soc/pcnt_reg.h b/components/soc/esp32/include/soc/pcnt_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/pcnt_reg.h rename to components/soc/esp32/include/soc/pcnt_reg.h diff --git a/components/soc/soc/esp32/include/soc/pcnt_struct.h b/components/soc/esp32/include/soc/pcnt_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/pcnt_struct.h rename to components/soc/esp32/include/soc/pcnt_struct.h diff --git a/components/soc/soc/esp32/include/soc/periph_defs.h b/components/soc/esp32/include/soc/periph_defs.h similarity index 100% rename from components/soc/soc/esp32/include/soc/periph_defs.h rename to components/soc/esp32/include/soc/periph_defs.h diff --git a/components/soc/soc/esp32/include/soc/pid.h b/components/soc/esp32/include/soc/pid.h similarity index 100% rename from components/soc/soc/esp32/include/soc/pid.h rename to components/soc/esp32/include/soc/pid.h diff --git a/components/soc/soc/esp32/include/soc/rmt_reg.h b/components/soc/esp32/include/soc/rmt_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rmt_reg.h rename to components/soc/esp32/include/soc/rmt_reg.h diff --git a/components/soc/soc/esp32/include/soc/rmt_struct.h b/components/soc/esp32/include/soc/rmt_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rmt_struct.h rename to components/soc/esp32/include/soc/rmt_struct.h diff --git a/components/soc/soc/esp32/include/soc/rsa_caps.h b/components/soc/esp32/include/soc/rsa_caps.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rsa_caps.h rename to components/soc/esp32/include/soc/rsa_caps.h diff --git a/components/soc/soc/esp32/include/soc/rtc.h b/components/soc/esp32/include/soc/rtc.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rtc.h rename to components/soc/esp32/include/soc/rtc.h diff --git a/components/soc/soc/esp32/include/soc/rtc_cntl_reg.h b/components/soc/esp32/include/soc/rtc_cntl_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rtc_cntl_reg.h rename to components/soc/esp32/include/soc/rtc_cntl_reg.h diff --git a/components/soc/soc/esp32/include/soc/rtc_cntl_struct.h b/components/soc/esp32/include/soc/rtc_cntl_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rtc_cntl_struct.h rename to components/soc/esp32/include/soc/rtc_cntl_struct.h diff --git a/components/soc/soc/esp32/include/soc/rtc_i2c_reg.h b/components/soc/esp32/include/soc/rtc_i2c_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rtc_i2c_reg.h rename to components/soc/esp32/include/soc/rtc_i2c_reg.h diff --git a/components/soc/soc/esp32/include/soc/rtc_io_channel.h b/components/soc/esp32/include/soc/rtc_io_channel.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rtc_io_channel.h rename to components/soc/esp32/include/soc/rtc_io_channel.h diff --git a/components/soc/soc/esp32/include/soc/rtc_io_reg.h b/components/soc/esp32/include/soc/rtc_io_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rtc_io_reg.h rename to components/soc/esp32/include/soc/rtc_io_reg.h diff --git a/components/soc/soc/esp32/include/soc/rtc_io_struct.h b/components/soc/esp32/include/soc/rtc_io_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/rtc_io_struct.h rename to components/soc/esp32/include/soc/rtc_io_struct.h diff --git a/components/soc/soc/esp32/include/soc/sdio_slave_pins.h b/components/soc/esp32/include/soc/sdio_slave_pins.h similarity index 100% rename from components/soc/soc/esp32/include/soc/sdio_slave_pins.h rename to components/soc/esp32/include/soc/sdio_slave_pins.h diff --git a/components/soc/soc/esp32/include/soc/sdmmc_pins.h b/components/soc/esp32/include/soc/sdmmc_pins.h similarity index 100% rename from components/soc/soc/esp32/include/soc/sdmmc_pins.h rename to components/soc/esp32/include/soc/sdmmc_pins.h diff --git a/components/soc/soc/esp32/include/soc/sdmmc_reg.h b/components/soc/esp32/include/soc/sdmmc_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/sdmmc_reg.h rename to components/soc/esp32/include/soc/sdmmc_reg.h diff --git a/components/soc/soc/esp32/include/soc/sdmmc_struct.h b/components/soc/esp32/include/soc/sdmmc_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/sdmmc_struct.h rename to components/soc/esp32/include/soc/sdmmc_struct.h diff --git a/components/soc/soc/esp32/include/soc/sens_reg.h b/components/soc/esp32/include/soc/sens_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/sens_reg.h rename to components/soc/esp32/include/soc/sens_reg.h diff --git a/components/soc/soc/esp32/include/soc/sens_struct.h b/components/soc/esp32/include/soc/sens_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/sens_struct.h rename to components/soc/esp32/include/soc/sens_struct.h diff --git a/components/soc/soc/esp32/include/soc/sha_caps.h b/components/soc/esp32/include/soc/sha_caps.h similarity index 100% rename from components/soc/soc/esp32/include/soc/sha_caps.h rename to components/soc/esp32/include/soc/sha_caps.h diff --git a/components/soc/soc/esp32/include/soc/slc_reg.h b/components/soc/esp32/include/soc/slc_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/slc_reg.h rename to components/soc/esp32/include/soc/slc_reg.h diff --git a/components/soc/soc/esp32/include/soc/slc_struct.h b/components/soc/esp32/include/soc/slc_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/slc_struct.h rename to components/soc/esp32/include/soc/slc_struct.h diff --git a/components/soc/soc/esp32/include/soc/soc.h b/components/soc/esp32/include/soc/soc.h similarity index 100% rename from components/soc/soc/esp32/include/soc/soc.h rename to components/soc/esp32/include/soc/soc.h diff --git a/components/soc/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h similarity index 100% rename from components/soc/soc/esp32/include/soc/soc_caps.h rename to components/soc/esp32/include/soc/soc_caps.h diff --git a/components/soc/soc/esp32/include/soc/soc_pins.h b/components/soc/esp32/include/soc/soc_pins.h similarity index 100% rename from components/soc/soc/esp32/include/soc/soc_pins.h rename to components/soc/esp32/include/soc/soc_pins.h diff --git a/components/soc/soc/esp32/include/soc/soc_ulp.h b/components/soc/esp32/include/soc/soc_ulp.h similarity index 100% rename from components/soc/soc/esp32/include/soc/soc_ulp.h rename to components/soc/esp32/include/soc/soc_ulp.h diff --git a/components/soc/soc/esp32/include/soc/spi_pins.h b/components/soc/esp32/include/soc/spi_pins.h similarity index 100% rename from components/soc/soc/esp32/include/soc/spi_pins.h rename to components/soc/esp32/include/soc/spi_pins.h diff --git a/components/soc/soc/esp32/include/soc/spi_reg.h b/components/soc/esp32/include/soc/spi_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/spi_reg.h rename to components/soc/esp32/include/soc/spi_reg.h diff --git a/components/soc/soc/esp32/include/soc/spi_struct.h b/components/soc/esp32/include/soc/spi_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/spi_struct.h rename to components/soc/esp32/include/soc/spi_struct.h diff --git a/components/soc/soc/esp32/include/soc/syscon_reg.h b/components/soc/esp32/include/soc/syscon_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/syscon_reg.h rename to components/soc/esp32/include/soc/syscon_reg.h diff --git a/components/soc/soc/esp32/include/soc/syscon_struct.h b/components/soc/esp32/include/soc/syscon_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/syscon_struct.h rename to components/soc/esp32/include/soc/syscon_struct.h diff --git a/components/soc/soc/esp32/include/soc/timer_group_reg.h b/components/soc/esp32/include/soc/timer_group_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/timer_group_reg.h rename to components/soc/esp32/include/soc/timer_group_reg.h diff --git a/components/soc/soc/esp32/include/soc/timer_group_struct.h b/components/soc/esp32/include/soc/timer_group_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/timer_group_struct.h rename to components/soc/esp32/include/soc/timer_group_struct.h diff --git a/components/soc/soc/esp32/include/soc/touch_sensor_channel.h b/components/soc/esp32/include/soc/touch_sensor_channel.h similarity index 100% rename from components/soc/soc/esp32/include/soc/touch_sensor_channel.h rename to components/soc/esp32/include/soc/touch_sensor_channel.h diff --git a/components/soc/soc/esp32/include/soc/twai_struct.h b/components/soc/esp32/include/soc/twai_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/twai_struct.h rename to components/soc/esp32/include/soc/twai_struct.h diff --git a/components/soc/soc/esp32/include/soc/uart_channel.h b/components/soc/esp32/include/soc/uart_channel.h similarity index 100% rename from components/soc/soc/esp32/include/soc/uart_channel.h rename to components/soc/esp32/include/soc/uart_channel.h diff --git a/components/soc/soc/esp32/include/soc/uart_reg.h b/components/soc/esp32/include/soc/uart_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/uart_reg.h rename to components/soc/esp32/include/soc/uart_reg.h diff --git a/components/soc/soc/esp32/include/soc/uart_struct.h b/components/soc/esp32/include/soc/uart_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/uart_struct.h rename to components/soc/esp32/include/soc/uart_struct.h diff --git a/components/soc/soc/esp32/include/soc/uhci_reg.h b/components/soc/esp32/include/soc/uhci_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/uhci_reg.h rename to components/soc/esp32/include/soc/uhci_reg.h diff --git a/components/soc/soc/esp32/include/soc/uhci_struct.h b/components/soc/esp32/include/soc/uhci_struct.h similarity index 100% rename from components/soc/soc/esp32/include/soc/uhci_struct.h rename to components/soc/esp32/include/soc/uhci_struct.h diff --git a/components/soc/soc/esp32/include/soc/wdev_reg.h b/components/soc/esp32/include/soc/wdev_reg.h similarity index 100% rename from components/soc/soc/esp32/include/soc/wdev_reg.h rename to components/soc/esp32/include/soc/wdev_reg.h diff --git a/components/soc/soc/esp32/interrupts.c b/components/soc/esp32/interrupts.c similarity index 100% rename from components/soc/soc/esp32/interrupts.c rename to components/soc/esp32/interrupts.c diff --git a/components/soc/soc/esp32/ledc_periph.c b/components/soc/esp32/ledc_periph.c similarity index 100% rename from components/soc/soc/esp32/ledc_periph.c rename to components/soc/esp32/ledc_periph.c diff --git a/components/soc/soc/esp32/pcnt_periph.c b/components/soc/esp32/pcnt_periph.c similarity index 100% rename from components/soc/soc/esp32/pcnt_periph.c rename to components/soc/esp32/pcnt_periph.c diff --git a/components/soc/soc/esp32/private_include/regi2c_apll.h b/components/soc/esp32/private_include/regi2c_apll.h similarity index 100% rename from components/soc/soc/esp32/private_include/regi2c_apll.h rename to components/soc/esp32/private_include/regi2c_apll.h diff --git a/components/soc/soc/esp32/private_include/regi2c_bbpll.h b/components/soc/esp32/private_include/regi2c_bbpll.h similarity index 100% rename from components/soc/soc/esp32/private_include/regi2c_bbpll.h rename to components/soc/esp32/private_include/regi2c_bbpll.h diff --git a/components/soc/src/esp32/regi2c_ctrl.h b/components/soc/esp32/regi2c_ctrl.h similarity index 100% rename from components/soc/src/esp32/regi2c_ctrl.h rename to components/soc/esp32/regi2c_ctrl.h diff --git a/components/soc/src/esp32/rtc_clk.c b/components/soc/esp32/rtc_clk.c similarity index 100% rename from components/soc/src/esp32/rtc_clk.c rename to components/soc/esp32/rtc_clk.c diff --git a/components/soc/src/esp32/rtc_clk_common.h b/components/soc/esp32/rtc_clk_common.h similarity index 96% rename from components/soc/src/esp32/rtc_clk_common.h rename to components/soc/esp32/rtc_clk_common.h index 7b7f1bb220..b6ae3ca2e4 100644 --- a/components/soc/src/esp32/rtc_clk_common.h +++ b/components/soc/esp32/rtc_clk_common.h @@ -14,6 +14,9 @@ #pragma once +#include +#include + #define MHZ (1000000) #ifdef __cplusplus diff --git a/components/soc/src/esp32/rtc_clk_init.c b/components/soc/esp32/rtc_clk_init.c similarity index 100% rename from components/soc/src/esp32/rtc_clk_init.c rename to components/soc/esp32/rtc_clk_init.c diff --git a/components/soc/src/esp32/rtc_init.c b/components/soc/esp32/rtc_init.c similarity index 100% rename from components/soc/src/esp32/rtc_init.c rename to components/soc/esp32/rtc_init.c diff --git a/components/soc/soc/esp32/rtc_io_periph.c b/components/soc/esp32/rtc_io_periph.c similarity index 100% rename from components/soc/soc/esp32/rtc_io_periph.c rename to components/soc/esp32/rtc_io_periph.c diff --git a/components/soc/soc/esp32/rtc_periph.c b/components/soc/esp32/rtc_periph.c similarity index 100% rename from components/soc/soc/esp32/rtc_periph.c rename to components/soc/esp32/rtc_periph.c diff --git a/components/soc/src/esp32/rtc_pm.c b/components/soc/esp32/rtc_pm.c similarity index 100% rename from components/soc/src/esp32/rtc_pm.c rename to components/soc/esp32/rtc_pm.c diff --git a/components/soc/src/esp32/rtc_sleep.c b/components/soc/esp32/rtc_sleep.c similarity index 100% rename from components/soc/src/esp32/rtc_sleep.c rename to components/soc/esp32/rtc_sleep.c diff --git a/components/soc/src/esp32/rtc_time.c b/components/soc/esp32/rtc_time.c similarity index 100% rename from components/soc/src/esp32/rtc_time.c rename to components/soc/esp32/rtc_time.c diff --git a/components/soc/src/esp32/rtc_wdt.c b/components/soc/esp32/rtc_wdt.c similarity index 100% rename from components/soc/src/esp32/rtc_wdt.c rename to components/soc/esp32/rtc_wdt.c diff --git a/components/soc/soc/esp32/sdio_slave_periph.c b/components/soc/esp32/sdio_slave_periph.c similarity index 100% rename from components/soc/soc/esp32/sdio_slave_periph.c rename to components/soc/esp32/sdio_slave_periph.c diff --git a/components/soc/soc/esp32/sdmmc_periph.c b/components/soc/esp32/sdmmc_periph.c similarity index 100% rename from components/soc/soc/esp32/sdmmc_periph.c rename to components/soc/esp32/sdmmc_periph.c diff --git a/components/soc/src/esp32/soc_memory_layout.c b/components/soc/esp32/soc_memory_layout.c similarity index 100% rename from components/soc/src/esp32/soc_memory_layout.c rename to components/soc/esp32/soc_memory_layout.c diff --git a/components/soc/soc/esp32/spi_periph.c b/components/soc/esp32/spi_periph.c similarity index 100% rename from components/soc/soc/esp32/spi_periph.c rename to components/soc/esp32/spi_periph.c diff --git a/components/soc/soc/esp32/touch_sensor_periph.c b/components/soc/esp32/touch_sensor_periph.c similarity index 100% rename from components/soc/soc/esp32/touch_sensor_periph.c rename to components/soc/esp32/touch_sensor_periph.c diff --git a/components/soc/soc/esp32/uart_periph.c b/components/soc/esp32/uart_periph.c similarity index 100% rename from components/soc/soc/esp32/uart_periph.c rename to components/soc/esp32/uart_periph.c diff --git a/components/soc/esp32s2/CMakeLists.txt b/components/soc/esp32s2/CMakeLists.txt new file mode 100644 index 0000000000..698337c934 --- /dev/null +++ b/components/soc/esp32s2/CMakeLists.txt @@ -0,0 +1,35 @@ +set(srcs + "adc_periph.c" + "dac_periph.c" + "dedic_gpio_periph.c" + "gpio_periph.c" + "i2c_periph.c" + "i2s_periph.c" + "interrupts.c" + "ledc_periph.c" + "pcnt_periph.c" + "regi2c_ctrl.c" + "rtc_clk.c" + "rtc_clk_init.c" + "rtc_init.c" + "rtc_io_periph.c" + "rtc_periph.c" + "rtc_pm.c" + "rtc_sleep.c" + "rtc_time.c" + "rtc_wdt.c" + "soc_memory_layout.c" + "spi_periph.c" + "touch_sensor_periph.c" + "uart_periph.c" + "usb_periph.c") + +add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") + +target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") +target_include_directories(${COMPONENT_LIB} PUBLIC . include) + +if(NOT CMAKE_BUILD_EARLY_EXPANSION) + set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES + COMPILE_FLAGS "-fno-jump-tables -fno-tree-switch-conversion") +endif() diff --git a/components/soc/soc/esp32s2/adc_periph.c b/components/soc/esp32s2/adc_periph.c similarity index 100% rename from components/soc/soc/esp32s2/adc_periph.c rename to components/soc/esp32s2/adc_periph.c diff --git a/components/soc/soc/esp32s2/dac_periph.c b/components/soc/esp32s2/dac_periph.c similarity index 100% rename from components/soc/soc/esp32s2/dac_periph.c rename to components/soc/esp32s2/dac_periph.c diff --git a/components/soc/soc/esp32s2/dedic_gpio_periph.c b/components/soc/esp32s2/dedic_gpio_periph.c similarity index 100% rename from components/soc/soc/esp32s2/dedic_gpio_periph.c rename to components/soc/esp32s2/dedic_gpio_periph.c diff --git a/components/soc/soc/esp32s2/gpio_periph.c b/components/soc/esp32s2/gpio_periph.c similarity index 100% rename from components/soc/soc/esp32s2/gpio_periph.c rename to components/soc/esp32s2/gpio_periph.c diff --git a/components/soc/esp32s2/i2c_apll.h b/components/soc/esp32s2/i2c_apll.h new file mode 100644 index 0000000000..909326f64e --- /dev/null +++ b/components/soc/esp32s2/i2c_apll.h @@ -0,0 +1,136 @@ +// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +/** + * @file i2c_apll.h + * @brief Register definitions for audio PLL (APLL) + * + * This file lists register fields of APLL, located on an internal configuration + * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by + * rtc_clk_apll_enable function in rtc_clk.c. + */ + +#define I2C_APLL 0X6D +#define I2C_APLL_HOSTID 1 + +#define I2C_APLL_IR_CAL_DELAY 0 +#define I2C_APLL_IR_CAL_DELAY_MSB 3 +#define I2C_APLL_IR_CAL_DELAY_LSB 0 + +#define I2C_APLL_IR_CAL_RSTB 0 +#define I2C_APLL_IR_CAL_RSTB_MSB 4 +#define I2C_APLL_IR_CAL_RSTB_LSB 4 + +#define I2C_APLL_IR_CAL_START 0 +#define I2C_APLL_IR_CAL_START_MSB 5 +#define I2C_APLL_IR_CAL_START_LSB 5 + +#define I2C_APLL_IR_CAL_UNSTOP 0 +#define I2C_APLL_IR_CAL_UNSTOP_MSB 6 +#define I2C_APLL_IR_CAL_UNSTOP_LSB 6 + +#define I2C_APLL_OC_ENB_FCAL 0 +#define I2C_APLL_OC_ENB_FCAL_MSB 7 +#define I2C_APLL_OC_ENB_FCAL_LSB 7 + +#define I2C_APLL_IR_CAL_EXT_CAP 1 +#define I2C_APLL_IR_CAL_EXT_CAP_MSB 4 +#define I2C_APLL_IR_CAL_EXT_CAP_LSB 0 + +#define I2C_APLL_IR_CAL_ENX_CAP 1 +#define I2C_APLL_IR_CAL_ENX_CAP_MSB 5 +#define I2C_APLL_IR_CAL_ENX_CAP_LSB 5 + +#define I2C_APLL_OC_LBW 1 +#define I2C_APLL_OC_LBW_MSB 6 +#define I2C_APLL_OC_LBW_LSB 6 + +#define I2C_APLL_IR_CAL_CK_DIV 2 +#define I2C_APLL_IR_CAL_CK_DIV_MSB 3 +#define I2C_APLL_IR_CAL_CK_DIV_LSB 0 + +#define I2C_APLL_OC_DCHGP 2 +#define I2C_APLL_OC_DCHGP_MSB 6 +#define I2C_APLL_OC_DCHGP_LSB 4 + +#define I2C_APLL_OC_ENB_VCON 2 +#define I2C_APLL_OC_ENB_VCON_MSB 7 +#define I2C_APLL_OC_ENB_VCON_LSB 7 + +#define I2C_APLL_OR_CAL_CAP 3 +#define I2C_APLL_OR_CAL_CAP_MSB 4 +#define I2C_APLL_OR_CAL_CAP_LSB 0 + +#define I2C_APLL_OR_CAL_UDF 3 +#define I2C_APLL_OR_CAL_UDF_MSB 5 +#define I2C_APLL_OR_CAL_UDF_LSB 5 + +#define I2C_APLL_OR_CAL_OVF 3 +#define I2C_APLL_OR_CAL_OVF_MSB 6 +#define I2C_APLL_OR_CAL_OVF_LSB 6 + +#define I2C_APLL_OR_CAL_END 3 +#define I2C_APLL_OR_CAL_END_MSB 7 +#define I2C_APLL_OR_CAL_END_LSB 7 + +#define I2C_APLL_OR_OUTPUT_DIV 4 +#define I2C_APLL_OR_OUTPUT_DIV_MSB 4 +#define I2C_APLL_OR_OUTPUT_DIV_LSB 0 + +#define I2C_APLL_OC_TSCHGP 4 +#define I2C_APLL_OC_TSCHGP_MSB 6 +#define I2C_APLL_OC_TSCHGP_LSB 6 + +#define I2C_APLL_EN_FAST_CAL 4 +#define I2C_APLL_EN_FAST_CAL_MSB 7 +#define I2C_APLL_EN_FAST_CAL_LSB 7 + +#define I2C_APLL_OC_DHREF_SEL 5 +#define I2C_APLL_OC_DHREF_SEL_MSB 1 +#define I2C_APLL_OC_DHREF_SEL_LSB 0 + +#define I2C_APLL_OC_DLREF_SEL 5 +#define I2C_APLL_OC_DLREF_SEL_MSB 3 +#define I2C_APLL_OC_DLREF_SEL_LSB 2 + +#define I2C_APLL_SDM_DITHER 5 +#define I2C_APLL_SDM_DITHER_MSB 4 +#define I2C_APLL_SDM_DITHER_LSB 4 + +#define I2C_APLL_SDM_STOP 5 +#define I2C_APLL_SDM_STOP_MSB 5 +#define I2C_APLL_SDM_STOP_LSB 5 + +#define I2C_APLL_SDM_RSTB 5 +#define I2C_APLL_SDM_RSTB_MSB 6 +#define I2C_APLL_SDM_RSTB_LSB 6 + +#define I2C_APLL_OC_DVDD 6 +#define I2C_APLL_OC_DVDD_MSB 4 +#define I2C_APLL_OC_DVDD_LSB 0 + +#define I2C_APLL_DSDM2 7 +#define I2C_APLL_DSDM2_MSB 5 +#define I2C_APLL_DSDM2_LSB 0 + +#define I2C_APLL_DSDM1 8 +#define I2C_APLL_DSDM1_MSB 7 +#define I2C_APLL_DSDM1_LSB 0 + +#define I2C_APLL_DSDM0 9 +#define I2C_APLL_DSDM0_MSB 7 +#define I2C_APLL_DSDM0_LSB 0 + diff --git a/components/soc/esp32s2/i2c_bbpll.h b/components/soc/esp32s2/i2c_bbpll.h new file mode 100644 index 0000000000..1f56a5f40d --- /dev/null +++ b/components/soc/esp32s2/i2c_bbpll.h @@ -0,0 +1,184 @@ +// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +/** + * @file i2c_apll.h + * @brief Register definitions for digital PLL (BBPLL) + * + * This file lists register fields of BBPLL, located on an internal configuration + * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by + * rtc_clk_cpu_freq_set function in rtc_clk.c. + */ + +#define I2C_BBPLL 0x66 +#define I2C_BBPLL_HOSTID 1 + +#define I2C_BBPLL_IR_CAL_DELAY 0 +#define I2C_BBPLL_IR_CAL_DELAY_MSB 3 +#define I2C_BBPLL_IR_CAL_DELAY_LSB 0 + +#define I2C_BBPLL_IR_CAL_CK_DIV 0 +#define I2C_BBPLL_IR_CAL_CK_DIV_MSB 7 +#define I2C_BBPLL_IR_CAL_CK_DIV_LSB 4 + +#define I2C_BBPLL_IR_CAL_EXT_CAP 1 +#define I2C_BBPLL_IR_CAL_EXT_CAP_MSB 3 +#define I2C_BBPLL_IR_CAL_EXT_CAP_LSB 0 + +#define I2C_BBPLL_IR_CAL_ENX_CAP 1 +#define I2C_BBPLL_IR_CAL_ENX_CAP_MSB 4 +#define I2C_BBPLL_IR_CAL_ENX_CAP_LSB 4 + +#define I2C_BBPLL_IR_CAL_RSTB 1 +#define I2C_BBPLL_IR_CAL_RSTB_MSB 5 +#define I2C_BBPLL_IR_CAL_RSTB_LSB 5 + +#define I2C_BBPLL_IR_CAL_START 1 +#define I2C_BBPLL_IR_CAL_START_MSB 6 +#define I2C_BBPLL_IR_CAL_START_LSB 6 + +#define I2C_BBPLL_IR_CAL_UNSTOP 1 +#define I2C_BBPLL_IR_CAL_UNSTOP_MSB 7 +#define I2C_BBPLL_IR_CAL_UNSTOP_LSB 7 + +#define I2C_BBPLL_OC_REF_DIV 2 +#define I2C_BBPLL_OC_REF_DIV_MSB 3 +#define I2C_BBPLL_OC_REF_DIV_LSB 0 + +#define I2C_BBPLL_OC_DCHGP 2 +#define I2C_BBPLL_OC_DCHGP_MSB 6 +#define I2C_BBPLL_OC_DCHGP_LSB 4 + +#define I2C_BBPLL_OC_ENB_FCAL 2 +#define I2C_BBPLL_OC_ENB_FCAL_MSB 7 +#define I2C_BBPLL_OC_ENB_FCAL_LSB 7 + +#define I2C_BBPLL_OC_DIV_7_0 3 +#define I2C_BBPLL_OC_DIV_7_0_MSB 7 +#define I2C_BBPLL_OC_DIV_7_0_LSB 0 + +#define I2C_BBPLL_RSTB_DIV_ADC 4 +#define I2C_BBPLL_RSTB_DIV_ADC_MSB 0 +#define I2C_BBPLL_RSTB_DIV_ADC_LSB 0 + +#define I2C_BBPLL_MODE_HF 4 +#define I2C_BBPLL_MODE_HF_MSB 1 +#define I2C_BBPLL_MODE_HF_LSB 1 + +#define I2C_BBPLL_DIV_ADC 4 +#define I2C_BBPLL_DIV_ADC_MSB 3 +#define I2C_BBPLL_DIV_ADC_LSB 2 + +#define I2C_BBPLL_DIV_DAC 4 +#define I2C_BBPLL_DIV_DAC_MSB 4 +#define I2C_BBPLL_DIV_DAC_LSB 4 + +#define I2C_BBPLL_DIV_CPU 4 +#define I2C_BBPLL_DIV_CPU_MSB 5 +#define I2C_BBPLL_DIV_CPU_LSB 5 + +#define I2C_BBPLL_OC_ENB_VCON 4 +#define I2C_BBPLL_OC_ENB_VCON_MSB 6 +#define I2C_BBPLL_OC_ENB_VCON_LSB 6 + +#define I2C_BBPLL_OC_TSCHGP 4 +#define I2C_BBPLL_OC_TSCHGP_MSB 7 +#define I2C_BBPLL_OC_TSCHGP_LSB 7 + +#define I2C_BBPLL_OC_DR1 5 +#define I2C_BBPLL_OC_DR1_MSB 2 +#define I2C_BBPLL_OC_DR1_LSB 0 + +#define I2C_BBPLL_OC_DR3 5 +#define I2C_BBPLL_OC_DR3_MSB 6 +#define I2C_BBPLL_OC_DR3_LSB 4 + +#define I2C_BBPLL_EN_USB 5 +#define I2C_BBPLL_EN_USB_MSB 7 +#define I2C_BBPLL_EN_USB_LSB 7 + +#define I2C_BBPLL_OC_DCUR 6 +#define I2C_BBPLL_OC_DCUR_MSB 2 +#define I2C_BBPLL_OC_DCUR_LSB 0 + +#define I2C_BBPLL_INC_CUR 6 +#define I2C_BBPLL_INC_CUR_MSB 3 +#define I2C_BBPLL_INC_CUR_LSB 3 + +#define I2C_BBPLL_OC_DHREF_SEL 6 +#define I2C_BBPLL_OC_DHREF_SEL_MSB 5 +#define I2C_BBPLL_OC_DHREF_SEL_LSB 4 + +#define I2C_BBPLL_OC_DLREF_SEL 6 +#define I2C_BBPLL_OC_DLREF_SEL_MSB 7 +#define I2C_BBPLL_OC_DLREF_SEL_LSB 6 + +#define I2C_BBPLL_OR_CAL_CAP 8 +#define I2C_BBPLL_OR_CAL_CAP_MSB 3 +#define I2C_BBPLL_OR_CAL_CAP_LSB 0 + +#define I2C_BBPLL_OR_CAL_UDF 8 +#define I2C_BBPLL_OR_CAL_UDF_MSB 4 +#define I2C_BBPLL_OR_CAL_UDF_LSB 4 + +#define I2C_BBPLL_OR_CAL_OVF 8 +#define I2C_BBPLL_OR_CAL_OVF_MSB 5 +#define I2C_BBPLL_OR_CAL_OVF_LSB 5 + +#define I2C_BBPLL_OR_CAL_END 8 +#define I2C_BBPLL_OR_CAL_END_MSB 6 +#define I2C_BBPLL_OR_CAL_END_LSB 6 + +#define I2C_BBPLL_OR_LOCK 8 +#define I2C_BBPLL_OR_LOCK_MSB 7 +#define I2C_BBPLL_OR_LOCK_LSB 7 + +#define I2C_BBPLL_BBADC_DELAY1 9 +#define I2C_BBPLL_BBADC_DELAY1_MSB 1 +#define I2C_BBPLL_BBADC_DELAY1_LSB 0 + +#define I2C_BBPLL_BBADC_DELAY2 9 +#define I2C_BBPLL_BBADC_DELAY2_MSB 3 +#define I2C_BBPLL_BBADC_DELAY2_LSB 2 + +#define I2C_BBPLL_BBADC_DVDD 9 +#define I2C_BBPLL_BBADC_DVDD_MSB 5 +#define I2C_BBPLL_BBADC_DVDD_LSB 4 + +#define I2C_BBPLL_BBADC_DREF 9 +#define I2C_BBPLL_BBADC_DREF_MSB 7 +#define I2C_BBPLL_BBADC_DREF_LSB 6 + +#define I2C_BBPLL_BBADC_DCUR 10 +#define I2C_BBPLL_BBADC_DCUR_MSB 1 +#define I2C_BBPLL_BBADC_DCUR_LSB 0 + +#define I2C_BBPLL_BBADC_INPUT_SHORT 10 +#define I2C_BBPLL_BBADC_INPUT_SHORT_MSB 2 +#define I2C_BBPLL_BBADC_INPUT_SHORT_LSB 2 + +#define I2C_BBPLL_ENT_PLL 10 +#define I2C_BBPLL_ENT_PLL_MSB 3 +#define I2C_BBPLL_ENT_PLL_LSB 3 + +#define I2C_BBPLL_DTEST 10 +#define I2C_BBPLL_DTEST_MSB 5 +#define I2C_BBPLL_DTEST_LSB 4 + +#define I2C_BBPLL_ENT_ADC 10 +#define I2C_BBPLL_ENT_ADC_MSB 7 +#define I2C_BBPLL_ENT_ADC_LSB 6 + diff --git a/components/soc/soc/esp32s2/i2c_periph.c b/components/soc/esp32s2/i2c_periph.c similarity index 100% rename from components/soc/soc/esp32s2/i2c_periph.c rename to components/soc/esp32s2/i2c_periph.c diff --git a/components/soc/esp32s2/i2c_ulp.h b/components/soc/esp32s2/i2c_ulp.h new file mode 100644 index 0000000000..e7f4afa08f --- /dev/null +++ b/components/soc/esp32s2/i2c_ulp.h @@ -0,0 +1,39 @@ +// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +/** + * @file i2c_ulp.h + * @brief Register definitions for analog to calibrate o_code for getting a more precise voltage. + * + * This file lists register fields of ULP, located on an internal configuration + * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by + * rtc_init function in rtc_init.c. + */ + +#define I2C_ULP 0x61 +#define I2C_ULP_HOSTID 1 + +#define I2C_ULP_IR_RESETB 0 +#define I2C_ULP_IR_RESETB_MSB 0 +#define I2C_ULP_IR_RESETB_LSB 0 + +#define I2C_ULP_O_DONE_FLAG 3 +#define I2C_ULP_O_DONE_FLAG_MSB 0 +#define I2C_ULP_O_DONE_FLAG_LSB 0 + +#define I2C_ULP_BG_O_DONE_FLAG 3 +#define I2C_ULP_BG_O_DONE_FLAG_MSB 3 +#define I2C_ULP_BG_O_DONE_FLAG_LSB 3 \ No newline at end of file diff --git a/components/soc/soc/esp32s2/i2s_periph.c b/components/soc/esp32s2/i2s_periph.c similarity index 100% rename from components/soc/soc/esp32s2/i2s_periph.c rename to components/soc/esp32s2/i2s_periph.c diff --git a/components/soc/soc/esp32s2/include/soc/adc_channel.h b/components/soc/esp32s2/include/soc/adc_channel.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/adc_channel.h rename to components/soc/esp32s2/include/soc/adc_channel.h diff --git a/components/soc/soc/esp32s2/include/soc/apb_ctrl_reg.h b/components/soc/esp32s2/include/soc/apb_ctrl_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/apb_ctrl_reg.h rename to components/soc/esp32s2/include/soc/apb_ctrl_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/apb_ctrl_struct.h b/components/soc/esp32s2/include/soc/apb_ctrl_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/apb_ctrl_struct.h rename to components/soc/esp32s2/include/soc/apb_ctrl_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/apb_saradc_reg.h b/components/soc/esp32s2/include/soc/apb_saradc_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/apb_saradc_reg.h rename to components/soc/esp32s2/include/soc/apb_saradc_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/apb_saradc_struct.h b/components/soc/esp32s2/include/soc/apb_saradc_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/apb_saradc_struct.h rename to components/soc/esp32s2/include/soc/apb_saradc_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/assist_debug_reg.h b/components/soc/esp32s2/include/soc/assist_debug_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/assist_debug_reg.h rename to components/soc/esp32s2/include/soc/assist_debug_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/bb_reg.h b/components/soc/esp32s2/include/soc/bb_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/bb_reg.h rename to components/soc/esp32s2/include/soc/bb_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/boot_mode.h b/components/soc/esp32s2/include/soc/boot_mode.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/boot_mode.h rename to components/soc/esp32s2/include/soc/boot_mode.h diff --git a/components/soc/soc/esp32s2/include/soc/cache_memory.h b/components/soc/esp32s2/include/soc/cache_memory.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/cache_memory.h rename to components/soc/esp32s2/include/soc/cache_memory.h diff --git a/components/soc/soc/esp32s2/include/soc/clkout_channel.h b/components/soc/esp32s2/include/soc/clkout_channel.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/clkout_channel.h rename to components/soc/esp32s2/include/soc/clkout_channel.h diff --git a/components/soc/soc/esp32s2/include/soc/cp_dma_reg.h b/components/soc/esp32s2/include/soc/cp_dma_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/cp_dma_reg.h rename to components/soc/esp32s2/include/soc/cp_dma_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/cp_dma_struct.h b/components/soc/esp32s2/include/soc/cp_dma_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/cp_dma_struct.h rename to components/soc/esp32s2/include/soc/cp_dma_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/crypto_dma_reg.h b/components/soc/esp32s2/include/soc/crypto_dma_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/crypto_dma_reg.h rename to components/soc/esp32s2/include/soc/crypto_dma_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/dac_channel.h b/components/soc/esp32s2/include/soc/dac_channel.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/dac_channel.h rename to components/soc/esp32s2/include/soc/dac_channel.h diff --git a/components/soc/soc/esp32s2/include/soc/dedic_gpio_reg.h b/components/soc/esp32s2/include/soc/dedic_gpio_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/dedic_gpio_reg.h rename to components/soc/esp32s2/include/soc/dedic_gpio_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/dedic_gpio_struct.h b/components/soc/esp32s2/include/soc/dedic_gpio_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/dedic_gpio_struct.h rename to components/soc/esp32s2/include/soc/dedic_gpio_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/dport_access.h b/components/soc/esp32s2/include/soc/dport_access.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/dport_access.h rename to components/soc/esp32s2/include/soc/dport_access.h diff --git a/components/soc/soc/esp32s2/include/soc/dport_reg.h b/components/soc/esp32s2/include/soc/dport_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/dport_reg.h rename to components/soc/esp32s2/include/soc/dport_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/efuse_reg.h b/components/soc/esp32s2/include/soc/efuse_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/efuse_reg.h rename to components/soc/esp32s2/include/soc/efuse_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/efuse_struct.h b/components/soc/esp32s2/include/soc/efuse_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/efuse_struct.h rename to components/soc/esp32s2/include/soc/efuse_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/extmem_reg.h b/components/soc/esp32s2/include/soc/extmem_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/extmem_reg.h rename to components/soc/esp32s2/include/soc/extmem_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/fe_reg.h b/components/soc/esp32s2/include/soc/fe_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/fe_reg.h rename to components/soc/esp32s2/include/soc/fe_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/frc_timer_reg.h b/components/soc/esp32s2/include/soc/frc_timer_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/frc_timer_reg.h rename to components/soc/esp32s2/include/soc/frc_timer_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/gpio_pins.h b/components/soc/esp32s2/include/soc/gpio_pins.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/gpio_pins.h rename to components/soc/esp32s2/include/soc/gpio_pins.h diff --git a/components/soc/soc/esp32s2/include/soc/gpio_reg.h b/components/soc/esp32s2/include/soc/gpio_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/gpio_reg.h rename to components/soc/esp32s2/include/soc/gpio_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/gpio_sd_reg.h b/components/soc/esp32s2/include/soc/gpio_sd_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/gpio_sd_reg.h rename to components/soc/esp32s2/include/soc/gpio_sd_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/gpio_sd_struct.h b/components/soc/esp32s2/include/soc/gpio_sd_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/gpio_sd_struct.h rename to components/soc/esp32s2/include/soc/gpio_sd_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/gpio_sig_map.h b/components/soc/esp32s2/include/soc/gpio_sig_map.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/gpio_sig_map.h rename to components/soc/esp32s2/include/soc/gpio_sig_map.h diff --git a/components/soc/soc/esp32s2/include/soc/gpio_struct.h b/components/soc/esp32s2/include/soc/gpio_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/gpio_struct.h rename to components/soc/esp32s2/include/soc/gpio_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/hwcrypto_reg.h b/components/soc/esp32s2/include/soc/hwcrypto_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/hwcrypto_reg.h rename to components/soc/esp32s2/include/soc/hwcrypto_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/i2c_reg.h b/components/soc/esp32s2/include/soc/i2c_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/i2c_reg.h rename to components/soc/esp32s2/include/soc/i2c_reg.h diff --git a/components/soc/esp32s2/include/soc/i2c_saradc.h b/components/soc/esp32s2/include/soc/i2c_saradc.h new file mode 100644 index 0000000000..5aa6451743 --- /dev/null +++ b/components/soc/esp32s2/include/soc/i2c_saradc.h @@ -0,0 +1,77 @@ +// Copyright 2019-2020 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +/** + * @file i2c_sar.h + * @brief Register definitions for analog to calibrate initial code for getting a more precise voltage of SAR ADC. + * + * This file lists register fields of SAR, located on an internal configuration + * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by + * function in adc_ll.h. + */ + +#define I2C_SAR_ADC 0X69 +#define I2C_SAR_ADC_HOSTID 0 + +#define ADC_ANA_CONFIG2_REG 0x6000E048 + +#define ADC_SAR1_ENCAL_GND_ADDR 0x7 +#define ADC_SAR1_ENCAL_GND_ADDR_MSB 5 +#define ADC_SAR1_ENCAL_GND_ADDR_LSB 5 + +#define ADC_SAR2_ENCAL_GND_ADDR 0x7 +#define ADC_SAR2_ENCAL_GND_ADDR_MSB 7 +#define ADC_SAR2_ENCAL_GND_ADDR_LSB 7 + +#define ADC_SAR1_INITIAL_CODE_HIGH_ADDR 0x1 +#define ADC_SAR1_INITIAL_CODE_HIGH_ADDR_MSB 0x3 +#define ADC_SAR1_INITIAL_CODE_HIGH_ADDR_LSB 0x0 + +#define ADC_SAR1_INITIAL_CODE_LOW_ADDR 0x0 +#define ADC_SAR1_INITIAL_CODE_LOW_ADDR_MSB 0x7 +#define ADC_SAR1_INITIAL_CODE_LOW_ADDR_LSB 0x0 + +#define ADC_SAR2_INITIAL_CODE_HIGH_ADDR 0x4 +#define ADC_SAR2_INITIAL_CODE_HIGH_ADDR_MSB 0x3 +#define ADC_SAR2_INITIAL_CODE_HIGH_ADDR_LSB 0x0 + +#define ADC_SAR2_INITIAL_CODE_LOW_ADDR 0x3 +#define ADC_SAR2_INITIAL_CODE_LOW_ADDR_MSB 0x7 +#define ADC_SAR2_INITIAL_CODE_LOW_ADDR_LSB 0x0 + +#define ADC_SAR1_DREF_ADDR 0x2 +#define ADC_SAR1_DREF_ADDR_MSB 0x6 +#define ADC_SAR1_DREF_ADDR_LSB 0x4 + +#define ADC_SAR2_DREF_ADDR 0x5 +#define ADC_SAR2_DREF_ADDR_MSB 0x6 +#define ADC_SAR2_DREF_ADDR_LSB 0x4 + +#define ADC_SAR1_SAMPLE_CYCLE_ADDR 0x2 +#define ADC_SAR1_SAMPLE_CYCLE_ADDR_MSB 0x2 +#define ADC_SAR1_SAMPLE_CYCLE_ADDR_LSB 0x0 + +#define ADC_SARADC_DTEST_RTC_ADDR 0x7 +#define ADC_SARADC_DTEST_RTC_ADDR_MSB 1 +#define ADC_SARADC_DTEST_RTC_ADDR_LSB 0 + +#define ADC_SARADC_ENT_TSENS_ADDR 0x7 +#define ADC_SARADC_ENT_TSENS_ADDR_MSB 2 +#define ADC_SARADC_ENT_TSENS_ADDR_LSB 2 + +#define ADC_SARADC_ENT_RTC_ADDR 0x7 +#define ADC_SARADC_ENT_RTC_ADDR_MSB 3 +#define ADC_SARADC_ENT_RTC_ADDR_LSB 3 diff --git a/components/soc/soc/esp32s2/include/soc/i2c_struct.h b/components/soc/esp32s2/include/soc/i2c_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/i2c_struct.h rename to components/soc/esp32s2/include/soc/i2c_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/i2s_reg.h b/components/soc/esp32s2/include/soc/i2s_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/i2s_reg.h rename to components/soc/esp32s2/include/soc/i2s_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/i2s_struct.h b/components/soc/esp32s2/include/soc/i2s_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/i2s_struct.h rename to components/soc/esp32s2/include/soc/i2s_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/interrupt_reg.h b/components/soc/esp32s2/include/soc/interrupt_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/interrupt_reg.h rename to components/soc/esp32s2/include/soc/interrupt_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/io_mux_reg.h b/components/soc/esp32s2/include/soc/io_mux_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/io_mux_reg.h rename to components/soc/esp32s2/include/soc/io_mux_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/ledc_reg.h b/components/soc/esp32s2/include/soc/ledc_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/ledc_reg.h rename to components/soc/esp32s2/include/soc/ledc_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/ledc_struct.h b/components/soc/esp32s2/include/soc/ledc_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/ledc_struct.h rename to components/soc/esp32s2/include/soc/ledc_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/nrx_reg.h b/components/soc/esp32s2/include/soc/nrx_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/nrx_reg.h rename to components/soc/esp32s2/include/soc/nrx_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/pcnt_reg.h b/components/soc/esp32s2/include/soc/pcnt_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/pcnt_reg.h rename to components/soc/esp32s2/include/soc/pcnt_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/pcnt_struct.h b/components/soc/esp32s2/include/soc/pcnt_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/pcnt_struct.h rename to components/soc/esp32s2/include/soc/pcnt_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/periph_defs.h b/components/soc/esp32s2/include/soc/periph_defs.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/periph_defs.h rename to components/soc/esp32s2/include/soc/periph_defs.h diff --git a/components/soc/soc/esp32s2/include/soc/rmt_reg.h b/components/soc/esp32s2/include/soc/rmt_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rmt_reg.h rename to components/soc/esp32s2/include/soc/rmt_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/rmt_struct.h b/components/soc/esp32s2/include/soc/rmt_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rmt_struct.h rename to components/soc/esp32s2/include/soc/rmt_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/rsa_caps.h b/components/soc/esp32s2/include/soc/rsa_caps.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rsa_caps.h rename to components/soc/esp32s2/include/soc/rsa_caps.h diff --git a/components/soc/soc/esp32s2/include/soc/rtc.h b/components/soc/esp32s2/include/soc/rtc.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rtc.h rename to components/soc/esp32s2/include/soc/rtc.h diff --git a/components/soc/soc/esp32s2/include/soc/rtc_cntl_reg.h b/components/soc/esp32s2/include/soc/rtc_cntl_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rtc_cntl_reg.h rename to components/soc/esp32s2/include/soc/rtc_cntl_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/rtc_cntl_struct.h b/components/soc/esp32s2/include/soc/rtc_cntl_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rtc_cntl_struct.h rename to components/soc/esp32s2/include/soc/rtc_cntl_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/rtc_i2c_reg.h b/components/soc/esp32s2/include/soc/rtc_i2c_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rtc_i2c_reg.h rename to components/soc/esp32s2/include/soc/rtc_i2c_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/rtc_i2c_struct.h b/components/soc/esp32s2/include/soc/rtc_i2c_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rtc_i2c_struct.h rename to components/soc/esp32s2/include/soc/rtc_i2c_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/rtc_io_channel.h b/components/soc/esp32s2/include/soc/rtc_io_channel.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rtc_io_channel.h rename to components/soc/esp32s2/include/soc/rtc_io_channel.h diff --git a/components/soc/soc/esp32s2/include/soc/rtc_io_reg.h b/components/soc/esp32s2/include/soc/rtc_io_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rtc_io_reg.h rename to components/soc/esp32s2/include/soc/rtc_io_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/rtc_io_struct.h b/components/soc/esp32s2/include/soc/rtc_io_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/rtc_io_struct.h rename to components/soc/esp32s2/include/soc/rtc_io_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/sdio_slave_pins.h b/components/soc/esp32s2/include/soc/sdio_slave_pins.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/sdio_slave_pins.h rename to components/soc/esp32s2/include/soc/sdio_slave_pins.h diff --git a/components/soc/soc/esp32s2/include/soc/sdmmc_pins.h b/components/soc/esp32s2/include/soc/sdmmc_pins.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/sdmmc_pins.h rename to components/soc/esp32s2/include/soc/sdmmc_pins.h diff --git a/components/soc/soc/esp32s2/include/soc/sdmmc_reg.h b/components/soc/esp32s2/include/soc/sdmmc_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/sdmmc_reg.h rename to components/soc/esp32s2/include/soc/sdmmc_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/sdmmc_struct.h b/components/soc/esp32s2/include/soc/sdmmc_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/sdmmc_struct.h rename to components/soc/esp32s2/include/soc/sdmmc_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/sens_reg.h b/components/soc/esp32s2/include/soc/sens_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/sens_reg.h rename to components/soc/esp32s2/include/soc/sens_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/sens_struct.h b/components/soc/esp32s2/include/soc/sens_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/sens_struct.h rename to components/soc/esp32s2/include/soc/sens_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/sensitive_reg.h b/components/soc/esp32s2/include/soc/sensitive_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/sensitive_reg.h rename to components/soc/esp32s2/include/soc/sensitive_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/sha_caps.h b/components/soc/esp32s2/include/soc/sha_caps.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/sha_caps.h rename to components/soc/esp32s2/include/soc/sha_caps.h diff --git a/components/soc/soc/esp32s2/include/soc/soc.h b/components/soc/esp32s2/include/soc/soc.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/soc.h rename to components/soc/esp32s2/include/soc/soc.h diff --git a/components/soc/soc/esp32s2/include/soc/soc_caps.h b/components/soc/esp32s2/include/soc/soc_caps.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/soc_caps.h rename to components/soc/esp32s2/include/soc/soc_caps.h diff --git a/components/soc/soc/esp32s2/include/soc/soc_pins.h b/components/soc/esp32s2/include/soc/soc_pins.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/soc_pins.h rename to components/soc/esp32s2/include/soc/soc_pins.h diff --git a/components/soc/soc/esp32s2/include/soc/soc_ulp.h b/components/soc/esp32s2/include/soc/soc_ulp.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/soc_ulp.h rename to components/soc/esp32s2/include/soc/soc_ulp.h diff --git a/components/soc/soc/esp32s2/include/soc/spi_mem_reg.h b/components/soc/esp32s2/include/soc/spi_mem_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/spi_mem_reg.h rename to components/soc/esp32s2/include/soc/spi_mem_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/spi_mem_struct.h b/components/soc/esp32s2/include/soc/spi_mem_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/spi_mem_struct.h rename to components/soc/esp32s2/include/soc/spi_mem_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/spi_pins.h b/components/soc/esp32s2/include/soc/spi_pins.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/spi_pins.h rename to components/soc/esp32s2/include/soc/spi_pins.h diff --git a/components/soc/soc/esp32s2/include/soc/spi_reg.h b/components/soc/esp32s2/include/soc/spi_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/spi_reg.h rename to components/soc/esp32s2/include/soc/spi_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/spi_struct.h b/components/soc/esp32s2/include/soc/spi_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/spi_struct.h rename to components/soc/esp32s2/include/soc/spi_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/syscon_reg.h b/components/soc/esp32s2/include/soc/syscon_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/syscon_reg.h rename to components/soc/esp32s2/include/soc/syscon_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/syscon_struct.h b/components/soc/esp32s2/include/soc/syscon_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/syscon_struct.h rename to components/soc/esp32s2/include/soc/syscon_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/system_reg.h b/components/soc/esp32s2/include/soc/system_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/system_reg.h rename to components/soc/esp32s2/include/soc/system_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/systimer_reg.h b/components/soc/esp32s2/include/soc/systimer_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/systimer_reg.h rename to components/soc/esp32s2/include/soc/systimer_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/timer_group_reg.h b/components/soc/esp32s2/include/soc/timer_group_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/timer_group_reg.h rename to components/soc/esp32s2/include/soc/timer_group_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/timer_group_struct.h b/components/soc/esp32s2/include/soc/timer_group_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/timer_group_struct.h rename to components/soc/esp32s2/include/soc/timer_group_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/touch_sensor_channel.h b/components/soc/esp32s2/include/soc/touch_sensor_channel.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/touch_sensor_channel.h rename to components/soc/esp32s2/include/soc/touch_sensor_channel.h diff --git a/components/soc/soc/esp32s2/include/soc/touch_sensor_pins.h b/components/soc/esp32s2/include/soc/touch_sensor_pins.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/touch_sensor_pins.h rename to components/soc/esp32s2/include/soc/touch_sensor_pins.h diff --git a/components/soc/soc/esp32s2/include/soc/twai_struct.h b/components/soc/esp32s2/include/soc/twai_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/twai_struct.h rename to components/soc/esp32s2/include/soc/twai_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/uart_channel.h b/components/soc/esp32s2/include/soc/uart_channel.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/uart_channel.h rename to components/soc/esp32s2/include/soc/uart_channel.h diff --git a/components/soc/soc/esp32s2/include/soc/uart_reg.h b/components/soc/esp32s2/include/soc/uart_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/uart_reg.h rename to components/soc/esp32s2/include/soc/uart_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/uart_struct.h b/components/soc/esp32s2/include/soc/uart_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/uart_struct.h rename to components/soc/esp32s2/include/soc/uart_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/uhci_reg.h b/components/soc/esp32s2/include/soc/uhci_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/uhci_reg.h rename to components/soc/esp32s2/include/soc/uhci_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/uhci_struct.h b/components/soc/esp32s2/include/soc/uhci_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/uhci_struct.h rename to components/soc/esp32s2/include/soc/uhci_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/usb_periph.h b/components/soc/esp32s2/include/soc/usb_periph.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/usb_periph.h rename to components/soc/esp32s2/include/soc/usb_periph.h diff --git a/components/soc/soc/esp32s2/include/soc/usb_pins.h b/components/soc/esp32s2/include/soc/usb_pins.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/usb_pins.h rename to components/soc/esp32s2/include/soc/usb_pins.h diff --git a/components/soc/soc/esp32s2/include/soc/usb_reg.h b/components/soc/esp32s2/include/soc/usb_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/usb_reg.h rename to components/soc/esp32s2/include/soc/usb_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/usb_struct.h b/components/soc/esp32s2/include/soc/usb_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/usb_struct.h rename to components/soc/esp32s2/include/soc/usb_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/usb_types.h b/components/soc/esp32s2/include/soc/usb_types.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/usb_types.h rename to components/soc/esp32s2/include/soc/usb_types.h diff --git a/components/soc/soc/esp32s2/include/soc/usb_wrap_reg.h b/components/soc/esp32s2/include/soc/usb_wrap_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/usb_wrap_reg.h rename to components/soc/esp32s2/include/soc/usb_wrap_reg.h diff --git a/components/soc/soc/esp32s2/include/soc/usb_wrap_struct.h b/components/soc/esp32s2/include/soc/usb_wrap_struct.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/usb_wrap_struct.h rename to components/soc/esp32s2/include/soc/usb_wrap_struct.h diff --git a/components/soc/soc/esp32s2/include/soc/wdev_reg.h b/components/soc/esp32s2/include/soc/wdev_reg.h similarity index 100% rename from components/soc/soc/esp32s2/include/soc/wdev_reg.h rename to components/soc/esp32s2/include/soc/wdev_reg.h diff --git a/components/soc/soc/esp32s2/interrupts.c b/components/soc/esp32s2/interrupts.c similarity index 100% rename from components/soc/soc/esp32s2/interrupts.c rename to components/soc/esp32s2/interrupts.c diff --git a/components/soc/soc/esp32s2/ledc_periph.c b/components/soc/esp32s2/ledc_periph.c similarity index 100% rename from components/soc/soc/esp32s2/ledc_periph.c rename to components/soc/esp32s2/ledc_periph.c diff --git a/components/soc/soc/esp32s2/pcnt_periph.c b/components/soc/esp32s2/pcnt_periph.c similarity index 100% rename from components/soc/soc/esp32s2/pcnt_periph.c rename to components/soc/esp32s2/pcnt_periph.c diff --git a/components/soc/soc/esp32s2/private_include/regi2c_apll.h b/components/soc/esp32s2/private_include/regi2c_apll.h similarity index 100% rename from components/soc/soc/esp32s2/private_include/regi2c_apll.h rename to components/soc/esp32s2/private_include/regi2c_apll.h diff --git a/components/soc/soc/esp32s2/private_include/regi2c_bbpll.h b/components/soc/esp32s2/private_include/regi2c_bbpll.h similarity index 100% rename from components/soc/soc/esp32s2/private_include/regi2c_bbpll.h rename to components/soc/esp32s2/private_include/regi2c_bbpll.h diff --git a/components/soc/soc/esp32s2/private_include/regi2c_brownout.h b/components/soc/esp32s2/private_include/regi2c_brownout.h similarity index 100% rename from components/soc/soc/esp32s2/private_include/regi2c_brownout.h rename to components/soc/esp32s2/private_include/regi2c_brownout.h diff --git a/components/soc/soc/esp32s2/private_include/regi2c_saradc.h b/components/soc/esp32s2/private_include/regi2c_saradc.h similarity index 100% rename from components/soc/soc/esp32s2/private_include/regi2c_saradc.h rename to components/soc/esp32s2/private_include/regi2c_saradc.h diff --git a/components/soc/soc/esp32s2/private_include/regi2c_ulp.h b/components/soc/esp32s2/private_include/regi2c_ulp.h similarity index 100% rename from components/soc/soc/esp32s2/private_include/regi2c_ulp.h rename to components/soc/esp32s2/private_include/regi2c_ulp.h diff --git a/components/soc/src/esp32s2/regi2c_ctrl.c b/components/soc/esp32s2/regi2c_ctrl.c similarity index 100% rename from components/soc/src/esp32s2/regi2c_ctrl.c rename to components/soc/esp32s2/regi2c_ctrl.c diff --git a/components/soc/src/esp32s2/regi2c_ctrl.h b/components/soc/esp32s2/regi2c_ctrl.h similarity index 100% rename from components/soc/src/esp32s2/regi2c_ctrl.h rename to components/soc/esp32s2/regi2c_ctrl.h diff --git a/components/soc/src/esp32s2/rtc_clk.c b/components/soc/esp32s2/rtc_clk.c similarity index 100% rename from components/soc/src/esp32s2/rtc_clk.c rename to components/soc/esp32s2/rtc_clk.c diff --git a/components/soc/src/esp32s2/rtc_clk_common.h b/components/soc/esp32s2/rtc_clk_common.h similarity index 97% rename from components/soc/src/esp32s2/rtc_clk_common.h rename to components/soc/esp32s2/rtc_clk_common.h index cb92f67ac2..d4dad103ad 100644 --- a/components/soc/src/esp32s2/rtc_clk_common.h +++ b/components/soc/esp32s2/rtc_clk_common.h @@ -14,6 +14,9 @@ #pragma once +#include +#include + #define MHZ (1000000) #define DPORT_CPUPERIOD_SEL_80 0 diff --git a/components/soc/src/esp32s2/rtc_clk_init.c b/components/soc/esp32s2/rtc_clk_init.c similarity index 100% rename from components/soc/src/esp32s2/rtc_clk_init.c rename to components/soc/esp32s2/rtc_clk_init.c diff --git a/components/soc/src/esp32s2/rtc_init.c b/components/soc/esp32s2/rtc_init.c similarity index 100% rename from components/soc/src/esp32s2/rtc_init.c rename to components/soc/esp32s2/rtc_init.c diff --git a/components/soc/soc/esp32s2/rtc_io_periph.c b/components/soc/esp32s2/rtc_io_periph.c similarity index 100% rename from components/soc/soc/esp32s2/rtc_io_periph.c rename to components/soc/esp32s2/rtc_io_periph.c diff --git a/components/soc/soc/esp32s2/rtc_periph.c b/components/soc/esp32s2/rtc_periph.c similarity index 100% rename from components/soc/soc/esp32s2/rtc_periph.c rename to components/soc/esp32s2/rtc_periph.c diff --git a/components/soc/src/esp32s2/rtc_pm.c b/components/soc/esp32s2/rtc_pm.c similarity index 100% rename from components/soc/src/esp32s2/rtc_pm.c rename to components/soc/esp32s2/rtc_pm.c diff --git a/components/soc/src/esp32s2/rtc_sleep.c b/components/soc/esp32s2/rtc_sleep.c similarity index 100% rename from components/soc/src/esp32s2/rtc_sleep.c rename to components/soc/esp32s2/rtc_sleep.c diff --git a/components/soc/src/esp32s2/rtc_time.c b/components/soc/esp32s2/rtc_time.c similarity index 100% rename from components/soc/src/esp32s2/rtc_time.c rename to components/soc/esp32s2/rtc_time.c diff --git a/components/soc/src/esp32s2/rtc_wdt.c b/components/soc/esp32s2/rtc_wdt.c similarity index 100% rename from components/soc/src/esp32s2/rtc_wdt.c rename to components/soc/esp32s2/rtc_wdt.c diff --git a/components/soc/src/esp32s2/soc_memory_layout.c b/components/soc/esp32s2/soc_memory_layout.c similarity index 100% rename from components/soc/src/esp32s2/soc_memory_layout.c rename to components/soc/esp32s2/soc_memory_layout.c diff --git a/components/soc/soc/esp32s2/spi_periph.c b/components/soc/esp32s2/spi_periph.c similarity index 100% rename from components/soc/soc/esp32s2/spi_periph.c rename to components/soc/esp32s2/spi_periph.c diff --git a/components/soc/soc/esp32s2/touch_sensor_periph.c b/components/soc/esp32s2/touch_sensor_periph.c similarity index 100% rename from components/soc/soc/esp32s2/touch_sensor_periph.c rename to components/soc/esp32s2/touch_sensor_periph.c diff --git a/components/soc/soc/esp32s2/uart_periph.c b/components/soc/esp32s2/uart_periph.c similarity index 100% rename from components/soc/soc/esp32s2/uart_periph.c rename to components/soc/esp32s2/uart_periph.c diff --git a/components/soc/soc/esp32s2/usb_periph.c b/components/soc/esp32s2/usb_periph.c similarity index 100% rename from components/soc/soc/esp32s2/usb_periph.c rename to components/soc/esp32s2/usb_periph.c diff --git a/components/soc/esp32s3/CMakeLists.txt b/components/soc/esp32s3/CMakeLists.txt new file mode 100644 index 0000000000..5854ba56f4 --- /dev/null +++ b/components/soc/esp32s3/CMakeLists.txt @@ -0,0 +1,34 @@ +set(srcs + "adc_periph.c" + "dac_periph.c" + "dedic_gpio_periph.c" + "gpio_periph.c" + "i2c_periph.c" + "i2s_periph.c" + "interrupts.c" + "ledc_periph.c" + "pcnt_periph.c" + "rtc_clk.c" + "rtc_clk_init.c" + "rtc_init.c" + "rtc_io_periph.c" + "rtc_periph.c" + "rtc_pm.c" + "rtc_sleep.c" + "rtc_time.c" + "sdio_slave_periph.c" + "sdmmc_periph.c" + "soc_memory_layout.c" + "spi_periph.c" + "touch_sensor_periph.c" + "uart_periph.c") + +add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") + +target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") +target_include_directories(${COMPONENT_LIB} PUBLIC . include) + +if(NOT CMAKE_BUILD_EARLY_EXPANSION) + set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES + COMPILE_FLAGS "-fno-jump-tables -fno-tree-switch-conversion") +endif() diff --git a/components/soc/soc/esp32s3/adc_periph.c b/components/soc/esp32s3/adc_periph.c similarity index 100% rename from components/soc/soc/esp32s3/adc_periph.c rename to components/soc/esp32s3/adc_periph.c diff --git a/components/soc/soc/esp32s3/dac_periph.c b/components/soc/esp32s3/dac_periph.c similarity index 100% rename from components/soc/soc/esp32s3/dac_periph.c rename to components/soc/esp32s3/dac_periph.c diff --git a/components/soc/soc/esp32s3/dedic_gpio_periph.c b/components/soc/esp32s3/dedic_gpio_periph.c similarity index 100% rename from components/soc/soc/esp32s3/dedic_gpio_periph.c rename to components/soc/esp32s3/dedic_gpio_periph.c diff --git a/components/soc/soc/esp32s3/gpio_periph.c b/components/soc/esp32s3/gpio_periph.c similarity index 100% rename from components/soc/soc/esp32s3/gpio_periph.c rename to components/soc/esp32s3/gpio_periph.c diff --git a/components/soc/esp32s3/i2c_bbpll.h b/components/soc/esp32s3/i2c_bbpll.h new file mode 100644 index 0000000000..73a0a84ccf --- /dev/null +++ b/components/soc/esp32s3/i2c_bbpll.h @@ -0,0 +1,184 @@ +// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +/** + * @file i2c_bbpll.h + * @brief Register definitions for digital PLL (BBPLL) + * + * This file lists register fields of BBPLL, located on an internal configuration + * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by + * rtc_clk_cpu_freq_set function in rtc_clk.c. + */ + +#define I2C_BBPLL 0x66 +#define I2C_BBPLL_HOSTID 1 + +#define I2C_BBPLL_IR_CAL_DELAY 0 +#define I2C_BBPLL_IR_CAL_DELAY_MSB 3 +#define I2C_BBPLL_IR_CAL_DELAY_LSB 0 + +#define I2C_BBPLL_IR_CAL_CK_DIV 0 +#define I2C_BBPLL_IR_CAL_CK_DIV_MSB 7 +#define I2C_BBPLL_IR_CAL_CK_DIV_LSB 4 + +#define I2C_BBPLL_IR_CAL_EXT_CAP 1 +#define I2C_BBPLL_IR_CAL_EXT_CAP_MSB 3 +#define I2C_BBPLL_IR_CAL_EXT_CAP_LSB 0 + +#define I2C_BBPLL_IR_CAL_ENX_CAP 1 +#define I2C_BBPLL_IR_CAL_ENX_CAP_MSB 4 +#define I2C_BBPLL_IR_CAL_ENX_CAP_LSB 4 + +#define I2C_BBPLL_IR_CAL_RSTB 1 +#define I2C_BBPLL_IR_CAL_RSTB_MSB 5 +#define I2C_BBPLL_IR_CAL_RSTB_LSB 5 + +#define I2C_BBPLL_IR_CAL_START 1 +#define I2C_BBPLL_IR_CAL_START_MSB 6 +#define I2C_BBPLL_IR_CAL_START_LSB 6 + +#define I2C_BBPLL_IR_CAL_UNSTOP 1 +#define I2C_BBPLL_IR_CAL_UNSTOP_MSB 7 +#define I2C_BBPLL_IR_CAL_UNSTOP_LSB 7 + +#define I2C_BBPLL_OC_REF_DIV 2 +#define I2C_BBPLL_OC_REF_DIV_MSB 3 +#define I2C_BBPLL_OC_REF_DIV_LSB 0 + +#define I2C_BBPLL_OC_DCHGP 2 +#define I2C_BBPLL_OC_DCHGP_MSB 6 +#define I2C_BBPLL_OC_DCHGP_LSB 4 + +#define I2C_BBPLL_OC_ENB_FCAL 2 +#define I2C_BBPLL_OC_ENB_FCAL_MSB 7 +#define I2C_BBPLL_OC_ENB_FCAL_LSB 7 + +#define I2C_BBPLL_OC_DIV_7_0 3 +#define I2C_BBPLL_OC_DIV_7_0_MSB 7 +#define I2C_BBPLL_OC_DIV_7_0_LSB 0 + +#define I2C_BBPLL_RSTB_DIV_ADC 4 +#define I2C_BBPLL_RSTB_DIV_ADC_MSB 0 +#define I2C_BBPLL_RSTB_DIV_ADC_LSB 0 + +#define I2C_BBPLL_MODE_HF 4 +#define I2C_BBPLL_MODE_HF_MSB 1 +#define I2C_BBPLL_MODE_HF_LSB 1 + +#define I2C_BBPLL_DIV_ADC 4 +#define I2C_BBPLL_DIV_ADC_MSB 3 +#define I2C_BBPLL_DIV_ADC_LSB 2 + +#define I2C_BBPLL_DIV_DAC 4 +#define I2C_BBPLL_DIV_DAC_MSB 4 +#define I2C_BBPLL_DIV_DAC_LSB 4 + +#define I2C_BBPLL_DIV_CPU 4 +#define I2C_BBPLL_DIV_CPU_MSB 5 +#define I2C_BBPLL_DIV_CPU_LSB 5 + +#define I2C_BBPLL_OC_ENB_VCON 4 +#define I2C_BBPLL_OC_ENB_VCON_MSB 6 +#define I2C_BBPLL_OC_ENB_VCON_LSB 6 + +#define I2C_BBPLL_OC_TSCHGP 4 +#define I2C_BBPLL_OC_TSCHGP_MSB 7 +#define I2C_BBPLL_OC_TSCHGP_LSB 7 + +#define I2C_BBPLL_OC_DR1 5 +#define I2C_BBPLL_OC_DR1_MSB 2 +#define I2C_BBPLL_OC_DR1_LSB 0 + +#define I2C_BBPLL_OC_DR3 5 +#define I2C_BBPLL_OC_DR3_MSB 6 +#define I2C_BBPLL_OC_DR3_LSB 4 + +#define I2C_BBPLL_EN_USB 5 +#define I2C_BBPLL_EN_USB_MSB 7 +#define I2C_BBPLL_EN_USB_LSB 7 + +#define I2C_BBPLL_OC_DCUR 6 +#define I2C_BBPLL_OC_DCUR_MSB 2 +#define I2C_BBPLL_OC_DCUR_LSB 0 + +#define I2C_BBPLL_INC_CUR 6 +#define I2C_BBPLL_INC_CUR_MSB 3 +#define I2C_BBPLL_INC_CUR_LSB 3 + +#define I2C_BBPLL_OC_DHREF_SEL 6 +#define I2C_BBPLL_OC_DHREF_SEL_MSB 5 +#define I2C_BBPLL_OC_DHREF_SEL_LSB 4 + +#define I2C_BBPLL_OC_DLREF_SEL 6 +#define I2C_BBPLL_OC_DLREF_SEL_MSB 7 +#define I2C_BBPLL_OC_DLREF_SEL_LSB 6 + +#define I2C_BBPLL_OR_CAL_CAP 8 +#define I2C_BBPLL_OR_CAL_CAP_MSB 3 +#define I2C_BBPLL_OR_CAL_CAP_LSB 0 + +#define I2C_BBPLL_OR_CAL_UDF 8 +#define I2C_BBPLL_OR_CAL_UDF_MSB 4 +#define I2C_BBPLL_OR_CAL_UDF_LSB 4 + +#define I2C_BBPLL_OR_CAL_OVF 8 +#define I2C_BBPLL_OR_CAL_OVF_MSB 5 +#define I2C_BBPLL_OR_CAL_OVF_LSB 5 + +#define I2C_BBPLL_OR_CAL_END 8 +#define I2C_BBPLL_OR_CAL_END_MSB 6 +#define I2C_BBPLL_OR_CAL_END_LSB 6 + +#define I2C_BBPLL_OR_LOCK 8 +#define I2C_BBPLL_OR_LOCK_MSB 7 +#define I2C_BBPLL_OR_LOCK_LSB 7 + +#define I2C_BBPLL_OC_VCO_DBIAS 9 +#define I2C_BBPLL_OC_VCO_DBIAS_MSB 1 +#define I2C_BBPLL_OC_VCO_DBIAS_LSB 0 + +#define I2C_BBPLL_BBADC_DELAY2 9 +#define I2C_BBPLL_BBADC_DELAY2_MSB 3 +#define I2C_BBPLL_BBADC_DELAY2_LSB 2 + +#define I2C_BBPLL_BBADC_DVDD 9 +#define I2C_BBPLL_BBADC_DVDD_MSB 5 +#define I2C_BBPLL_BBADC_DVDD_LSB 4 + +#define I2C_BBPLL_BBADC_DREF 9 +#define I2C_BBPLL_BBADC_DREF_MSB 7 +#define I2C_BBPLL_BBADC_DREF_LSB 6 + +#define I2C_BBPLL_BBADC_DCUR 10 +#define I2C_BBPLL_BBADC_DCUR_MSB 1 +#define I2C_BBPLL_BBADC_DCUR_LSB 0 + +#define I2C_BBPLL_BBADC_INPUT_SHORT 10 +#define I2C_BBPLL_BBADC_INPUT_SHORT_MSB 2 +#define I2C_BBPLL_BBADC_INPUT_SHORT_LSB 2 + +#define I2C_BBPLL_ENT_PLL 10 +#define I2C_BBPLL_ENT_PLL_MSB 3 +#define I2C_BBPLL_ENT_PLL_LSB 3 + +#define I2C_BBPLL_DTEST 10 +#define I2C_BBPLL_DTEST_MSB 5 +#define I2C_BBPLL_DTEST_LSB 4 + +#define I2C_BBPLL_ENT_ADC 10 +#define I2C_BBPLL_ENT_ADC_MSB 7 +#define I2C_BBPLL_ENT_ADC_LSB 6 + diff --git a/components/soc/soc/esp32s3/i2c_periph.c b/components/soc/esp32s3/i2c_periph.c similarity index 100% rename from components/soc/soc/esp32s3/i2c_periph.c rename to components/soc/esp32s3/i2c_periph.c diff --git a/components/soc/esp32s3/i2c_ulp.h b/components/soc/esp32s3/i2c_ulp.h new file mode 100644 index 0000000000..bf60672c9c --- /dev/null +++ b/components/soc/esp32s3/i2c_ulp.h @@ -0,0 +1,39 @@ +// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#pragma once + +/** + * @file i2c_ulp.h + * @brief Register definitions for analog to calibrate o_code for getting a more precise voltage. + * + * This file lists register fields of ULP, located on an internal configuration + * bus. These definitions are used via macros defined in i2c_rtc_clk.h, by + * rtc_init function in rtc_init.c. + */ + +#define I2C_ULP 0x61 +#define I2C_ULP_HOSTID 1 + +#define I2C_ULP_IR_RESETB 0 +#define I2C_ULP_IR_RESETB_MSB 0 +#define I2C_ULP_IR_RESETB_LSB 0 + +#define I2C_ULP_O_DONE_FLAG 3 +#define I2C_ULP_O_DONE_FLAG_MSB 0 +#define I2C_ULP_O_DONE_FLAG_LSB 0 + +#define I2C_ULP_BG_O_DONE_FLAG 3 +#define I2C_ULP_BG_O_DONE_FLAG_MSB 3 +#define I2C_ULP_BG_O_DONE_FLAG_LSB 3 diff --git a/components/soc/soc/esp32s3/i2s_periph.c b/components/soc/esp32s3/i2s_periph.c similarity index 100% rename from components/soc/soc/esp32s3/i2s_periph.c rename to components/soc/esp32s3/i2s_periph.c diff --git a/components/soc/soc/esp32s3/include/soc/adc_caps.h b/components/soc/esp32s3/include/soc/adc_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/adc_caps.h rename to components/soc/esp32s3/include/soc/adc_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/adc_channel.h b/components/soc/esp32s3/include/soc/adc_channel.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/adc_channel.h rename to components/soc/esp32s3/include/soc/adc_channel.h diff --git a/components/soc/soc/esp32s3/include/soc/apb_ctrl_reg.h b/components/soc/esp32s3/include/soc/apb_ctrl_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/apb_ctrl_reg.h rename to components/soc/esp32s3/include/soc/apb_ctrl_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/apb_ctrl_struct.h b/components/soc/esp32s3/include/soc/apb_ctrl_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/apb_ctrl_struct.h rename to components/soc/esp32s3/include/soc/apb_ctrl_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/apb_saradc_reg.h b/components/soc/esp32s3/include/soc/apb_saradc_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/apb_saradc_reg.h rename to components/soc/esp32s3/include/soc/apb_saradc_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/apb_saradc_struct.h b/components/soc/esp32s3/include/soc/apb_saradc_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/apb_saradc_struct.h rename to components/soc/esp32s3/include/soc/apb_saradc_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/assist_debug_reg.h b/components/soc/esp32s3/include/soc/assist_debug_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/assist_debug_reg.h rename to components/soc/esp32s3/include/soc/assist_debug_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/assist_debug_struct.h b/components/soc/esp32s3/include/soc/assist_debug_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/assist_debug_struct.h rename to components/soc/esp32s3/include/soc/assist_debug_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/bb_reg.h b/components/soc/esp32s3/include/soc/bb_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/bb_reg.h rename to components/soc/esp32s3/include/soc/bb_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/boot_mode.h b/components/soc/esp32s3/include/soc/boot_mode.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/boot_mode.h rename to components/soc/esp32s3/include/soc/boot_mode.h diff --git a/components/soc/soc/esp32s3/include/soc/brownout_caps.h b/components/soc/esp32s3/include/soc/brownout_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/brownout_caps.h rename to components/soc/esp32s3/include/soc/brownout_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/cache_memory.h b/components/soc/esp32s3/include/soc/cache_memory.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/cache_memory.h rename to components/soc/esp32s3/include/soc/cache_memory.h diff --git a/components/soc/soc/esp32s3/include/soc/clkout_channel.h b/components/soc/esp32s3/include/soc/clkout_channel.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/clkout_channel.h rename to components/soc/esp32s3/include/soc/clkout_channel.h diff --git a/components/soc/soc/esp32s3/include/soc/cpu_caps.h b/components/soc/esp32s3/include/soc/cpu_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/cpu_caps.h rename to components/soc/esp32s3/include/soc/cpu_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/dac_caps.h b/components/soc/esp32s3/include/soc/dac_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/dac_caps.h rename to components/soc/esp32s3/include/soc/dac_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/dac_channel.h b/components/soc/esp32s3/include/soc/dac_channel.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/dac_channel.h rename to components/soc/esp32s3/include/soc/dac_channel.h diff --git a/components/soc/soc/esp32s3/include/soc/dport_access.h b/components/soc/esp32s3/include/soc/dport_access.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/dport_access.h rename to components/soc/esp32s3/include/soc/dport_access.h diff --git a/components/soc/soc/esp32s3/include/soc/dport_reg.h b/components/soc/esp32s3/include/soc/dport_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/dport_reg.h rename to components/soc/esp32s3/include/soc/dport_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/efuse_reg.h b/components/soc/esp32s3/include/soc/efuse_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/efuse_reg.h rename to components/soc/esp32s3/include/soc/efuse_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/efuse_struct.h b/components/soc/esp32s3/include/soc/efuse_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/efuse_struct.h rename to components/soc/esp32s3/include/soc/efuse_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/extmem_reg.h b/components/soc/esp32s3/include/soc/extmem_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/extmem_reg.h rename to components/soc/esp32s3/include/soc/extmem_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/extmem_struct.h b/components/soc/esp32s3/include/soc/extmem_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/extmem_struct.h rename to components/soc/esp32s3/include/soc/extmem_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/fe_reg.h b/components/soc/esp32s3/include/soc/fe_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/fe_reg.h rename to components/soc/esp32s3/include/soc/fe_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/gdma_caps.h b/components/soc/esp32s3/include/soc/gdma_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gdma_caps.h rename to components/soc/esp32s3/include/soc/gdma_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/gdma_reg.h b/components/soc/esp32s3/include/soc/gdma_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gdma_reg.h rename to components/soc/esp32s3/include/soc/gdma_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/gdma_struct.h b/components/soc/esp32s3/include/soc/gdma_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gdma_struct.h rename to components/soc/esp32s3/include/soc/gdma_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/gpio_caps.h b/components/soc/esp32s3/include/soc/gpio_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gpio_caps.h rename to components/soc/esp32s3/include/soc/gpio_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/gpio_pins.h b/components/soc/esp32s3/include/soc/gpio_pins.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gpio_pins.h rename to components/soc/esp32s3/include/soc/gpio_pins.h diff --git a/components/soc/soc/esp32s3/include/soc/gpio_reg.h b/components/soc/esp32s3/include/soc/gpio_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gpio_reg.h rename to components/soc/esp32s3/include/soc/gpio_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/gpio_sd_reg.h b/components/soc/esp32s3/include/soc/gpio_sd_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gpio_sd_reg.h rename to components/soc/esp32s3/include/soc/gpio_sd_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/gpio_sd_struct.h b/components/soc/esp32s3/include/soc/gpio_sd_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gpio_sd_struct.h rename to components/soc/esp32s3/include/soc/gpio_sd_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/gpio_sig_map.h b/components/soc/esp32s3/include/soc/gpio_sig_map.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gpio_sig_map.h rename to components/soc/esp32s3/include/soc/gpio_sig_map.h diff --git a/components/soc/soc/esp32s3/include/soc/gpio_struct.h b/components/soc/esp32s3/include/soc/gpio_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/gpio_struct.h rename to components/soc/esp32s3/include/soc/gpio_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/hinf_reg.h b/components/soc/esp32s3/include/soc/hinf_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/hinf_reg.h rename to components/soc/esp32s3/include/soc/hinf_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/hinf_struct.h b/components/soc/esp32s3/include/soc/hinf_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/hinf_struct.h rename to components/soc/esp32s3/include/soc/hinf_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/host_reg.h b/components/soc/esp32s3/include/soc/host_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/host_reg.h rename to components/soc/esp32s3/include/soc/host_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/host_struct.h b/components/soc/esp32s3/include/soc/host_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/host_struct.h rename to components/soc/esp32s3/include/soc/host_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/hwcrypto_reg.h b/components/soc/esp32s3/include/soc/hwcrypto_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/hwcrypto_reg.h rename to components/soc/esp32s3/include/soc/hwcrypto_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/i2c_caps.h b/components/soc/esp32s3/include/soc/i2c_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/i2c_caps.h rename to components/soc/esp32s3/include/soc/i2c_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/i2c_reg.h b/components/soc/esp32s3/include/soc/i2c_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/i2c_reg.h rename to components/soc/esp32s3/include/soc/i2c_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/i2c_struct.h b/components/soc/esp32s3/include/soc/i2c_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/i2c_struct.h rename to components/soc/esp32s3/include/soc/i2c_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/i2s_caps.h b/components/soc/esp32s3/include/soc/i2s_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/i2s_caps.h rename to components/soc/esp32s3/include/soc/i2s_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/i2s_reg.h b/components/soc/esp32s3/include/soc/i2s_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/i2s_reg.h rename to components/soc/esp32s3/include/soc/i2s_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/i2s_struct.h b/components/soc/esp32s3/include/soc/i2s_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/i2s_struct.h rename to components/soc/esp32s3/include/soc/i2s_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_core0_reg.h b/components/soc/esp32s3/include/soc/interrupt_core0_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/interrupt_core0_reg.h rename to components/soc/esp32s3/include/soc/interrupt_core0_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_core0_struct.h b/components/soc/esp32s3/include/soc/interrupt_core0_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/interrupt_core0_struct.h rename to components/soc/esp32s3/include/soc/interrupt_core0_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_core1_reg.h b/components/soc/esp32s3/include/soc/interrupt_core1_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/interrupt_core1_reg.h rename to components/soc/esp32s3/include/soc/interrupt_core1_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_core1_struct.h b/components/soc/esp32s3/include/soc/interrupt_core1_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/interrupt_core1_struct.h rename to components/soc/esp32s3/include/soc/interrupt_core1_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/interrupt_reg.h b/components/soc/esp32s3/include/soc/interrupt_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/interrupt_reg.h rename to components/soc/esp32s3/include/soc/interrupt_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/io_mux_reg.h b/components/soc/esp32s3/include/soc/io_mux_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/io_mux_reg.h rename to components/soc/esp32s3/include/soc/io_mux_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/lcd_cam_reg.h b/components/soc/esp32s3/include/soc/lcd_cam_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/lcd_cam_reg.h rename to components/soc/esp32s3/include/soc/lcd_cam_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/lcd_cam_struct.h b/components/soc/esp32s3/include/soc/lcd_cam_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/lcd_cam_struct.h rename to components/soc/esp32s3/include/soc/lcd_cam_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/ledc_caps.h b/components/soc/esp32s3/include/soc/ledc_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/ledc_caps.h rename to components/soc/esp32s3/include/soc/ledc_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/ledc_reg.h b/components/soc/esp32s3/include/soc/ledc_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/ledc_reg.h rename to components/soc/esp32s3/include/soc/ledc_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/ledc_struct.h b/components/soc/esp32s3/include/soc/ledc_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/ledc_struct.h rename to components/soc/esp32s3/include/soc/ledc_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/mcpwm_reg.h b/components/soc/esp32s3/include/soc/mcpwm_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/mcpwm_reg.h rename to components/soc/esp32s3/include/soc/mcpwm_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/mcpwm_struct.h b/components/soc/esp32s3/include/soc/mcpwm_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/mcpwm_struct.h rename to components/soc/esp32s3/include/soc/mcpwm_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/mpu_caps.h b/components/soc/esp32s3/include/soc/mpu_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/mpu_caps.h rename to components/soc/esp32s3/include/soc/mpu_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/nrx_reg.h b/components/soc/esp32s3/include/soc/nrx_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/nrx_reg.h rename to components/soc/esp32s3/include/soc/nrx_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/pcnt_reg.h b/components/soc/esp32s3/include/soc/pcnt_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/pcnt_reg.h rename to components/soc/esp32s3/include/soc/pcnt_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/pcnt_struct.h b/components/soc/esp32s3/include/soc/pcnt_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/pcnt_struct.h rename to components/soc/esp32s3/include/soc/pcnt_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/periph_defs.h b/components/soc/esp32s3/include/soc/periph_defs.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/periph_defs.h rename to components/soc/esp32s3/include/soc/periph_defs.h diff --git a/components/soc/soc/esp32s3/include/soc/rmt_caps.h b/components/soc/esp32s3/include/soc/rmt_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rmt_caps.h rename to components/soc/esp32s3/include/soc/rmt_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/rmt_reg.h b/components/soc/esp32s3/include/soc/rmt_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rmt_reg.h rename to components/soc/esp32s3/include/soc/rmt_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/rmt_struct.h b/components/soc/esp32s3/include/soc/rmt_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rmt_struct.h rename to components/soc/esp32s3/include/soc/rmt_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/rsa_caps.h b/components/soc/esp32s3/include/soc/rsa_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rsa_caps.h rename to components/soc/esp32s3/include/soc/rsa_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc.h b/components/soc/esp32s3/include/soc/rtc.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc.h rename to components/soc/esp32s3/include/soc/rtc.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_cntl_reg.h b/components/soc/esp32s3/include/soc/rtc_cntl_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_cntl_reg.h rename to components/soc/esp32s3/include/soc/rtc_cntl_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_cntl_struct.h b/components/soc/esp32s3/include/soc/rtc_cntl_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_cntl_struct.h rename to components/soc/esp32s3/include/soc/rtc_cntl_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_gpio_channel.h b/components/soc/esp32s3/include/soc/rtc_gpio_channel.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_gpio_channel.h rename to components/soc/esp32s3/include/soc/rtc_gpio_channel.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_i2c_reg.h b/components/soc/esp32s3/include/soc/rtc_i2c_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_i2c_reg.h rename to components/soc/esp32s3/include/soc/rtc_i2c_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_i2c_struct.h b/components/soc/esp32s3/include/soc/rtc_i2c_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_i2c_struct.h rename to components/soc/esp32s3/include/soc/rtc_i2c_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_io_caps.h b/components/soc/esp32s3/include/soc/rtc_io_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_io_caps.h rename to components/soc/esp32s3/include/soc/rtc_io_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_io_channel.h b/components/soc/esp32s3/include/soc/rtc_io_channel.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_io_channel.h rename to components/soc/esp32s3/include/soc/rtc_io_channel.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_io_reg.h b/components/soc/esp32s3/include/soc/rtc_io_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_io_reg.h rename to components/soc/esp32s3/include/soc/rtc_io_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/rtc_io_struct.h b/components/soc/esp32s3/include/soc/rtc_io_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/rtc_io_struct.h rename to components/soc/esp32s3/include/soc/rtc_io_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/sdio_slave_pins.h b/components/soc/esp32s3/include/soc/sdio_slave_pins.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sdio_slave_pins.h rename to components/soc/esp32s3/include/soc/sdio_slave_pins.h diff --git a/components/soc/soc/esp32s3/include/soc/sdmmc_pins.h b/components/soc/esp32s3/include/soc/sdmmc_pins.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sdmmc_pins.h rename to components/soc/esp32s3/include/soc/sdmmc_pins.h diff --git a/components/soc/soc/esp32s3/include/soc/sdmmc_reg.h b/components/soc/esp32s3/include/soc/sdmmc_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sdmmc_reg.h rename to components/soc/esp32s3/include/soc/sdmmc_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/sdmmc_struct.h b/components/soc/esp32s3/include/soc/sdmmc_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sdmmc_struct.h rename to components/soc/esp32s3/include/soc/sdmmc_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/sens_reg.h b/components/soc/esp32s3/include/soc/sens_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sens_reg.h rename to components/soc/esp32s3/include/soc/sens_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/sens_struct.h b/components/soc/esp32s3/include/soc/sens_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sens_struct.h rename to components/soc/esp32s3/include/soc/sens_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/sensitive_reg.h b/components/soc/esp32s3/include/soc/sensitive_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sensitive_reg.h rename to components/soc/esp32s3/include/soc/sensitive_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/sensitive_struct.h b/components/soc/esp32s3/include/soc/sensitive_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sensitive_struct.h rename to components/soc/esp32s3/include/soc/sensitive_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/sha_caps.h b/components/soc/esp32s3/include/soc/sha_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sha_caps.h rename to components/soc/esp32s3/include/soc/sha_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/sigmadelta_caps.h b/components/soc/esp32s3/include/soc/sigmadelta_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sigmadelta_caps.h rename to components/soc/esp32s3/include/soc/sigmadelta_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/slc_reg.h b/components/soc/esp32s3/include/soc/slc_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/slc_reg.h rename to components/soc/esp32s3/include/soc/slc_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/slc_struct.h b/components/soc/esp32s3/include/soc/slc_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/slc_struct.h rename to components/soc/esp32s3/include/soc/slc_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/soc.h b/components/soc/esp32s3/include/soc/soc.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/soc.h rename to components/soc/esp32s3/include/soc/soc.h diff --git a/components/soc/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/soc_caps.h rename to components/soc/esp32s3/include/soc/soc_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/soc_pins.h b/components/soc/esp32s3/include/soc/soc_pins.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/soc_pins.h rename to components/soc/esp32s3/include/soc/soc_pins.h diff --git a/components/soc/soc/esp32s3/include/soc/soc_ulp.h b/components/soc/esp32s3/include/soc/soc_ulp.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/soc_ulp.h rename to components/soc/esp32s3/include/soc/soc_ulp.h diff --git a/components/soc/soc/esp32s3/include/soc/spi_caps.h b/components/soc/esp32s3/include/soc/spi_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/spi_caps.h rename to components/soc/esp32s3/include/soc/spi_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/spi_mem_reg.h b/components/soc/esp32s3/include/soc/spi_mem_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/spi_mem_reg.h rename to components/soc/esp32s3/include/soc/spi_mem_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/spi_mem_struct.h b/components/soc/esp32s3/include/soc/spi_mem_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/spi_mem_struct.h rename to components/soc/esp32s3/include/soc/spi_mem_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/spi_pins.h b/components/soc/esp32s3/include/soc/spi_pins.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/spi_pins.h rename to components/soc/esp32s3/include/soc/spi_pins.h diff --git a/components/soc/soc/esp32s3/include/soc/spi_reg.h b/components/soc/esp32s3/include/soc/spi_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/spi_reg.h rename to components/soc/esp32s3/include/soc/spi_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/spi_struct.h b/components/soc/esp32s3/include/soc/spi_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/spi_struct.h rename to components/soc/esp32s3/include/soc/spi_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/sys_timer_reg.h b/components/soc/esp32s3/include/soc/sys_timer_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sys_timer_reg.h rename to components/soc/esp32s3/include/soc/sys_timer_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/sys_timer_struct.h b/components/soc/esp32s3/include/soc/sys_timer_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/sys_timer_struct.h rename to components/soc/esp32s3/include/soc/sys_timer_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/syscon_reg.h b/components/soc/esp32s3/include/soc/syscon_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/syscon_reg.h rename to components/soc/esp32s3/include/soc/syscon_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/syscon_struct.h b/components/soc/esp32s3/include/soc/syscon_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/syscon_struct.h rename to components/soc/esp32s3/include/soc/syscon_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/system_reg.h b/components/soc/esp32s3/include/soc/system_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/system_reg.h rename to components/soc/esp32s3/include/soc/system_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/system_struct.h b/components/soc/esp32s3/include/soc/system_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/system_struct.h rename to components/soc/esp32s3/include/soc/system_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/systimer_caps.h b/components/soc/esp32s3/include/soc/systimer_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/systimer_caps.h rename to components/soc/esp32s3/include/soc/systimer_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/timer_group_caps.h b/components/soc/esp32s3/include/soc/timer_group_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/timer_group_caps.h rename to components/soc/esp32s3/include/soc/timer_group_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/timer_group_reg.h b/components/soc/esp32s3/include/soc/timer_group_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/timer_group_reg.h rename to components/soc/esp32s3/include/soc/timer_group_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/timer_group_struct.h b/components/soc/esp32s3/include/soc/timer_group_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/timer_group_struct.h rename to components/soc/esp32s3/include/soc/timer_group_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/touch_channel.h b/components/soc/esp32s3/include/soc/touch_channel.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/touch_channel.h rename to components/soc/esp32s3/include/soc/touch_channel.h diff --git a/components/soc/soc/esp32s3/include/soc/touch_sensor_caps.h b/components/soc/esp32s3/include/soc/touch_sensor_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/touch_sensor_caps.h rename to components/soc/esp32s3/include/soc/touch_sensor_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/touch_sensor_channel.h b/components/soc/esp32s3/include/soc/touch_sensor_channel.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/touch_sensor_channel.h rename to components/soc/esp32s3/include/soc/touch_sensor_channel.h diff --git a/components/soc/soc/esp32s3/include/soc/twai_caps.h b/components/soc/esp32s3/include/soc/twai_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/twai_caps.h rename to components/soc/esp32s3/include/soc/twai_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/twai_struct.h b/components/soc/esp32s3/include/soc/twai_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/twai_struct.h rename to components/soc/esp32s3/include/soc/twai_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/uart_caps.h b/components/soc/esp32s3/include/soc/uart_caps.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/uart_caps.h rename to components/soc/esp32s3/include/soc/uart_caps.h diff --git a/components/soc/soc/esp32s3/include/soc/uart_channel.h b/components/soc/esp32s3/include/soc/uart_channel.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/uart_channel.h rename to components/soc/esp32s3/include/soc/uart_channel.h diff --git a/components/soc/soc/esp32s3/include/soc/uart_reg.h b/components/soc/esp32s3/include/soc/uart_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/uart_reg.h rename to components/soc/esp32s3/include/soc/uart_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/uart_struct.h b/components/soc/esp32s3/include/soc/uart_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/uart_struct.h rename to components/soc/esp32s3/include/soc/uart_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/uhci_reg.h b/components/soc/esp32s3/include/soc/uhci_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/uhci_reg.h rename to components/soc/esp32s3/include/soc/uhci_reg.h diff --git a/components/soc/soc/esp32s3/include/soc/uhci_struct.h b/components/soc/esp32s3/include/soc/uhci_struct.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/uhci_struct.h rename to components/soc/esp32s3/include/soc/uhci_struct.h diff --git a/components/soc/soc/esp32s3/include/soc/wdev_reg.h b/components/soc/esp32s3/include/soc/wdev_reg.h similarity index 100% rename from components/soc/soc/esp32s3/include/soc/wdev_reg.h rename to components/soc/esp32s3/include/soc/wdev_reg.h diff --git a/components/soc/soc/esp32s3/interrupts.c b/components/soc/esp32s3/interrupts.c similarity index 100% rename from components/soc/soc/esp32s3/interrupts.c rename to components/soc/esp32s3/interrupts.c diff --git a/components/soc/soc/esp32s3/ledc_periph.c b/components/soc/esp32s3/ledc_periph.c similarity index 100% rename from components/soc/soc/esp32s3/ledc_periph.c rename to components/soc/esp32s3/ledc_periph.c diff --git a/components/soc/soc/esp32s3/pcnt_periph.c b/components/soc/esp32s3/pcnt_periph.c similarity index 100% rename from components/soc/soc/esp32s3/pcnt_periph.c rename to components/soc/esp32s3/pcnt_periph.c diff --git a/components/soc/soc/esp32s3/private_include/regi2c_bbpll.h b/components/soc/esp32s3/private_include/regi2c_bbpll.h similarity index 100% rename from components/soc/soc/esp32s3/private_include/regi2c_bbpll.h rename to components/soc/esp32s3/private_include/regi2c_bbpll.h diff --git a/components/soc/soc/esp32s3/private_include/regi2c_brownout.h b/components/soc/esp32s3/private_include/regi2c_brownout.h similarity index 100% rename from components/soc/soc/esp32s3/private_include/regi2c_brownout.h rename to components/soc/esp32s3/private_include/regi2c_brownout.h diff --git a/components/soc/soc/esp32s3/private_include/regi2c_dig_reg.h b/components/soc/esp32s3/private_include/regi2c_dig_reg.h similarity index 100% rename from components/soc/soc/esp32s3/private_include/regi2c_dig_reg.h rename to components/soc/esp32s3/private_include/regi2c_dig_reg.h diff --git a/components/soc/soc/esp32s3/private_include/regi2c_ulp.h b/components/soc/esp32s3/private_include/regi2c_ulp.h similarity index 100% rename from components/soc/soc/esp32s3/private_include/regi2c_ulp.h rename to components/soc/esp32s3/private_include/regi2c_ulp.h diff --git a/components/soc/src/esp32s3/regi2c_ctrl.h b/components/soc/esp32s3/regi2c_ctrl.h similarity index 100% rename from components/soc/src/esp32s3/regi2c_ctrl.h rename to components/soc/esp32s3/regi2c_ctrl.h diff --git a/components/soc/src/esp32s3/rtc_clk.c b/components/soc/esp32s3/rtc_clk.c similarity index 100% rename from components/soc/src/esp32s3/rtc_clk.c rename to components/soc/esp32s3/rtc_clk.c diff --git a/components/soc/src/esp32s3/rtc_clk_common.h b/components/soc/esp32s3/rtc_clk_common.h similarity index 97% rename from components/soc/src/esp32s3/rtc_clk_common.h rename to components/soc/esp32s3/rtc_clk_common.h index ad6e455835..7c0f76dafd 100644 --- a/components/soc/src/esp32s3/rtc_clk_common.h +++ b/components/soc/esp32s3/rtc_clk_common.h @@ -14,6 +14,9 @@ #pragma once +#include +#include + #define MHZ (1000000) #define DPORT_CPUPERIOD_SEL_80 0 diff --git a/components/soc/src/esp32s3/rtc_clk_init.c b/components/soc/esp32s3/rtc_clk_init.c similarity index 100% rename from components/soc/src/esp32s3/rtc_clk_init.c rename to components/soc/esp32s3/rtc_clk_init.c diff --git a/components/soc/src/esp32s3/rtc_init.c b/components/soc/esp32s3/rtc_init.c similarity index 100% rename from components/soc/src/esp32s3/rtc_init.c rename to components/soc/esp32s3/rtc_init.c diff --git a/components/soc/soc/esp32s3/rtc_io_periph.c b/components/soc/esp32s3/rtc_io_periph.c similarity index 100% rename from components/soc/soc/esp32s3/rtc_io_periph.c rename to components/soc/esp32s3/rtc_io_periph.c diff --git a/components/soc/soc/esp32s3/rtc_periph.c b/components/soc/esp32s3/rtc_periph.c similarity index 100% rename from components/soc/soc/esp32s3/rtc_periph.c rename to components/soc/esp32s3/rtc_periph.c diff --git a/components/soc/src/esp32s3/rtc_pm.c b/components/soc/esp32s3/rtc_pm.c similarity index 100% rename from components/soc/src/esp32s3/rtc_pm.c rename to components/soc/esp32s3/rtc_pm.c diff --git a/components/soc/src/esp32s3/rtc_sleep.c b/components/soc/esp32s3/rtc_sleep.c similarity index 100% rename from components/soc/src/esp32s3/rtc_sleep.c rename to components/soc/esp32s3/rtc_sleep.c diff --git a/components/soc/src/esp32s3/rtc_time.c b/components/soc/esp32s3/rtc_time.c similarity index 100% rename from components/soc/src/esp32s3/rtc_time.c rename to components/soc/esp32s3/rtc_time.c diff --git a/components/soc/soc/esp32s3/sdio_slave_periph.c b/components/soc/esp32s3/sdio_slave_periph.c similarity index 100% rename from components/soc/soc/esp32s3/sdio_slave_periph.c rename to components/soc/esp32s3/sdio_slave_periph.c diff --git a/components/soc/soc/esp32s3/sdmmc_periph.c b/components/soc/esp32s3/sdmmc_periph.c similarity index 100% rename from components/soc/soc/esp32s3/sdmmc_periph.c rename to components/soc/esp32s3/sdmmc_periph.c diff --git a/components/soc/src/esp32s3/soc_memory_layout.c b/components/soc/esp32s3/soc_memory_layout.c similarity index 100% rename from components/soc/src/esp32s3/soc_memory_layout.c rename to components/soc/esp32s3/soc_memory_layout.c diff --git a/components/soc/soc/esp32s3/spi_periph.c b/components/soc/esp32s3/spi_periph.c similarity index 100% rename from components/soc/soc/esp32s3/spi_periph.c rename to components/soc/esp32s3/spi_periph.c diff --git a/components/soc/soc/esp32s3/touch_sensor_periph.c b/components/soc/esp32s3/touch_sensor_periph.c similarity index 100% rename from components/soc/soc/esp32s3/touch_sensor_periph.c rename to components/soc/esp32s3/touch_sensor_periph.c diff --git a/components/soc/soc/esp32s3/uart_periph.c b/components/soc/esp32s3/uart_periph.c similarity index 100% rename from components/soc/soc/esp32s3/uart_periph.c rename to components/soc/esp32s3/uart_periph.c diff --git a/components/soc/soc/include/soc/adc_periph.h b/components/soc/include/soc/adc_periph.h similarity index 100% rename from components/soc/soc/include/soc/adc_periph.h rename to components/soc/include/soc/adc_periph.h diff --git a/components/soc/soc/include/soc/dac_periph.h b/components/soc/include/soc/dac_periph.h similarity index 100% rename from components/soc/soc/include/soc/dac_periph.h rename to components/soc/include/soc/dac_periph.h diff --git a/components/soc/soc/include/soc/dedic_gpio_periph.h b/components/soc/include/soc/dedic_gpio_periph.h similarity index 100% rename from components/soc/soc/include/soc/dedic_gpio_periph.h rename to components/soc/include/soc/dedic_gpio_periph.h diff --git a/components/soc/soc/include/soc/efuse_periph.h b/components/soc/include/soc/efuse_periph.h similarity index 100% rename from components/soc/soc/include/soc/efuse_periph.h rename to components/soc/include/soc/efuse_periph.h diff --git a/components/soc/soc/include/soc/emac_periph.h b/components/soc/include/soc/emac_periph.h similarity index 100% rename from components/soc/soc/include/soc/emac_periph.h rename to components/soc/include/soc/emac_periph.h diff --git a/components/soc/soc/include/soc/gpio_periph.h b/components/soc/include/soc/gpio_periph.h similarity index 100% rename from components/soc/soc/include/soc/gpio_periph.h rename to components/soc/include/soc/gpio_periph.h diff --git a/components/soc/soc/include/soc/hwcrypto_periph.h b/components/soc/include/soc/hwcrypto_periph.h similarity index 100% rename from components/soc/soc/include/soc/hwcrypto_periph.h rename to components/soc/include/soc/hwcrypto_periph.h diff --git a/components/soc/soc/include/soc/i2c_periph.h b/components/soc/include/soc/i2c_periph.h similarity index 100% rename from components/soc/soc/include/soc/i2c_periph.h rename to components/soc/include/soc/i2c_periph.h diff --git a/components/soc/soc/include/soc/i2s_periph.h b/components/soc/include/soc/i2s_periph.h similarity index 100% rename from components/soc/soc/include/soc/i2s_periph.h rename to components/soc/include/soc/i2s_periph.h diff --git a/components/soc/soc/include/soc/interrupts.h b/components/soc/include/soc/interrupts.h similarity index 100% rename from components/soc/soc/include/soc/interrupts.h rename to components/soc/include/soc/interrupts.h diff --git a/components/soc/soc/include/soc/ledc_periph.h b/components/soc/include/soc/ledc_periph.h similarity index 100% rename from components/soc/soc/include/soc/ledc_periph.h rename to components/soc/include/soc/ledc_periph.h diff --git a/components/soc/soc/include/soc/mcpwm_periph.h b/components/soc/include/soc/mcpwm_periph.h similarity index 100% rename from components/soc/soc/include/soc/mcpwm_periph.h rename to components/soc/include/soc/mcpwm_periph.h diff --git a/components/soc/soc/include/soc/pcnt_periph.h b/components/soc/include/soc/pcnt_periph.h similarity index 100% rename from components/soc/soc/include/soc/pcnt_periph.h rename to components/soc/include/soc/pcnt_periph.h diff --git a/components/soc/soc/include/soc/rmt_periph.h b/components/soc/include/soc/rmt_periph.h similarity index 100% rename from components/soc/soc/include/soc/rmt_periph.h rename to components/soc/include/soc/rmt_periph.h diff --git a/components/soc/soc/include/soc/rtc_cntl_periph.h b/components/soc/include/soc/rtc_cntl_periph.h similarity index 100% rename from components/soc/soc/include/soc/rtc_cntl_periph.h rename to components/soc/include/soc/rtc_cntl_periph.h diff --git a/components/soc/soc/include/soc/rtc_io_periph.h b/components/soc/include/soc/rtc_io_periph.h similarity index 100% rename from components/soc/soc/include/soc/rtc_io_periph.h rename to components/soc/include/soc/rtc_io_periph.h diff --git a/components/soc/soc/include/soc/rtc_periph.h b/components/soc/include/soc/rtc_periph.h similarity index 100% rename from components/soc/soc/include/soc/rtc_periph.h rename to components/soc/include/soc/rtc_periph.h diff --git a/components/soc/soc/include/soc/sdio_slave_periph.h b/components/soc/include/soc/sdio_slave_periph.h similarity index 100% rename from components/soc/soc/include/soc/sdio_slave_periph.h rename to components/soc/include/soc/sdio_slave_periph.h diff --git a/components/soc/soc/include/soc/sdmmc_periph.h b/components/soc/include/soc/sdmmc_periph.h similarity index 100% rename from components/soc/soc/include/soc/sdmmc_periph.h rename to components/soc/include/soc/sdmmc_periph.h diff --git a/components/soc/soc/include/soc/sens_periph.h b/components/soc/include/soc/sens_periph.h similarity index 100% rename from components/soc/soc/include/soc/sens_periph.h rename to components/soc/include/soc/sens_periph.h diff --git a/components/soc/soc/include/soc/sigmadelta_periph.h b/components/soc/include/soc/sigmadelta_periph.h similarity index 100% rename from components/soc/soc/include/soc/sigmadelta_periph.h rename to components/soc/include/soc/sigmadelta_periph.h diff --git a/components/soc/soc/include/soc/spi_periph.h b/components/soc/include/soc/spi_periph.h similarity index 100% rename from components/soc/soc/include/soc/spi_periph.h rename to components/soc/include/soc/spi_periph.h diff --git a/components/soc/soc/include/soc/syscon_periph.h b/components/soc/include/soc/syscon_periph.h similarity index 100% rename from components/soc/soc/include/soc/syscon_periph.h rename to components/soc/include/soc/syscon_periph.h diff --git a/components/soc/soc/include/soc/timer_periph.h b/components/soc/include/soc/timer_periph.h similarity index 100% rename from components/soc/soc/include/soc/timer_periph.h rename to components/soc/include/soc/timer_periph.h diff --git a/components/soc/soc/include/soc/touch_sensor_periph.h b/components/soc/include/soc/touch_sensor_periph.h similarity index 100% rename from components/soc/soc/include/soc/touch_sensor_periph.h rename to components/soc/include/soc/touch_sensor_periph.h diff --git a/components/soc/soc/include/soc/twai_periph.h b/components/soc/include/soc/twai_periph.h similarity index 100% rename from components/soc/soc/include/soc/twai_periph.h rename to components/soc/include/soc/twai_periph.h diff --git a/components/soc/soc/include/soc/uart_periph.h b/components/soc/include/soc/uart_periph.h similarity index 100% rename from components/soc/soc/include/soc/uart_periph.h rename to components/soc/include/soc/uart_periph.h diff --git a/components/soc/soc/include/soc/uhci_periph.h b/components/soc/include/soc/uhci_periph.h similarity index 100% rename from components/soc/soc/include/soc/uhci_periph.h rename to components/soc/include/soc/uhci_periph.h diff --git a/components/soc/src/lldesc.c b/components/soc/lldesc.c similarity index 100% rename from components/soc/src/lldesc.c rename to components/soc/lldesc.c diff --git a/components/soc/soc/CMakeLists.txt b/components/soc/soc/CMakeLists.txt deleted file mode 100644 index 0f0ee7f6cf..0000000000 --- a/components/soc/soc/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -idf_build_get_property(target IDF_TARGET) -add_subdirectory(${target}) diff --git a/components/soc/soc/component.mk b/components/soc/soc/component.mk deleted file mode 100644 index 8deea5253f..0000000000 --- a/components/soc/soc/component.mk +++ /dev/null @@ -1,2 +0,0 @@ -COMPONENT_ADD_INCLUDEDIRS += soc/include soc/$(SOC_NAME)/private_include soc/$(SOC_NAME)/include -COMPONENT_SRCDIRS += soc/$(SOC_NAME) diff --git a/components/soc/soc/esp32/CMakeLists.txt b/components/soc/soc/esp32/CMakeLists.txt deleted file mode 100644 index c423a829bc..0000000000 --- a/components/soc/soc/esp32/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_library(soc_esp32 STATIC - "adc_periph.c" - "dac_periph.c" - "gpio_periph.c" - "pcnt_periph.c" - "rtc_io_periph.c" - "rtc_periph.c" - "sdio_slave_periph.c" - "sdmmc_periph.c" - "interrupts.c" - "spi_periph.c" - "ledc_periph.c" - "i2s_periph.c" - "i2c_periph.c" - "uart_periph.c" - "touch_sensor_periph.c") - -target_include_directories(soc_esp32 PUBLIC include ../include private_include) \ No newline at end of file diff --git a/components/soc/soc/esp32s2/CMakeLists.txt b/components/soc/soc/esp32s2/CMakeLists.txt deleted file mode 100644 index 9b00451d91..0000000000 --- a/components/soc/soc/esp32s2/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -add_library(soc_esp32s2 STATIC - "adc_periph.c" - "dac_periph.c" - "dedic_gpio_periph.c" - "gpio_periph.c" - "pcnt_periph.c" - "rtc_io_periph.c" - "rtc_periph.c" - "interrupts.c" - "spi_periph.c" - "ledc_periph.c" - "i2s_periph.c" - "i2c_periph.c" - "uart_periph.c" - "usb_periph.c" - "touch_sensor_periph.c") - -target_include_directories(soc_esp32s2 PUBLIC include ../include private_include) diff --git a/components/soc/soc/esp32s3/CMakeLists.txt b/components/soc/soc/esp32s3/CMakeLists.txt deleted file mode 100644 index 148a3177fb..0000000000 --- a/components/soc/soc/esp32s3/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_library(soc_esp32s3 STATIC - "adc_periph.c" - "dac_periph.c" - "dedic_gpio_periph.c" - "gpio_periph.c" - "i2c_periph.c" - "i2s_periph.c" - "interrupts.c" - "ledc_periph.c" - "pcnt_periph.c" - "rtc_io_periph.c" - "rtc_periph.c" - "sdio_slave_periph.c" - "sdmmc_periph.c" - "spi_periph.c" - "touch_sensor_periph.c" - "uart_periph.c") - -target_include_directories(soc_esp32s3 PUBLIC include ../include private_include) diff --git a/components/soc/src/soc_include_legacy_warn.c b/components/soc/soc_include_legacy_warn.c similarity index 100% rename from components/soc/src/soc_include_legacy_warn.c rename to components/soc/soc_include_legacy_warn.c diff --git a/components/soc/src/esp32/component.mk b/components/soc/src/esp32/component.mk deleted file mode 100644 index aea3541d82..0000000000 --- a/components/soc/src/esp32/component.mk +++ /dev/null @@ -1,8 +0,0 @@ -COMPONENT_ADD_INCLUDEDIRS += src/$(SOC_NAME) src/$(SOC_NAME)/include -COMPONENT_SRCDIRS += src/$(SOC_NAME) - -ifndef CONFIG_ETH_USE_ESP32_EMAC - COMPONENT_OBJEXCLUDE += src/esp32/emac_hal.o -endif - -src/esp32/rtc_clk.o: CFLAGS += -fno-jump-tables -fno-tree-switch-conversion \ No newline at end of file diff --git a/components/soc/src/esp32s2/CMakeLists.txt b/components/soc/src/esp32s2/CMakeLists.txt deleted file mode 100644 index f1fe8ca090..0000000000 --- a/components/soc/src/esp32s2/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -set(srcs - "rtc_clk.c" - "regi2c_ctrl.c" - "rtc_clk_init.c" - "rtc_init.c" - "rtc_pm.c" - "rtc_sleep.c" - "rtc_time.c" - "rtc_wdt.c" - "soc_memory_layout.c") - -add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") - -target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") -target_include_directories(${COMPONENT_LIB} PUBLIC . include) - -if(NOT CMAKE_BUILD_EARLY_EXPANSION) - set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES - COMPILE_FLAGS "-fno-jump-tables -fno-tree-switch-conversion") -endif() diff --git a/components/soc/src/esp32s3/CMakeLists.txt b/components/soc/src/esp32s3/CMakeLists.txt deleted file mode 100644 index 972d69f96b..0000000000 --- a/components/soc/src/esp32s3/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -set(srcs - "rtc_clk_init.c" - "rtc_clk.c" - "rtc_init.c" - "rtc_pm.c" - "rtc_sleep.c" - "rtc_time.c" - "soc_memory_layout.c") - -add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") - -target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") -target_include_directories(${COMPONENT_LIB} PUBLIC . include) - -if(NOT CMAKE_BUILD_EARLY_EXPANSION) - set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES - COMPILE_FLAGS "-fno-jump-tables -fno-tree-switch-conversion") -endif() diff --git a/components/spi_flash/sim/Makefile.files b/components/spi_flash/sim/Makefile.files index 5c05144322..a66ca7733d 100644 --- a/components/spi_flash/sim/Makefile.files +++ b/components/spi_flash/sim/Makefile.files @@ -29,9 +29,8 @@ INCLUDE_DIRS := \ esp_system/include \ xtensa/include \ xtensa/esp32/include \ - soc/soc/esp32/include \ + soc/esp32/include \ soc/include \ - soc/soc/include \ esp32/include \ esp_timer/include \ bootloader_support/include \ diff --git a/components/spi_flash/sim/stubs/Makefile.files b/components/spi_flash/sim/stubs/Makefile.files index 9b63d80c97..f6275d7f23 100644 --- a/components/spi_flash/sim/stubs/Makefile.files +++ b/components/spi_flash/sim/stubs/Makefile.files @@ -21,9 +21,8 @@ INCLUDE_DIRS := \ $(addprefix ../../../../components/, \ esp_common/include \ esp_system/include \ - soc/soc/esp32/include \ + soc/esp32/include \ soc/include \ - soc/soc/include \ xtensa/include \ xtensa/esp32/include \ esp32/include \ diff --git a/components/spiffs/test_spiffs_host/Makefile.files b/components/spiffs/test_spiffs_host/Makefile.files index f5278d0002..924493e9e4 100644 --- a/components/spiffs/test_spiffs_host/Makefile.files +++ b/components/spiffs/test_spiffs_host/Makefile.files @@ -28,9 +28,8 @@ INCLUDE_DIRS := \ esp_system/include \ xtensa/include \ xtensa/esp32/include \ - soc/soc/esp32/include \ + soc/esp32/include \ soc/include \ - soc/soc/include \ esp32/include \ bootloader_support/include \ app_update/include \ diff --git a/components/wear_levelling/test_wl_host/Makefile.files b/components/wear_levelling/test_wl_host/Makefile.files index 93cd2bc722..47c365a4fc 100644 --- a/components/wear_levelling/test_wl_host/Makefile.files +++ b/components/wear_levelling/test_wl_host/Makefile.files @@ -27,9 +27,8 @@ INCLUDE_DIRS := \ esp_common/include \ xtensa/include \ xtensa/esp32/include \ - soc/soc/esp32/include \ + soc/esp32/include \ soc/include \ - soc/soc/include \ esp32/include \ bootloader_support/include \ app_update/include \ diff --git a/docs/en/api-reference/peripherals/rmt.rst b/docs/en/api-reference/peripherals/rmt.rst index 0e66057b59..8420ee363a 100644 --- a/docs/en/api-reference/peripherals/rmt.rst +++ b/docs/en/api-reference/peripherals/rmt.rst @@ -269,11 +269,11 @@ Setting or clearing an interrupt enable mask for specific channels and events ma .. only:: esp32 - When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/soc/esp32/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above. + When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/esp32/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above. .. only:: esp32s2 - When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/soc/esp32s2/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above. + When servicing an interrupt within an ISR, the interrupt need to explicitly cleared. To do so, set specific bits described as ``RMT.int_clr.val.chN_event_name`` and defined as a ``volatile struct`` in :component_file:`soc/esp32s2/include/soc/rmt_struct.h`, where N is the RMT channel number [0, n] and the ``event_name`` is one of four events described above. If you do not need an ISR anymore, you can deregister it by calling a function :cpp:func:`rmt_isr_deregister`. diff --git a/docs/en/api-reference/peripherals/timer.rst b/docs/en/api-reference/peripherals/timer.rst index 017ecab01f..94ecf5461d 100644 --- a/docs/en/api-reference/peripherals/timer.rst +++ b/docs/en/api-reference/peripherals/timer.rst @@ -91,7 +91,7 @@ Registration of the interrupt handler for a specific timer or a timer group can To enable interrupts for a timer group, call :cpp:func:`timer_group_intr_enable`, for a specific timer call :cpp:func:`timer_enable_intr`. To disable interrupts for a timer group, call :cpp:func:`timer_group_intr_disable`, for a specified timer, call :cpp:func:`timer_disable_intr`. -When handling an interrupt within an interrupt serivce routine (ISR), the interrupt status bit needs to be explicitly cleared. To do that, set the ``TIMERGN.{IDF_TARGET_INT_CLR_REG}.tM`` structure, defined in :component_file:`soc/soc/{IDF_TARGET_PATH_NAME}/include/soc/timer_group_struct.h`. In this structure, ``N`` is the timer group number [0, 1], ``M`` is the timer number [0, 1]. For example, to clear an interrupt status bit for the timer 1 in the timer group 0, call the following:: +When handling an interrupt within an interrupt serivce routine (ISR), the interrupt status bit needs to be explicitly cleared. To do that, set the ``TIMERGN.{IDF_TARGET_INT_CLR_REG}.tM`` structure, defined in :component_file:`soc/{IDF_TARGET_PATH_NAME}/include/soc/timer_group_struct.h`. In this structure, ``N`` is the timer group number [0, 1], ``M`` is the timer number [0, 1]. For example, to clear an interrupt status bit for the timer 1 in the timer group 0, call the following:: TIMERG0.{IDF_TARGET_INT_CLR_REG}.t1 = 1 diff --git a/docs/idf_extensions/gen_defines.py b/docs/idf_extensions/gen_defines.py index da5f325f14..c067ce5a7d 100644 --- a/docs/idf_extensions/gen_defines.py +++ b/docs/idf_extensions/gen_defines.py @@ -26,7 +26,7 @@ def generate_defines(app, project_description): # # kind of a hack, be nicer to add a component info dict in project_description.json soc_path = [p for p in project_description["build_component_paths"] if p.endswith("/soc")][0] - soc_headers = glob.glob(os.path.join(soc_path, "soc", project_description["target"], + soc_headers = glob.glob(os.path.join(soc_path, project_description["target"], "include", "soc", "*_caps.h")) assert len(soc_headers) > 0 diff --git a/docs/zh_CN/api-reference/peripherals/timer.rst b/docs/zh_CN/api-reference/peripherals/timer.rst index b9ea490b7e..bc61138967 100644 --- a/docs/zh_CN/api-reference/peripherals/timer.rst +++ b/docs/zh_CN/api-reference/peripherals/timer.rst @@ -89,7 +89,7 @@ ESP32 芯片提供两组硬件定时器，每组包含两个通用硬件定时 调用 :cpp:func:`timer_group_intr_enable` 使能定时器组的中断程序，调用 :cpp:func:`timer_enable_intr` 使能某定时器的中断程序。调用 :cpp:func:`timer_group_intr_disable` 关闭定时器组的中断程序，调用 :cpp:func:`timer_disable_intr` 关闭某定时器的中断程序。 -在中断服务程序（ISR）中处理中断时，需要明确地清除中断状态位。为此，请设置定义在 :component_file:`soc/soc/esp32/include/soc/timer_group_struct.h` 中的 ``TIMERGN.int_clr_timers.tM`` 结构。该结构中 ``N`` 是定时器组别编号 [0, 1]，``M`` 是定时器编号 [0, 1]。例如，要清除定时器组别 0 中定时器 1 的中断状态位，请调用以下命令:: +在中断服务程序（ISR）中处理中断时，需要明确地清除中断状态位。为此，请设置定义在 :component_file:`soc/esp32/include/soc/timer_group_struct.h` 中的 ``TIMERGN.int_clr_timers.tM`` 结构。该结构中 ``N`` 是定时器组别编号 [0, 1]，``M`` 是定时器编号 [0, 1]。例如，要清除定时器组别 0 中定时器 1 的中断状态位，请调用以下命令:: TIMERG0.int_clr_timers.t1 = 1