media: ov5647: Support V4L2_CID_PIXEL_RATE

Clients need to know the pixel rate in order to compute exposure
and frame rate values. Advertise it.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
index 45144a6..86612f9 100644 (file)
--- a/drivers/media/i2c/ov5647.c
+++ b/drivers/media/i2c/ov5647.c
@@ -76,6 +76,7 @@ struct regval_list {
 struct ov5647_mode {
        struct v4l2_mbus_framefmt       format;
        struct v4l2_rect                crop;
+       u64                             pixel_rate;
        const struct regval_list        *reg_list;
        unsigned int                    num_regs;
 };
@@ -96,6 +97,7 @@ struct ov5647 {
        bool                            clock_ncont;
        struct v4l2_ctrl_handler        ctrls;
        const struct ov5647_mode        *mode;
+       struct v4l2_ctrl                *pixel_rate;
 };
 
 static inline struct ov5647 *to_sensor(struct v4l2_subdev *sd)
@@ -582,6 +584,7 @@ static const struct ov5647_mode ov5647_8bpp_modes[] = {
                        .width          = 1280,
                        .height         = 960,
                },
+               .pixel_rate     = 77291670,
                .reg_list       = ov5647_640x480_8bpp,
                .num_regs       = ARRAY_SIZE(ov5647_640x480_8bpp)
        },
@@ -603,6 +606,7 @@ static const struct ov5647_mode ov5647_10bpp_modes[] = {
                        .width          = 2592,
                        .height         = 1944
                },
+               .pixel_rate     = 87500000,
                .reg_list       = ov5647_2592x1944_10bpp,
                .num_regs       = ARRAY_SIZE(ov5647_2592x1944_10bpp)
        },
@@ -621,6 +625,7 @@ static const struct ov5647_mode ov5647_10bpp_modes[] = {
                        .width          = 1928,
                        .height         = 1080,
                },
+               .pixel_rate     = 81666700,
                .reg_list       = ov5647_1080p30_10bpp,
                .num_regs       = ARRAY_SIZE(ov5647_1080p30_10bpp)
        },
@@ -639,6 +644,7 @@ static const struct ov5647_mode ov5647_10bpp_modes[] = {
                        .width          = 2592,
                        .height         = 1944,
                },
+               .pixel_rate     = 81666700,
                .reg_list       = ov5647_2x2binned_10bpp,
                .num_regs       = ARRAY_SIZE(ov5647_2x2binned_10bpp)
        },
@@ -657,6 +663,7 @@ static const struct ov5647_mode ov5647_10bpp_modes[] = {
                        .width          = 2560,
                        .height         = 1920,
                },
+               .pixel_rate     = 55000000,
                .reg_list       = ov5647_640x480_10bpp,
                .num_regs       = ARRAY_SIZE(ov5647_640x480_10bpp)
        },
@@ -1080,10 +1087,13 @@ static int ov5647_set_pad_fmt(struct v4l2_subdev *sd,
 
        /* Update the sensor mode and apply at it at streamon time. */
        mutex_lock(&sensor->lock);
-       if (format->which == V4L2_SUBDEV_FORMAT_TRY)
+       if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                *v4l2_subdev_get_try_format(sd, cfg, format->pad) = mode->format;
-       else
+       } else {
                sensor->mode = mode;
+               __v4l2_ctrl_modify_range(sensor->pixel_rate, mode->pixel_rate,
+                                        mode->pixel_rate, 1, mode->pixel_rate);
+       }
        *fmt = mode->format;
        mutex_unlock(&sensor->lock);
 
@@ -1288,6 +1298,9 @@ static int ov5647_s_ctrl(struct v4l2_ctrl *ctrl)
                return  ov5647_s_analogue_gain(sd, ctrl->val);
        case V4L2_CID_EXPOSURE:
                return ov5647_s_exposure(sd, ctrl->val);
+       case V4L2_CID_PIXEL_RATE:
+               /* Read-only, but we adjust it based on mode. */
+               return 0;
        default:
                dev_info(&client->dev,
                         "Control (id:0x%x, val:0x%x) not supported\n",
@@ -1306,7 +1319,7 @@ static int ov5647_init_controls(struct ov5647 *sensor)
 {
        struct i2c_client *client = v4l2_get_subdevdata(&sensor->sd);
 
-       v4l2_ctrl_handler_init(&sensor->ctrls, 5);
+       v4l2_ctrl_handler_init(&sensor->ctrls, 6);
 
        v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
                          V4L2_CID_AUTOGAIN, 0, 1, 1, 0);
@@ -1326,18 +1339,26 @@ static int ov5647_init_controls(struct ov5647 *sensor)
        v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
                          V4L2_CID_ANALOGUE_GAIN, 16, 1023, 1, 32);
 
-       if (sensor->ctrls.error) {
-               dev_err(&client->dev,
-                       "%s Controls initialization failed (%d)\n",
-                       __func__, sensor->ctrls.error);
-               v4l2_ctrl_handler_free(&sensor->ctrls);
-
-               return sensor->ctrls.error;
-       }
+       /* By default, PIXEL_RATE is read only, but it does change per mode */
+       sensor->pixel_rate = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
+                                              V4L2_CID_PIXEL_RATE,
+                                              sensor->mode->pixel_rate,
+                                              sensor->mode->pixel_rate, 1,
+                                              sensor->mode->pixel_rate);
+       if (sensor->ctrls.error)
+               goto handler_free;
 
+       sensor->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY;
        sensor->sd.ctrl_handler = &sensor->ctrls;
 
        return 0;
+
+handler_free:
+       dev_err(&client->dev, "%s Controls initialization failed (%d)\n",
+               __func__, sensor->ctrls.error);
+       v4l2_ctrl_handler_free(&sensor->ctrls);
+
+       return sensor->ctrls.error;
 }
 
 static int ov5647_parse_dt(struct ov5647 *sensor, struct device_node *np)