Просмотр исходного кода

feat(i2s): support i2s on esp32p4

laokaiyao 2 лет назад
Родитель
Сommit
cf889f3c6d

+ 2 - 2
components/driver/deprecated/i2s_legacy.c

@@ -654,12 +654,12 @@ static uint32_t i2s_config_source_clock(i2s_port_t i2s_num, bool use_apll, uint3
         /* In APLL mode, there is no sclk but only mclk, so return 0 here to indicate APLL mode */
         return real_freq;
     }
-    return I2S_LL_DEFAULT_PLL_CLK_FREQ;
+    return I2S_LL_DEFAULT_CLK_FREQ;
 #else
     if (use_apll) {
         ESP_LOGW(TAG, "APLL not supported on current chip, use I2S_CLK_SRC_DEFAULT as default clock source");
     }
-    return I2S_LL_DEFAULT_PLL_CLK_FREQ;
+    return I2S_LL_DEFAULT_CLK_FREQ;
 #endif
 }
 

+ 24 - 0
components/driver/i2s/include/driver/i2s_pdm.h

@@ -48,6 +48,24 @@ extern "C" {
     .bclk_div = 8, \
 }
 
+#if SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER
+/**
+ * @brief PDM format in 2 slots(RX)
+ * @param bits_per_sample i2s data bit width, only support 16 bits for PDM mode
+ * @param mono_or_stereo I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
+ */
+#define I2S_PDM_RX_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo) { \
+    .data_bit_width = bits_per_sample, \
+    .slot_bit_width = I2S_SLOT_BIT_WIDTH_AUTO, \
+    .slot_mode = mono_or_stereo, \
+    .slot_mask = (mono_or_stereo  == I2S_SLOT_MODE_MONO) ? \
+                 I2S_PDM_SLOT_LEFT : I2S_PDM_SLOT_BOTH, \
+    .hp_en = true, \
+    .hp_cut_off_freq_hz = 35.5, \
+    .amplify_num = 1, \  /* TODO: maybe need an enum */
+}
+#endif  // SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER
+
 /**
  * @brief I2S slot configuration for pdm rx mode
  */
