Merge branch 'bugfix/i2s_tdm_doubled_mclk' into 'master'

i2s: fixed double mclk in tdm mode

Closes IDFGH-8764 and IDFGH-8763

See merge request espressif/esp-idf!21138

components/driver/i2s/i2s_tdm.c

@@ -40,14 +40,12 @@ static esp_err_t i2s_tdm_calculate_clock(i2s_chan_handle_t handle, const i2s_tdm
         clk_info->bclk = rate * handle->total_slot * slot_bits;
         clk_info->mclk = rate * clk_cfg->mclk_multiple;
         clk_info->bclk_div = clk_info->mclk / clk_info->bclk;
-        /* While RECEIVING multiple slots, the data will go wrong if the bclk_div is euqal or smaller than 2 */
-        do {
-            clk_info->mclk *= 2;
-            clk_info->bclk_div = clk_info->mclk / clk_info->bclk;
-            if (clk_info->bclk_div <= 2) {
-                ESP_LOGW(TAG, "the current mclk multiple is too small, adjust the mclk multiple to %"PRIu32, clk_info->mclk / rate);
-            }
-        } while (clk_info->bclk_div <= 2);
+        /* While RECEIVING multiple slots, the data will go wrong if the bclk_div is equal or smaller than 2 */
+        if (clk_info->bclk_div <= 2) {
+            clk_info->bclk_div = 3;
+            clk_info->mclk = clk_info->bclk * clk_info->bclk_div;
+            ESP_LOGW(TAG, "the current mclk multiple is too small, adjust the mclk multiple to %"PRIu32, clk_info->mclk / rate);
+        }
     } else {
         if (clk_cfg->bclk_div < 8) {
             ESP_LOGW(TAG, "the current bclk division is too small, adjust the bclk division to 8");

components/driver/include/driver/i2s_std.h

@@ -7,7 +7,7 @@
 /**
  * This file is specified for I2S standard communication mode
  * Features:
- *      - Philip/MSB/PCM are supported in standard mode
+ *      - Philips/MSB/PCM are supported in standard mode
  *      - Fixed to 2 slots
  */
 #pragma once
@@ -24,11 +24,11 @@ extern "C" {
 
 #if CONFIG_IDF_TARGET_ESP32
 /**
- * @brief Philip format in 2 slots
+ * @brief Philips format in 2 slots
  * @param bits_per_sample i2s data bit width
  * @param mono_or_stereo I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
  */
-#define I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo) { \
+#define I2S_STD_PHILIPS_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, \
@@ -43,7 +43,7 @@ extern "C" {
 
 /**
  * @brief PCM(short) format in 2 slots
- * @note  PCM(long) is sample as philip in 2 slots
+ * @note  PCM(long) is same as philips in 2 slots
  * @param bits_per_sample i2s data bit width
  * @param mono_or_stereo I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
  */
@@ -80,11 +80,11 @@ extern "C" {
 
 #elif CONFIG_IDF_TARGET_ESP32S2
 /**
- * @brief Philip format in 2 slots
+ * @brief Philips format in 2 slots
  * @param bits_per_sample i2s data bit width
  * @param mono_or_stereo I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
  */
-#define I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo) { \
+#define I2S_STD_PHILIPS_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, \
@@ -98,7 +98,7 @@ extern "C" {
 
 /**
  * @brief PCM(short) format in 2 slots
- * @note  PCM(long) is sample as philip in 2 slots
+ * @note  PCM(long) is same as philips in 2 slots
  * @param bits_per_sample i2s data bit width
  * @param mono_or_stereo I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
  */
@@ -133,11 +133,11 @@ extern "C" {
 
 #else
 /**
- * @brief Philip format in 2 slots
+ * @brief Philips format in 2 slots
  * @param bits_per_sample i2s data bit width
  * @param mono_or_stereo I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
  */
-#define I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo) { \
+#define I2S_STD_PHILIPS_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, \
@@ -152,7 +152,7 @@ extern "C" {
 
 /**
  * @brief PCM(short) format in 2 slots
- * @note  PCM(long) is sample as philip in 2 slots
+ * @note  PCM(long) is same as philips in 2 slots
  * @param bits_per_sample i2s data bit width
  * @param mono_or_stereo I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
  */
@@ -188,6 +188,11 @@ extern "C" {
 }
 #endif
 
+/** @cond */
+#define I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo) \
+        I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo)  // Alias
+/** @endcond */
+
 /**
  * @brief i2s default standard clock configuration
  * @note Please set the mclk_multiple to I2S_MCLK_MULTIPLE_384 while using 24 bits data width
@@ -216,7 +221,7 @@ typedef struct {
     i2s_std_slot_mask_t     slot_mask;          /*!< Select the left, right or both slot */
     uint32_t                ws_width;           /*!< WS signal width (i.e. the number of bclk ticks that ws signal is high) */
     bool                    ws_pol;             /*!< WS signal polarity, set true to enable high lever first */
-    bool                    bit_shift;          /*!< Set to enbale bit shift in Philip mode */
+    bool                    bit_shift;          /*!< Set to enable bit shift in Philips mode */
 #if SOC_I2S_HW_VERSION_1    // For esp32/esp32-s2
     bool                    msb_right;          /*!< Set to place right channel data at the MSB in the FIFO */
 #else
@@ -261,7 +266,7 @@ typedef struct {
  */
 typedef struct {
     i2s_std_clk_config_t    clk_cfg;    /*!< Standard mode clock configuration, can be generated by macro I2S_STD_CLK_DEFAULT_CONFIG */
-    i2s_std_slot_config_t   slot_cfg;   /*!< Standard mode slot configuration, can be generated by macros I2S_STD_[mode]_SLOT_DEFAULT_CONFIG, [mode] can be replaced with PHILIP/MSB/PCM */
+    i2s_std_slot_config_t   slot_cfg;   /*!< Standard mode slot configuration, can be generated by macros I2S_STD_[mode]_SLOT_DEFAULT_CONFIG, [mode] can be replaced with PHILIPS/MSB/PCM */
     i2s_std_gpio_config_t   gpio_cfg;   /*!< Standard mode gpio configuration, specified by user */
 } i2s_std_config_t;
 
@@ -273,7 +278,7 @@ typedef struct {
  * @param[in]   handle      I2S channel handler
  * @param[in]   std_cfg     Configurations for standard mode, including clock, slot and gpio
  *                          The clock configuration can be generated by the helper macro `I2S_STD_CLK_DEFAULT_CONFIG`
- *                          The slot configuration can be generated by the helper macro `I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG`,
+ *                          The slot configuration can be generated by the helper macro `I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG`,
  *                          `I2S_STD_PCM_SLOT_DEFAULT_CONFIG` or `I2S_STD_MSB_SLOT_DEFAULT_CONFIG`
  *
  * @return
@@ -306,7 +311,7 @@ esp_err_t i2s_channel_reconfig_std_clock(i2s_chan_handle_t handle, const i2s_std
  * @note  The input channel handle has to be initialized to standard mode, i.e., 'i2s_channel_init_std_mode' has been called before reconfigring
  *
  * @param[in]   handle      I2S channel handler
- * @param[in]   slot_cfg    Standard mode slot configuration, can be generated by `I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG`,
+ * @param[in]   slot_cfg    Standard mode slot configuration, can be generated by `I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG`,
  *                          `I2S_STD_PCM_SLOT_DEFAULT_CONFIG` and `I2S_STD_MSB_SLOT_DEFAULT_CONFIG`.
  * @return
  *      - ESP_OK    Set clock successfully

components/driver/include/driver/i2s_tdm.h

@@ -25,12 +25,12 @@ extern "C" {
 #define I2S_TDM_AUTO_WS_WIDTH    (0)       // Auto means ws signal width will be equal to the half width of a frame
 
 /**
- * @brief Philip format in active slot that enabled by mask
+ * @brief Philips format in active slot that enabled by mask
  * @param bits_per_sample i2s data bit width
  * @param mono_or_stereo I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
  * @param mask active slot mask
  */
-#define I2S_TDM_PHILIP_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo, mask) { \
+#define I2S_TDM_PHILIPS_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo, mask) { \
     .data_bit_width = (bits_per_sample), \
     .slot_bit_width = I2S_SLOT_BIT_WIDTH_AUTO, \
     .slot_mode = mono_or_stereo, \
@@ -108,6 +108,12 @@ extern "C" {
     .total_slot = I2S_TDM_AUTO_SLOT_NUM \
 }
 
+/** @cond */
+#define I2S_TDM_PHILIP_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo, mask)  \
+        I2S_TDM_PHILIPS_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo, mask)  // Alias
+/** @endcond */
+
+
 /**
  * @brief i2s default tdm clock configuration
  * @note Please set the mclk_multiple to I2S_MCLK_MULTIPLE_384 while the data width in slot configuration is set to 24 bits
@@ -134,7 +140,7 @@ typedef struct {
     i2s_tdm_slot_mask_t     slot_mask;          /*!< Slot mask. Activating slots by setting 1 to corresponding bits. When the activated slots is not consecutive, those data in unactivated slots will be ignored */
     uint32_t                ws_width;           /*!< WS signal width (i.e. the number of bclk ticks that ws signal is high) */
     bool                    ws_pol;             /*!< WS signal polarity, set true to enable high lever first */
-    bool                    bit_shift;          /*!< Set true to enable bit shift in Philip mode */
+    bool                    bit_shift;          /*!< Set true to enable bit shift in Philips mode */
 
     bool                    left_align;         /*!< Set true to enable left alignment */
     bool                    big_endian;         /*!< Set true to enable big endian */
@@ -176,7 +182,7 @@ typedef struct {
  */
 typedef struct {
     i2s_tdm_clk_config_t    clk_cfg;    /*!< TDM mode clock configuration, can be generated by macro I2S_TDM_CLK_DEFAULT_CONFIG */
-    i2s_tdm_slot_config_t   slot_cfg;   /*!< TDM mode slot configuration, can be generated by macros I2S_TDM_[mode]_SLOT_DEFAULT_CONFIG, [mode] can be replaced with PHILIP/MSB/PCM_SHORT/PCM_LONG */
+    i2s_tdm_slot_config_t   slot_cfg;   /*!< TDM mode slot configuration, can be generated by macros I2S_TDM_[mode]_SLOT_DEFAULT_CONFIG, [mode] can be replaced with PHILIPS/MSB/PCM_SHORT/PCM_LONG */
     i2s_tdm_gpio_config_t   gpio_cfg;   /*!< TDM mode gpio configuration, specified by user */
 } i2s_tdm_config_t;
 
@@ -188,7 +194,7 @@ typedef struct {
  * @param[in]   handle      I2S channel handler
  * @param[in]   tdm_cfg     Configurations for TDM mode, including clock, slot and gpio
  *                          The clock configuration can be generated by the helper macro `I2S_TDM_CLK_DEFAULT_CONFIG`
- *                          The slot configuration can be generated by the helper macro `I2S_TDM_PHILIP_SLOT_DEFAULT_CONFIG`,
+ *                          The slot configuration can be generated by the helper macro `I2S_TDM_PHILIPS_SLOT_DEFAULT_CONFIG`,
  *                          `I2S_TDM_PCM_SHORT_SLOT_DEFAULT_CONFIG`, `I2S_TDM_PCM_LONG_SLOT_DEFAULT_CONFIG` or `I2S_TDM_MSB_SLOT_DEFAULT_CONFIG`
  *
  * @return
@@ -221,7 +227,7 @@ esp_err_t i2s_channel_reconfig_tdm_clock(i2s_chan_handle_t handle, const i2s_tdm
  * @note  The input channel handle has to be initialized to TDM mode, i.e., 'i2s_channel_init_tdm_mode' has been called before reconfigring
  *
  * @param[in]   handle      I2S channel handler
- * @param[in]   slot_cfg    Standard mode slot configuration, can be generated by `I2S_TDM_PHILIP_SLOT_DEFAULT_CONFIG`,
+ * @param[in]   slot_cfg    Standard mode slot configuration, can be generated by `I2S_TDM_PHILIPS_SLOT_DEFAULT_CONFIG`,
  *                          `I2S_TDM_PCM_SHORT_SLOT_DEFAULT_CONFIG`, `I2S_TDM_PCM_LONG_SLOT_DEFAULT_CONFIG` or `I2S_TDM_MSB_SLOT_DEFAULT_CONFIG`.
  * @return
  *      - ESP_OK    Set clock successfully

components/driver/include/driver/i2s_types.h

@@ -30,7 +30,7 @@ typedef enum {
  * @brief I2S controller communication mode
  */
 typedef enum {
-    I2S_COMM_MODE_STD,              /*!< I2S controller using standard communication mode, support philip/MSB/PCM format */
+    I2S_COMM_MODE_STD,              /*!< I2S controller using standard communication mode, support philips/MSB/PCM format */
 #if SOC_I2S_SUPPORTS_PDM
     I2S_COMM_MODE_PDM,              /*!< I2S controller using PDM communication mode, support PDM output or input */
 #endif

components/driver/test_apps/i2s_test_apps/i2s/main/test_i2s.c

@@ -168,7 +168,7 @@ TEST_CASE("I2S_basic_channel_allocation_reconfig_deleting_test", "[i2s]")
     i2s_chan_config_t chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_AUTO, I2S_ROLE_MASTER);
     i2s_std_config_t std_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_MASTER_DEFAULT_PIN,
     };
 
@@ -263,7 +263,7 @@ static void i2s_reconfig_task(void *args) {
 
     while (task_run_flag) {
         /* Reconfig the slot while reading / writing */
-        i2s_std_slot_config_t slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO);
+        i2s_std_slot_config_t slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO);
         TEST_ESP_OK(i2s_channel_disable(tx_handle));
         TEST_ESP_OK(i2s_channel_disable(rx_handle));
         printf("[%d] Reconfiguring the slot...\n", cnt);
@@ -579,7 +579,7 @@ TEST_CASE("I2S_memory_leak_test", "[i2s]")
     i2s_chan_config_t chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_AUTO, I2S_ROLE_MASTER);
     i2s_std_config_t std_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_MASTER_DEFAULT_PIN,
     };
 
@@ -619,7 +619,7 @@ TEST_CASE("I2S_loopback_test", "[i2s]")
     i2s_chan_config_t chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_0, I2S_ROLE_MASTER);
     i2s_std_config_t std_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_MASTER_DEFAULT_PIN,
     };
     TEST_ESP_OK(i2s_new_channel(&chan_cfg, &tx_handle, &rx_handle));
@@ -649,13 +649,13 @@ TEST_CASE("I2S_master_write_slave_read_test", "[i2s]")
 
     i2s_std_config_t std_mst_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_MASTER_DEFAULT_PIN,
     };
 
     i2s_std_config_t std_slv_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_SLAVE_DEFAULT_PIN,
     };
 
@@ -685,13 +685,13 @@ TEST_CASE("I2S_master_read_slave_write_test", "[i2s]")
     i2s_chan_config_t slv_chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_1, I2S_ROLE_SLAVE);
     i2s_std_config_t std_mst_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_MASTER_DEFAULT_PIN,
     };
 
     i2s_std_config_t std_slv_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_SLAVE_DEFAULT_PIN,
     };
 
@@ -788,7 +788,7 @@ TEST_CASE("I2S_default_PLL_clock_test", "[i2s]")
     i2s_chan_config_t chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_0, I2S_ROLE_MASTER);
     i2s_std_config_t std_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_MASTER_DEFAULT_PIN,
     };
 
@@ -811,7 +811,7 @@ TEST_CASE("I2S_APLL_clock_test", "[i2s]")
     i2s_chan_config_t chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_0, I2S_ROLE_MASTER);
     i2s_std_config_t std_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(SAMPLE_BITS, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_MASTER_DEFAULT_PIN,
     };
     std_cfg.clk_cfg.clk_src = I2S_CLK_SRC_APLL;
@@ -849,7 +849,7 @@ TEST_CASE("I2S_package_lost_test", "[i2s]")
     chan_cfg.dma_frame_num = 511;
     i2s_std_config_t std_cfg = {
         .clk_cfg = I2S_STD_CLK_DEFAULT_CONFIG(SAMPLE_RATE),
-        .slot_cfg = I2S_STD_PHILIP_SLOT_DEFAULT_CONFIG(I2S_DATA_BIT_WIDTH_32BIT, I2S_SLOT_MODE_STEREO),
+        .slot_cfg = I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(I2S_DATA_BIT_WIDTH_32BIT, I2S_SLOT_MODE_STEREO),
         .gpio_cfg = I2S_TEST_MASTER_DEFAULT_PIN,
     };
 

components/driver/test_apps/i2s_test_apps/i2s_tdm/main/test_i2s_tdm_full_duplex.c

@@ -90,7 +90,7 @@ static void test_i2s_tdm_master(uint32_t sample_rate, i2s_data_bit_width_t bit_w
     /* Configure channels to TDM mode */
     i2s_tdm_config_t i2s_tdm_config = {
         .clk_cfg = I2S_TDM_CLK_DEFAULT_CONFIG(sample_rate),
-        .slot_cfg = I2S_TDM_PHILIP_SLOT_DEFAULT_CONFIG(bit_width, I2S_SLOT_MODE_STEREO, slot_mask),
+        .slot_cfg = I2S_TDM_PHILIPS_SLOT_DEFAULT_CONFIG(bit_width, I2S_SLOT_MODE_STEREO, slot_mask),
         .gpio_cfg = {
             .mclk = GPIO_NUM_NC,
             .bclk = TEST_I2S_BCK_IO,
@@ -197,7 +197,7 @@ static void test_i2s_tdm_slave(uint32_t sample_rate, i2s_data_bit_width_t bit_wi
     /* Configure channels to TDM mode */
     i2s_tdm_config_t i2s_tdm_config = {
         .clk_cfg = I2S_TDM_CLK_DEFAULT_CONFIG(sample_rate),
-        .slot_cfg = I2S_TDM_PHILIP_SLOT_DEFAULT_CONFIG(bit_width, I2S_SLOT_MODE_STEREO, slot_mask),
+        .slot_cfg = I2S_TDM_PHILIPS_SLOT_DEFAULT_CONFIG(bit_width, I2S_SLOT_MODE_STEREO, slot_mask),
         .gpio_cfg = {
             .mclk = GPIO_NUM_NC,
             .bclk = TEST_I2S_BCK_IO,

components/hal/esp32s2/include/hal/i2s_ll.h

@@ -707,22 +707,22 @@ static inline void i2s_ll_enable_dma(i2s_dev_t *hw, bool ena)
 }
 
 /**
- * @brief Set I2S TX to philip standard
+ * @brief Set I2S TX to philips standard
  *
  * @param hw Peripheral I2S hardware instance address.
  */
-static inline void i2s_ll_tx_set_format_philip(i2s_dev_t *hw)
+static inline void i2s_ll_tx_set_format_philips(i2s_dev_t *hw)
 {
     hw->conf.tx_short_sync = 0;
     hw->conf.tx_msb_shift = 1;
 }
 
 /**
- * @brief Set I2S RX to philip standard
+ * @brief Set I2S RX to philips standard
  *
  * @param hw Peripheral I2S hardware instance address.
  */
-static inline void i2s_ll_rx_set_format_philip(i2s_dev_t *hw)
+static inline void i2s_ll_rx_set_format_philips(i2s_dev_t *hw)
 {
     hw->conf.rx_short_sync = 0;
     hw->conf.rx_msb_shift = 1;