media: i2c: imx290: Replace V4L2_CID_GAIN with V4L2_CID_ANALOGUE_GAIN
authorDavid Plowman <david.plowman@raspberrypi.com>
Thu, 4 Feb 2021 17:29:32 +0000 (17:29 +0000)
committerPhil Elwell <8911409+pelwell@users.noreply.github.com>
Fri, 5 Feb 2021 04:52:06 +0000 (04:52 +0000)
Most software (including libcamera) requires V4L2_CID_ANALOGUE_GAIN,
not V4L2_CID_GAIN.

The range for the control is 0 to 100 for which the sensor uses only
analogue gain; higher values would involve digital gain which this
control should not apply.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
drivers/media/i2c/imx290.c

index 2e646fb..a2df46e 100644 (file)
@@ -647,7 +647,7 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
                return 0;
 
        switch (ctrl->id) {
-       case V4L2_CID_GAIN:
+       case V4L2_CID_ANALOGUE_GAIN:
                ret = imx290_set_gain(imx290, ctrl->val);
                break;
        case V4L2_CID_EXPOSURE:
@@ -1331,7 +1331,7 @@ static int imx290_probe(struct i2c_client *client)
        v4l2_ctrl_handler_init(&imx290->ctrls, 4);
 
        v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-                         V4L2_CID_GAIN, 0, 238, 1, 0);
+                         V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
 
        mode = imx290->current_mode;
        imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,