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

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

Merge "msm: camera: cpas: Add QoS settings for ICP" into dev/msm-4.9-camx

parents 9e28e6ef e6244c39

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -372,6 +372,8 @@ static int cam_cpastop_poweron(struct cam_hw_info *cpas_hw) 
				&camnoc_info->specific[i].safe_lut);

			cam_cpas_util_reg_update(cpas_hw, CAM_CPAS_REG_CAMNOC,

				&camnoc_info->specific[i].ubwc_ctl);

			cam_cpas_util_reg_update(cpas_hw, CAM_CPAS_REG_CAMNOC,

				&camnoc_info->specific[i].flag_out_set0_low);

		}

	}

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct cam_camnoc_specific { 
	struct cam_cpas_reg danger_lut;

	struct cam_cpas_reg safe_lut;

	struct cam_cpas_reg ubwc_ctl;

	struct cam_cpas_reg flag_out_set0_low;

};



/**

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cpastop_v170_110.h

+9 −2
Original line number Diff line number Diff line
@@ -494,8 +494,15 @@ static struct cam_camnoc_specific 
	},

	{

		.port_type = CAM_CAMNOC_ICP,

		.enable = false,

	}

		.enable = true,

		.flag_out_set0_low = {

			.enable = true,

			.access_type = CAM_REG_TYPE_WRITE,

			.masked_value = 0,

			.offset = 0x2088,

			.value = 0x100000,

		},

	},

};



static uint32_t cam_cpas110_slave_error_logger[] = {