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

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

Merge "msm: camera: icp: Add feature flag for power collapse" into dev/msm-4.14-camx

parents 48e177cc 8299005b

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

+6 −3
Original line number Diff line number Diff line
@@ -4648,6 +4648,12 @@ static int cam_icp_mgr_alloc_devs(struct device_node *of_node) 
		goto num_bps_failed;

	}



	icp_hw_mgr.ipe_bps_pc_flag = of_property_read_bool(of_node,

		"ipe_bps_pc_en");



	icp_hw_mgr.icp_pc_flag = of_property_read_bool(of_node,

		"icp_pc_en");



	return 0;

num_bps_failed:

	kfree(icp_hw_mgr.devices[CAM_ICP_DEV_IPE]);
@@ -4784,9 +4790,6 @@ static int cam_icp_mgr_create_wq(void) 
	if (rc)

		goto debugfs_create_failed;



	icp_hw_mgr.icp_pc_flag = true;

	icp_hw_mgr.ipe_bps_pc_flag = false;



	for (i = 0; i < ICP_WORKQ_NUM_TASK; i++)

		icp_hw_mgr.msg_work->task.pool[i].payload =

				&icp_hw_mgr.msg_work_data[i];