39 files changed, 53 insertions, 53 deletions

diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c
index d12bd33f39cb..a0a6ee6398fe 100644
--- a/drivers/media/parport/bw-qcam.c
+++ b/drivers/media/parport/bw-qcam.c
@@ -965,7 +965,7 @@ static struct qcam *qcam_init(struct parport *port)
         q->drv_priv = qcam;
         q->ops = &qcam_video_qops;
         q->mem_ops = &vb2_vmalloc_memops;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         err = vb2_queue_init(q);
         if (err < 0) {
                 v4l2_err(v4l2_dev, "couldn't init vb2_queue for %s.\n", port->name);
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index 281916591437..200bec91182e 100644
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -997,7 +997,7 @@ static int bcap_probe(struct platform_device *pdev)
         q->buf_struct_size = sizeof(struct bcap_buffer);
         q->ops = &bcap_video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret)
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 61f3dbcc259f..81b6f7b1d6af 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -2428,7 +2428,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         src_vq->ops = &coda_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         ret = vb2_queue_init(src_vq);
         if (ret)
@@ -2440,7 +2440,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         dst_vq->ops = &coda_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         return vb2_queue_init(dst_vq);
 }
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index b02aba488826..e512767cf7ea 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -1415,7 +1415,7 @@ static int vpbe_display_reqbufs(struct file *file, void *priv,
         q->ops = &video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct vpbe_disp_buffer);
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret) {
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 735ec47601a9..cd6da8b78108 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1023,7 +1023,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         q->ops = &video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct vpif_cap_buffer);
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret) {
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 9d115cdc6bdb..fd68236657c2 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -983,7 +983,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         q->ops = &video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct vpif_disp_buffer);
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret) {
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index 810c3e13970c..6741025e7dcb 100644
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -590,7 +590,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->ops = &gsc_m2m_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         ret = vb2_queue_init(src_vq);
         if (ret)
@@ -603,7 +603,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->ops = &gsc_m2m_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         return vb2_queue_init(dst_vq);
 }
diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 8a712ca91d11..92ae812abce2 100644
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -1782,7 +1782,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc,
         q->ops = &fimc_capture_qops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct fimc_vid_buffer);
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         q->lock = &fimc->lock;
 
         ret = vb2_queue_init(q);
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 1234734bccf4..2be4bb522cad 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -1313,7 +1313,7 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct flite_buffer);
         q->drv_priv = fimc;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         q->lock = &fimc->lock;
 
         ret = vb2_queue_init(q);
diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c
index 9da95bd14820..bfc900d67a59 100644
--- a/drivers/media/platform/exynos4-is/fimc-m2m.c
+++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
@@ -557,7 +557,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->ops = &fimc_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         src_vq->lock = &ctx->fimc_dev->lock;
 
         ret = vb2_queue_init(src_vq);
@@ -570,7 +570,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->ops = &fimc_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         dst_vq->lock = &ctx->fimc_dev->lock;
 
         return vb2_queue_init(dst_vq);
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 6bb86b581a34..f3a9e248ca4a 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -868,7 +868,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         src_vq->ops = &deinterlace_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         q_data[V4L2_M2M_SRC].fmt = &formats[0];
         q_data[V4L2_M2M_SRC].width = 640;
         q_data[V4L2_M2M_SRC].height = 480;
@@ -885,7 +885,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         dst_vq->ops = &deinterlace_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         q_data[V4L2_M2M_DST].fmt = &formats[0];
         q_data[V4L2_M2M_DST].width = 640;
         q_data[V4L2_M2M_DST].height = 480;
diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index 08e24379b794..02a40c541e4e 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -777,7 +777,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         src_vq->ops = &m2mtest_qops;
         src_vq->mem_ops = &vb2_vmalloc_memops;
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         src_vq->lock = &ctx->dev->dev_mutex;
 
         ret = vb2_queue_init(src_vq);
@@ -790,7 +790,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         dst_vq->ops = &m2mtest_qops;
         dst_vq->mem_ops = &vb2_vmalloc_memops;
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         dst_vq->lock = &ctx->dev->dev_mutex;
 
         return vb2_queue_init(dst_vq);
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index c690435853bd..af3e1069ac44 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -766,7 +766,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         src_vq->ops = &emmaprp_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         ret = vb2_queue_init(src_vq);
         if (ret)
@@ -778,7 +778,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         dst_vq->ops = &emmaprp_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         return vb2_queue_init(dst_vq);
 }
diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index 5372111addd3..4e4d1631e042 100644
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -1160,7 +1160,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct camif_buffer);
         q->drv_priv = vp;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret)
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index 0fcf7d75e841..bf7c9b38c088 100644
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -157,7 +157,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->ops = &g2d_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         src_vq->lock = &ctx->dev->mutex;
 
         ret = vb2_queue_init(src_vq);
@@ -170,7 +170,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->ops = &g2d_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         dst_vq->lock = &ctx->dev->mutex;
 
         return vb2_queue_init(dst_vq);
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index a1c78c870b68..f5e987035fdb 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1701,7 +1701,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         src_vq->ops = &s5p_jpeg_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         src_vq->lock = &ctx->jpeg->lock;
 
         ret = vb2_queue_init(src_vq);
@@ -1714,7 +1714,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         dst_vq->ops = &s5p_jpeg_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         dst_vq->lock = &ctx->jpeg->lock;
 
         return vb2_queue_init(dst_vq);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index e2aac592d29f..0e8c171b3cbd 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -794,7 +794,7 @@ static int s5p_mfc_open(struct file *file)
                 goto err_queue_init;
         }
         q->mem_ops = (struct vb2_mem_ops *)&vb2_dma_contig_memops;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         ret = vb2_queue_init(q);
         if (ret) {
                 mfc_err("Failed to initialize videobuf2 queue(capture)\n");
@@ -816,7 +816,7 @@ static int s5p_mfc_open(struct file *file)
                 goto err_queue_init;
         }
         q->mem_ops = (struct vb2_mem_ops *)&vb2_dma_contig_memops;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         ret = vb2_queue_init(q);
         if (ret) {
                 mfc_err("Failed to initialize videobuf2 queue(output)\n");
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 4835173d7f80..f0b6c900034d 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -472,7 +472,7 @@ static int isi_camera_init_videobuf(struct vb2_queue *q,
         q->buf_struct_size = sizeof(struct frame_buffer);
         q->ops = &isi_video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         return vb2_queue_init(q);
 }
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index d73abca9c6ee..3e844803bdca 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -794,7 +794,7 @@ static int mx2_camera_init_videobuf(struct vb2_queue *q,
         q->ops = &mx2_videobuf_ops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct mx2_buffer);
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         return vb2_queue_init(q);
 }
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index f975b7008692..9ed81ac6881c 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -453,7 +453,7 @@ static int mx3_camera_init_videobuf(struct vb2_queue *q,
         q->ops = &mx3_videobuf_ops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct mx3_camera_buffer);
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         return vb2_queue_init(q);
 }
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 3b1c05a72d00..0ff5cfaf2677 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1360,7 +1360,7 @@ static int rcar_vin_init_videobuf2(struct vb2_queue *vq,
         vq->ops = &rcar_vin_vb2_ops;
         vq->mem_ops = &vb2_dma_contig_memops;
         vq->buf_struct_size = sizeof(struct rcar_vin_buffer);
-        vq->timestamp_type  = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        vq->timestamp_flags  = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         return vb2_queue_init(vq);
 }
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 150bd4df413c..3e75a469cd49 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -1665,7 +1665,7 @@ static int sh_mobile_ceu_init_videobuf(struct vb2_queue *q,
         q->ops = &sh_mobile_ceu_videobuf_ops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct sh_mobile_ceu_buffer);
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         return vb2_queue_init(q);
 }
diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
index 1296c5386231..8ea3b89149cb 100644
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -1770,7 +1770,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         src_vq->ops = &vpe_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         ret = vb2_queue_init(src_vq);
         if (ret)
@@ -1783,7 +1783,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         dst_vq->ops = &vpe_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
         return vb2_queue_init(dst_vq);
 }
diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
index e9cd96ecf4d0..776015bc187d 100644
--- a/drivers/media/platform/vivi.c
+++ b/drivers/media/platform/vivi.c
@@ -1429,7 +1429,7 @@ static int __init vivi_create_instance(int inst)
         q->buf_struct_size = sizeof(struct vivi_buffer);
         q->ops = &vivi_video_qops;
         q->mem_ops = &vb2_vmalloc_memops;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret)
diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index b4687a834f85..e41f07d36c2b 100644
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -1051,7 +1051,7 @@ int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf)
         video->queue.buf_struct_size = sizeof(struct vsp1_video_buffer);
         video->queue.ops = &vsp1_video_queue_qops;
         video->queue.mem_ops = &vb2_dma_contig_memops;
