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

Commit ffc5ea7b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: msm_sensor and camera_dt_util changes for fetchcam"

parents 41011a18 11db7856

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c

+4 −3
Original line number Diff line number Diff line
@@ -1778,11 +1778,12 @@ int msm_camera_power_down(struct msm_camera_power_ctrl_t *ctrl, 
			pr_err("%s:%d cannot set pin to suspend state",

			__func__, __LINE__);

		devm_pinctrl_put(ctrl->pinctrl_info.pinctrl);

	}

	ctrl->cam_pinctrl_status = 0;

		msm_camera_request_gpio_table(

		ctrl->gpio_conf->cam_gpio_req_tbl,

		ctrl->gpio_conf->cam_gpio_req_tbl_size, 0);

	}

	ctrl->cam_pinctrl_status = 0;



	CDBG("%s exit\n", __func__);

	return 0;

}

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

+4 −4
Original line number Diff line number Diff line
@@ -260,11 +260,11 @@ int msm_sensor_match_id(struct msm_sensor_ctrl_t *s_ctrl) 
	sensor_name = s_ctrl->sensordata->sensor_name;



	if (adsp_shmem_is_initialized()) {

		pr_info("%s aDSP sensor_name:%s\n", __func__,

		pr_debug("%s aDSP camera supports sensor_name:%s\n", __func__,

			adsp_shmem_get_sensor_name());

		if (strnstr(sensor_name, adsp_shmem_get_sensor_name(),

			strlen(sensor_name))) {

			pr_info("%s this is special adsp sensor:%s!\n",

			pr_debug("%s ARM-side sensor matched with aDSP-side sensor:%s\n",

				__func__, sensor_name);

			return rc;

		}