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

Merge branch 'fix/i2s_remove_soc_cap' into 'master'

Browse Source 
refactor(i2s): remove `SOC_I2S_NUM` from soc_caps for esp32s31

See merge request espressif/esp-idf!48039
This commit is contained in:
Chen Chen
2026-04-29 15:58:36 +08:00
parent c9ee9deaaf ad2b1a7e79
commit ecb15422a6
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/soc/esp32s31/include/soc/Kconfig.soc_caps.in
-4
View File
@@ -1271,10 +1271,6 @@ config SOC_BLE_PERIODIC_ADV_WITH_RESPONSE
bool bool
default y default y
config SOC_I2S_NUM
int
default 2
config SOC_I2S_HW_VERSION_2 config SOC_I2S_HW_VERSION_2
bool bool
default y default y
components/soc/esp32s31/include/soc/soc_caps.h
+3 -4
View File
@@ -521,11 +521,10 @@
#define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE (1) /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */ #define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE (1) /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */
/*-------------------------- I2S CAPS ----------------------------------------*/ /*-------------------------- I2S CAPS ----------------------------------------*/
#define SOC_I2S_NUM (2U) #define SOC_I2S_HW_VERSION_2 (1)
#define SOC_I2S_HW_VERSION_2 (1)
#define SOC_I2S_SUPPORTS_ETM (1) #define SOC_I2S_SUPPORTS_ETM (1)
#define SOC_I2S_SUPPORTS_APLL (1) #define SOC_I2S_SUPPORTS_APLL (1)
#define SOC_I2S_SUPPORTS_RC_FAST (1) // Support RC_FAST as I2S clock source #define SOC_I2S_SUPPORTS_RC_FAST (1) // Support RC_FAST as I2S clock source
#define SOC_I2S_SUPPORTS_EXTERNAL (1) // Support External clock source #define SOC_I2S_SUPPORTS_EXTERNAL (1) // Support External clock source
#define SOC_I2S_SUPPORTS_PCM (1) #define SOC_I2S_SUPPORTS_PCM (1)
#define SOC_I2S_SUPPORTS_PDM (1) #define SOC_I2S_SUPPORTS_PDM (1)
@@ -533,7 +532,7 @@
#define SOC_I2S_SUPPORTS_PCM2PDM (1) // Support to write PCM format but output PDM format data with the help of PCM to PDM filter #define SOC_I2S_SUPPORTS_PCM2PDM (1) // Support to write PCM format but output PDM format data with the help of PCM to PDM filter
#define SOC_I2S_SUPPORTS_PDM_RX (1) // Support to input raw PDM format data #define SOC_I2S_SUPPORTS_PDM_RX (1) // Support to input raw PDM format data
#define SOC_I2S_SUPPORTS_PDM2PCM (1) // Support to input PDM format but read PCM format data with the help of PDM to PCM filter (only on I2S0) #define SOC_I2S_SUPPORTS_PDM2PCM (1) // Support to input PDM format but read PCM format data with the help of PDM to PCM filter (only on I2S0)
#define SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER (1) #define SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER (1)
#define SOC_I2S_SUPPORTS_TX_SYNC_CNT (1) // Support TX synchronization count (ideal_cnt) #define SOC_I2S_SUPPORTS_TX_SYNC_CNT (1) // Support TX synchronization count (ideal_cnt)
#define SOC_I2S_SUPPORTS_RX_RECOMB (1) // Support RX recomb for DMA data format reorganization #define SOC_I2S_SUPPORTS_RX_RECOMB (1) // Support RX recomb for DMA data format reorganization
#define SOC_I2S_SUPPORTS_TDM (1) #define SOC_I2S_SUPPORTS_TDM (1)