These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / i2c / mt9v011.c

diff --git a/kernel/drivers/media/i2c/mt9v011.c b/kernel/drivers/media/i2c/mt9v011.c
index a10f7f8..a4a5c39 100644 (file)
--- a/kernel/drivers/media/i2c/mt9v011.c
+++ b/kernel/drivers/media/i2c/mt9v011.c
@@ -324,19 +324,25 @@ static int mt9v011_reset(struct v4l2_subdev *sd, u32 val)
        return 0;
 }
 
-static int mt9v011_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-                                       u32 *code)
+static int mt9v011_enum_mbus_code(struct v4l2_subdev *sd,
+               struct v4l2_subdev_pad_config *cfg,
+               struct v4l2_subdev_mbus_code_enum *code)
 {
-       if (index > 0)
+       if (code->pad || code->index > 0)
                return -EINVAL;
 
-       *code = MEDIA_BUS_FMT_SGRBG8_1X8;
+       code->code = MEDIA_BUS_FMT_SGRBG8_1X8;
        return 0;
 }
 
-static int mt9v011_try_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
+static int mt9v011_set_fmt(struct v4l2_subdev *sd,
+               struct v4l2_subdev_pad_config *cfg,
+               struct v4l2_subdev_format *format)
 {
-       if (fmt->code != MEDIA_BUS_FMT_SGRBG8_1X8)
+       struct v4l2_mbus_framefmt *fmt = &format->format;
+       struct mt9v011 *core = to_mt9v011(sd);
+
+       if (format->pad || fmt->code != MEDIA_BUS_FMT_SGRBG8_1X8)
                return -EINVAL;
 
        v4l_bound_align_image(&fmt->width, 48, 639, 1,
@@ -344,6 +350,15 @@ static int mt9v011_try_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
        fmt->field = V4L2_FIELD_NONE;
        fmt->colorspace = V4L2_COLORSPACE_SRGB;
 
+       if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
+               core->width = fmt->width;
+               core->height = fmt->height;
+
+               set_res(sd);
+       } else {
+               cfg->try_fmt = *fmt;
+       }
+
        return 0;
 }
 
@@ -385,23 +400,6 @@ static int mt9v011_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
        return 0;
 }
 
-static int mt9v011_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
-{
-       struct mt9v011 *core = to_mt9v011(sd);
-       int rc;
-
-       rc = mt9v011_try_mbus_fmt(sd, fmt);
-       if (rc < 0)
-               return -EINVAL;
-
-       core->width = fmt->width;
-       core->height = fmt->height;
-
-       set_res(sd);
-
-       return 0;
-}
-
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int mt9v011_g_register(struct v4l2_subdev *sd,
                              struct v4l2_dbg_register *reg)
@@ -469,16 +467,19 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = {
 };
 
 static const struct v4l2_subdev_video_ops mt9v011_video_ops = {
-       .enum_mbus_fmt = mt9v011_enum_mbus_fmt,
-       .try_mbus_fmt = mt9v011_try_mbus_fmt,
-       .s_mbus_fmt = mt9v011_s_mbus_fmt,
        .g_parm = mt9v011_g_parm,
        .s_parm = mt9v011_s_parm,
 };
 
+static const struct v4l2_subdev_pad_ops mt9v011_pad_ops = {
+       .enum_mbus_code = mt9v011_enum_mbus_code,
+       .set_fmt = mt9v011_set_fmt,
+};
+
 static const struct v4l2_subdev_ops mt9v011_ops = {
        .core  = &mt9v011_core_ops,
        .video = &mt9v011_video_ops,
+       .pad   = &mt9v011_pad_ops,
 };
 
 
@@ -582,7 +583,6 @@ MODULE_DEVICE_TABLE(i2c, mt9v011_id);
 
 static struct i2c_driver mt9v011_driver = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = "mt9v011",
        },
        .probe          = mt9v011_probe,