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

Commit 2032ce51 authored by edwardkao(153792)'s avatar edwardkao(153792) Committed by Gerrit Code Review
Browse files

Merge "Revert "Camera Module Rear 2nd Source Backward Compatibility"" into... 

Merge "Revert "Camera Module Rear 2nd Source Backward Compatibility"" into 8901-fairphone-p-mp-release
parents d90ba48c b8fca45d

drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c

+1 −15
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ static void msm_actuator_parse_i2c_params(struct msm_actuator_ctrl_t *a_ctrl, 
				((hw_dword & write_arr[i].hw_mask) >>

				write_arr[i].hw_shift);

//[Camera] Modify for IMX363 module AF Person Liu 20190509 S

<<<<<<< HEAD   (600096 msm: adsprpc: maintain local copy of rpra offloaded to DSP)

				value = abs(1023-value);

=======

//[Camera] Modify for IMX363 module AF Frank Cheng 20191225 S

				/*

				pr_err("%s:%d nActuatorAK7374: %d\n",
@@ -132,7 +129,6 @@ static void msm_actuator_parse_i2c_params(struct msm_actuator_ctrl_t *a_ctrl, 
				*/

				if(nActuatorAK7374 == 0)value = abs(1023-value);

//[Camera] Modify for IMX363 module AF Frank Cheng 20191225 S

>>>>>>> CHANGE (081cba Camera Module Rear 2nd Source Backward Compatibility)

//[Camera] Modify for IMX363 module AF Person Liu 20190509 S

			if (write_arr[i].reg_addr != 0xFFFF) {

				i2c_byte1 = write_arr[i].reg_addr;
@@ -1591,15 +1587,6 @@ static int msm_actuator_close(struct v4l2_subdev *sd, 
		return -EINVAL;

	}

	mutex_lock(a_ctrl->actuator_mutex);

<<<<<<< HEAD   (600096 msm: adsprpc: maintain local copy of rpra offloaded to DSP)

	if (a_ctrl->act_device_type == MSM_CAMERA_PLATFORM_DEVICE &&

		a_ctrl->actuator_state != ACT_DISABLE_STATE) {

		rc = a_ctrl->i2c_client.i2c_func_tbl->i2c_util(

			&a_ctrl->i2c_client, MSM_CCI_RELEASE);

		if (rc < 0)

			pr_err("cci_init failed\n");

	}

=======

//[Camera] Modify for IMX363 module AF Frank Cheng 20191225 S

// temporary skip

//				pr_err("%s:%d nActuatorAK7374: %d\n",
@@ -1617,7 +1604,6 @@ static int msm_actuator_close(struct v4l2_subdev *sd, 
                }

        }

//[Camera] Modify for IMX363 module AF Frank Cheng 20191225 S

>>>>>>> CHANGE (081cba Camera Module Rear 2nd Source Backward Compatibility)

	kfree(a_ctrl->i2c_reg_tbl);

	a_ctrl->i2c_reg_tbl = NULL;

	a_ctrl->actuator_state = ACT_DISABLE_STATE;

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

+1 −1

File changed.

Contains only whitespace changes.