Skip to content

Commit

Permalink
Merge branch 'change/change_isp_new_processer_pipeline_items' into 'm…
Browse files Browse the repository at this point in the history
…aster'

isp: don't init unnecessary isp pipeline items when doing isp_new_processor

See merge request espressif/esp-idf!31327
  • Loading branch information
Icarus113 committed Jun 5, 2024
2 parents 788455f + b4ddeee commit 4220c18
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 2 additions & 0 deletions components/esp_driver_isp/src/isp_bf.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ esp_err_t esp_isp_bf_enable(isp_proc_handle_t proc)
ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
ESP_RETURN_ON_FALSE(proc->bf_fsm == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "bf is enabled already");

isp_ll_bf_clk_enable(proc->hal.hw, true);
isp_ll_bf_enable(proc->hal.hw, true);
proc->bf_fsm = ISP_FSM_ENABLE;

Expand All @@ -68,6 +69,7 @@ esp_err_t esp_isp_bf_disable(isp_proc_handle_t proc)
ESP_RETURN_ON_FALSE(proc->bf_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "bf isn't enabled yet");

isp_ll_bf_enable(proc->hal.hw, false);
isp_ll_bf_clk_enable(proc->hal.hw, false);
proc->bf_fsm = ISP_FSM_INIT;

return ESP_OK;
Expand Down
7 changes: 0 additions & 7 deletions components/esp_driver_isp/src/isp_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ esp_err_t esp_isp_new_processor(const esp_isp_processor_cfg_t *proc_config, isp_
}

isp_hal_init(&proc->hal, proc->proc_id);
//necessary ISP submodules that needs basic initialisation
isp_ll_bf_clk_enable(proc->hal.hw, true);
isp_ll_bf_enable(proc->hal.hw, true);
isp_ll_ccm_clk_enable(proc->hal.hw, true);
isp_ll_ccm_enable(proc->hal.hw, true);
isp_ll_color_clk_enable(proc->hal.hw, true);
isp_ll_color_enable(proc->hal.hw, true);
PERIPH_RCC_ATOMIC() {
isp_ll_select_clk_source(proc->hal.hw, clk_src);
isp_ll_set_clock_div(proc->hal.hw, &clk_div);
Expand Down

0 comments on commit 4220c18

Please sign in to comment.