V4L/DVB (13644): v4l: add new v4l2-subdev sensor operations, use g_skip_top_lines in soc-camera

Introduce new v4l2-subdev sensor operations, move .enum_framesizes() and
.enum_frameintervals() methods to it, add a new .g_skip_top_lines() method
and switch soc-camera to use it instead of .y_skip_top soc_camera_device
member, which can now be removed.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Reviewed-by: Sergio Aguirre <saaguirre@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 51b683c63b70..4df09a693ec7 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -1051,8 +1051,13 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
 {
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct pxa_camera_dev *pcdev = ici->priv;
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         unsigned long dw, bpp;
-        u32 cicr0, cicr1, cicr2, cicr3, cicr4 = 0;
+        u32 cicr0, cicr1, cicr2, cicr3, cicr4 = 0, y_skip_top;
+        int ret = v4l2_subdev_call(sd, sensor, g_skip_top_lines, &y_skip_top);
+
+        if (ret < 0)
+                y_skip_top = 0;
 
         /* Datawidth is now guaranteed to be equal to one of the three values.
          * We fix bit-per-pixel equal to data-width... */
@@ -1118,7 +1123,7 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
 
         cicr2 = 0;
         cicr3 = CICR3_LPF_VAL(icd->user_height - 1) |
-                CICR3_BFW_VAL(min((unsigned short)255, icd->y_skip_top));
+                CICR3_BFW_VAL(min((u32)255, y_skip_top));
         cicr4 |= pcdev->mclk_divisor;
 
         __raw_writel(cicr1, pcdev->base + CICR1);