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

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

diff --git a/kernel/drivers/media/i2c/soc_camera/tw9910.c b/kernel/drivers/media/i2c/soc_camera/tw9910.c
index 9b85321..e939c24 100644 (file)
--- a/kernel/drivers/media/i2c/soc_camera/tw9910.c
+++ b/kernel/drivers/media/i2c/soc_camera/tw9910.c
@@ -510,13 +510,39 @@ static int tw9910_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct tw9910_priv *priv = to_tw9910(client);
+       const unsigned hact = 720;
+       const unsigned hdelay = 15;
+       unsigned vact;
+       unsigned vdelay;
+       int ret;
 
        if (!(norm & (V4L2_STD_NTSC | V4L2_STD_PAL)))
                return -EINVAL;
 
        priv->norm = norm;
+       if (norm & V4L2_STD_525_60) {
+               vact = 240;
+               vdelay = 18;
+               ret = tw9910_mask_set(client, VVBI, 0x10, 0x10);
+       } else {
+               vact = 288;
+               vdelay = 24;
+               ret = tw9910_mask_set(client, VVBI, 0x10, 0x00);
+       }
+       if (!ret)
+               ret = i2c_smbus_write_byte_data(client, CROP_HI,
+                       ((vdelay >> 2) & 0xc0) |
+                       ((vact >> 4) & 0x30) |
+                       ((hdelay >> 6) & 0x0c) |
+                       ((hact >> 8) & 0x03));
+       if (!ret)
+               ret = i2c_smbus_write_byte_data(client, VDELAY_LO,
+                       vdelay & 0xff);
+       if (!ret)
+               ret = i2c_smbus_write_byte_data(client, VACTIVE_LO,
+                       vact & 0xff);
 
-       return 0;
+       return ret;
 }
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -691,12 +717,17 @@ static int tw9910_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
        return 0;
 }
 
-static int tw9910_g_fmt(struct v4l2_subdev *sd,
-                       struct v4l2_mbus_framefmt *mf)
+static int tw9910_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 i2c_client *client = v4l2_get_subdevdata(sd);
        struct tw9910_priv *priv = to_tw9910(client);
 
+       if (format->pad)
+               return -EINVAL;
+
        if (!priv->scale) {
                priv->scale = tw9910_select_norm(priv->norm, 640, 480);
                if (!priv->scale)
@@ -706,7 +737,7 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
        mf->width       = priv->scale->width;
        mf->height      = priv->scale->height;
        mf->code        = MEDIA_BUS_FMT_UYVY8_2X8;
-       mf->colorspace  = V4L2_COLORSPACE_JPEG;
+       mf->colorspace  = V4L2_COLORSPACE_SMPTE170M;
        mf->field       = V4L2_FIELD_INTERLACED_BT;
 
        return 0;
@@ -727,7 +758,7 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd,
        if (mf->code != MEDIA_BUS_FMT_UYVY8_2X8)
                return -EINVAL;
 
-       mf->colorspace = V4L2_COLORSPACE_JPEG;
+       mf->colorspace = V4L2_COLORSPACE_SMPTE170M;
 
        ret = tw9910_set_frame(sd, &width, &height);
        if (!ret) {
@@ -737,13 +768,18 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd,
        return ret;
 }
 
-static int tw9910_try_fmt(struct v4l2_subdev *sd,
-                         struct v4l2_mbus_framefmt *mf)
+static int tw9910_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 tw9910_priv *priv = to_tw9910(client);
        const struct tw9910_scale_ctrl *scale;
 
+       if (format->pad)
+               return -EINVAL;
+
        if (V4L2_FIELD_ANY == mf->field) {
                mf->field = V4L2_FIELD_INTERLACED_BT;
        } else if (V4L2_FIELD_INTERLACED_BT != mf->field) {
@@ -752,7 +788,7 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
        }
 
        mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
-       mf->colorspace = V4L2_COLORSPACE_JPEG;
+       mf->colorspace = V4L2_COLORSPACE_SMPTE170M;
 
        /*
         * select suitable norm
@@ -764,6 +800,9 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
        mf->width       = scale->width;
        mf->height      = scale->height;
 
+       if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
+               return tw9910_s_fmt(sd, mf);
+       cfg->try_fmt = *mf;
        return 0;
 }
 
@@ -807,6 +846,7 @@ static int tw9910_video_probe(struct i2c_client *client)
                 "tw9910 Product ID %0x:%0x\n", id, priv->revision);
 
        priv->norm = V4L2_STD_NTSC;
+       priv->scale = &tw9910_ntsc_scales[0];
 
 done:
        tw9910_s_power(&priv->subdev, 0);
@@ -821,13 +861,14 @@ static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
        .s_power        = tw9910_s_power,
 };
 
-static int tw9910_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                          u32 *code)
+static int tw9910_enum_mbus_code(struct v4l2_subdev *sd,
+               struct v4l2_subdev_pad_config *cfg,
+               struct v4l2_subdev_mbus_code_enum *code)
 {
-       if (index)
+       if (code->pad || code->index)
                return -EINVAL;
 
-       *code = MEDIA_BUS_FMT_UYVY8_2X8;
+       code->code = MEDIA_BUS_FMT_UYVY8_2X8;
        return 0;
 }
 
@@ -880,20 +921,23 @@ static struct v4l2_subdev_video_ops tw9910_subdev_video_ops = {
        .s_std          = tw9910_s_std,
        .g_std          = tw9910_g_std,
        .s_stream       = tw9910_s_stream,
-       .g_mbus_fmt     = tw9910_g_fmt,
-       .s_mbus_fmt     = tw9910_s_fmt,
-       .try_mbus_fmt   = tw9910_try_fmt,
        .cropcap        = tw9910_cropcap,
        .g_crop         = tw9910_g_crop,
-       .enum_mbus_fmt  = tw9910_enum_fmt,
        .g_mbus_config  = tw9910_g_mbus_config,
        .s_mbus_config  = tw9910_s_mbus_config,
        .g_tvnorms      = tw9910_g_tvnorms,
 };
 
+static const struct v4l2_subdev_pad_ops tw9910_subdev_pad_ops = {
+       .enum_mbus_code = tw9910_enum_mbus_code,
+       .get_fmt        = tw9910_get_fmt,
+       .set_fmt        = tw9910_set_fmt,
+};
+
 static struct v4l2_subdev_ops tw9910_subdev_ops = {
        .core   = &tw9910_subdev_core_ops,
        .video  = &tw9910_subdev_video_ops,
+       .pad    = &tw9910_subdev_pad_ops,
 };
 
 /*