diff options
-rw-r--r-- | drivers/media/platform/soc_camera/rcar_vin.c | 3 |
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)) |