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

[kvmfornfv.git] / kernel / drivers / media / i2c / soc_camera / mt9m111.c

diff --git a/kernel/drivers/media/i2c/soc_camera/mt9m111.c b/kernel/drivers/media/i2c/soc_camera/mt9m111.c
index 441e0fd..6dfaead 100644 (file)
--- a/kernel/drivers/media/i2c/soc_camera/mt9m111.c
+++ b/kernel/drivers/media/i2c/soc_camera/mt9m111.c
@@ -447,11 +447,16 @@ static int mt9m111_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
        return 0;
 }
 
-static int mt9m111_g_fmt(struct v4l2_subdev *sd,
-                        struct v4l2_mbus_framefmt *mf)
+static int mt9m111_get_fmt(struct v4l2_subdev *sd,
+               struct v4l2_subdev_pad_config *cfg,
+               struct v4l2_subdev_format *format)
 {
+       struct v4l2_mbus_framefmt *mf = &format->format;
        struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);
 
+       if (format->pad)
+               return -EINVAL;
+
        mf->width       = mt9m111->width;
        mf->height      = mt9m111->height;
        mf->code        = mt9m111->fmt->code;
@@ -531,14 +536,20 @@ static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111,
        return ret;
 }
 
-static int mt9m111_try_fmt(struct v4l2_subdev *sd,
-                          struct v4l2_mbus_framefmt *mf)
+static int mt9m111_set_fmt(struct v4l2_subdev *sd,
+               struct v4l2_subdev_pad_config *cfg,
+               struct v4l2_subdev_format *format)
 {
+       struct v4l2_mbus_framefmt *mf = &format->format;
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);
        const struct mt9m111_datafmt *fmt;
        struct v4l2_rect *rect = &mt9m111->rect;
        bool bayer;
+       int ret;
+
+       if (format->pad)
+               return -EINVAL;
 
        fmt = mt9m111_find_datafmt(mt9m111, mf->code);
 
@@ -572,20 +583,10 @@ static int mt9m111_try_fmt(struct v4l2_subdev *sd,
        mf->code = fmt->code;
        mf->colorspace = fmt->colorspace;
 
-       return 0;
-}
-
-static int mt9m111_s_fmt(struct v4l2_subdev *sd,
-                        struct v4l2_mbus_framefmt *mf)
-{
-       const struct mt9m111_datafmt *fmt;
-       struct mt9m111 *mt9m111 = container_of(sd, struct mt9m111, subdev);
-       struct v4l2_rect *rect = &mt9m111->rect;
-       int ret;
-
-       mt9m111_try_fmt(sd, mf);
-       fmt = mt9m111_find_datafmt(mt9m111, mf->code);
-       /* try_fmt() guarantees fmt != NULL && fmt->code == mf->code */
+       if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+               cfg->try_fmt = *mf;
+               return 0;
+       }
 
        ret = mt9m111_setup_geometry(mt9m111, rect, mf->width, mf->height, mf->code);
        if (!ret)
@@ -839,13 +840,14 @@ static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = {
 #endif
 };
 
-static int mt9m111_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           u32 *code)
+static int mt9m111_enum_mbus_code(struct v4l2_subdev *sd,
+               struct v4l2_subdev_pad_config *cfg,
+               struct v4l2_subdev_mbus_code_enum *code)
 {
-       if (index >= ARRAY_SIZE(mt9m111_colour_fmts))
+       if (code->pad || code->index >= ARRAY_SIZE(mt9m111_colour_fmts))
                return -EINVAL;
 
-       *code = mt9m111_colour_fmts[index].code;
+       code->code = mt9m111_colour_fmts[code->index].code;
        return 0;
 }
 
@@ -865,19 +867,22 @@ static int mt9m111_g_mbus_config(struct v4l2_subdev *sd,
 }
 
 static struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = {
-       .s_mbus_fmt     = mt9m111_s_fmt,
-       .g_mbus_fmt     = mt9m111_g_fmt,
-       .try_mbus_fmt   = mt9m111_try_fmt,
        .s_crop         = mt9m111_s_crop,
        .g_crop         = mt9m111_g_crop,
        .cropcap        = mt9m111_cropcap,
-       .enum_mbus_fmt  = mt9m111_enum_fmt,
        .g_mbus_config  = mt9m111_g_mbus_config,
 };
 
+static const struct v4l2_subdev_pad_ops mt9m111_subdev_pad_ops = {
+       .enum_mbus_code = mt9m111_enum_mbus_code,
+       .get_fmt        = mt9m111_get_fmt,
+       .set_fmt        = mt9m111_set_fmt,
+};
+
 static struct v4l2_subdev_ops mt9m111_subdev_ops = {
        .core   = &mt9m111_subdev_core_ops,
        .video  = &mt9m111_subdev_video_ops,
+       .pad    = &mt9m111_subdev_pad_ops,
 };
 
 /*