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

Commit 8b059f70 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: icp: cap clock rate to turbo" into dev/msm-4.9-camx

parents b6472f3e 7d0cb128

drivers/media/platform/msm/camera/cam_icp/icp_hw/bps_hw/bps_soc.c

+14 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -138,9 +138,22 @@ int cam_bps_get_gdsc_control(struct cam_hw_soc_info *soc_info) 
int cam_bps_update_clk_rate(struct cam_hw_soc_info *soc_info,

	uint32_t clk_rate)

{

	int32_t src_clk_idx;



	if (!soc_info)

		return -EINVAL;



	src_clk_idx = soc_info->src_clk_idx;



	if ((soc_info->clk_level_valid[CAM_TURBO_VOTE] == true) &&

		(soc_info->clk_rate[CAM_TURBO_VOTE][src_clk_idx] != 0) &&

		(clk_rate > soc_info->clk_rate[CAM_TURBO_VOTE][src_clk_idx])) {

		CAM_DBG(CAM_ICP, "clk_rate %d greater than max, reset to %d",

			clk_rate,

			soc_info->clk_rate[CAM_TURBO_VOTE][src_clk_idx]);

		clk_rate = soc_info->clk_rate[CAM_TURBO_VOTE][src_clk_idx];

	}



	return cam_soc_util_set_clk_rate(soc_info->clk[soc_info->src_clk_idx],

		soc_info->clk_name[soc_info->src_clk_idx], clk_rate);

}

drivers/media/platform/msm/camera/cam_icp/icp_hw/ipe_hw/ipe_soc.c

+14 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -141,9 +141,22 @@ int cam_ipe_disable_soc_resources(struct cam_hw_soc_info *soc_info, 
int cam_ipe_update_clk_rate(struct cam_hw_soc_info *soc_info,

	uint32_t clk_rate)

{

	int32_t src_clk_idx;



	if (!soc_info)

		return -EINVAL;



	src_clk_idx = soc_info->src_clk_idx;



	if ((soc_info->clk_level_valid[CAM_TURBO_VOTE] == true) &&

		(soc_info->clk_rate[CAM_TURBO_VOTE][src_clk_idx] != 0) &&

		(clk_rate > soc_info->clk_rate[CAM_TURBO_VOTE][src_clk_idx])) {

		CAM_DBG(CAM_ICP, "clk_rate %d greater than max, reset to %d",

			clk_rate,

			soc_info->clk_rate[CAM_TURBO_VOTE][src_clk_idx]);

		clk_rate = soc_info->clk_rate[CAM_TURBO_VOTE][src_clk_idx];

	}



	return cam_soc_util_set_clk_rate(soc_info->clk[soc_info->src_clk_idx],

		soc_info->clk_name[soc_info->src_clk_idx], clk_rate);

}