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

Commit 2934c2d8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: ife: Update max soc block"

parents a2c9c116 addbb33b

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver3.c

+2 −1
Original line number Diff line number Diff line
@@ -782,7 +782,8 @@ int cam_vfe_top_ver3_init( 
	top_priv->last_counter[0] = 0;

	top_priv->last_counter[1] = 0;



	for (i = 0, j = 0; i < CAM_VFE_TOP_VER3_MUX_MAX; i++) {

	for (i = 0, j = 0; i < CAM_VFE_TOP_VER3_MUX_MAX &&

		j < CAM_VFE_RDI_VER2_MAX; i++) {

		top_priv->mux_rsrc[i].res_type = CAM_ISP_RESOURCE_VFE_IN;

		top_priv->mux_rsrc[i].hw_intf = hw_intf;

		top_priv->mux_rsrc[i].res_state =

drivers/media/platform/msm/camera/cam_utils/cam_soc_util.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define INIT_RATE    -2



/* maximum number of device block */

#define CAM_SOC_MAX_BLOCK           4

#define CAM_SOC_MAX_BLOCK           7



/* maximum number of device base */

#define CAM_SOC_MAX_BASE            CAM_SOC_MAX_BLOCK