[media] mt9v022 driver: send valid HORIZONTAL_BLANKING values to mt9v024 soc camera

This patch fixes the issue that appears when mt9v024 camera is used with the
mt9v022 soc camera driver. The minimum total row time is 690 columns
(horizontal width + horizontal blanking). The minimum horizontal
blanking is 61. Thus, when the window width is set below 627, horizontal blanking must
be increased. For the mt9v024 camera the values above are correct and
for the mt9v022 camera the correct values are in the existing kernel driver.

Signed-off-by: Andrei Andreyanau <a.andreyanau@sam-solutions.net>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c
index a5e65d6a078182d6f9830f281aeebe90bb2c201b..53eaf899d3b6d4b81123dac5701b61b2a8c866ba 100644 (file)
--- a/drivers/media/i2c/soc_camera/mt9v022.c
+++ b/drivers/media/i2c/soc_camera/mt9v022.c
@@ -275,6 +275,7 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a)
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct mt9v022 *mt9v022 = to_mt9v022(client);
        struct v4l2_rect rect = a->c;
+       int min_row, min_blank;
        int ret;
 
        /* Bayer format - even size lengths */
@@ -310,13 +311,21 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a)
                ret = reg_write(client, MT9V022_COLUMN_START, rect.left);
        if (!ret)
                ret = reg_write(client, MT9V022_ROW_START, rect.top);
+       /*
+        * mt9v022: min total row time is 660 columns, min blanking is 43
+        * mt9v024: min total row time is 690 columns, min blanking is 61
+        */
+       if (is_mt9v024(mt9v022->chip_version)) {
+               min_row = 690;
+               min_blank = 61;
+       } else {
+               min_row = 660;
+               min_blank = 43;
+       }
        if (!ret)
-               /*
-                * Default 94, Phytec driver says:
-                * "width + horizontal blank >= 660"
-                */
                ret = v4l2_ctrl_s_ctrl(mt9v022->hblank,
-                               rect.width > 660 - 43 ? 43 : 660 - rect.width);
+                               rect.width > min_row - min_blank ?
+                               min_blank : min_row - rect.width);
        if (!ret)
                ret = v4l2_ctrl_s_ctrl(mt9v022->vblank, 45);
        if (!ret)