pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refactor/use_isp_hw_auto_clk_force_en' into 'master'

Browse Source 
isp: use isp hw auto clk force en

Closes IDF-10773

See merge request espressif/esp-idf!36423
This commit is contained in:
Armando (Dou Yiwen)
2025-01-16 15:31:23 +08:00
parent 4beb9b7390 775e4d584c
commit 3957211c34
10 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/hal/esp32p4/include/hal/isp_ll.h
+57 -49
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -167,6 +167,14 @@ typedef enum {
ISP_LL_LUT_DPC, ///< LUT for DPC
} isp_ll_lut_t;
/**
* @brief ISP pipeline clock control mode
*/
typedef enum {
ISP_LL_PIPELINE_CLK_CTRL_AUTO, ///< HW control, off when in frame interval
ISP_LL_PIPELINE_CLK_CTRL_ALWAYS_ON, ///< Always on
} isp_ll_pipeline_clk_ctrl_t;
/*---------------------------------------------------------------
Clock
@@ -495,14 +503,14 @@ static inline void isp_ll_set_bayer_mode(isp_dev_t *hw, color_raw_element_order_
AF
---------------------------------------------------------------*/
/**
* @brief Enable / Disable AF clock
* @brief Set AF clock control mode
*
* @param[in] hw
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_af_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_af_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_af_force_on = enable;
hw->clk_en.clk_af_force_on = mode;
}
/**
@@ -730,14 +738,14 @@ static inline void isp_ll_af_env_detector_set_ratio(isp_dev_t *hw, uint32_t rati
BF
---------------------------------------------------------------*/
/**
* @brief Enable / Disable BF clock
* @brief Set BF clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_bf_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_bf_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_bf_force_on = enable;
hw->clk_en.clk_bf_force_on = mode;
}
/**
@@ -832,14 +840,14 @@ static inline void isp_ll_bf_set_template(isp_dev_t *hw, uint8_t template_arr[SO
CCM
---------------------------------------------------------------*/
/**
* @brief Enable / Disable CCM clock
* @brief Set CCM clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_ccm_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_ccm_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_ccm_force_on = enable;
hw->clk_en.clk_ccm_force_on = mode;
}
/**
@@ -876,14 +884,14 @@ static inline void isp_ll_ccm_set_matrix(isp_dev_t *hw, isp_ll_ccm_gain_t fixed_
Color
---------------------------------------------------------------*/
/**
* @brief Enable / Disable Color clock
* @brief Set Color clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_color_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_color_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_color_force_on = enable;
hw->clk_en.clk_color_force_on = mode;
}
/**
@@ -1071,14 +1079,14 @@ static inline void isp_ll_cam_enable(isp_dev_t *hw, bool enable)
---------------------------------------------------------------*/
/**
* @brief Enable / Disable AE clock
* @brief Set AE clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_ae_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_ae_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_ae_force_on = enable;
hw->clk_en.clk_ae_force_on = mode;
}
/**
@@ -1185,14 +1193,14 @@ static inline void isp_ll_ae_env_detector_set_period(isp_dev_t *hw, uint32_t per
LSC
---------------------------------------------------------------*/
/**
* @brief Enable / Disable LSC clock
* @brief Set LSC clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_lsc_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_lsc_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_lsc_force_on = enable;
hw->clk_en.clk_lsc_force_on = mode;
}
/**
@@ -1337,14 +1345,14 @@ static inline void isp_ll_clear_intr(isp_dev_t *hw, uint32_t mask)
AWB
---------------------------------------------------------------*/
/**
* @brief Enable / Disable AWB clock
* @brief Set AWB clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_awb_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_awb_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_awb_force_on = enable;
hw->clk_en.clk_awb_force_on = mode;
}
/**
@@ -1495,14 +1503,14 @@ static inline uint32_t isp_ll_awb_get_accumulated_b_value(isp_dev_t *hw)
Demosaic
---------------------------------------------------------------*/
/**
* @brief Enable / Disable demosaic clock
* @brief Set demosaic clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_demosaic_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_demosaic_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_demosaic_force_on = enable;
hw->clk_en.clk_demosaic_force_on = mode;
}
/**
@@ -1580,14 +1588,14 @@ static inline void isp_ll_demosaic_set_padding_line_tail_valid_end_pixel(isp_dev
Sharpen
---------------------------------------------------------------*/
/**
* @brief Enable / Disable sharpen clock
* @brief Set sharpen clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable Enable / Disable
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_sharp_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_sharp_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_sharp_force_on = enable;
hw->clk_en.clk_sharp_force_on = mode;
}
/**
@@ -1740,25 +1748,25 @@ static inline uint8_t isp_ll_sharp_get_high_freq_pixel_max(isp_dev_t *hw)
RGB/YUV
---------------------------------------------------------------*/
/**
* @brief Enable / Disable rgb2yuv clock
* @brief Set rgb2yuv clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable 0: hw control; 1: always on
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_rgb2yuv_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_rgb2yuv_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_rgb2yuv_force_on = enable;
hw->clk_en.clk_rgb2yuv_force_on = mode;
}
/**
* @brief Enable / Disable yuv2rgb clock
* @brief Set yuv2rgb clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable 0: hw control; 1: always on
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_yuv2rgb_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_yuv2rgb_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_yuv2rgb_force_on = enable;
hw->clk_en.clk_yuv2rgb_force_on = mode;
}
/**
@@ -1868,14 +1876,14 @@ static inline void isp_ll_gamma_set_correction_curve(isp_dev_t *hw, color_compon
HIST
---------------------------------------------------------------*/
/**
* @brief enable histogram clock
* @brief Set histogram clock control mode
*
* @param[in] hw Hardware instance address
* @param[in] enable true: enable the clock. false: disable the clock
* @param[in] mode 'isp_ll_pipeline_clk_ctrl_t`
*/
static inline void isp_ll_hist_clk_enable(isp_dev_t *hw, bool enable)
static inline void isp_ll_hist_set_clk_ctrl_mode(isp_dev_t *hw, isp_ll_pipeline_clk_ctrl_t mode)
{
hw->clk_en.clk_hist_force_on = enable;
hw->clk_en.clk_hist_force_on = mode;
}
/**