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

Commit 2ba0cd2c authored by bob.nill's avatar bob.nill Committed by hecaiqiang
Browse files

Support new lens semco module 

Change-Id: I5e52e93d7167b27fa71f589735c0f23048de07bc
(cherry picked from commit 97bca5fc571faf92e856aabc4c6c8f175ee05c4e)
parent 6d184c7d

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c

+22 −0
Original line number Diff line number Diff line
@@ -902,6 +902,9 @@ int cam_sensor_match_id(struct cam_sensor_ctrl_t *s_ctrl) 
	uint32_t id = 0;

	uint32_t id_l = 0;

	uint32_t id_h = 0;

	uint32_t lens = 0;

	uint32_t lens_l = 0;

	uint32_t lens_h = 0;



	slave_info = &(s_ctrl->sensordata->slave_info);
@@ -941,6 +944,18 @@ int cam_sensor_match_id(struct cam_sensor_ctrl_t *s_ctrl) 
	            &id_h, s_ctrl->sensordata->id_info.sensor_addr_type,

	            s_ctrl->sensordata->id_info.sensor_data_type);



	    if (0x586 == slave_info->sensor_id) {

	        rc = camera_io_dev_read( &(s_ctrl->io_master_info),

	                0x0008,

	                &lens_l, s_ctrl->sensordata->id_info.sensor_addr_type,

	                s_ctrl->sensordata->id_info.sensor_data_type);

	        rc = camera_io_dev_read(&(s_ctrl->io_master_info),

	                0x0009,

	                &lens_h, s_ctrl->sensordata->id_info.sensor_addr_type,

	                s_ctrl->sensordata->id_info.sensor_data_type);

	        lens = (lens_h << 8) | lens_l;

	    }



	    s_ctrl->io_master_info.cci_client->sid = sensor_slave_addr;

	    if (0x30d5 == slave_info->sensor_id) {//set the CCI master back to s5k3m5

	    	s_ctrl->io_master_info.cci_client->cci_i2c_master = MASTER_0;
@@ -952,6 +967,13 @@ int cam_sensor_match_id(struct cam_sensor_ctrl_t *s_ctrl) 
	            slave_info->sensor_id, id, s_ctrl->sensordata->id_info.sensor_id);

	        return -1;

	    } else {

	        if (0x586 == slave_info->sensor_id && 0x03 == id) {

	            if (0xe2 == lens) {

	                CAM_INFO(CAM_SENSOR, "sensor_id: 0x%x, id 0x%x, lens 0x%x, lens mismatch",

	                    slave_info->sensor_id, id, lens);

	                return -1;

	            }

	        }

	        CAM_INFO(CAM_SENSOR, "sensor_id: 0x%x, vendor_id 0x%x matched", slave_info->sensor_id, id);

	    }

	}