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

Groups > linux.kernel > #1477222

[PATCH v6 11/14] media: platform: pxa_camera: add debug register access

Show all headers | View raw

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 | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index 395cd398c32b..fb89b85f59ab 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -1342,6 +1342,34 @@ 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;
+}
+#endif
+
 static int pxac_vidioc_enum_fmt_vid_cap(struct file *filp, void  *priv,
 					struct v4l2_fmtdesc *f)
 {
@@ -1592,6 +1620,10 @@ 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,
+#endif
 };
 
 static struct v4l2_clk_ops pxa_camera_mclk_ops = {
-- 
2.1.4

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

Thread

[PATCH v6 01/14] media: mt9m111: make a standalone v4l2 subdevice Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:10 +0200
  [PATCH v6 08/14] media: platform: pxa_camera: add buffer sequencing Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:10 +0200
  [PATCH v6 04/14] media: platform: pxa_camera: convert to vb2 Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:10 +0200
  [PATCH v6 02/14] media: mt9m111: use only the SRGB colorspace Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:10 +0200
  [PATCH v6 09/14] media: platform: pxa_camera: remove set_selection Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:10 +0200
  [PATCH v6 13/14] media: platform: pxa_camera: move pxa_camera out of soc_camera Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:20 +0200
    Re: [PATCH v6 13/14] media: platform: pxa_camera: move pxa_camera out  of soc_camera Hans Verkuil <hverkuil@xs4all.nl> - 2016-09-06 12:30 +0200
  [PATCH v6 07/14] media: platform: pxa_camera: make printk consistent Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:20 +0200
  [PATCH v6 06/14] media: platform: pxa_camera: introduce sensor_call Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:20 +0200
  [PATCH v6 11/14] media: platform: pxa_camera: add debug register access Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:40 +0200
  [PATCH v6 14/14] media: platform: pxa_camera: fix style Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:40 +0200
  [PATCH v6 12/14] media: platform: pxa_camera: change stop_streaming semantics Robert Jarzmik <robert.jarzmik@free.fr> - 2016-09-06 11:40 +0200

csiph-web