Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'chip/bringup_esp32s31_wifi_coexist' into 'master'

Browse Source 
Chip/bringup esp32s31 wifi coexist

Closes IDF-14614, IDF-14616, IDF-14617, and IDF-14615

See merge request espressif/esp-idf!47697
This commit is contained in:
Jiang Jiang Jian
2026-04-23 11:44:14 +08:00
parent fbd6ae1b9e 322b1812b1
commit 4586d65af3
11 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/soc/esp32s31/include/soc/Kconfig.soc_caps.in
+8
View File
@@ -903,6 +903,14 @@ config SOC_UART_WAKEUP_SUPPORT_CHAR_SEQ_MODE
bool
default y
config SOC_COEX_HW_PTI
bool
default y
config SOC_EXTERNAL_COEX_ADVANCE
bool
default y
config SOC_MODEM_CLOCK_IS_INDEPENDENT
bool
default y
components/soc/esp32s31/include/soc/gpio_sig_map.h
+5
View File
@@ -48,6 +48,11 @@
#define GPIO_EXTERN_ACTIVE_PAD_OUT_IDX 19
#define GPIO_EXTERN_PRIORITY_PAD_IN_IDX 20
#define GPIO_EXTERN_PRIORITY_PAD_OUT_IDX 20
/* Same GPIO matrix indices as EXTERN_* on other targets (used by esp_coex external coexist). */
#define EXTERN_ACTIVE_I_IDX GPIO_EXTERN_ACTIVE_PAD_IN_IDX
#define EXTERN_ACTIVE_O_IDX GPIO_EXTERN_ACTIVE_PAD_OUT_IDX
#define EXTERN_PRIORITY_I_IDX GPIO_EXTERN_PRIORITY_PAD_IN_IDX
#define EXTERN_PRIORITY_O_IDX GPIO_EXTERN_PRIORITY_PAD_OUT_IDX
#define GPIO_EVENT_MATRIX_IN0_IDX 21
#define GPIO_TASK_MATRIX_OUT0_IDX 21
#define GPIO_EVENT_MATRIX_IN1_IDX 22
components/soc/esp32s31/include/soc/soc_caps.h
+6
View File
@@ -384,6 +384,12 @@
#define SOC_UART_WAKEUP_SUPPORT_START_BIT_MODE (1)
#define SOC_UART_WAKEUP_SUPPORT_CHAR_SEQ_MODE (1)
/*-------------------------- COEXISTENCE HARDWARE PTI CAPS -------------------------------*/
#define SOC_COEX_HW_PTI (1)
/*-------------------------- EXTERNAL COEXISTENCE CAPS -------------------------------------*/
#define SOC_EXTERNAL_COEX_ADVANCE (1) /*!< HARDWARE EXTERNAL COEXISTENCE CAPS */
// /*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/
#define SOC_MODEM_CLOCK_IS_INDEPENDENT (1)
#define SOC_MODEM_CLOCK_SOC_PLL_SOURCE_CG_SUPPORTED (1)