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

Commit 89b37de5 authored by Sridhar Gujje's avatar Sridhar Gujje
Browse files

Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 12/13 



* commit '93cb9b54':
  msm: camera: isp: Add debug status register data for VFE 175_130 hw
  msm: camera: icp: Update clock debug option

Change-Id: I168b1cdb2b1f5fca03dba88cc29992daead1fc3f
Signed-off-by: default avatarSridhar Gujje <sgujje@codeaurora.org>
parents 2c840c5f 93cb9b54

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+0 −3
Original line number Diff line number Diff line
@@ -849,9 +849,6 @@ static bool cam_icp_debug_clk_update(struct cam_icp_clk_info *hw_mgr_clk_info) 
		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;

		hw_mgr_clk_info->uncompressed_bw = icp_hw_mgr.icp_debug_clk;

		hw_mgr_clk_info->compressed_bw = icp_hw_mgr.icp_debug_clk;

		hw_mgr_clk_info->compressed_bw_ab = icp_hw_mgr.icp_debug_clk;

		CAM_DBG(CAM_ICP, "bc = %d cc = %d",

			hw_mgr_clk_info->base_clk, hw_mgr_clk_info->curr_clk);

		return true;

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe175_130.h

+5 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ static struct cam_vfe_bus_ver2_stats_cfg_info stats_175_130_info = { 
			},

		},

		/* CAM_VFE_BUS_VER2_VFE_OUT_STATS_TL_BG */

		{

		},

		/* CAM_VFE_BUS_VER2_VFE_OUT_STATS_BF */

		{

			.res_index      = CAM_VFE_BUS_VER2_VFE_OUT_STATS_BF,

			.cfg_offset     = 0x00000AE4,
@@ -602,6 +605,8 @@ static struct cam_vfe_bus_ver2_hw_info vfe175_130_bus_hw_info = { 
		.addr_sync_cfg                = 0x0000207C,

		.addr_sync_frame_hdr          = 0x00002080,

		.addr_sync_no_sync            = 0x00002084,

		.debug_status_cfg             = 0x0000226C,

		.debug_status_0               = 0x00002270,

	},

	.num_client = 24,

	.bus_client_reg = {