-        video->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        video->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         ret = vb2_queue_init(&video->queue);
         if (ret < 0) {
                 dev_err(video->vsp1->dev, "failed to initialize vb2 queue\n");
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 19af6b3e9e2b..13466c47023c 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1029,7 +1029,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
         q = &dev->vb_vidq;
         q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         q->drv_priv = dev;
         q->buf_struct_size = sizeof(struct em28xx_buffer);
         q->ops = &em28xx_video_qops;
@@ -1043,7 +1043,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
         q = &dev->vb_vbiq;
         q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
         q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         q->drv_priv = dev;
         q->buf_struct_size = sizeof(struct em28xx_buffer);
         q->ops = &em28xx_vbi_qops;
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index abf365ab025d..8bef0152b1ce 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -1001,7 +1001,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
         pdev->vb_queue.buf_struct_size = sizeof(struct pwc_frame_buf);
         pdev->vb_queue.ops = &pwc_vb_queue_ops;
         pdev->vb_queue.mem_ops = &vb2_vmalloc_memops;
-        pdev->vb_queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        pdev->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         rc = vb2_queue_init(&pdev->vb_queue);
         if (rc < 0) {
                 PWC_ERROR("Oops, could not initialize vb2 queue.\n");
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index ef66b1b74a9b..4c7513af2450 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -1664,7 +1664,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
                 q->buf_struct_size = sizeof(struct s2255_buffer);
                 q->mem_ops = &vb2_vmalloc_memops;
                 q->ops = &s2255_video_qops;
-                q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+                q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
                 ret = vb2_queue_init(q);
                 if (ret != 0) {
                         dev_err(&dev->udev->dev,
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index c45c9881bb5f..37bc00f418f1 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -641,7 +641,7 @@ int stk1160_vb2_setup(struct stk1160 *dev)
         q->buf_struct_size = sizeof(struct stk1160_buffer);
         q->ops = &stk1160_video_qops;
         q->mem_ops = &vb2_vmalloc_memops;
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         rc = vb2_queue_init(q);
         if (rc < 0)
diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
index 496bc2ec26b4..01ed1ec89989 100644
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c
@@ -679,7 +679,7 @@ int usbtv_video_init(struct usbtv *usbtv)
         usbtv->vb2q.buf_struct_size = sizeof(struct usbtv_buf);
         usbtv->vb2q.ops = &usbtv_vb2_ops;
         usbtv->vb2q.mem_ops = &vb2_vmalloc_memops;
-        usbtv->vb2q.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        usbtv->vb2q.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         usbtv->vb2q.lock = &usbtv->vb2q_lock;
         ret = vb2_queue_init(&usbtv->vb2q);
         if (ret < 0) {
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index ff7be9702486..7c146167b103 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -151,7 +151,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
         queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
         queue->queue.ops = &uvc_queue_qops;
         queue->queue.mem_ops = &vb2_vmalloc_memops;
-        queue->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        queue->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         ret = vb2_queue_init(&queue->queue);
         if (ret)
                 return ret;
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index edab3af525b2..411429c402e7 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -488,7 +488,7 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
          * Clear any buffer state related flags.
          */
         b->flags &= ~V4L2_BUFFER_MASK_FLAGS;
-        b->flags |= q->timestamp_type;
+        b->flags |= q->timestamp_flags;
 
         switch (vb->state) {
         case VB2_BUF_STATE_QUEUED:
@@ -1473,7 +1473,7 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
                  * For output buffers copy the timestamp if needed,
                  * and the timecode field and flag if needed.
                  */
-                if (q->timestamp_type == V4L2_BUF_FLAG_TIMESTAMP_COPY)
+                if (q->timestamp_flags == V4L2_BUF_FLAG_TIMESTAMP_COPY)
                         vb->v4l2_buf.timestamp = b->timestamp;
                 vb->v4l2_buf.flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;
                 if (b->flags & V4L2_BUF_FLAG_TIMECODE)
@@ -2226,11 +2226,11 @@ int vb2_queue_init(struct vb2_queue *q)
             WARN_ON(!q->io_modes)         ||
             WARN_ON(!q->ops->queue_setup) ||
             WARN_ON(!q->ops->buf_queue)   ||
-            WARN_ON(q->timestamp_type & ~V4L2_BUF_FLAG_TIMESTAMP_MASK))
+            WARN_ON(q->timestamp_flags & ~V4L2_BUF_FLAG_TIMESTAMP_MASK))
                 return -EINVAL;
 
         /* Warn that the driver should choose an appropriate timestamp type */
-        WARN_ON(q->timestamp_type == V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN);
+        WARN_ON(q->timestamp_flags == V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN);
 
         INIT_LIST_HEAD(&q->queued_list);
         INIT_LIST_HEAD(&q->done_list);
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index e729e52639c5..e2357873458c 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -391,7 +391,7 @@ dt3155_open(struct file *filp)
                         goto err_alloc_queue;
                 }
                 pd->q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                pd->q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+                pd->q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
                 pd->q->io_modes = VB2_READ | VB2_MMAP;
                 pd->q->ops = &q_ops;
                 pd->q->mem_ops = &vb2_dma_contig_memops;
diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c
index edc52e2630a9..efacda244452 100644
--- a/drivers/staging/media/go7007/go7007-v4l2.c
+++ b/drivers/staging/media/go7007/go7007-v4l2.c
@@ -989,7 +989,7 @@ int go7007_v4l2_init(struct go7007 *go)
         go->vidq.mem_ops = &vb2_vmalloc_memops;
         go->vidq.drv_priv = go;
         go->vidq.buf_struct_size = sizeof(struct go7007_buffer);
-        go->vidq.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        go->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         go->vidq.lock = &go->queue_lock;
         rv = vb2_queue_init(&go->vidq);
         if (rv)
diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/staging/media/msi3101/sdr-msi3101.c
index 4c3bf776bb20..04ff29e597b8 100644
--- a/drivers/staging/media/msi3101/sdr-msi3101.c
+++ b/drivers/staging/media/msi3101/sdr-msi3101.c
@@ -1851,7 +1851,7 @@ static int msi3101_probe(struct usb_interface *intf,
         s->vb_queue.buf_struct_size = sizeof(struct msi3101_frame_buf);
         s->vb_queue.ops = &msi3101_vb2_ops;
         s->vb_queue.mem_ops = &vb2_vmalloc_memops;
-        s->vb_queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        s->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         ret = vb2_queue_init(&s->vb_queue);
         if (ret < 0) {
                 dev_err(&s->udev->dev, "Could not initialize vb2 queue\n");
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 8c7f35029cd5..ded31ea6bd39 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -1074,7 +1074,7 @@ static int iss_video_open(struct file *file)
         q->ops = &iss_video_vb2ops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->buf_struct_size = sizeof(struct iss_buffer);
-        q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 
         ret = vb2_queue_init(q);
         if (ret) {
diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
index ce9e5aaf7fd4..edcabcddebd6 100644
--- a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
@@ -1290,7 +1290,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
         solo_enc->vidq.mem_ops = &vb2_dma_sg_memops;
         solo_enc->vidq.drv_priv = solo_enc;
         solo_enc->vidq.gfp_flags = __GFP_DMA32;
-        solo_enc->vidq.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        solo_enc->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         solo_enc->vidq.buf_struct_size = sizeof(struct solo_vb2_buf);
         solo_enc->vidq.lock = &solo_enc->lock;
         ret = vb2_queue_init(&solo_enc->vidq);
diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2.c b/drivers/staging/media/solo6x10/solo6x10-v4l2.c
index 47e72dac9b13..1815f765d033 100644
--- a/drivers/staging/media/solo6x10/solo6x10-v4l2.c
+++ b/drivers/staging/media/solo6x10/solo6x10-v4l2.c
@@ -676,7 +676,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
         solo_dev->vidq.ops = &solo_video_qops;
         solo_dev->vidq.mem_ops = &vb2_dma_contig_memops;
         solo_dev->vidq.drv_priv = solo_dev;
-        solo_dev->vidq.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        solo_dev->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
         solo_dev->vidq.gfp_flags = __GFP_DMA32;
         solo_dev->vidq.buf_struct_size = sizeof(struct solo_vb2_buf);
         solo_dev->vidq.lock = &solo_dev->lock;
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index bef53ce555d2..3770be6e972d 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -342,7 +342,7 @@ struct vb2_queue {
         const struct vb2_mem_ops        *mem_ops;
         void                            *drv_priv;
         unsigned int                    buf_struct_size;
-        u32                             timestamp_type;
+        u32                             timestamp_flags;
         gfp_t                           gfp_flags;
 
 /* private: internal use only */