Merge branch 'feature/support_i2s_on_p4' into 'master'

feat(i2s): support i2s on esp32p4 Closes IDF-6508 See merge request espressif/esp-idf!24280
2023-09-29 00:50:04 +08:00
parent 4a40c7bb5e e1039f9ce2
commit 4c6f4b39f1
58 changed files with 2560 additions and 736 deletions
@@ -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
    };

@@ -136,20 +142,35 @@ void i2s_hal_calc_mclk_precise_division(uint32_t sclk, uint32_t mclk, hal_utils_
 * @brief Set tx channel clock
 *
 * @param hal Context of the HAL layer
- * @param clk_info clock information
+ * @param clk_info clock information, if it is NULL, only set the clock source
 * @param clk_src clock source
 */
-void i2s_hal_set_tx_clock(i2s_hal_context_t *hal, const i2s_hal_clock_info_t *clk_info, i2s_clock_src_t clk_src);
+void _i2s_hal_set_tx_clock(i2s_hal_context_t *hal, const i2s_hal_clock_info_t *clk_info, i2s_clock_src_t clk_src);
+
+#if SOC_PERIPH_CLK_CTRL_SHARED
+/// use a macro to wrap the function, force the caller to use it in a critical section
+/// the critical section needs to declare the __DECLARE_RCC_ATOMIC_ENV variable in advance
+#define i2s_hal_set_tx_clock(...) (void)__DECLARE_RCC_ATOMIC_ENV; _i2s_hal_set_tx_clock(__VA_ARGS__)
+#else
+#define i2s_hal_set_tx_clock(...)   _i2s_hal_set_tx_clock(__VA_ARGS__)
+#endif

 /**
 * @brief Set rx channel clock
 *
 * @param hal Context of the HAL layer
- * @param clk_info clock information
+ * @param clk_info clock information, if it is NULL, only set the clock source
 * @param clk_src clock source
 */
-void i2s_hal_set_rx_clock(i2s_hal_context_t *hal, const i2s_hal_clock_info_t *clk_info, i2s_clock_src_t clk_src);
+void _i2s_hal_set_rx_clock(i2s_hal_context_t *hal, const i2s_hal_clock_info_t *clk_info, i2s_clock_src_t clk_src);

+#if SOC_PERIPH_CLK_CTRL_SHARED
+/// use a macro to wrap the function, force the caller to use it in a critical section
+/// the critical section needs to declare the __DECLARE_RCC_ATOMIC_ENV variable in advance
+#define i2s_hal_set_rx_clock(...) (void)__DECLARE_RCC_ATOMIC_ENV; _i2s_hal_set_rx_clock(__VA_ARGS__)
+#else
+#define i2s_hal_set_rx_clock(...)   _i2s_hal_set_rx_clock(__VA_ARGS__)
+#endif

 /*-------------------------------------------------------------------------
 |                           STD configuration                            |