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

Commit 5e78949e 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: Export IR CUT device to mm-qcamera-daemon"

parents e5b04012 63bc645c

Documentation/devicetree/bindings/media/video/msm-cci.txt

+4 −0
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ Optional properties: 
   property should contain phandle of respective eeprom nodes

- qcom,ois-src : if optical image stabilization is supported by this sensor,

   this property should contain phandle of respective ois node

- qcom,ir-led-src : if ir led is supported by this sensor, this property

   should contain phandle of respective ir-led node

- qcom,ir-cut-src : if ir cut is supported by this sensor, this property

   should contain phandle of respective ir-cut node



* Qualcomm MSM ACTUATOR

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

+32 −0
Original line number Diff line number Diff line
@@ -282,6 +282,38 @@ int msm_sensor_get_sub_module_index(struct device_node *of_node, 
		src_node = NULL;

	}



	src_node = of_parse_phandle(of_node, "qcom,ir-led-src", 0);

	if (!src_node) {

		CDBG("%s:%d src_node NULL\n", __func__, __LINE__);

	} else {

		rc = of_property_read_u32(src_node, "cell-index", &val);

		CDBG("%s qcom,ir led cell index %d, rc %d\n", __func__,

			val, rc);

		if (rc < 0) {

			pr_err("%s:%d failed %d\n", __func__, __LINE__, rc);

			goto ERROR;

		}

		sensor_info->subdev_id[SUB_MODULE_IR_LED] = val;

		of_node_put(src_node);

		src_node = NULL;

	}



	src_node = of_parse_phandle(of_node, "qcom,ir-cut-src", 0);

	if (!src_node) {

		CDBG("%s:%d src_node NULL\n", __func__, __LINE__);

	} else {

		rc = of_property_read_u32(src_node, "cell-index", &val);

		CDBG("%s qcom,ir cut cell index %d, rc %d\n", __func__,

			val, rc);

		if (rc < 0) {

			pr_err("%s:%d failed %d\n", __func__, __LINE__, rc);

			goto ERROR;

		}

		sensor_info->subdev_id[SUB_MODULE_IR_CUT] = val;

		of_node_put(src_node);

		src_node = NULL;

	}



	rc = of_property_read_u32(of_node, "qcom,strobe-flash-sd-index", &val);

	if (rc != -EINVAL) {

		CDBG("%s qcom,strobe-flash-sd-index %d, rc %d\n", __func__,

include/uapi/media/msm_cam_sensor.h

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ enum sensor_sub_module_t { 
	SUB_MODULE_CSIPHY_3D,

	SUB_MODULE_OIS,

	SUB_MODULE_EXT,

	SUB_MODULE_IR_LED,

	SUB_MODULE_IR_CUT,

	SUB_MODULE_MAX,

};