@@ -58,6 +76,12 @@ typedef struct {
     i2s_slot_mode_t         slot_mode;          /*!< Set mono or stereo mode with I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO */
     /* Particular fields */
     i2s_pdm_slot_mask_t     slot_mask;          /*!< Choose the slots to activate */
+#if SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER
+    bool                    hp_en;              /*!< High pass filter enable */
+    float                   hp_cut_off_freq_hz; /*!< High pass filter cut-off frequency, range 23.3Hz ~ 185Hz, see cut-off frequency sheet above */
+    uint32_t                amplify_num;        /*!< The amplification number of the final conversion result, range 1~15, default 1 */
+#endif  // SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER
+
 } i2s_pdm_rx_slot_config_t;
 
 /**

+ 2 - 0
components/driver/test_apps/i2s_test_apps/i2s/main/test_i2s.c

@@ -803,7 +803,9 @@ TEST_CASE("I2S_default_PLL_clock_test", "[i2s]")
     TEST_ESP_OK(i2s_new_channel(&chan_cfg, NULL, &rx_handle));
     TEST_ESP_OK(i2s_channel_init_std_mode(rx_handle, &std_cfg));
 
+#if SOC_I2S_SUPPORTS_PLL_F160M || SOC_I2S_SUPPORTS_PLL_F96M
     i2s_test_common_sample_rate(rx_handle, &std_cfg.clk_cfg);
+#endif  // SOC_I2S_SUPPORTS_PLL_F160M || SOC_I2S_SUPPORTS_PLL_F96M
 #if SOC_I2S_SUPPORTS_XTAL
     std_cfg.clk_cfg.clk_src = I2S_CLK_SRC_XTAL;
     i2s_test_common_sample_rate(rx_handle, &std_cfg.clk_cfg);

+ 16 - 0
components/esp_hw_support/port/esp32p4/rtc_clk.c

@@ -368,6 +368,22 @@ uint32_t rtc_clk_apb_freq_get(void)
     return rtc_clk_ahb_freq_get() / clk_ll_apb_get_divider() * MHZ;
 }
 
+void rtc_clk_apll_enable(bool enable)
+{
+    // TODO: IDF-7526
+}
+
+uint32_t rtc_clk_apll_coeff_calc(uint32_t freq, uint32_t *_o_div, uint32_t *_sdm0, uint32_t *_sdm1, uint32_t *_sdm2)
+{
+    // TODO: IDF-7526
+    return 0;
+}
+
+void rtc_clk_apll_coeff_set(uint32_t o_div, uint32_t sdm0, uint32_t sdm1, uint32_t sdm2)
+{
+    // TODO: IDF-7526
+}
+
 void rtc_dig_clk8m_enable(void)
 {
     clk_ll_rc_fast_digi_enable();

+ 1 - 1
components/hal/esp32/include/hal/i2s_ll.h

@@ -48,7 +48,7 @@ extern "C" {
 #define I2S_LL_RX_EVENT_MASK        I2S_LL_EVENT_RX_EOF
 
 #define I2S_LL_PLL_F160M_CLK_FREQ   (160 * 1000000) // PLL_F160M_CLK: 160MHz
-#define I2S_LL_DEFAULT_PLL_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
+#define I2S_LL_DEFAULT_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
 
 /**
  * @brief Enable DMA descriptor owner check

+ 1 - 1
components/hal/esp32c3/include/hal/i2s_ll.h

@@ -34,7 +34,7 @@ extern "C" {
 #define I2S_LL_CLK_FRAC_DIV_AB_MAX 512 // I2S_MCLK = I2S_SRC_CLK / (N + b/a), the a/b register is 9 bit-width
 
 #define I2S_LL_PLL_F160M_CLK_FREQ      (160 * 1000000) // PLL_F160M_CLK: 160MHz
-#define I2S_LL_DEFAULT_PLL_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
+#define I2S_LL_DEFAULT_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
 
 /**
  * @brief I2S module general init, enable I2S clock.

+ 1 - 1
components/hal/esp32c6/include/hal/i2s_ll.h

@@ -35,7 +35,7 @@ extern "C" {
 #define I2S_LL_CLK_FRAC_DIV_AB_MAX 512 // I2S_MCLK = I2S_SRC_CLK / (N + b/a), the a/b register is 9 bit-width
 
 #define I2S_LL_PLL_F160M_CLK_FREQ      (160 * 1000000) // PLL_F160M_CLK: 160MHz
-#define I2S_LL_DEFAULT_PLL_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
+#define I2S_LL_DEFAULT_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
 
 /**
  * @brief I2S module general init, enable I2S clock.

+ 1 - 1
components/hal/esp32h2/include/hal/i2s_ll.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define I2S_LL_PLL_F96M_CLK_FREQ      (96 * 1000000) // PLL_F96M_CLK: 96MHz
 #define I2S_LL_PLL_F64M_CLK_FREQ      (64 * 1000000) // PLL_F64M_CLK: 64MHz
-#define I2S_LL_DEFAULT_PLL_CLK_FREQ   I2S_LL_PLL_F96M_CLK_FREQ  // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
+#define I2S_LL_DEFAULT_CLK_FREQ   I2S_LL_PLL_F96M_CLK_FREQ  // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
 
 /**
  * @brief I2S module general init, enable I2S clock.

+ 1244 - 0
components/hal/esp32p4/include/i2s_ll.h

@@ -0,0 +1,1244 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// The LL layer for I2S register operations
+/*******************************************************************************
+ * NOTICE
+ * The hal is not public api, don't use in application code.
+ * See readme.md in hal/include/hal/readme.md
+ ******************************************************************************/
+
+#pragma once
+#include <stdbool.h>
+#include "hal/misc.h"
+#include "hal/assert.h"
+#include "soc/i2s_periph.h"
+#include "soc/i2s_struct.h"
+#include "soc/pcr_struct.h"
+#include "hal/i2s_types.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define I2S_LL_GET_HW(num)             (((num) == 0)? (&I2S0) : ((num) == 1) ? (&I2S1) : (&I2S2))
+
+#define I2S_LL_TDM_CH_MASK             (0xffff)
+#define I2S_LL_PDM_BCK_FACTOR          (64)
+
+#define I2S_LL_MCLK_DIVIDER_BIT_WIDTH  (9)
+#define I2S_LL_MCLK_DIVIDER_MAX        ((1 << I2S_LL_MCLK_DIVIDER_BIT_WIDTH) - 1)
+
+#define I2S_LL_XTAL_CLK_FREQ           (40 * 1000000)   // XTAL_CLK: 40MHz
+#define I2S_LL_DEFAULT_CLK_FREQ        I2S_LL_XTAL_CLK_FREQ  // No PLL clock source on P4, use XTAL as default
+
+/**
+ * @brief I2S clock configuration structure
+ * @note Fmclk = Fsclk /(integ+numer/denom)
+ */
+typedef struct {
+    uint16_t integ;     // Integer part of I2S module clock divider
+    uint16_t denom;     // Denominator part of I2S module clock divider
+    uint16_t numer;     // Numerator part of I2S module clock divider
+} i2s_ll_mclk_div_t;
+
+/**
+ * @brief I2S module general init, enable I2S clock.
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_enable_clock(i2s_dev_t *hw)
+{
+    // The clock gate enabling is moved to `periph_module_enable`
+    (void)hw;
+}
+
+/**
+ * @brief I2S module disable I2S clock.
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_disable_clock(i2s_dev_t *hw)
+{
+    // The clock gate disabling is moved to `periph_module_disable`
+    (void)hw;
+}
+
+/**
+ * @brief Enable I2S tx module clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_enable_clock(i2s_dev_t *hw)
+{
+    (void)hw;
+    PCR.i2s_tx_clkm_conf.i2s_tx_clkm_en = 1;
+}
+
+/**
+ * @brief Enable I2S rx module clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_rx_enable_clock(i2s_dev_t *hw)
+{
+    (void)hw;
+    PCR.i2s_rx_clkm_conf.i2s_rx_clkm_en = 1;
+}
+
+/**
+ * @brief Disable I2S tx module clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_disable_clock(i2s_dev_t *hw)
+{
+    (void)hw;
+    PCR.i2s_tx_clkm_conf.i2s_tx_clkm_en = 0;
+}
+
+/**
+ * @brief Disable I2S rx module clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_rx_disable_clock(i2s_dev_t *hw)
+{
+    (void)hw;
+    PCR.i2s_rx_clkm_conf.i2s_rx_clkm_en = 0;
+}
+
+/**
+ * @brief I2S mclk use tx module clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_mclk_bind_to_tx_clk(i2s_dev_t *hw)
+{
+    (void)hw;
+    PCR.i2s_rx_clkm_conf.i2s_mclk_sel = 0;
+}
+
+/**
+ * @brief I2S mclk use rx module clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_mclk_bind_to_rx_clk(i2s_dev_t *hw)
+{
+    (void)hw;
+    PCR.i2s_rx_clkm_conf.i2s_mclk_sel = 1;
+}
+
+/**
+ * @brief Enable I2S TX slave mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param slave_en Set true to enable slave mode
+ */
+static inline void i2s_ll_tx_set_slave_mod(i2s_dev_t *hw, bool slave_en)
+{
+    hw->tx_conf.tx_slave_mod = slave_en;
+}
+
+/**
+ * @brief Enable I2S RX slave mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param slave_en Set true to enable slave mode
+ */
+static inline void i2s_ll_rx_set_slave_mod(i2s_dev_t *hw, bool slave_en)
+{
+    hw->rx_conf.rx_slave_mod = slave_en;
+}
+
+/**
+ * @brief Reset I2S TX module
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_reset(i2s_dev_t *hw)
+{
+    hw->tx_conf.tx_reset = 1;
+    hw->tx_conf.tx_reset = 0;
+}
+
+/**
+ * @brief Reset I2S RX module
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_rx_reset(i2s_dev_t *hw)
+{
+    hw->rx_conf.rx_reset = 1;
+    hw->rx_conf.rx_reset = 0;
+}
+
+/**
+ * @brief Reset I2S TX FIFO
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_reset_fifo(i2s_dev_t *hw)
+{
+    hw->tx_conf.tx_fifo_reset = 1;
+    hw->tx_conf.tx_fifo_reset = 0;
+}
+
+/**
+ * @brief Reset I2S RX FIFO
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_rx_reset_fifo(i2s_dev_t *hw)
+{
+    hw->rx_conf.rx_fifo_reset = 1;
+    hw->rx_conf.rx_fifo_reset = 0;
+}
+
+/**
+ * @brief Set TX source clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param src I2S source clock.
+ */
+static inline void i2s_ll_tx_clk_set_src(i2s_dev_t *hw, i2s_clock_src_t src)
+{
+    (void)hw;
+    switch (src)
+    {
+    case I2S_CLK_SRC_XTAL:
+        PCR.i2s_tx_clkm_conf.i2s_tx_clkm_sel = 0;
+        break;
+    case I2S_CLK_SRC_APLL:
+        PCR.i2s_tx_clkm_conf.i2s_tx_clkm_sel = 1;
+        break;
+    default:
+        HAL_ASSERT(false && "unsupported clock source");
+        break;
+    }
+}
+
+/**
+ * @brief Set RX source clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param src I2S source clock
+ */
+static inline void i2s_ll_rx_clk_set_src(i2s_dev_t *hw, i2s_clock_src_t src)
+{
+    (void)hw;
+    switch (src)
+    {
+    case I2S_CLK_SRC_XTAL:
+        PCR.i2s_rx_clkm_conf.i2s_rx_clkm_sel = 0;
+        break;
+    case I2S_CLK_SRC_APLL:
+        PCR.i2s_rx_clkm_conf.i2s_rx_clkm_sel = 1;
+        break;
+    default:
+        HAL_ASSERT(false && "unsupported clock source");
+        break;
+    }
+}
+
+/**
+ * @brief Set I2S tx bck div num
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param val value to set tx bck div num
+ */
+static inline void i2s_ll_tx_set_bck_div_num(i2s_dev_t *hw, uint32_t val)
+{
+    hw->tx_conf.tx_bck_div_num = val - 1;
+}
+
+/**
+ * @brief Set I2S tx raw clock division
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param div_int  Integer part of division
+ * @param x  div x
+ * @param y  div y
+ * @param z  div z
+ * @param yn1 yn1
+ */
+static inline void i2s_ll_tx_set_raw_clk_div(i2s_dev_t *hw, uint32_t div_int, uint32_t x, uint32_t y, uint32_t z, uint32_t yn1)
+{
+    (void)hw;
+    HAL_FORCE_MODIFY_U32_REG_FIELD(PCR.i2s_tx_clkm_conf, i2s_tx_clkm_div_num, div_int);
+    typeof(PCR.i2s_tx_clkm_div_conf) div = {};
+    div.i2s_tx_clkm_div_x = x;
+    div.i2s_tx_clkm_div_y = y;
+    div.i2s_tx_clkm_div_z = z;
+    div.i2s_tx_clkm_div_yn1 = yn1;
+    PCR.i2s_tx_clkm_div_conf.val = div.val;
+}
+
+/**
+ * @brief Set I2S rx raw clock division
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param div_int  Integer part of division
+ * @param x  div x
+ * @param y  div y
+ * @param z  div z
+ * @param yn1 yn1
+ */
+static inline void i2s_ll_rx_set_raw_clk_div(i2s_dev_t *hw, uint32_t div_int, uint32_t x, uint32_t y, uint32_t z, uint32_t yn1)
+{
+    (void)hw;
+    HAL_FORCE_MODIFY_U32_REG_FIELD(PCR.i2s_rx_clkm_conf, i2s_rx_clkm_div_num, div_int);
+    typeof(PCR.i2s_rx_clkm_div_conf) div = {};
+    div.i2s_rx_clkm_div_x = x;
+    div.i2s_rx_clkm_div_y = y;
+    div.i2s_rx_clkm_div_z = z;
+    div.i2s_rx_clkm_div_yn1 = yn1;
+    PCR.i2s_rx_clkm_div_conf.val = div.val;
+}
+
+/**
+ * @brief Configure I2S TX module clock divider
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param mclk_div The mclk division coefficients
+ */
+static inline void i2s_ll_tx_set_mclk(i2s_dev_t *hw, const i2s_ll_mclk_div_t *mclk_div)
+{
+    /* Workaround for inaccurate clock while switching from a relatively low sample rate to a high sample rate
+     * Set to particular coefficients first then update to the target coefficients,
+     * otherwise the clock division might be inaccurate.
+     * the general idea is to set a value that impossible to calculate from the regular decimal */
+    i2s_ll_tx_set_raw_clk_div(hw, 7, 317, 7, 3, 0);
+
+    uint32_t div_x = 0;
+    uint32_t div_y = 0;
+    uint32_t div_z = 0;
+    uint32_t div_yn1 = 0;
+    /* If any of denominator and numerator is 0, set all the coefficients to 0 */
+    if (mclk_div->denom && mclk_div->numer) {
+        div_yn1 = mclk_div->numer * 2 > mclk_div->denom;
+        div_z = div_yn1 ? mclk_div->denom - mclk_div->numer : mclk_div->numer;
+        div_x = mclk_div->denom / div_z - 1;
+        div_y = mclk_div->denom % div_z;
+    }
+    i2s_ll_tx_set_raw_clk_div(hw, mclk_div->integ, div_x, div_y, div_z, div_yn1);
+}
+
+/**
+ * @brief Set I2S rx bck div num
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param val value to set rx bck div num
+ */
+static inline void i2s_ll_rx_set_bck_div_num(i2s_dev_t *hw, uint32_t val)
+{
+    hw->rx_conf.rx_bck_div_num = val - 1;
+}
+
+/**
+ * @brief Configure I2S RX module clock divider
+ * @note mclk on ESP32 is shared by both TX and RX channel
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param mclk_div The mclk division coefficients
+ */
+static inline void i2s_ll_rx_set_mclk(i2s_dev_t *hw, const i2s_ll_mclk_div_t *mclk_div)
+{
+    /* Workaround for inaccurate clock while switching from a relatively low sample rate to a high sample rate
+     * Set to particular coefficients first then update to the target coefficients,
+     * otherwise the clock division might be inaccurate.
+     * the general idea is to set a value that impossible to calculate from the regular decimal */
+    i2s_ll_rx_set_raw_clk_div(hw, 7, 317, 7, 3, 0);
+
+    uint32_t div_x = 0;
+    uint32_t div_y = 0;
+    uint32_t div_z = 0;
+    uint32_t div_yn1 = 0;
+    /* If any of denominator and numerator is 0, set all the coefficients to 0 */
+    if (mclk_div->denom && mclk_div->numer) {
+        div_yn1 = mclk_div->numer * 2 > mclk_div->denom;
+        div_z = div_yn1 ? mclk_div->denom - mclk_div->numer : mclk_div->numer;
+        div_x = mclk_div->denom / div_z - 1;
+        div_y = mclk_div->denom % div_z;
+    }
+    i2s_ll_rx_set_raw_clk_div(hw, mclk_div->integ, div_x, div_y, div_z, div_yn1);
+}
+
+/**
+ * @brief Start I2S TX
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_start(i2s_dev_t *hw)
+{
+    // Have to update registers before start
+    hw->tx_conf.tx_update = 1;
+    while (hw->tx_conf.tx_update);
+    hw->tx_conf.tx_start = 1;
+}
+
+/**
+ * @brief Start I2S RX
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_rx_start(i2s_dev_t *hw)
+{
+    // Have to update registers before start
+    hw->rx_conf.rx_update = 1;
+    while (hw->rx_conf.rx_update);
+    hw->rx_conf.rx_start = 1;
+}
+
+/**
+ * @brief Stop I2S TX
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_stop(i2s_dev_t *hw)
+{
+    hw->tx_conf.tx_start = 0;
+}
+
+/**
+ * @brief Stop I2S RX
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_rx_stop(i2s_dev_t *hw)
+{
+    hw->rx_conf.rx_start = 0;
+}
+
+/**
+ * @brief Configure TX WS signal width
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param width WS width in BCK cycle
+ */
+static inline void i2s_ll_tx_set_ws_width(i2s_dev_t *hw, int width)
+{
+    hw->tx_conf1.tx_tdm_ws_width = width - 1;
+}
+
+/**
+ * @brief Configure RX WS signal width
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param width WS width in BCK cycle
+ */
+static inline void i2s_ll_rx_set_ws_width(i2s_dev_t *hw, int width)
+{
+    hw->rx_conf1.rx_tdm_ws_width = width - 1;
+}
+
+/**
+ * @brief Configure the received length to trigger in_suc_eof interrupt
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param eof_num the byte length to trigger in_suc_eof interrupt
+ */
+static inline void i2s_ll_rx_set_eof_num(i2s_dev_t *hw, int eof_num)
+{
+    hw->rx_eof_num.rx_eof_num = eof_num;
+}
+
+/**
+ * @brief Congfigure TX chan bit and audio data bit
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param chan_bit The chan bit width
+ * @param data_bit The audio data bit width
+ */
+static inline void i2s_ll_tx_set_sample_bit(i2s_dev_t *hw, uint8_t chan_bit, int data_bit)
+{
+    hw->tx_conf1.tx_bits_mod = data_bit - 1;
+    hw->tx_conf1.tx_tdm_chan_bits = chan_bit - 1;
+}
+
+/**
+ * @brief Congfigure RX chan bit and audio data bit
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param chan_bit The chan bit width
+ * @param data_bit The audio data bit width
+ */
+static inline void i2s_ll_rx_set_sample_bit(i2s_dev_t *hw, uint8_t chan_bit, int data_bit)
+{
+    hw->rx_conf1.rx_bits_mod = data_bit - 1;
+    hw->rx_conf1.rx_tdm_chan_bits = chan_bit - 1;
+}
+
+/**
+ * @brief Configure RX half_sample_bit
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param half_sample_bits half sample bit width
+ */
+static inline void i2s_ll_tx_set_half_sample_bit(i2s_dev_t *hw, int half_sample_bits)
+{
+    HAL_FORCE_MODIFY_U32_REG_FIELD(hw->tx_conf1, tx_half_sample_bits,  half_sample_bits - 1);
+}
+
+/**
+ * @brief Configure RX half_sample_bit
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param half_sample_bits half sample bit width
+ */
+static inline void i2s_ll_rx_set_half_sample_bit(i2s_dev_t *hw, int half_sample_bits)
+{
+    HAL_FORCE_MODIFY_U32_REG_FIELD(hw->rx_conf1, rx_half_sample_bits,  half_sample_bits - 1);
+}
+
+/**
+ * @brief Enable TX MSB shift, the data will be launch at the first BCK clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param msb_shift_enable Set true to enable MSB shift
+ */
+static inline void i2s_ll_tx_enable_msb_shift(i2s_dev_t *hw, bool msb_shift_enable)
+{
+    hw->tx_conf.tx_msb_shift = msb_shift_enable;
+}
+
+/**
+ * @brief Enable RX MSB shift, the data will be launch at the first BCK clock
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param msb_shift_enable Set true to enable MSB shift
+ */
+static inline void i2s_ll_rx_enable_msb_shift(i2s_dev_t *hw, bool msb_shift_enable)
+{
+    hw->rx_conf.rx_msb_shift = msb_shift_enable;
+}
+
+/**
+ * @brief Configure TX total chan number
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param total_num Total chan number
+ */
+static inline void i2s_ll_tx_set_chan_num(i2s_dev_t *hw, int total_num)
+{
+    hw->tx_tdm_ctrl.tx_tdm_tot_chan_num = total_num - 1;
+}
+
+/**
+ * @brief Configure RX total chan number
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param total_num Total chan number
+ */
+static inline void i2s_ll_rx_set_chan_num(i2s_dev_t *hw, int total_num)
+{
+    hw->rx_tdm_ctrl.rx_tdm_tot_chan_num = total_num - 1;
+}
+
+/**
+ * @brief Set the bimap of the active TX chan, only the active chan can launch audio data.
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param chan_mask mask of tx active chan
+ */
+static inline void i2s_ll_tx_set_active_chan_mask(i2s_dev_t *hw, uint32_t chan_mask)
+{
+    uint32_t tdm_ctrl = hw->tx_tdm_ctrl.val;
+    tdm_ctrl &= 0xFFFF0000;
+    tdm_ctrl |= chan_mask;
+    hw->tx_tdm_ctrl.val = tdm_ctrl;
+}
+
+/**
+ * @brief Set the bimap of the active RX chan, only the active chan can receive audio data.
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param chan_mask mask of rx active chan
+ */
+static inline void i2s_ll_rx_set_active_chan_mask(i2s_dev_t *hw, uint32_t chan_mask)
+{
+    uint32_t tdm_ctrl = hw->rx_tdm_ctrl.val;
+    tdm_ctrl &= 0xFFFF0000;
+    tdm_ctrl |= chan_mask;
+    hw->rx_tdm_ctrl.val = tdm_ctrl;
+}
+
+/**
+ * @brief Set I2S tx chan mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param slot_mask select slot to send data
+ */
+static inline void i2s_ll_tx_select_std_slot(i2s_dev_t *hw, i2s_std_slot_mask_t slot_mask)
+{
+    /* In mono mode, there only should be one slot enabled, another inactive slot will transmit same data as enabled slot
+     * Otherwise always enable the first two slots */
+    hw->tx_tdm_ctrl.tx_tdm_tot_chan_num = 1;  // tx_tdm_tot_chan_num = 2 slots - 1 = 1
+    uint32_t chan_mask = 0;
+    switch (slot_mask)
+    {
+    case I2S_STD_SLOT_LEFT:
+        chan_mask |= 0x01;
+        break;
+    case I2S_STD_SLOT_RIGHT:
+        chan_mask |= 0x02;
+        break;
+    case I2S_STD_SLOT_BOTH:
+        chan_mask |= 0x03;
+        break;
+    default:
+        break;
+    }
+    i2s_ll_tx_set_active_chan_mask(hw, chan_mask);
+}
+
+/**
+ * @brief Set I2S rx chan mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param slot_mask select slot to receive data
+ */
+static inline void i2s_ll_rx_select_std_slot(i2s_dev_t *hw, i2s_std_slot_mask_t slot_mask)
+{
+    /* In mono mode, there only should be one slot enabled, another inactive slot will transmit same data as enabled slot
+     * Otherwise always enable the first two slots */
+    hw->rx_tdm_ctrl.rx_tdm_tot_chan_num = 1;  // rx_tdm_tot_chan_num = 2 slots - 1 = 1
+    uint32_t chan_mask = 0;
+    switch (slot_mask)
+    {
+    case I2S_STD_SLOT_LEFT:
+        chan_mask |= 0x01;
+        break;
+    case I2S_STD_SLOT_RIGHT:
+        chan_mask |= 0x02;
+        break;
+    case I2S_STD_SLOT_BOTH:
+        chan_mask |= 0x03;
+        break;
+    default:
+        break;
+    }
+    i2s_ll_rx_set_active_chan_mask(hw, chan_mask);
+}
+
+/**
+ * @brief PDM slot mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param mod Channel mode
+ *            while tx_ws_idle_pol = 0:
+ *            0: stereo
+ *            1: Both slots transmit left
+ *            2: Both slots transmit right
+ *            3: Left transmits `conf_single_data` right transmits data
+ *            4: Right transmits `conf_single_data` left transmits data
+ *            while tx_ws_idle_pol = 1:
+              0: stereo
+ *            1: Both slots transmit right
+ *            2: Both slots transmit left
+ *            3: Right transmits `conf_single_data` left transmits data
+ *            4: Left transmits `conf_single_data` right transmits data
+ */
+static inline void i2s_ll_tx_set_pdm_chan_mod(i2s_dev_t *hw, uint32_t mod)
+{
+    hw->tx_conf.tx_chan_mod = mod;
+}
+
+/**
+ * @brief Set TX WS signal pol level
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param ws_pol_level pin level of WS(output) when receiving left channel data
+ */
+static inline void i2s_ll_tx_set_ws_idle_pol(i2s_dev_t *hw, bool ws_pol_level)
+{
+    hw->tx_conf.tx_ws_idle_pol = ws_pol_level;
+}
+
+/**
+ * @brief Set RX WS signal pol level
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param ws_pol_level pin level of WS(input) when receiving left channel data
+ */
+static inline void i2s_ll_rx_set_ws_idle_pol(i2s_dev_t *hw, bool ws_pol_level)
+{
+    hw->rx_conf.rx_ws_idle_pol = ws_pol_level;
+}
+
+/**
+ * @brief Enable I2S TX TDM mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_enable_tdm(i2s_dev_t *hw)
+{
+    hw->tx_conf.tx_pdm_en = false;
+    hw->tx_conf.tx_tdm_en = true;
+    hw->tx_pcm2pdm_conf.pcm2pdm_conv_en = false;
+}
+
+/**
+ * @brief Enable I2S RX TDM mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_rx_enable_tdm(i2s_dev_t *hw)
+{
+    hw->rx_conf.rx_pdm_en = false;
+    hw->rx_conf.rx_tdm_en = true;
+    hw->rx_pdm2pcm_conf.rx_pdm2pcm_en = false;
+}
+
+/**
+ * @brief Enable I2S TX STD mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_enable_std(i2s_dev_t *hw)
+{
+    i2s_ll_tx_enable_tdm(hw);
+}
+
+/**
+ * @brief Enable I2S RX STD mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_rx_enable_std(i2s_dev_t *hw)
+{
+    i2s_ll_rx_enable_tdm(hw);
+}
+
+/**
+ * @brief Enable TX PDM mode.
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_enable_pdm(i2s_dev_t *hw)
+{
+    hw->tx_conf.tx_pdm_en = true;
+    hw->tx_conf.tx_tdm_en = false;
+    hw->tx_pcm2pdm_conf.pcm2pdm_conv_en = true;
+}
+
+/**
+ * @brief Set I2S TX PDM prescale
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param prescale I2S TX PDM prescale
+ */
+static inline void i2s_ll_tx_set_pdm_prescale(i2s_dev_t *hw, bool prescale)
+{
+    HAL_FORCE_MODIFY_U32_REG_FIELD(hw->tx_pcm2pdm_conf, tx_pdm_prescale, prescale);
+}
+
+/**
+ * @brief Set I2S TX PDM high pass filter scaling
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param sig_scale I2S TX PDM signal scaling before transmit to the filter
+ */
+static inline void i2s_ll_tx_set_pdm_hp_scale(i2s_dev_t *hw, i2s_pdm_sig_scale_t sig_scale)
+{
+    hw->tx_pcm2pdm_conf.tx_pdm_hp_in_shift = sig_scale;
+}
+
+/**
+ * @brief Set I2S TX PDM low pass filter scaling
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param sig_scale I2S TX PDM signal scaling before transmit to the filter
+ */
+static inline void i2s_ll_tx_set_pdm_lp_scale(i2s_dev_t *hw, i2s_pdm_sig_scale_t sig_scale)
+{
+    hw->tx_pcm2pdm_conf.tx_pdm_lp_in_shift = sig_scale;
+}
+
+/**
+ * @brief Set I2S TX PDM sinc filter scaling
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param sig_scale I2S TX PDM signal scaling before transmit to the filter
+ */
+static inline void i2s_ll_tx_set_pdm_sinc_scale(i2s_dev_t *hw, i2s_pdm_sig_scale_t sig_scale)
+{
+    hw->tx_pcm2pdm_conf.tx_pdm_sinc_in_shift = sig_scale;
+}
+
+/**
+ * @brief Set I2S TX PDM sigma-delta filter scaling
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param sig_scale I2S TX PDM signal scaling before transmit to the filter
+ */
+static inline void i2s_ll_tx_set_pdm_sd_scale(i2s_dev_t *hw, i2s_pdm_sig_scale_t sig_scale)
+{
+    hw->tx_pcm2pdm_conf.tx_pdm_sigmadelta_in_shift = sig_scale;
+}
+
+/**
+ * @brief Set I2S TX PDM high pass filter param0
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param param The fourth parameter of PDM TX IIR_HP filter stage 1 is (504 + I2S_TX_IIR_HP_MULT12_0[2:0])
+ */
+static inline void i2s_ll_tx_set_pdm_hp_filter_param0(i2s_dev_t *hw, uint32_t param)
+{
+    hw->tx_pcm2pdm_conf1.tx_iir_hp_mult12_0 = param;
+}
+
+/**
+ * @brief Set I2S TX PDM high pass filter param5
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param param The fourth parameter of PDM TX IIR_HP filter stage 2 is (504 + I2S_TX_IIR_HP_MULT12_5[2:0])
+ */
+static inline void i2s_ll_tx_set_pdm_hp_filter_param5(i2s_dev_t *hw, uint32_t param)
+{
+    hw->tx_pcm2pdm_conf1.tx_iir_hp_mult12_5 = param;
+}
+
+/**
+ * @brief Enable I2S TX PDM high pass filter
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param enable Set true to enable I2S TX PDM high pass filter, set false to bypass it
+ */
+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;
+}
+
+/**
+ * @brief Set I2S TX PDM sigma-delta codec dither
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param dither I2S TX PDM sigmadelta dither value
+ */
+static inline void i2s_ll_tx_set_pdm_sd_dither(i2s_dev_t *hw, uint32_t dither)
+{
+    hw->tx_pcm2pdm_conf.tx_pdm_sigmadelta_dither = dither;
+}
+
+/**
+ * @brief Set I2S TX PDM sigma-delta codec dither
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param dither2 I2S TX PDM sigmadelta dither2 value
+ */
+static inline void i2s_ll_tx_set_pdm_sd_dither2(i2s_dev_t *hw, uint32_t dither2)
+{
+    hw->tx_pcm2pdm_conf.tx_pdm_sigmadelta_dither2 = dither2;
+}
+
+/**
+ * @brief Set the PDM TX over sampling ratio
+ *
+ * @param hw  Peripheral I2S hardware instance address.
+ * @param ovr Over sampling ratio
+ */
+static inline void i2s_ll_tx_set_pdm_over_sample_ratio(i2s_dev_t *hw, uint32_t ovr)
+{
+    hw->tx_pcm2pdm_conf.tx_pdm_sinc_osr2 = ovr;
+}
+
+/**
+ * @brief Configure I2S TX PDM sample rate
+ *        Fpdm = 64*Fpcm*fp/fs
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param fp The fp value of TX PDM filter module group0.
+ * @param fs The fs value of TX PDM filter module group0.
+ */
+static inline void i2s_ll_tx_set_pdm_fpfs(i2s_dev_t *hw, uint32_t fp, uint32_t fs)
+{
+    hw->tx_pcm2pdm_conf1.tx_pdm_fp = fp;
+    hw->tx_pcm2pdm_conf1.tx_pdm_fs = fs;
+}
+
+/**
+ * @brief Get I2S TX PDM fp configuration paramater
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @return
+ *        - fp configuration paramater
+ */
+static inline uint32_t i2s_ll_tx_get_pdm_fp(i2s_dev_t *hw)
+{
+    return hw->tx_pcm2pdm_conf1.tx_pdm_fp;
+}
+
+/**
+ * @brief Get I2S TX PDM fs configuration paramater
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @return
+ *        - fs configuration paramater
+ */
+static inline uint32_t i2s_ll_tx_get_pdm_fs(i2s_dev_t *hw)
+{
+    return hw->tx_pcm2pdm_conf1.tx_pdm_fs;
+}
+
+/**
+ * @brief Enable RX PDM mode.
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param pdm_enable Set true to RX enable PDM mode
+ */
+static inline void i2s_ll_rx_enable_pdm(i2s_dev_t *hw, bool pdm_enable)
+{
+    hw->rx_conf.rx_pdm_en = pdm_enable;
+    hw->rx_conf.rx_tdm_en = !pdm_enable;
+    hw->rx_pdm2pcm_conf.rx_pdm2pcm_en = pdm_enable;
+}
+
+/**
+ * @brief Configure RX PDM downsample
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param dsr PDM downsample configuration paramater
+ */
+static inline void i2s_ll_rx_set_pdm_dsr(i2s_dev_t *hw, i2s_pdm_dsr_t dsr)
+{
+    hw->rx_pdm2pcm_conf.rx_pdm_sinc_dsr_16_en = dsr;
+}
+
+/**
+ * @brief Get RX PDM downsample configuration
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param dsr Pointer to accept PDM downsample configuration
+ */
+static inline void i2s_ll_rx_get_pdm_dsr(i2s_dev_t *hw, i2s_pdm_dsr_t *dsr)
+{
+    *dsr = (i2s_pdm_dsr_t)hw->rx_pdm2pcm_conf.rx_pdm_sinc_dsr_16_en;
+}
+
+/**
+ * @brief Configure RX PDM amplify number
+ * @note  This is the amplification number of the digital amplifier,
+ *        which is added after the PDM to PCM conversion result and mainly used for
+ *        amplify the small PDM signal under the VAD scenario
+ *        pcm_result = pdm_input * amplify_num
+ *        pcm_result = 0 if amplify_num = 0
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param amp_num PDM RX amplify number
+ */
+static inline void i2s_ll_rx_set_pdm_amplify_num(i2s_dev_t *hw, uint32_t amp_num)
+{
+    hw->rx_pdm2pcm_conf.rx_pdm2pcm_amplify_num = amp_num;
+}
+
+
+/**
+ * @brief Set I2S RX PDM high pass filter param0
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param param The fourth parameter of PDM RX IIR_HP filter stage 1 is (504 + I2S_RX_IIR_HP_MULT12_0[2:0])
+ */
+static inline void i2s_ll_rx_set_pdm_hp_filter_param0(i2s_dev_t *hw, uint32_t param)
+{
+    hw->rx_pdm2pcm_conf.rx_iir_hp_mult12_0 = param;
+}
+
+/**
+ * @brief Set I2S RX PDM high pass filter param5
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param param The fourth parameter of PDM RX IIR_HP filter stage 2 is (504 + I2S_RX_IIR_HP_MULT12_5[2:0])
+ */
+static inline void i2s_ll_rx_set_pdm_hp_filter_param5(i2s_dev_t *hw, uint32_t param)
+{
+    hw->rx_pdm2pcm_conf.rx_iir_hp_mult12_5 = param;
+}
+
+/**
+ * @brief Enable I2S RX PDM high pass filter
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param enable Set true to enable I2S RX PDM high pass filter, set false to bypass it
+ */
+static inline void i2s_ll_rx_enable_pdm_hp_filter(i2s_dev_t *hw, bool enable)
+{
+    hw->rx_pdm2pcm_conf.rx_pdm_hp_bypass = !enable;
+}
+
+
+/**
+ * @brief Configura TX a/u-law decompress or compress
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param pcm_cfg PCM configuration paramater
+ */
+static inline void i2s_ll_tx_set_pcm_type(i2s_dev_t *hw, i2s_pcm_compress_t pcm_cfg)
+{
+    hw->tx_conf.tx_pcm_conf = pcm_cfg;
+    hw->tx_conf.tx_pcm_bypass = !pcm_cfg;
+}
+
+/**
+ * @brief Configure RX a/u-law decompress or compress
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param pcm_cfg PCM configuration paramater
+ */
+static inline void i2s_ll_rx_set_pcm_type(i2s_dev_t *hw, i2s_pcm_compress_t pcm_cfg)
+{
+    hw->rx_conf.rx_pcm_conf = pcm_cfg;
+    hw->rx_conf.rx_pcm_bypass = !pcm_cfg;
+}
+
+/**
+ * @brief Enable TX audio data left alignment
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param ena Set true to enable left alignment
+ */
+static inline void i2s_ll_tx_enable_left_align(i2s_dev_t *hw, bool ena)
+{
+    hw->tx_conf.tx_left_align = ena;
+}
+
+/**
+ * @brief Enable RX audio data left alignment
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param ena Set true to enable left alignment
+ */
+static inline void i2s_ll_rx_enable_left_align(i2s_dev_t *hw, bool ena)
+{
+    hw->rx_conf.rx_left_align = ena;
+}
+
+/**
+ * @brief Enable TX big endian mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param ena Set true to enable big endian mode
+ */
+static inline void i2s_ll_rx_enable_big_endian(i2s_dev_t *hw, bool ena)
+{
+    hw->rx_conf.rx_big_endian = ena;
+}
+
+/**
+ * @brief Enable RX big endian mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param ena Set true to enable big endian mode
+ */
+static inline void i2s_ll_tx_enable_big_endian(i2s_dev_t *hw, bool ena)
+{
+    hw->tx_conf.tx_big_endian = ena;
+}
+
+/**
+ * @brief Configure TX bit order
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param lsb_order_ena Set true to enable LSB bit order
+ */
+static inline void i2s_ll_tx_set_bit_order(i2s_dev_t *hw, bool lsb_order_ena)
+{
+    hw->tx_conf.tx_bit_order = lsb_order_ena;
+}
+
+/**
+ * @brief Configure RX bit order
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param lsb_order_ena Set true to enable LSB bit order
+ */
+static inline void i2s_ll_rx_set_bit_order(i2s_dev_t *hw, bool lsb_order_ena)
+{
+    hw->rx_conf.rx_bit_order = lsb_order_ena;
+}
+
+/**
+ * @brief Configure TX skip mask enable
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param skip_mask_ena Set true to skip inactive channels.
+ */
+static inline void i2s_ll_tx_set_skip_mask(i2s_dev_t *hw, bool skip_mask_ena)
+{
+    hw->tx_tdm_ctrl.tx_tdm_skip_msk_en = skip_mask_ena;
+}
+
+
+/**
+ * @brief Configure single data
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param data Single data to be set
+ */
+static inline void i2s_ll_set_single_data(i2s_dev_t *hw, uint32_t data)
+{
+    hw->conf_single_data.val = data;
+}
+
+/**
+ * @brief Enable TX mono mode
+ * @note MONO in hardware means only one channel got data, but another doesn't
+ *       MONO in software means two channel share same data
+ *       This function aims to use MONO in software meaning
+ *       so 'tx_mono' and 'tx_chan_equal' should be enabled at the same time
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param mono_ena Set true to enable mono mde.
+ */
+static inline void i2s_ll_tx_enable_mono_mode(i2s_dev_t *hw, bool mono_ena)
+{
+    hw->tx_conf.tx_mono = mono_ena;
+    hw->tx_conf.tx_chan_equal = mono_ena;
+}
+
+/**
+ * @brief Enable RX mono mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param mono_ena Set true to enable mono mde.
+ */
+static inline void i2s_ll_rx_enable_mono_mode(i2s_dev_t *hw, bool mono_ena)
+{
+    hw->rx_conf.rx_mono = mono_ena;
+    hw->rx_conf.rx_mono_fst_vld = mono_ena;
+}
+
+/**
+ * @brief Enable loopback mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param ena Set true to share BCK and WS signal for tx module and rx module.
+ */
+static inline void i2s_ll_share_bck_ws(i2s_dev_t *hw, bool ena)
+{
+    hw->tx_conf.sig_loopback = ena;
+}
+
+/**
+ * @brief PDM TX DMA data take mode
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param is_mono   The DMA data only has one slot (mono) or contains two slots (stereo)
+ * @param is_fst_valid  Whether take the DMA data at the first half period
+ *                      Only take effet when 'is_mono' is true
+ */
+static inline void i2s_ll_tx_pdm_dma_take_mode(i2s_dev_t *hw, bool is_mono, bool is_fst_valid)
+{
+    hw->tx_conf.tx_mono = is_mono;
+    hw->tx_conf.tx_mono_fst_vld = is_fst_valid;
+}
+
+/**
+ * @brief PDM TX slot mode
+ * @note     Mode     Left Slot       Right Slot      Chan Mode       WS Pol
+ *          -----------------------------------------------------------------
+ *           Stereo   Left            Right           0               x
+ *          -----------------------------------------------------------------
+ *           Mono     Left            Left            1               0
+ *           Mono     Right           Right           2               0
+ *           Mono     Single          Right           3               0
+ *           Mono     Left            Single          4               0
+ *          -----------------------------------------------------------------
+ *           Mono     Right           Right           1               1
+ *           Mono     Left            Left            2               1
+ *           Mono     Left            Single          3               1
+ *           Mono     Single          Right           4               1
+ * @note  The 'Single' above means always sending the value of `conf_single_data` reg
+ *        The default value of `conf_single_data` reg is '0', it is not public for now
+ *
+ * @param hw Peripheral I2S hardware instance address.
+ * @param is_mono   The DMA data only has one slot (mono) or contains two slots (stereo)
+ * @param is_copy   Whether the un-selected slot copies the data from the selected one
+ *                  If not, the un-selected slot will transmit the data from 'conf_single_data'
+ * @param mask      The slot mask to selet the slot
+ */
+static inline void i2s_ll_tx_pdm_slot_mode(i2s_dev_t *hw, bool is_mono, bool is_copy, i2s_pdm_slot_mask_t mask)
+{
+    if (is_mono) {
+        /* The default tx_ws_idle_pol is false */
+        if (is_copy) {
+            hw->tx_conf.tx_chan_mod = mask == I2S_PDM_SLOT_LEFT ? 1 : 2;
+        } else {
+            hw->tx_conf.tx_chan_mod = mask == I2S_PDM_SLOT_LEFT ? 4 : 3;
+        }
+    } else {
+        hw->tx_conf.tx_chan_mod = 0;
+    }
+}
+
+/**
+ * @brief PDM TX line mode
+ * @note    Mode         DAC Mode        2 lines output
+ *          -------------------------------------------
+ *          PDM codec    0               1
+ *          DAC 1-line   1               0
+ *          DAC 2-line   1               1
+ *
+ * @param hw    Peripheral I2S hardware instance address.
+ * @param line_mode    PDM TX line mode
+ */
+static inline void i2s_ll_tx_pdm_line_mode(i2s_dev_t *hw, i2s_pdm_tx_line_mode_t line_mode)
+{
+    hw->tx_pcm2pdm_conf.tx_pdm_dac_mode_en = line_mode > I2S_PDM_TX_ONE_LINE_CODEC;
+    hw->tx_pcm2pdm_conf.tx_pdm_dac_2out_en = line_mode != I2S_PDM_TX_ONE_LINE_DAC;
+}
+
+/**
+ * @brief  Reset TX FIFO synchronization counter
+ *
+ * @param hw    Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_reset_fifo_sync_counter(i2s_dev_t *hw)
+{
+    hw->fifo_cnt.tx_fifo_cnt_rst = 1;
+    hw->fifo_cnt.tx_fifo_cnt_rst = 0;
+}
+
+/**
+ * @brief Get TX FIFO synchronization count value
+ *
+ * @param hw    Peripheral I2S hardware instance address.
+ * @return
+ *      count value
+ */
+static inline uint32_t i2s_ll_tx_get_fifo_sync_count(i2s_dev_t *hw)
+{
+    return hw->fifo_cnt.tx_fifo_cnt;
+}
+
+/**
+ * @brief  Reset TX bclk synchronization counter
+ *
+ * @param hw    Peripheral I2S hardware instance address.
+ */
+static inline void i2s_ll_tx_reset_bclk_sync_counter(i2s_dev_t *hw)
+{
+    hw->bck_cnt.tx_bck_cnt_rst = 1;
+    hw->bck_cnt.tx_bck_cnt_rst = 0;
+}
+
+/**
+ * @brief Get TX bclk synchronization count value
+ *
+ * @param hw    Peripheral I2S hardware instance address.
+ * @return
+ *      count value
+ */
+static inline void i2s_ll_tx_get_bclk_sync_count(i2s_dev_t *hw)
+{
+    return hw->bck_cnt.tx_bck_cnt;
+}
+
+#ifdef __cplusplus
+}
+#endif

