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

Commit 98cddae6 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: Fix media_entity assignment"

parents c325b5ab 586ba08d

drivers/media/platform/msm/camera_v2/Makefile

+1 −1
Original line number Diff line number Diff line 
ccflags-y += -Idrivers/media/platform/msm/camera_v2

ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor

ccflags-y += -Idrivers/media/platform/msm/camera_v2/codecs

ccflags-y += -Idrivers/media/platform/msm/camera_v2/isps

ccflags-y += -Idrivers/media/platform/msm/camera_v2/isp

ccflags-y += -Idrivers/media/platform/msm/camera_v2/pproc

ccflags-y += -Idrivers/media/platform/msm/camera_v2/msm_vb2

ccflags-y += -Idrivers/media/platform/msm/camera_v2/camera

drivers/media/platform/msm/camera_v2/camera/camera.c

+1 −3
Original line number Diff line number Diff line
@@ -917,9 +917,7 @@ int camera_init_v4l2(struct device *dev, unsigned int *session) 
	rc = media_entity_pads_init(&pvdev->vdev->entity, 0, NULL);

	if (WARN_ON(rc < 0))

		goto entity_fail;

	pvdev->vdev->entity.function = MEDIA_ENT_F_IO_V4L;

	//TODO: Use entity.name in from userspcae to find device.

	//pvdev->vdev->entity.group_id = QCAMERA_VNODE_GROUP_ID;

	pvdev->vdev->entity.function = QCAMERA_VNODE_GROUP_ID;

#endif



	v4l2_dev->notify = NULL;

drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c

+2 −2
Original line number Diff line number Diff line
@@ -1390,7 +1390,7 @@ static int cam_smmu_alloc_scratch_buffer_add_to_list(int idx, 
					virt_len, &iova);



	if (rc < 0) {

		pr_err("Could not find valid iova for scratch buffer");

		pr_err("Could not find valid iova for scratch buffer\n");

		goto err_iommu_map;

	}
@@ -2118,7 +2118,7 @@ static int cam_smmu_populate_sids(struct device *dev, 
	/* set the name of the context bank */

	property = of_get_property(dev->of_node, "iommus", &cnt);

	cnt /= 4;

	for (i = 0, j = 0; i < cnt; i = i + 2, j++) {

	for (i = 0, j = 0; i < cnt; i = i + 3, j++) {

		rc = of_property_read_u32_index(dev->of_node,

			"iommus", i + 1, &cb->sids[j]);

		if (rc < 0)

drivers/media/platform/msm/camera_v2/common/cam_soc_api.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ int msm_camera_regulator_set_mode(struct msm_cam_regulator *vdd_info, 
			CDBG("name : %s, enable : %d\n", tmp->name, mode);

			if (mode) {

				rc = regulator_set_mode(tmp->vdd,

					REGULATOR_MODE_FAST);

					REGULATOR_MODE_NORMAL);

				if (rc < 0) {

					pr_err("regulator enable failed %d\n",

						i);

drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c

+5 −5
Original line number Diff line number Diff line
@@ -408,14 +408,14 @@ int msm_camera_config_vreg(struct device *dev, struct camera_vreg_t *cam_vreg, 
		return -EINVAL;

	}



	if (cam_vreg == NULL) {

		pr_err("%s:%d cam_vreg sequence invalid\n", __func__, __LINE__);

		return -EINVAL;

	}



	if (!num_vreg_seq)

		num_vreg_seq = num_vreg;



	if ((cam_vreg == NULL) && num_vreg_seq) {

		pr_err("%s:%d cam_vreg NULL\n", __func__, __LINE__);

		return -EINVAL;

	}



	if (config) {

		for (i = 0; i < num_vreg_seq; i++) {

			if (vreg_seq) {