espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/support_i2s_on_p4_eco5_v5.4' into 'release/v5.4'

Browse Source 
change(i2s): update i2s soc and hal for p4 hw_ver3 (v5.4)

See merge request espressif/esp-idf!42739
This commit is contained in:
morris
2025-11-12 10:16:16 +08:00
parent f483e9fa4c fbf49d795a
commit 479727d89a
6 changed files with 7 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_i2s/test_apps/i2s/main/test_i2s.c
+1 -1
View File
@@ -742,7 +742,7 @@ TEST_CASE("I2S_loopback_test", "[i2s]")
TEST_ESP_OK(i2s_del_channel(rx_handle));
}
#if SOC_I2S_NUM > 1 && !CONFIG_IDF_TARGET_ESP32P4
#if SOC_I2S_NUM > 1 && !CONFIG_ESP32P4_SELECTS_REV_LESS_V3
TEST_CASE("I2S_master_write_slave_read_test", "[i2s]")
{
i2s_chan_handle_t tx_handle;
components/hal/esp32p4/include/hal/i2s_ll.h
+2 -1
View File
@@ -1139,7 +1139,8 @@ static inline void i2s_ll_tx_set_pdm_hp_filter_param5(i2s_dev_t *hw, uint32_t pa
*/
static inline void i2s_ll_tx_enable_pdm_hp_filter(i2s_dev_t *hw, bool enable)
{
hw->tx_pcm2pdm_conf.tx_pdm_hp_bypass = !enable;
// Must enable on P4
HAL_ASSERT(enable);
}
/**
components/soc/esp32p4/include/soc/clk_tree_defs.h
+1 -1
View File
@@ -332,7 +332,7 @@ typedef enum {
/**
* @brief Array initializer for all supported clock sources of I2S
*/
#define SOC_I2S_CLKS {SOC_MOD_CLK_XTAL, SOC_MOD_CLK_APLL, I2S_CLK_SRC_EXTERNAL}
#define SOC_I2S_CLKS {SOC_MOD_CLK_XTAL, SOC_MOD_CLK_PLL_F160M, SOC_MOD_CLK_APLL, I2S_CLK_SRC_EXTERNAL}
/**
* @brief I2S clock source enum
components/soc/esp32p4/register/hw_ver1/soc/i2s_struct.h
+2 -5
View File
@@ -1,5 +1,5 @@
/**
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -282,10 +282,7 @@ typedef union {
*/
typedef union {
struct {
/** tx_pdm_hp_bypass : R/W; bitpos: [0]; default: 0;
* I2S TX PDM bypass hp filter or not. The option has been removed.
*/
uint32_t tx_pdm_hp_bypass:1;
uint32_t reserved_0:1;
/** tx_pdm_sinc_osr2 : R/W; bitpos: [4:1]; default: 2;
* I2S TX PDM OSR2 value
*/
components/soc/esp32p4/register/hw_ver3/soc/i2s_eco5_struct.h
-1009
View File
File diff suppressed because it is too large Load Diff
components/soc/esp32p4/register/hw_ver3/soc/i2s_struct.h
+1 -4
View File
@@ -282,10 +282,7 @@ typedef union {
*/
typedef union {
struct {
/** tx_pdm_hp_bypass : R/W; bitpos: [0]; default: 0;
* I2S TX PDM bypass hp filter or not. The option has been removed.
*/
uint32_t tx_pdm_hp_bypass:1;
uint32_t reserved_0:1;
/** tx_pdm_sinc_osr2 : R/W; bitpos: [4:1]; default: 2;
* I2S TX PDM OSR2 value
*/