Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1461741

Re: [PATCH v3 12/14] media: platform: pxa_camera: add debug register access

Show all headers | View raw

On 08/08/2016 09:30 PM, Robert Jarzmik wrote:
> Add pxa_camera registers access through advanced video debugging.
> 
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
> ---
>  drivers/media/platform/soc_camera/pxa_camera.c | 57 ++++++++++++++++++++++++++
>  1 file changed, 57 insertions(+)
> 
> diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
> index 1e15734ae287..20340489e07e 100644
> --- a/drivers/media/platform/soc_camera/pxa_camera.c
> +++ b/drivers/media/platform/soc_camera/pxa_camera.c
> @@ -1344,6 +1344,58 @@ static int pxa_camera_check_frame(u32 width, u32 height)
>  		(width & 0x01);
>  }
>  
> +#ifdef CONFIG_VIDEO_ADV_DEBUG
> +static int pxac_vidioc_g_register(struct file *file, void *priv,
> +				  struct v4l2_dbg_register *reg)
> +{
> +	struct pxa_camera_dev *pcdev = video_drvdata(file);
> +
> +	if (reg->reg > CIBR2)
> +		return -ERANGE;
> +
> +	reg->val = __raw_readl(pcdev->base + reg->reg);
> +	reg->size = sizeof(__u32);
> +	return 0;
> +}
> +
> +static int pxac_vidioc_s_register(struct file *file, void *priv,
> +				  const struct v4l2_dbg_register *reg)
> +{
> +	struct pxa_camera_dev *pcdev = video_drvdata(file);
> +
> +	if (reg->reg > CIBR2)
> +		return -ERANGE;
> +	if (reg->size != sizeof(__u32))
> +		return -EINVAL;
> +	__raw_writel(reg->val, pcdev->base + reg->reg);
> +	return 0;
> +}
> +
> +static int pxac_vidioc_g_chip_info(struct file *file, void *fh,
> +				   struct v4l2_dbg_chip_info *chip)
> +{
> +	struct pxa_camera_dev *pcdev = video_drvdata(file);
> +
> +	switch (chip->match.type) {
> +	case V4L2_CHIP_MATCH_BRIDGE:
> +		if (chip->match.addr > 0)
> +			return -EINVAL;
> +
> +		strlcpy(chip->name, "pxa-camera", sizeof(chip->name));
> +		return 0;
> +	case V4L2_CHIP_MATCH_SUBDEV:
> +		if (chip->match.addr > 0)
> +			return -EINVAL;
> +
> +		strlcpy(chip->name, pcdev->sensor->name, sizeof(chip->name));
> +		return 0;
> +	default:
> +		return -EINVAL;
> +	}
> +}

You shouldn't need this g_chip_info function, it should be handled automatically
by the v4l2 core. Just drop it.

> +
> +#endif
> +
>  static int pxac_vidioc_enum_fmt_vid_cap(struct file *filp, void  *priv,
>  					struct v4l2_fmtdesc *f)
>  {
> @@ -1594,6 +1646,11 @@ static const struct v4l2_ioctl_ops pxa_camera_ioctl_ops = {
>  	.vidioc_expbuf			= vb2_ioctl_expbuf,
>  	.vidioc_streamon		= vb2_ioctl_streamon,
>  	.vidioc_streamoff		= vb2_ioctl_streamoff,
> +#ifdef CONFIG_VIDEO_ADV_DEBUG
> +	.vidioc_g_register		= pxac_vidioc_g_register,
> +	.vidioc_s_register		= pxac_vidioc_s_register,
> +	.vidioc_g_chip_info		= pxac_vidioc_g_chip_info,
> +#endif
>  };
>  
>  static struct v4l2_clk_ops pxa_camera_mclk_ops = {
> 

Regards,

	Hans

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH v3 12/14] media: platform: pxa_camera: add debug register  access Hans Verkuil <hverkuil@xs4all.nl> - 2016-08-14 11:20 +0200
  Re: [PATCH v3 12/14] media: platform: pxa_camera: add debug register access Robert Jarzmik <robert.jarzmik@free.fr> - 2016-08-14 21:40 +0200

csiph-web