aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorKoji Matsuoka <koji.matsuoka.xm@renesas.com>2014-10-22 00:05:36 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-12-12 07:29:20 -0500
commit609f33c928026a2b3833bc3db23e4fabafa3306e (patch)
tree7369a8d0bbf0ae45ee12f035decd988c4b067b72 /drivers/media
parent4c28078c0eed3f9130f758e74934763207defa19 (diff)
[media] rcar_vin: Enable VSYNC field toggle mode
By applying this patch, it sets to VSYNC field toggle mode not only at the time of progressive mode but at the time of an interlace mode. Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/soc_camera/rcar_vin.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index c71ef2b526a0..1b1d5bc16afe 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -130,6 +130,7 @@
130#define VNDMR2_VPS (1 << 30) 130#define VNDMR2_VPS (1 << 30)
131#define VNDMR2_HPS (1 << 29) 131#define VNDMR2_HPS (1 << 29)
132#define VNDMR2_FTEV (1 << 17) 132#define VNDMR2_FTEV (1 << 17)
133#define VNDMR2_VLV(n) ((n & 0xf) << 12)
133 134
134#define VIN_MAX_WIDTH 2048 135#define VIN_MAX_WIDTH 2048
135#define VIN_MAX_HEIGHT 2048 136#define VIN_MAX_HEIGHT 2048
@@ -1243,7 +1244,7 @@ static int rcar_vin_set_bus_param(struct soc_camera_device *icd)
1243 if (ret < 0 && ret != -ENOIOCTLCMD) 1244 if (ret < 0 && ret != -ENOIOCTLCMD)
1244 return ret; 1245 return ret;
1245 1246
1246 val = priv->field == V4L2_FIELD_NONE ? VNDMR2_FTEV : 0; 1247 val = VNDMR2_FTEV | VNDMR2_VLV(1);
1247 if (!(common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) 1248 if (!(common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW))
1248 val |= VNDMR2_VPS; 1249 val |= VNDMR2_VPS;
1249 if (!(common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) 1250 if (!(common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW))