Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91bd8594 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge c48130df on remote branch 

Change-Id: I5213f530e292d14b1425bce51b5bb8df3590ec7d
parents 5a1938e1 c48130df

drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+2 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/uaccess.h>
@@ -1062,8 +1062,7 @@ static bool cam_icp_update_clk_free(struct cam_icp_hw_mgr *hw_mgr, 


static bool cam_icp_debug_clk_update(struct cam_icp_clk_info *hw_mgr_clk_info)

{

	if (icp_hw_mgr.icp_debug_clk < ICP_CLK_TURBO_HZ &&

		icp_hw_mgr.icp_debug_clk &&

	if (icp_hw_mgr.icp_debug_clk &&

		icp_hw_mgr.icp_debug_clk != hw_mgr_clk_info->curr_clk) {

		hw_mgr_clk_info->base_clk = icp_hw_mgr.icp_debug_clk;

		hw_mgr_clk_info->curr_clk = icp_hw_mgr.icp_debug_clk;

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+2 −0
Original line number Diff line number Diff line
@@ -1684,6 +1684,8 @@ static int cam_ife_csid_tpg_start(struct cam_ife_csid_hw *csid_hw, 
		CAM_DBG(CAM_ISP, "reg 0x%x = 0x%x", 0x600, val);

	}



	res->res_state = CAM_ISP_RESOURCE_STATE_STREAMING;



	return 0;

}