+ 1 - 1
components/hal/esp32s2/include/hal/i2s_ll.h

@@ -45,7 +45,7 @@ extern "C" {
 #define I2S_LL_RX_EVENT_MASK        I2S_LL_EVENT_RX_EOF
 
 #define I2S_LL_PLL_F160M_CLK_FREQ   (160 * 1000000) // PLL_F160M_CLK: 160MHz
-#define I2S_LL_DEFAULT_PLL_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
+#define I2S_LL_DEFAULT_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
 
 /**
  * @brief Enable DMA descriptor owner check

+ 1 - 1
components/hal/esp32s3/include/hal/i2s_ll.h

@@ -35,7 +35,7 @@ extern "C" {
 #define I2S_LL_CLK_FRAC_DIV_AB_MAX 512 // I2S_MCLK = I2S_SRC_CLK / (N + b/a), the a/b register is 9 bit-width
 
 #define I2S_LL_PLL_F160M_CLK_FREQ      (160 * 1000000) // PLL_F160M_CLK: 160MHz
-#define I2S_LL_DEFAULT_PLL_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
+#define I2S_LL_DEFAULT_CLK_FREQ     I2S_LL_PLL_F160M_CLK_FREQ    // The default PLL clock frequency while using I2S_CLK_SRC_DEFAULT
 
 /**
  * @brief I2S module general init, enable I2S clock.

+ 34 - 15
components/hal/i2s_hal.c

@@ -10,7 +10,7 @@
 #include "soc/soc.h"
 #include "hal/i2s_hal.h"
 
-#if SOC_I2S_HW_VERSION_2 && SOC_I2S_SUPPORTS_PDM_TX
+#if SOC_I2S_HW_VERSION_2 && (SOC_I2S_SUPPORTS_PDM_TX || SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER)
 /* PDM tx high pass filter cut-off frequency and coefficients list
  * [0]: cut-off frequency; [1]: param0; [2]: param5 */
 static const float cut_off_coef[21][3] = {
@@ -22,6 +22,22 @@ static const float cut_off_coef[21][3] = {
     {63,  4, 7}, {58,   5, 6}, {49,   5, 7},
     {46,  6, 6}, {35.5, 6, 7}, {23.3, 7, 7}
 };
+
+static void s_i2s_hal_get_cut_off_coef(float freq, uint32_t *param0, uint32_t *param5)
+{
+    uint8_t cnt = 0;
+    float min = 1000;
+    /* Find the closest cut-off frequency and its coefficients */
+    for (int i = 0; i < 21; i++) {
+        float tmp = cut_off_coef[i][0] < freq ? freq - cut_off_coef[i][0] : cut_off_coef[i][0] - freq;
+        if (tmp < min) {
+            min = tmp;
+            cnt = i;
+        }
+    }
+    *param0 = (uint32_t)cut_off_coef[cnt][1];
+    *param5 = (uint32_t)cut_off_coef[cnt][2];
+}
 #endif
 
 /**
@@ -183,20 +199,12 @@ void i2s_hal_pdm_set_tx_slot(i2s_hal_context_t *hal, bool is_slave, const i2s_ha
     i2s_ll_tx_set_ws_idle_pol(hal->dev, false);
     /* Slot mode seems not take effect according to the test, leave it default here */
     i2s_ll_tx_pdm_slot_mode(hal->dev, is_mono, false, I2S_PDM_SLOT_BOTH);
-    uint8_t cnt = 0;
-    float min = 1000;
-    float expt_cut_off = slot_cfg->pdm_tx.hp_cut_off_freq_hz;
-    /* Find the closest cut-off frequency and its coefficients */
-    for (int i = 0; i < 21; i++) {
-        float tmp = cut_off_coef[i][0] < expt_cut_off ? expt_cut_off - cut_off_coef[i][0] : cut_off_coef[i][0] - expt_cut_off;
-        if (tmp < min) {
-            min = tmp;
-            cnt = i;
-        }
-    }
+    uint32_t param0;
+    uint32_t param5;
+    s_i2s_hal_get_cut_off_coef(slot_cfg->pdm_tx.hp_cut_off_freq_hz, &param0, &param5);
     i2s_ll_tx_enable_pdm_hp_filter(hal->dev, slot_cfg->pdm_tx.hp_en);
-    i2s_ll_tx_set_pdm_hp_filter_param0(hal->dev, cut_off_coef[cnt][1]);
-    i2s_ll_tx_set_pdm_hp_filter_param5(hal->dev, cut_off_coef[cnt][2]);
+    i2s_ll_tx_set_pdm_hp_filter_param0(hal->dev, param0);
+    i2s_ll_tx_set_pdm_hp_filter_param5(hal->dev, param5);
     i2s_ll_tx_set_pdm_sd_dither(hal->dev, slot_cfg->pdm_tx.sd_dither);
     i2s_ll_tx_set_pdm_sd_dither2(hal->dev, slot_cfg->pdm_tx.sd_dither2);
 #endif
@@ -233,7 +241,18 @@ void i2s_hal_pdm_set_rx_slot(i2s_hal_context_t *hal, bool is_slave, const i2s_ha
     uint32_t slot_mask = slot_cfg->slot_mode == I2S_SLOT_MODE_STEREO ? I2S_PDM_SLOT_BOTH : slot_cfg->pdm_rx.slot_mask;
 #endif  // SOC_I2S_SUPPORTS_PDM_RX > 1
     i2s_ll_rx_set_active_chan_mask(hal->dev, slot_mask);
-#endif  // SOC_I2S_SUPPORTS_PDM_RX
+#endif  // SOC_I2S_HW_VERSION_1
+
+#if SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER // TODO: add this macro to soc_caps
+    uint32_t param0;
+    uint32_t param5;
+    s_i2s_hal_get_cut_off_coef(slot_cfg->pdm_rx.hp_cut_off_freq_hz, &param0, &param5);
+    i2s_ll_rx_enable_pdm_hp_filter(hal->dev, slot_cfg->pdm_rx.hp_en);
+    i2s_ll_rx_set_pdm_hp_filter_param0(hal->dev, param0);
+    i2s_ll_rx_set_pdm_hp_filter_param5(hal->dev, param5);
+    /* Set the amplification number, the default and the minimum value is 1. 0 will mute the channel */
+    i2s_ll_rx_set_pdm_amplify_num(hal->dev, slot_cfg->pdm_rx.amplify_num ? slot_cfg->pdm_rx.amplify_num : 1);
+#endif  // SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER
 }
 
 void i2s_hal_pdm_enable_rx_channel(i2s_hal_context_t *hal)

+ 7 - 1
components/hal/include/hal/i2s_hal.h

@@ -91,7 +91,13 @@ typedef struct {
         /* PDM TX configurations */
         struct {
             i2s_pdm_slot_mask_t     slot_mask;          /*!< Choose the slots to activate */
-        } pdm_rx;                                       /*!< Specific configurations for PDM TX mode */
+#if SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER
+            bool                    hp_en;              /*!< High pass filter enable */
+            float                   hp_cut_off_freq_hz; /*!< High pass filter cut-off frequency, range 23.3Hz ~ 185Hz, see cut-off frequency sheet above */
+            uint32_t                amplify_num;        /*!< The amplification number of the final conversion result */
+#endif  // SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER
+
+        } pdm_rx;                                       /*!< Specific configurations for PDM RX mode */
 #endif
     };
 

+ 1 - 123
components/soc/esp32c6/include/soc/i2s_struct.h

@@ -240,34 +240,6 @@ typedef union {
     uint32_t val;
 } i2s_rx_conf1_reg_t;
 
-/** Type of rx_clkm_conf register
- *  I2S RX clock configure register
- */
-typedef union {
-    struct {
-        /** rx_clkm_div_num : R/W; bitpos: [7:0]; default: 2;
-         *  Integral I2S clock divider value
-         */
-        uint32_t rx_clkm_div_num:8;
-        uint32_t reserved_8:18;
-        /** rx_clk_active : R/W; bitpos: [26]; default: 0;
-         *  I2S Rx module clock enable signal.
-         */
-        uint32_t rx_clk_active:1;
-        /** rx_clk_sel : R/W; bitpos: [28:27]; default: 0;
-         *  Select I2S Rx module source clock. 0: XTAL clock. 1: PLL240M. 2: PLL160M. 3: I2S_MCLK_in.
-         */
-        uint32_t rx_clk_sel:2;
-        /** mclk_sel : R/W; bitpos: [29]; default: 0;
-         *  0: UseI2S Tx module clock as I2S_MCLK_OUT.  1: UseI2S Rx module clock as
-         *  I2S_MCLK_OUT.
-         */
-        uint32_t mclk_sel:1;
-        uint32_t reserved_30:2;
-    };
-    uint32_t val;
-} i2s_rx_clkm_conf_reg_t;
-
 /** Type of tx_pcm2pdm_conf register
  *  I2S TX PCM2PDM configuration register
  */
@@ -609,37 +581,6 @@ typedef union {
     uint32_t val;
 } i2s_tx_conf1_reg_t;
 
-/** Type of tx_clkm_conf register
- *  I2S TX clock configure register
- */
-typedef union {
-    struct {
-        /** tx_clkm_div_num : R/W; bitpos: [7:0]; default: 2;
-         *  Integral I2S TX clock divider value. f_I2S_CLK = f_I2S_CLK_S/(N+b/a). There will be
-         *  (a-b) * n-div and b * (n+1)-div.  So the average combination will be:  for b <=
-         *  a/2, z * [x * n-div + (n+1)-div] + y * n-div. For b > a/2, z * [n-div + x *
-         *  (n+1)-div] + y * (n+1)-div.
-         */
-        uint32_t tx_clkm_div_num:8;
-        uint32_t reserved_8:18;
-        /** tx_clk_active : R/W; bitpos: [26]; default: 0;
-         *  I2S Tx module clock enable signal.
-         */
-        uint32_t tx_clk_active:1;
-        /** tx_clk_sel : R/W; bitpos: [28:27]; default: 0;
-         *  Select I2S Tx module source clock. 0: XTAL clock. 1: PLL240M. 2: PLL160M. 3:
-         *  I2S_MCLK_in.
-         */
-        uint32_t tx_clk_sel:2;
-        /** clk_en : R/W; bitpos: [29]; default: 0;
-         *  Set this bit to enable clk gate
-         */
-        uint32_t clk_en:1;
-        uint32_t reserved_30:2;
-    };
-    uint32_t val;
-} i2s_tx_clkm_conf_reg_t;
-
 /** Type of tx_tdm_ctrl register
  *  I2S TX TDM mode control register
  */
@@ -742,36 +683,6 @@ typedef union {
 
 
 /** Group: RX clock and timing registers */
-/** Type of rx_clkm_div_conf register
- *  I2S RX module clock divider configure register
- */
-typedef union {
-    struct {
-        /** rx_clkm_div_z : R/W; bitpos: [8:0]; default: 0;
-         *  For b <= a/2, the value of I2S_RX_CLKM_DIV_Z is b. For b > a/2, the value of
-         *  I2S_RX_CLKM_DIV_Z is (a-b).
-         */
-        uint32_t rx_clkm_div_z:9;
-        /** rx_clkm_div_y : R/W; bitpos: [17:9]; default: 1;
-         *  For b <= a/2, the value of I2S_RX_CLKM_DIV_Y is (a%b) . For b > a/2, the value of
-         *  I2S_RX_CLKM_DIV_Y is (a%(a-b)).
-         */
-        uint32_t rx_clkm_div_y:9;
-        /** rx_clkm_div_x : R/W; bitpos: [26:18]; default: 0;
-         *  For b <= a/2, the value of I2S_RX_CLKM_DIV_X is (a/b) - 1. For b > a/2, the value
-         *  of I2S_RX_CLKM_DIV_X is (a/(a-b)) - 1.
-         */
-        uint32_t rx_clkm_div_x:9;
-        /** rx_clkm_div_yn1 : R/W; bitpos: [27]; default: 0;
-         *  For b <= a/2, the value of I2S_RX_CLKM_DIV_YN1 is 0 . For b > a/2, the value of
-         *  I2S_RX_CLKM_DIV_YN1 is 1.
-         */
-        uint32_t rx_clkm_div_yn1:1;
-        uint32_t reserved_28:4;
-    };
-    uint32_t val;
-} i2s_rx_clkm_div_conf_reg_t;
-
 /** Type of rx_timing register
  *  I2S RX timing control register
  */
@@ -813,36 +724,6 @@ typedef union {
 
 
 /** Group: TX clock and timing registers */
-/** Type of tx_clkm_div_conf register
- *  I2S TX module clock divider configure register
- */
-typedef union {
-    struct {
-        /** tx_clkm_div_z : R/W; bitpos: [8:0]; default: 0;
-         *  For b <= a/2, the value of I2S_TX_CLKM_DIV_Z is b. For b > a/2, the value of
-         *  I2S_TX_CLKM_DIV_Z is (a-b).
-         */
-        uint32_t tx_clkm_div_z:9;
-        /** tx_clkm_div_y : R/W; bitpos: [17:9]; default: 1;
-         *  For b <= a/2, the value of I2S_TX_CLKM_DIV_Y is (a%b) . For b > a/2, the value of
-         *  I2S_TX_CLKM_DIV_Y is (a%(a-b)).
-         */
-        uint32_t tx_clkm_div_y:9;
-        /** tx_clkm_div_x : R/W; bitpos: [26:18]; default: 0;
-         *  For b <= a/2, the value of I2S_TX_CLKM_DIV_X is (a/b) - 1. For b > a/2, the value
-         *  of I2S_TX_CLKM_DIV_X is (a/(a-b)) - 1.
-         */
-        uint32_t tx_clkm_div_x:9;
-        /** tx_clkm_div_yn1 : R/W; bitpos: [27]; default: 0;
-         *  For b <= a/2, the value of I2S_TX_CLKM_DIV_YN1 is 0 . For b > a/2, the value of
-         *  I2S_TX_CLKM_DIV_YN1 is 1.
-         */
-        uint32_t tx_clkm_div_yn1:1;
-        uint32_t reserved_28:4;
-    };
-    uint32_t val;
-} i2s_tx_clkm_div_conf_reg_t;
-
 /** Type of tx_timing register
  *  I2S TX timing control register
  */
@@ -993,10 +874,7 @@ typedef struct i2s_dev_t {
     volatile i2s_tx_conf_reg_t tx_conf;
     volatile i2s_rx_conf1_reg_t rx_conf1;
     volatile i2s_tx_conf1_reg_t tx_conf1;
-    volatile i2s_rx_clkm_conf_reg_t rx_clkm_conf;
-    volatile i2s_tx_clkm_conf_reg_t tx_clkm_conf;
-    volatile i2s_rx_clkm_div_conf_reg_t rx_clkm_div_conf;
-    volatile i2s_tx_clkm_div_conf_reg_t tx_clkm_div_conf;
+    uint32_t reserved_030[4];
     volatile i2s_tx_pcm2pdm_conf_reg_t tx_pcm2pdm_conf;
     volatile i2s_tx_pcm2pdm_conf1_reg_t tx_pcm2pdm_conf1;
     uint32_t reserved_048[2];

+ 1 - 123
components/soc/esp32h2/include/soc/i2s_struct.h

@@ -240,34 +240,6 @@ typedef union {
     uint32_t val;
 } i2s_rx_conf1_reg_t;
 
-/** Type of rx_clkm_conf register
- *  I2S RX clock configure register
- */
-typedef union {
-    struct {
-        /** rx_clkm_div_num : R/W; bitpos: [7:0]; default: 2;
-         *  Integral I2S clock divider value
-         */
-        uint32_t rx_clkm_div_num:8;
-        uint32_t reserved_8:18;
-        /** rx_clk_active : R/W; bitpos: [26]; default: 0;
-         *  I2S Rx module clock enable signal.
-         */
-        uint32_t rx_clk_active:1;
-        /** rx_clk_sel : R/W; bitpos: [28:27]; default: 0;
-         *  Select I2S Rx module source clock. 0: no clock. 1: APLL. 2: CLK160. 3: I2S_MCLK_in.
-         */
-        uint32_t rx_clk_sel:2;
-        /** mclk_sel : R/W; bitpos: [29]; default: 0;
-         *  0: UseI2S Tx module clock as I2S_MCLK_OUT.  1: UseI2S Rx module clock as
-         *  I2S_MCLK_OUT.
-         */
-        uint32_t mclk_sel:1;
-        uint32_t reserved_30:2;
-    };
-    uint32_t val;
-} i2s_rx_clkm_conf_reg_t;
-
 /** Type of tx_pcm2pdm_conf register
  *  I2S TX PCM2PDM configuration register
  */
@@ -607,37 +579,6 @@ typedef union {
     uint32_t val;
 } i2s_tx_conf1_reg_t;
 
-/** Type of tx_clkm_conf register
- *  I2S TX clock configure register
- */
-typedef union {
-    struct {
-        /** tx_clkm_div_num : R/W; bitpos: [7:0]; default: 2;
-         *  Integral I2S TX clock divider value. f_I2S_CLK = f_I2S_CLK_S/(N+b/a). There will be
-         *  (a-b) * n-div and b * (n+1)-div.  So the average combination will be:  for b <=
-         *  a/2, z * [x * n-div + (n+1)-div] + y * n-div. For b > a/2, z * [n-div + x *
-         *  (n+1)-div] + y * (n+1)-div.
-         */
-        uint32_t tx_clkm_div_num:8;
-        uint32_t reserved_8:18;
-        /** tx_clk_active : R/W; bitpos: [26]; default: 0;
-         *  I2S Tx module clock enable signal.
-         */
-        uint32_t tx_clk_active:1;
-        /** tx_clk_sel : R/W; bitpos: [28:27]; default: 0;
-         *  Select I2S Tx module source clock. 0: XTAL clock. 1: APLL. 2: CLK160. 3:
-         *  I2S_MCLK_in.
-         */
-        uint32_t tx_clk_sel:2;
-        /** clk_en : R/W; bitpos: [29]; default: 0;
-         *  Set this bit to enable clk gate
-         */
-        uint32_t clk_en:1;
-        uint32_t reserved_30:2;
-    };
-    uint32_t val;
-} i2s_tx_clkm_conf_reg_t;
-
 /** Type of tx_tdm_ctrl register
  *  I2S TX TDM mode control register
  */
@@ -740,36 +681,6 @@ typedef union {
 
 
 /** Group: RX clock and timing registers */
-/** Type of rx_clkm_div_conf register
- *  I2S RX module clock divider configure register
- */
-typedef union {
-    struct {
-        /** rx_clkm_div_z : R/W; bitpos: [8:0]; default: 0;
-         *  For b <= a/2, the value of I2S_RX_CLKM_DIV_Z is b. For b > a/2, the value of
-         *  I2S_RX_CLKM_DIV_Z is (a-b).
-         */
-        uint32_t rx_clkm_div_z:9;
-        /** rx_clkm_div_y : R/W; bitpos: [17:9]; default: 1;
-         *  For b <= a/2, the value of I2S_RX_CLKM_DIV_Y is (a%b) . For b > a/2, the value of
-         *  I2S_RX_CLKM_DIV_Y is (a%(a-b)).
-         */
-        uint32_t rx_clkm_div_y:9;
-        /** rx_clkm_div_x : R/W; bitpos: [26:18]; default: 0;
-         *  For b <= a/2, the value of I2S_RX_CLKM_DIV_X is (a/b) - 1. For b > a/2, the value
-         *  of I2S_RX_CLKM_DIV_X is (a/(a-b)) - 1.
-         */
-        uint32_t rx_clkm_div_x:9;
-        /** rx_clkm_div_yn1 : R/W; bitpos: [27]; default: 0;
-         *  For b <= a/2, the value of I2S_RX_CLKM_DIV_YN1 is 0 . For b > a/2, the value of
-         *  I2S_RX_CLKM_DIV_YN1 is 1.
-         */
-        uint32_t rx_clkm_div_yn1:1;
-        uint32_t reserved_28:4;
-    };
-    uint32_t val;
-} i2s_rx_clkm_div_conf_reg_t;
-
 /** Type of rx_timing register
  *  I2S RX timing control register
  */
@@ -811,36 +722,6 @@ typedef union {
 
 
 /** Group: TX clock and timing registers */
-/** Type of tx_clkm_div_conf register
- *  I2S TX module clock divider configure register
- */
-typedef union {
-    struct {
-        /** tx_clkm_div_z : R/W; bitpos: [8:0]; default: 0;
-         *  For b <= a/2, the value of I2S_TX_CLKM_DIV_Z is b. For b > a/2, the value of
-         *  I2S_TX_CLKM_DIV_Z is (a-b).
-         */
-        uint32_t tx_clkm_div_z:9;
-        /** tx_clkm_div_y : R/W; bitpos: [17:9]; default: 1;
-         *  For b <= a/2, the value of I2S_TX_CLKM_DIV_Y is (a%b) . For b > a/2, the value of
-         *  I2S_TX_CLKM_DIV_Y is (a%(a-b)).
-         */
-        uint32_t tx_clkm_div_y:9;
-        /** tx_clkm_div_x : R/W; bitpos: [26:18]; default: 0;
-         *  For b <= a/2, the value of I2S_TX_CLKM_DIV_X is (a/b) - 1. For b > a/2, the value
-         *  of I2S_TX_CLKM_DIV_X is (a/(a-b)) - 1.
-         */
-        uint32_t tx_clkm_div_x:9;
-        /** tx_clkm_div_yn1 : R/W; bitpos: [27]; default: 0;
-         *  For b <= a/2, the value of I2S_TX_CLKM_DIV_YN1 is 0 . For b > a/2, the value of
-         *  I2S_TX_CLKM_DIV_YN1 is 1.
-         */
-        uint32_t tx_clkm_div_yn1:1;
-        uint32_t reserved_28:4;
-    };
-    uint32_t val;
-} i2s_tx_clkm_div_conf_reg_t;
-
 /** Type of tx_timing register
  *  I2S TX timing control register
  */
@@ -991,10 +872,7 @@ typedef struct {
     volatile i2s_tx_conf_reg_t tx_conf;
     volatile i2s_rx_conf1_reg_t rx_conf1;
     volatile i2s_tx_conf1_reg_t tx_conf1;
-    volatile i2s_rx_clkm_conf_reg_t rx_clkm_conf;
-    volatile i2s_tx_clkm_conf_reg_t tx_clkm_conf;
-    volatile i2s_rx_clkm_div_conf_reg_t rx_clkm_div_conf;
-    volatile i2s_tx_clkm_div_conf_reg_t tx_clkm_div_conf;
+    uint32_t reserved_030[4];
     volatile i2s_tx_pcm2pdm_conf_reg_t tx_pcm2pdm_conf;
     volatile i2s_tx_pcm2pdm_conf1_reg_t tx_pcm2pdm_conf1;
     uint32_t reserved_048[2];

+ 69 - 0
components/soc/esp32p4/i2s_periph.c

@@ -11,4 +11,73 @@
  Bunch of constants for every I2S peripheral: GPIO signals, irqs, hw addr of registers etc
 */
 const i2s_signal_conn_t i2s_periph_signal[SOC_I2S_NUM] = {
+    [0] = {
+        .mck_out_sig  = I2S0_MCLK_PAD_OUT_IDX,
+
+        .m_tx_bck_sig = I2S0_O_BCK_PAD_OUT_IDX,
+        .m_rx_bck_sig = I2S0_I_BCK_PAD_OUT_IDX,
+        .m_tx_ws_sig  = I2S0_O_WS_PAD_OUT_IDX,
+        .m_rx_ws_sig  = I2S0_I_WS_PAD_OUT_IDX,
+
+        .s_tx_bck_sig = I2S0_O_BCK_PAD_IN_IDX,
+        .s_rx_bck_sig = I2S0_I_BCK_PAD_IN_IDX,
+        .s_tx_ws_sig  = I2S0_O_WS_PAD_IN_IDX,
+        .s_rx_ws_sig  = I2S0_I_WS_PAD_IN_IDX,
+
+        .data_out_sigs[0] = I2S0_O_SD_PAD_OUT_IDX,
+        .data_out_sigs[1] = I2S0_O_SD1_PAD_OUT_IDX,
+        .data_in_sigs[0]  = I2S0_I_SD_PAD_IN_IDX,
+        .data_in_sigs[1]  = I2S0_I_SD1_PAD_IN_IDX,
+        .data_in_sigs[2]  = I2S0_I_SD2_PAD_IN_IDX,
+        .data_in_sigs[3]  = I2S0_I_SD3_PAD_IN_IDX,
+
+        .irq          = -1,
+        .module       = PERIPH_I2S0_MODULE,
+    },
+    [1] = {
+        .mck_out_sig  = I2S1_MCLK_PAD_OUT_IDX,
+
+        .m_tx_bck_sig = I2S1_O_BCK_PAD_OUT_IDX,
+        .m_rx_bck_sig = I2S1_I_BCK_PAD_OUT_IDX,
+        .m_tx_ws_sig  = I2S1_O_WS_PAD_OUT_IDX,
+        .m_rx_ws_sig  = I2S1_I_WS_PAD_OUT_IDX,
+
+        .s_tx_bck_sig = I2S1_O_BCK_PAD_IN_IDX,
+        .s_rx_bck_sig = I2S1_I_BCK_PAD_IN_IDX,
+        .s_tx_ws_sig  = I2S1_O_WS_PAD_IN_IDX,
+        .s_rx_ws_sig  = I2S1_I_WS_PAD_IN_IDX,
+
+        .data_out_sigs[0] = I2S1_O_SD_PAD_OUT_IDX,
+        .data_out_sigs[1] = -1,
+        .data_in_sigs[0]  = I2S1_I_SD_PAD_IN_IDX,
+        .data_in_sigs[1]  = -1,
+        .data_in_sigs[2]  = -1,
+        .data_in_sigs[3]  = -1,
+
+        .irq          = -1,
+        .module       = PERIPH_I2S1_MODULE,
+    },
+    [2] = {
+        .mck_out_sig  = I2S2_MCLK_PAD_OUT_IDX,
+
+        .m_tx_bck_sig = I2S2_O_BCK_PAD_OUT_IDX,
+        .m_rx_bck_sig = I2S2_I_BCK_PAD_OUT_IDX,
+        .m_tx_ws_sig  = I2S2_O_WS_PAD_OUT_IDX,
+        .m_rx_ws_sig  = I2S2_I_WS_PAD_OUT_IDX,
+
+        .s_tx_bck_sig = I2S2_O_BCK_PAD_IN_IDX,
+        .s_rx_bck_sig = I2S2_I_BCK_PAD_IN_IDX,
+        .s_tx_ws_sig  = I2S2_O_WS_PAD_IN_IDX,
+        .s_rx_ws_sig  = I2S2_I_WS_PAD_IN_IDX,
+
+        .data_out_sigs[0] = I2S2_O_SD_PAD_OUT_IDX,
+        .data_out_sigs[1] = -1,
+        .data_in_sigs[0]  = I2S2_I_SD_PAD_IN_IDX,
+        .data_in_sigs[1]  = -1,
+        .data_in_sigs[2]  = -1,
+        .data_in_sigs[3]  = -1,
+
+        .irq          = -1,
+        .module       = PERIPH_I2S2_MODULE,
+    },
 };

+ 34 - 2
components/soc/esp32p4/include/soc/Kconfig.soc_caps.in

@@ -71,6 +71,10 @@ config SOC_I2C_SUPPORTED
     bool
     default y
 
+config SOC_I2S_SUPPORTED
+    bool
+    default y
+
 config SOC_SYSTIMER_SUPPORTED
     bool
     default y
@@ -433,7 +437,7 @@ config SOC_I2C_SUPPORT_RTC
 
 config SOC_I2S_NUM
     int
-    default 1
+    default 3
 
 config SOC_I2S_HW_VERSION_2
     bool
@@ -443,7 +447,7 @@ config SOC_I2S_SUPPORTS_XTAL
     bool
     default y
 
-config SOC_I2S_SUPPORTS_PLL_F160M
+config SOC_I2S_SUPPORTS_APLL
     bool
     default y
 
@@ -451,10 +455,38 @@ config SOC_I2S_SUPPORTS_PCM
     bool
     default y
 
+config SOC_I2S_SUPPORTS_PDM
+    bool
+    default y
+
+config SOC_I2S_SUPPORTS_PDM_TX
+    bool
+    default y
+
+config SOC_I2S_SUPPORTS_PDM_RX
+    bool
+    default y
+
+config SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER
+    bool
+    default y
+
+config SOC_I2S_SUPPORTS_TDM
+    bool
+    default y
+
 config SOC_I2S_PDM_MAX_TX_LINES
     int
     default 2
 
+config SOC_I2S_PDM_MAX_RX_LINES
+    int
+    default 4
+
+config SOC_I2S_TDM_FULL_DATA_WIDTH
+    bool
+    default y
+
 config SOC_LEDC_SUPPORT_PLL_DIV_CLOCK
     bool
     default y

+ 15 - 0
components/soc/esp32p4/include/soc/clk_tree_defs.h

@@ -150,6 +150,7 @@ typedef enum {
     SOC_MOD_CLK_XTAL32K,                       /*!< XTAL32K_CLK comes from the external 32kHz crystal, passing a clock gating to the peripherals */
     SOC_MOD_CLK_RC_FAST,                       /*!< RC_FAST_CLK comes from the internal 20MHz rc oscillator, passing a clock gating to the peripherals */
     SOC_MOD_CLK_XTAL,                          /*!< XTAL_CLK comes from the external 40MHz crystal */
+    SOC_MOD_CLK_APLL,                          /*!< Audio PLL is sourced from PLL, and its frequency is configurable through APLL configuration registers */
     SOC_MOD_CLK_INVALID,                       /*!< Indication of the end of the available module clock sources */
 } soc_module_clk_t;
 
@@ -334,6 +335,20 @@ typedef enum {
 
 ///////////////////////////////////////////////// I2S //////////////////////////////////////////////////////////////
 
+/**
+ * @brief Array initializer for all supported clock sources of I2S
+ */
+#define SOC_I2S_CLKS {SOC_MOD_CLK_XTAL, SOC_MOD_CLK_APLL}
+
+/**
+ * @brief I2S clock source enum
+ */
+typedef enum {
+    I2S_CLK_SRC_DEFAULT = SOC_MOD_CLK_XTAL,             /*!< Select XTAL as the default source clock  */
+    I2S_CLK_SRC_XTAL = SOC_MOD_CLK_XTAL,                /*!< Select XTAL as the source clock */
+    I2S_CLK_SRC_APLL = SOC_MOD_CLK_APLL,                /*!< Select APLL as the source clock */
+} soc_periph_i2s_clk_src_t;
+
 /////////////////////////////////////////////////I2C////////////////////////////////////////////////////////////////////
 
 /**

+ 95 - 89
components/soc/esp32p4/include/soc/i2s_struct.h

@@ -277,6 +277,92 @@ typedef union {
     uint32_t val;
 } i2s_rx_pdm2pcm_conf_reg_t;
 
+/** Type of tx_pcm2pdm_conf register
+ *  I2S TX PCM2PDM configuration register
+ */
+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;
+        /** tx_pdm_sinc_osr2 : R/W; bitpos: [4:1]; default: 2;
+         *  I2S TX PDM OSR2 value
+         */
+        uint32_t tx_pdm_sinc_osr2:4;
+        /** tx_pdm_prescale : R/W; bitpos: [12:5]; default: 0;
+         *  I2S TX PDM prescale for sigmadelta
+         */
+        uint32_t tx_pdm_prescale:8;
+        /** tx_pdm_hp_in_shift : R/W; bitpos: [14:13]; default: 1;
+         *  I2S TX PDM sigmadelta scale shift number: 0:/2 , 1:x1 , 2:x2 , 3: x4
+         */
+        uint32_t tx_pdm_hp_in_shift:2;
+        /** tx_pdm_lp_in_shift : R/W; bitpos: [16:15]; default: 1;
+         *  I2S TX PDM sigmadelta scale shift number: 0:/2 , 1:x1 , 2:x2 , 3: x4
+         */
+        uint32_t tx_pdm_lp_in_shift:2;
+        /** tx_pdm_sinc_in_shift : R/W; bitpos: [18:17]; default: 1;
+         *  I2S TX PDM sigmadelta scale shift number: 0:/2 , 1:x1 , 2:x2 , 3: x4
+         */
+        uint32_t tx_pdm_sinc_in_shift:2;
+        /** tx_pdm_sigmadelta_in_shift : R/W; bitpos: [20:19]; default: 1;
+         *  I2S TX PDM sigmadelta scale shift number: 0:/2 , 1:x1 , 2:x2 , 3: x4
+         */
+        uint32_t tx_pdm_sigmadelta_in_shift:2;
+        /** tx_pdm_sigmadelta_dither2 : R/W; bitpos: [21]; default: 0;
+         *  I2S TX PDM sigmadelta dither2 value
+         */
+        uint32_t tx_pdm_sigmadelta_dither2:1;
+        /** tx_pdm_sigmadelta_dither : R/W; bitpos: [22]; default: 1;
+         *  I2S TX PDM sigmadelta dither value
+         */
+        uint32_t tx_pdm_sigmadelta_dither:1;
+        /** tx_pdm_dac_2out_en : R/W; bitpos: [23]; default: 0;
+         *  I2S TX PDM dac mode enable
+         */
+        uint32_t tx_pdm_dac_2out_en:1;
+        /** tx_pdm_dac_mode_en : R/W; bitpos: [24]; default: 0;
+         *  I2S TX PDM dac 2channel enable
+         */
+        uint32_t tx_pdm_dac_mode_en:1;
+        /** pcm2pdm_conv_en : R/W; bitpos: [25]; default: 0;
+         *  I2S TX PDM Converter enable
+         */
+        uint32_t pcm2pdm_conv_en:1;
+        uint32_t reserved_26:6;
+    };
+    uint32_t val;
+} i2s_tx_pcm2pdm_conf_reg_t;
+
+/** Type of tx_pcm2pdm_conf1 register
+ *  I2S TX PCM2PDM configuration register
+ */
+typedef union {
+    struct {
+        /** tx_pdm_fp : R/W; bitpos: [9:0]; default: 960;
+         *  I2S TX PDM Fp
+         */
+        uint32_t tx_pdm_fp:10;
+        /** tx_pdm_fs : R/W; bitpos: [19:10]; default: 480;
+         *  I2S TX PDM Fs
+         */
+        uint32_t tx_pdm_fs:10;
+        /** tx_iir_hp_mult12_5 : R/W; bitpos: [22:20]; default: 7;
+         *  The fourth parameter of PDM TX IIR_HP filter stage 2 is (504 +
+         *  I2S_TX_IIR_HP_MULT12_5[2:0])
+         */
+        uint32_t tx_iir_hp_mult12_5:3;
+        /** tx_iir_hp_mult12_0 : R/W; bitpos: [25:23]; default: 7;
+         *  The fourth parameter of PDM TX IIR_HP filter stage 1 is (504 +
+         *  I2S_TX_IIR_HP_MULT12_0[2:0])
+         */
+        uint32_t tx_iir_hp_mult12_0:3;
+        uint32_t reserved_26:6;
+    };
+    uint32_t val;
+} i2s_tx_pcm2pdm_conf1_reg_t;
+
 /** Type of rx_tdm_ctrl register
  *  I2S TX TDM mode control register
  */
@@ -371,7 +457,7 @@ typedef union {
     uint32_t val;
 } i2s_rx_tdm_ctrl_reg_t;
 
-/** Type of rxeof_num register
+/** Type of rx_eof_num register
  *  I2S RX data number control register.
  */
 typedef union {
@@ -384,7 +470,7 @@ typedef union {
         uint32_t reserved_12:20;
     };
     uint32_t val;
-} i2s_rxeof_num_reg_t;
+} i2s_rx_eof_num_reg_t;
 
 
 /** Group: TX Control and configuration registers */
@@ -530,89 +616,6 @@ typedef union {
     uint32_t val;
 } i2s_tx_conf1_reg_t;
 
-/** Type of tx_pcm2pdm_conf register
- *  I2S TX PCM2PDM configuration register
- */
-typedef union {
-    struct {
-        uint32_t reserved_0:1;
-        /** tx_pdm_sinc_osr2 : R/W; bitpos: [4:1]; default: 2;
-         *  I2S TX PDM OSR2 value
-         */
-        uint32_t tx_pdm_sinc_osr2:4;
-        /** tx_pdm_prescale : R/W; bitpos: [12:5]; default: 0;
-         *  I2S TX PDM prescale for sigmadelta
-         */
-        uint32_t tx_pdm_prescale:8;
-        /** tx_pdm_hp_in_shift : R/W; bitpos: [14:13]; default: 1;
-         *  I2S TX PDM sigmadelta scale shift number: 0:/2 , 1:x1 , 2:x2 , 3: x4
-         */
-        uint32_t tx_pdm_hp_in_shift:2;
-        /** tx_pdm_lp_in_shift : R/W; bitpos: [16:15]; default: 1;
-         *  I2S TX PDM sigmadelta scale shift number: 0:/2 , 1:x1 , 2:x2 , 3: x4
-         */
-        uint32_t tx_pdm_lp_in_shift:2;
-        /** tx_pdm_sinc_in_shift : R/W; bitpos: [18:17]; default: 1;
-         *  I2S TX PDM sigmadelta scale shift number: 0:/2 , 1:x1 , 2:x2 , 3: x4
-         */
-        uint32_t tx_pdm_sinc_in_shift:2;
-        /** tx_pdm_sigmadelta_in_shift : R/W; bitpos: [20:19]; default: 1;
-         *  I2S TX PDM sigmadelta scale shift number: 0:/2 , 1:x1 , 2:x2 , 3: x4
-         */
-        uint32_t tx_pdm_sigmadelta_in_shift:2;
-        /** tx_pdm_sigmadelta_dither2 : R/W; bitpos: [21]; default: 0;
-         *  I2S TX PDM sigmadelta dither2 value
-         */
-        uint32_t tx_pdm_sigmadelta_dither2:1;
-        /** tx_pdm_sigmadelta_dither : R/W; bitpos: [22]; default: 1;
-         *  I2S TX PDM sigmadelta dither value
-         */
-        uint32_t tx_pdm_sigmadelta_dither:1;
-        /** tx_pdm_dac_2out_en : R/W; bitpos: [23]; default: 0;
-         *  I2S TX PDM dac mode enable
-         */
-        uint32_t tx_pdm_dac_2out_en:1;
-        /** tx_pdm_dac_mode_en : R/W; bitpos: [24]; default: 0;
-         *  I2S TX PDM dac 2channel enable
-         */
-        uint32_t tx_pdm_dac_mode_en:1;
-        /** pcm2pdm_conv_en : R/W; bitpos: [25]; default: 0;
-         *  I2S TX PDM Converter enable
-         */
-        uint32_t pcm2pdm_conv_en:1;
-        uint32_t reserved_26:6;
-    };
-    uint32_t val;
-} i2s_tx_pcm2pdm_conf_reg_t;
-
-/** Type of tx_pcm2pdm_conf1 register
- *  I2S TX PCM2PDM configuration register
- */
-typedef union {
-    struct {
-        /** tx_pdm_fp : R/W; bitpos: [9:0]; default: 960;
-         *  I2S TX PDM Fp
-         */
-        uint32_t tx_pdm_fp:10;
-        /** tx_pdm_fs : R/W; bitpos: [19:10]; default: 480;
-         *  I2S TX PDM Fs
-         */
-        uint32_t tx_pdm_fs:10;
-        /** tx_iir_hp_mult12_5 : R/W; bitpos: [22:20]; default: 7;
-         *  The fourth parameter of PDM TX IIR_HP filter stage 2 is (504 +
-         *  I2S_TX_IIR_HP_MULT12_5[2:0])
-         */
-        uint32_t tx_iir_hp_mult12_5:3;
-        /** tx_iir_hp_mult12_0 : R/W; bitpos: [25:23]; default: 7;
-         *  The fourth parameter of PDM TX IIR_HP filter stage 1 is (504 +
-         *  I2S_TX_IIR_HP_MULT12_0[2:0])
-         */
-        uint32_t tx_iir_hp_mult12_0:3;
-        uint32_t reserved_26:6;
-    };
-    uint32_t val;
-} i2s_tx_pcm2pdm_conf1_reg_t;
-
 /** Type of tx_tdm_ctrl register
  *  I2S TX TDM mode control register
  */
@@ -845,7 +848,7 @@ typedef union {
     uint32_t val;
 } i2s_lc_hung_conf_reg_t;
 
-/** Type of conf_sigle_data register
+/** Type of conf_single_data register
  *  I2S signal data register
  */
 typedef union {
@@ -856,7 +859,7 @@ typedef union {
         uint32_t single_data:32;
     };
     uint32_t val;
-} i2s_conf_sigle_data_reg_t;
+} i2s_conf_single_data_reg_t;
 
 
 /** Group: TX status registers */
@@ -986,8 +989,8 @@ typedef struct {
     volatile i2s_rx_timing_reg_t rx_timing;
     volatile i2s_tx_timing_reg_t tx_timing;
     volatile i2s_lc_hung_conf_reg_t lc_hung_conf;
-    volatile i2s_rxeof_num_reg_t rxeof_num;
-    volatile i2s_conf_sigle_data_reg_t conf_sigle_data;
+    volatile i2s_rx_eof_num_reg_t rx_eof_num;
+    volatile i2s_conf_single_data_reg_t conf_single_data;
     volatile i2s_state_reg_t state;
     volatile i2s_etm_conf_reg_t etm_conf;
     volatile i2s_fifo_cnt_reg_t fifo_cnt;
@@ -996,6 +999,9 @@ typedef struct {
     volatile i2s_date_reg_t date;
 } i2s_dev_t;
 
+extern i2s_dev_t I2S0;
+extern i2s_dev_t I2S1;
+extern i2s_dev_t I2S2;
 
 #ifndef __cplusplus
 _Static_assert(sizeof(i2s_dev_t) == 0x84, "Invalid size of i2s_dev_t structure");

+ 12 - 7
components/soc/esp32p4/include/soc/soc_caps.h

@@ -50,6 +50,8 @@
 #define SOC_RTC_MEM_SUPPORTED           1
 // #define SOC_I2S_SUPPORTED               1  //TODO: IDF-6508
 #define SOC_RMT_SUPPORTED               1
+#define SOC_I2S_SUPPORTED               1
+// #define SOC_RMT_SUPPORTED               1  //TODO: IDF-7476
 // #define SOC_SDM_SUPPORTED               1  //TODO: IDF-7551
 // #define SOC_GPSPI_SUPPORTED             1  //TODO: IDF-7502, TODO: IDF-7503
 // #define SOC_LEDC_SUPPORTED              1  //TODO: IDF-6510
@@ -240,16 +242,19 @@
 #define SOC_I2C_SUPPORT_RTC         (1)
 
 /*-------------------------- I2S CAPS ----------------------------------------*/
-//TODO: IDF-6508
-#define SOC_I2S_NUM                 (1U)
+#define SOC_I2S_NUM                 (3U)
 #define SOC_I2S_HW_VERSION_2        (1)
 #define SOC_I2S_SUPPORTS_XTAL       (1)
-#define SOC_I2S_SUPPORTS_PLL_F160M  (1)
+#define SOC_I2S_SUPPORTS_APLL       (1)
 #define SOC_I2S_SUPPORTS_PCM        (1)
-// #define SOC_I2S_SUPPORTS_PDM        (1)
-// #define SOC_I2S_SUPPORTS_PDM_TX     (1)
-#define SOC_I2S_PDM_MAX_TX_LINES    (2)
-// #define SOC_I2S_SUPPORTS_TDM        (1)
+#define SOC_I2S_SUPPORTS_PDM        (1)
+#define SOC_I2S_SUPPORTS_PDM_TX     (1)
+#define SOC_I2S_SUPPORTS_PDM_RX     (1)
+#define SOC_I2S_SUPPORTS_PDM_RX_HP_FILTER (1)
+#define SOC_I2S_SUPPORTS_TDM        (1)
+#define SOC_I2S_PDM_MAX_TX_LINES    (2)     // On I2S0
+#define SOC_I2S_PDM_MAX_RX_LINES    (4)     // On I2S0
+#define SOC_I2S_TDM_FULL_DATA_WIDTH (1)  /*!< No limitation to data bit width when using multiple slots */
 
 /*-------------------------- LEDC CAPS ---------------------------------------*/
 #define SOC_LEDC_SUPPORT_PLL_DIV_CLOCK      (1)

+ 6 - 4
examples/peripherals/.build-test-rules.yml

@@ -54,15 +54,15 @@ examples/peripherals/i2c/i2c_tools:
 
 examples/peripherals/i2s/i2s_basic/i2s_pdm:
   disable:
-    - if: SOC_I2S_SUPPORTS_PDM != 1
+    - if: SOC_I2S_SUPPORTS_PDM != 1 or IDF_TARGET == "esp32p4"
 
 examples/peripherals/i2s/i2s_basic/i2s_std:
   disable:
-    - if: SOC_I2S_SUPPORTED != 1
+    - if: SOC_I2S_SUPPORTED != 1 or IDF_TARGET == "esp32p4"
 
 examples/peripherals/i2s/i2s_basic/i2s_tdm:
   disable:
-    - if: SOC_I2S_SUPPORTS_TDM != 1
+    - if: SOC_I2S_SUPPORTS_TDM != 1  or IDF_TARGET == "esp32p4"
 
 examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm:
   disable:
@@ -71,10 +71,12 @@ examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm:
 
 examples/peripherals/i2s/i2s_codec/i2s_es8311:
   disable:
-    - if: SOC_I2S_SUPPORTED != 1 or SOC_I2C_SUPPORTED != 1
+    - if: (SOC_I2S_SUPPORTED != 1 or SOC_I2C_SUPPORTED != 1) or IDF_TARGET == "esp32p4"
       reason: rely on I2S STD mode and I2C to config es7210
 
 examples/peripherals/i2s/i2s_recorder:
+  disable:
+    - if: IDF_TARGET == "esp32p4"
   enable:
     - if: SOC_I2S_SUPPORTS_PDM_RX > 0