From ad2b1a7e796daf09004614b3d3d73241aa0e3cba Mon Sep 17 00:00:00 2001 From: Chen Chen Date: Tue, 28 Apr 2026 17:28:00 +0800 Subject: [PATCH] refactor(i2s): remove `SOC_I2S_NUM` from soc_caps for esp32s31 --- components/soc/esp32s31/include/soc/Kconfig.soc_caps.in | 4 ---- components/soc/esp32s31/include/soc/soc_caps.h | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in index af6140a8873..6a939809781 100644 --- a/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32s31/include/soc/Kconfig.soc_caps.in @@ -1271,10 +1271,6 @@ config SOC_BLE_PERIODIC_ADV_WITH_RESPONSE bool default y -config SOC_I2S_NUM - int - default 2 - config SOC_I2S_HW_VERSION_2 bool default y diff --git a/components/soc/esp32s31/include/soc/soc_caps.h b/components/soc/esp32s31/include/soc/soc_caps.h index 24d9a36ef47..4cec5028207 100644 --- a/components/soc/esp32s31/include/soc/soc_caps.h +++ b/components/soc/esp32s31/include/soc/soc_caps.h @@ -521,11 +521,10 @@ #define SOC_BLE_PERIODIC_ADV_WITH_RESPONSE (1) /*!< Support Bluetooth LE Periodic Advertising with Response (PAwR) */ /*-------------------------- 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_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_PCM (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_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_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_RX_RECOMB (1) // Support RX recomb for DMA data format reorganization #define SOC_I2S_SUPPORTS_TDM (1)