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

Commit 7b21ec62 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: Add support to query ISP ID"

parents 696677be 0b13113b

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+13 −0
Original line number Diff line number Diff line
@@ -752,6 +752,19 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev, 
		}

		break;

	}

	case GET_ISP_ID: {

		uint32_t *isp_id = NULL;



		if (cmd_len < sizeof(uint32_t)) {

			pr_err("%s:%d failed: invalid cmd len %u exp %u\n",

				__func__, __LINE__, cmd_len,

				sizeof(uint32_t));

			return -EINVAL;

		}



		isp_id = (uint32_t *)cfg_data;

		*isp_id = vfe_dev->pdev->id;

	}

	}

	return 0;

}

include/media/msmb_isp.h

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ enum msm_vfe_reg_cfg_type { 
	VFE_READ_DMI_32BIT,

	VFE_READ_DMI_64BIT,

	GET_MAX_CLK_RATE,

	GET_ISP_ID,

};



struct msm_vfe_cfg_cmd2 {