Improve camera power consumption

add mutex lock for cci init

Change-Id: I2a17041a7e926d4237789784a129add7cbf84d0d

Author: longxiaowu

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

@@ -58,6 +58,10 @@
 #define PRIORITY_QUEUE (QUEUE_0)
 #define SYNC_QUEUE (QUEUE_1)
 
+static struct mutex msm_cci_init_mutex =
+    __MUTEX_INITIALIZER(msm_cci_init_mutex);
+
+
 static struct v4l2_subdev *g_cci_subdev;
 
 static void msm_cci_dump_registers(struct cci_device *cci_dev,
@@ -1663,11 +1667,27 @@ static int32_t msm_cci_config(struct v4l2_subdev *sd,
 	struct msm_camera_cci_ctrl *cci_ctrl)
 {
 	int32_t rc = 0;
+
+    struct cci_device *cci_dev;
+    cci_dev = v4l2_get_subdevdata(sd);
+    if (!cci_dev || !cci_ctrl) {
+        pr_err("%s:%d failed: invalid params %pK %pK\n", __func__,
+            __LINE__, cci_dev, cci_ctrl);
+        rc = -EINVAL;
+        return rc;
+    }
+
 	CDBG("%s line %d cmd %d\n", __func__, __LINE__,
 		cci_ctrl->cmd);
 	switch (cci_ctrl->cmd) {
 	case MSM_CCI_INIT:
+
+		mutex_lock(cci_dev->cci_init_mutex);
+
 		rc = msm_cci_init(sd, cci_ctrl);
+
+		mutex_unlock(cci_dev->cci_init_mutex);
+
 		break;
 	case MSM_CCI_RELEASE:
 		rc = msm_cci_release(sd);
@@ -2105,6 +2125,9 @@ static int msm_cci_probe(struct platform_device *pdev)
 		return -EFAULT;
 	}
 
+
+	new_cci_dev->cci_init_mutex = &msm_cci_init_mutex;
+
 	new_cci_dev->ref_count = 0;
 	new_cci_dev->base = msm_camera_get_reg_base(pdev, "cci", true);
 	if (!new_cci_dev->base) {

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.h

@@ -181,6 +181,7 @@ struct cci_device {
 	struct workqueue_struct *write_wq[MASTER_MAX];
 	struct msm_camera_cci_wait_sync_cfg cci_wait_sync_cfg;
 	uint8_t valid_sync;
+	struct mutex *cci_init_mutex;
 };
 
 enum msm_cci_i2c_cmd_type {

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

@@ -152,7 +152,6 @@ int msm_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl)
 	struct msm_camera_slave_info *slave_info;
 	const char *sensor_name;
 	uint32_t retry = 0;
-	uint32_t check_id_retry = 0;
 
 	if (!s_ctrl) {
 		pr_err("%s:%d failed: %pK\n",
@@ -204,13 +203,7 @@ int msm_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl)
 			sensor_i2c_client);
 		if (rc < 0)
 			return rc;
-
-		for(check_id_retry = 0; check_id_retry < 3; check_id_retry++) {
-			rc = msm_sensor_check_id(s_ctrl);
-			if (!rc) break;
-			msleep(20);
-		}
-
+		rc = msm_sensor_check_id(s_ctrl);
 		if (rc < 0) {
 			msm_camera_power_down(power_info,
 				s_ctrl->sensor_device_type, sensor_i2c_client);