Merge tag 'media/v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - a new frontend driver for new ATSC devices: lgdt3306a

 - a new sensor driver: ov2659

 - a new platform driver: xilinx

 - the m88ts2022 tuner driver was merged at ts2020 driver

 - the media controller gained experimental support for DVB and hybrid
   devices

 - lots of random cleanups, fixes and improvements on media drivers

* tag 'media/v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (404 commits)
  [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
  [media] uvcvideo: fix cropcap v4l2-compliance failure
  [media] media: omap3isp: remove unused clkdev
  [media] coda: Add tracing support
  [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
  [media] coda: fix fill bitstream errors in nonstreaming case
  [media] coda: call SEQ_END when the first queue is stopped
  [media] coda: fail to start streaming if userspace set invalid formats
  [media] coda: remove duplicate error messages for buffer allocations
  [media] coda: move parameter buffer in together with context buffer allocation
  [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
  [media] coda: allocate per-context buffers from REQBUFS
  [media] coda: use strlcpy instead of snprintf
  [media] coda: bitstream payload is unsigned
  [media] coda: fix double call to debugfs_remove
  [media] coda: check kasprintf return value in coda_open
  [media] coda: bitrate can only be set in kbps steps
  [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
  [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
  [media] coda: set allow_zero_bytesused flag for vb2_queue_init
  ...

8 files changed, 192 insertions, 45 deletions

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 38df23435ebb..640954b9ecf9 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -447,5 +447,6 @@ header-y += wireless.h
 header-y += x25.h
 header-y += xattr.h
 header-y += xfrm.h
+header-y += xilinx-v4l2-controls.h
 header-y += zorro.h
 header-y += zorro_ids.h
diff --git a/include/uapi/linux/am437x-vpfe.h b/include/uapi/linux/am437x-vpfe.h
index 9b03033f9cd6..d75774317b9b 100644
--- a/include/uapi/linux/am437x-vpfe.h
+++ b/include/uapi/linux/am437x-vpfe.h
@@ -21,6 +21,8 @@
 #ifndef AM437X_VPFE_USER_H
 #define AM437X_VPFE_USER_H
 
+#include <linux/videodev2.h>
+
 enum vpfe_ccdc_data_size {
         VPFE_CCDC_DATA_16BITS = 0,
         VPFE_CCDC_DATA_15BITS,
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 73c78f18a328..190d491d5b13 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -45,6 +45,7 @@
 #define MEDIA_BUS_FMT_RGB565_2X8_BE             0x1007
 #define MEDIA_BUS_FMT_RGB565_2X8_LE             0x1008
 #define MEDIA_BUS_FMT_RGB666_1X18               0x1009
+#define MEDIA_BUS_FMT_RBG888_1X24               0x100e
 #define MEDIA_BUS_FMT_RGB666_1X24_CPADHI        0x1015
 #define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG         0x1010
 #define MEDIA_BUS_FMT_BGR888_1X24               0x1013
@@ -55,6 +56,7 @@
 #define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG         0x1011
 #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA        0x1012
 #define MEDIA_BUS_FMT_ARGB8888_1X32             0x100d
+#define MEDIA_BUS_FMT_RGB888_1X32_PADHI         0x100f
 
 /* YUV (including grey) - next is       0x2026 */
 #define MEDIA_BUS_FMT_Y8_1X8                    0x2001
@@ -73,6 +75,10 @@
 #define MEDIA_BUS_FMT_YUYV10_2X10               0x200b
 #define MEDIA_BUS_FMT_YVYU10_2X10               0x200c
 #define MEDIA_BUS_FMT_Y12_1X12                  0x2013
+#define MEDIA_BUS_FMT_UYVY12_2X12               0x201c
+#define MEDIA_BUS_FMT_VYUY12_2X12               0x201d
+#define MEDIA_BUS_FMT_YUYV12_2X12               0x201e
+#define MEDIA_BUS_FMT_YVYU12_2X12               0x201f
 #define MEDIA_BUS_FMT_UYVY8_1X16                0x200f
 #define MEDIA_BUS_FMT_VYUY8_1X16                0x2010
 #define MEDIA_BUS_FMT_YUYV8_1X16                0x2011
@@ -82,17 +88,14 @@
 #define MEDIA_BUS_FMT_VYUY10_1X20               0x201b
 #define MEDIA_BUS_FMT_YUYV10_1X20               0x200d
 #define MEDIA_BUS_FMT_YVYU10_1X20               0x200e
+#define MEDIA_BUS_FMT_VUY8_1X24                 0x2024
 #define MEDIA_BUS_FMT_YUV8_1X24                 0x2025
-#define MEDIA_BUS_FMT_YUV10_1X30                0x2016
-#define MEDIA_BUS_FMT_AYUV8_1X32                0x2017
-#define MEDIA_BUS_FMT_UYVY12_2X12               0x201c
-#define MEDIA_BUS_FMT_VYUY12_2X12               0x201d
-#define MEDIA_BUS_FMT_YUYV12_2X12               0x201e
-#define MEDIA_BUS_FMT_YVYU12_2X12               0x201f
 #define MEDIA_BUS_FMT_UYVY12_1X24               0x2020
 #define MEDIA_BUS_FMT_VYUY12_1X24               0x2021
 #define MEDIA_BUS_FMT_YUYV12_1X24               0x2022
 #define MEDIA_BUS_FMT_YVYU12_1X24               0x2023
+#define MEDIA_BUS_FMT_YUV10_1X30                0x2016
+#define MEDIA_BUS_FMT_AYUV8_1X32                0x2017
 
 /* Bayer - next is      0x3019 */
 #define MEDIA_BUS_FMT_SBGGR8_1X8                0x3001
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index d847c760e8f0..4e816be3de39 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -50,7 +50,14 @@ struct media_device_info {
 #define MEDIA_ENT_T_DEVNODE_V4L         (MEDIA_ENT_T_DEVNODE + 1)
 #define MEDIA_ENT_T_DEVNODE_FB          (MEDIA_ENT_T_DEVNODE + 2)
 #define MEDIA_ENT_T_DEVNODE_ALSA        (MEDIA_ENT_T_DEVNODE + 3)
-#define MEDIA_ENT_T_DEVNODE_DVB         (MEDIA_ENT_T_DEVNODE + 4)
+#define MEDIA_ENT_T_DEVNODE_DVB_FE      (MEDIA_ENT_T_DEVNODE + 4)
+#define MEDIA_ENT_T_DEVNODE_DVB_DEMUX   (MEDIA_ENT_T_DEVNODE + 5)
+#define MEDIA_ENT_T_DEVNODE_DVB_DVR     (MEDIA_ENT_T_DEVNODE + 6)
+#define MEDIA_ENT_T_DEVNODE_DVB_CA      (MEDIA_ENT_T_DEVNODE + 7)
+#define MEDIA_ENT_T_DEVNODE_DVB_NET     (MEDIA_ENT_T_DEVNODE + 8)
+
+/* Legacy symbol. Use it to avoid userspace compilation breakages */
+#define MEDIA_ENT_T_DEVNODE_DVB         MEDIA_ENT_T_DEVNODE_DVB_FE
 
 #define MEDIA_ENT_T_V4L2_SUBDEV         (2 << MEDIA_ENT_TYPE_SHIFT)
 #define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR  (MEDIA_ENT_T_V4L2_SUBDEV + 1)
@@ -59,6 +66,8 @@ struct media_device_info {
 /* A converter of analogue video to its digital representation. */
 #define MEDIA_ENT_T_V4L2_SUBDEV_DECODER (MEDIA_ENT_T_V4L2_SUBDEV + 4)
 
+#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER   (MEDIA_ENT_T_V4L2_SUBDEV + 5)
+
 #define MEDIA_ENT_FL_DEFAULT            (1 << 0)
 
 struct media_entity_desc {
@@ -78,17 +87,48 @@ struct media_entity_desc {
                 struct {
                         __u32 major;
                         __u32 minor;
-                } v4l;
-                struct {
-                        __u32 major;
-                        __u32 minor;
-                } fb;
+                } dev;
+
+#if 1
+                /*
+                 * TODO: this shouldn't have been added without
+                 * actual drivers that use this. When the first real driver
+                 * appears that sets this information, special attention
+                 * should be given whether this information is 1) enough, and
+                 * 2) can deal with udev rules that rename devices. The struct
+                 * dev would not be sufficient for this since that does not
+                 * contain the subdevice information. In addition, struct dev
+                 * can only refer to a single device, and not to multiple (e.g.
+                 * pcm and mixer devices).
+                 *
+                 * So for now mark this as a to do.
+                 */
                 struct {
                         __u32 card;
                         __u32 device;
                         __u32 subdevice;
                 } alsa;
+#endif
+
+#if 1
+                /*
+                 * DEPRECATED: previous node specifications. Kept just to
+                 * avoid breaking compilation, but media_entity_desc.dev
+                 * should be used instead. In particular, alsa and dvb
+                 * fields below are wrong: for all devnodes, there should
+                 * be just major/minor inside the struct, as this is enough
+                 * to represent any devnode, no matter what type.
+                 */
+                struct {
+                        __u32 major;
+                        __u32 minor;
+                } v4l;
+                struct {
+                        __u32 major;
+                        __u32 minor;
+                } fb;
                 int dvb;
+#endif
 
                 /* Sub-device specifications */
                 /* Nothing needed yet */
diff --git a/include/uapi/linux/v4l2-dv-timings.h b/include/uapi/linux/v4l2-dv-timings.h
index 6c8f159e416e..c039f1d68a09 100644
--- a/include/uapi/linux/v4l2-dv-timings.h
+++ b/include/uapi/linux/v4l2-dv-timings.h
@@ -48,14 +48,15 @@
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(720, 480, 1, 0, \
                 13500000, 19, 62, 57, 4, 3, 15, 4, 3, 16, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_720X480P59_94 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(720, 480, 0, 0, \
                 27000000, 16, 62, 60, 9, 6, 30, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 /* Note: these are the nominal timings, for HDMI links this format is typically
@@ -64,14 +65,15 @@
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(720, 576, 1, 0, \
                 13500000, 12, 63, 69, 2, 3, 19, 2, 3, 20, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_720X576P50 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(720, 576, 0, 0, \
                 27000000, 12, 64, 68, 5, 5, 39, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1280X720P24 { \
@@ -88,7 +90,7 @@
         V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 2420, 40, 220, 5, 5, 20, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1280X720P30 { \
@@ -96,7 +98,8 @@
         V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1280X720P50 { \
@@ -104,7 +107,7 @@
         V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 440, 40, 220, 5, 5, 20, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1280X720P60 { \
@@ -112,7 +115,8 @@
         V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 110, 40, 220, 5, 5, 20, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P24 { \
@@ -120,7 +124,8 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 638, 44, 148, 4, 5, 36, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P25 { \
@@ -128,7 +133,7 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P30 { \
@@ -136,7 +141,8 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080I50 { \
@@ -144,7 +150,8 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 1, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 528, 44, 148, 2, 5, 15, 2, 5, 16, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P50 { \
@@ -152,7 +159,7 @@
         V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 148500000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080I60 { \
@@ -161,7 +168,8 @@
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 74250000, 88, 44, 148, 2, 5, 15, 2, 5, 16, \
                 V4L2_DV_BT_STD_CEA861, \
-                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_HALF_LINE) \
+                V4L2_DV_FL_CAN_REDUCE_FPS | \
+                V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_1920X1080P60 { \
@@ -170,77 +178,83 @@
                 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
                 148500000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
                 V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
-                V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P24 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 1276, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P25 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P30 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P50 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 594000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P60 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 594000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P24 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 1020, 88, 296, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P25 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P30 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 297000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P50 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 594000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, 0) \
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P60 { \
         .type = V4L2_DV_BT_656_1120, \
         V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
                 594000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
-                V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \
+                V4L2_DV_BT_STD_CEA861, \
+                V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 
diff --git a/include/uapi/linux/v4l2-subdev.h b/include/uapi/linux/v4l2-subdev.h
index e0a7e3da498a..dbce2b554e02 100644
--- a/include/uapi/linux/v4l2-subdev.h
+++ b/include/uapi/linux/v4l2-subdev.h
@@ -69,12 +69,14 @@ struct v4l2_subdev_crop {
  * @pad: pad number, as reported by the media API
  * @index: format index during enumeration
  * @code: format code (MEDIA_BUS_FMT_ definitions)
+ * @which: format type (from enum v4l2_subdev_format_whence)
  */
 struct v4l2_subdev_mbus_code_enum {
         __u32 pad;
         __u32 index;
         __u32 code;
-        __u32 reserved[9];
+        __u32 which;
+        __u32 reserved[8];
 };
 
 /**
@@ -82,6 +84,7 @@ struct v4l2_subdev_mbus_code_enum {
  * @pad: pad number, as reported by the media API
  * @index: format index during enumeration
  * @code: format code (MEDIA_BUS_FMT_ definitions)
+ * @which: format type (from enum v4l2_subdev_format_whence)
  */
 struct v4l2_subdev_frame_size_enum {
         __u32 index;
@@ -91,7 +94,8 @@ struct v4l2_subdev_frame_size_enum {
         __u32 max_width;
         __u32 min_height;
         __u32 max_height;
-        __u32 reserved[9];
+        __u32 which;
+        __u32 reserved[8];
 };
 
 /**
@@ -113,6 +117,7 @@ struct v4l2_subdev_frame_interval {
  * @width: frame width in pixels
  * @height: frame height in pixels
  * @interval: frame interval in seconds
+ * @which: format type (from enum v4l2_subdev_format_whence)
  */
 struct v4l2_subdev_frame_interval_enum {
         __u32 index;
@@ -121,7 +126,8 @@ struct v4l2_subdev_frame_interval_enum {
         __u32 width;
         __u32 height;
         struct v4l2_fract interval;
-        __u32 reserved[9];
+        __u32 which;
+        __u32 reserved[8];
 };
 
 /**
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index fbdc3602ee27..fa376f7666ba 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -268,9 +268,10 @@ enum v4l2_ycbcr_encoding {
 
 enum v4l2_quantization {
         /*
-         * The default for R'G'B' quantization is always full range. For
-         * Y'CbCr the quantization is always limited range, except for
-         * SYCC, XV601, XV709 or JPEG: those are full range.
+         * The default for R'G'B' quantization is always full range, except
+         * for the BT2020 colorspace. For Y'CbCr the quantization is always
+         * limited range, except for COLORSPACE_JPEG, SYCC, XV601 or XV709:
+         * those are full range.
          */
         V4L2_QUANTIZATION_DEFAULT     = 0,
         V4L2_QUANTIZATION_FULL_RANGE  = 1,
@@ -1187,6 +1188,12 @@ struct v4l2_bt_timings {
    exactly the same number of half-lines. Whether half-lines can be detected
    or used depends on the hardware. */
 #define V4L2_DV_FL_HALF_LINE                    (1 << 3)
+/* If set, then this is a Consumer Electronics (CE) video format. Such formats
+ * differ from other formats (commonly called IT formats) in that if RGB
+ * encoding is used then by default the RGB values use limited range (i.e.
+ * use the range 16-235) as opposed to 0-255. All formats defined in CEA-861
+ * except for the 640x480 format are CE formats. */
+#define V4L2_DV_FL_IS_CE_VIDEO                  (1 << 4)
 
 /* A few useful defines to calculate the total blanking and frame sizes */
 #define V4L2_DV_BT_BLANKING_WIDTH(bt) \
@@ -1456,6 +1463,7 @@ struct v4l2_querymenu {
 #define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
 #define V4L2_CTRL_FLAG_VOLATILE         0x0080
 #define V4L2_CTRL_FLAG_HAS_PAYLOAD      0x0100
+#define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200
 
 /*  Query flags, to be ORed with the control ID */
 #define V4L2_CTRL_FLAG_NEXT_CTRL        0x80000000
@@ -1841,8 +1849,8 @@ struct v4l2_mpeg_vbi_fmt_ivtv {
  */
 struct v4l2_plane_pix_format {
         __u32           sizeimage;
-        __u16           bytesperline;
-        __u16           reserved[7];
+        __u32           bytesperline;
+        __u16           reserved[6];
 } __attribute__ ((packed));
 
 /**
diff --git a/include/uapi/linux/xilinx-v4l2-controls.h b/include/uapi/linux/xilinx-v4l2-controls.h
new file mode 100644
index 000000000000..fb495b91e800
--- /dev/null
+++ b/include/uapi/linux/xilinx-v4l2-controls.h
@@ -0,0 +1,73 @@
+/*
+ * Xilinx Controls Header
+ *
+ * Copyright (C) 2013-2015 Ideas on Board
+ * Copyright (C) 2013-2015 Xilinx, Inc.
+ *
+ * Contacts: Hyun Kwon <hyun.kwon@xilinx.com>
+ *           Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __UAPI_XILINX_V4L2_CONTROLS_H__
+#define __UAPI_XILINX_V4L2_CONTROLS_H__
+
+#include <linux/v4l2-controls.h>
+
+#define V4L2_CID_XILINX_OFFSET  0xc000
+#define V4L2_CID_XILINX_BASE    (V4L2_CID_USER_BASE + V4L2_CID_XILINX_OFFSET)
+
+/*
+ * Private Controls for Xilinx Video IPs
+ */
+
+/*
+ * Xilinx TPG Video IP
+ */
+
+#define V4L2_CID_XILINX_TPG                     (V4L2_CID_USER_BASE + 0xc000)
+
+/* Draw cross hairs */
+#define V4L2_CID_XILINX_TPG_CROSS_HAIRS         (V4L2_CID_XILINX_TPG + 1)
+/* Enable a moving box */
+#define V4L2_CID_XILINX_TPG_MOVING_BOX          (V4L2_CID_XILINX_TPG + 2)
+/* Mask out a color component */
+#define V4L2_CID_XILINX_TPG_COLOR_MASK          (V4L2_CID_XILINX_TPG + 3)
+/* Enable a stuck pixel feature */
+#define V4L2_CID_XILINX_TPG_STUCK_PIXEL         (V4L2_CID_XILINX_TPG + 4)
+/* Enable a noisy output */
+#define V4L2_CID_XILINX_TPG_NOISE               (V4L2_CID_XILINX_TPG + 5)
+/* Enable the motion feature */
+#define V4L2_CID_XILINX_TPG_MOTION              (V4L2_CID_XILINX_TPG + 6)
+/* Configure the motion speed of moving patterns */
+#define V4L2_CID_XILINX_TPG_MOTION_SPEED        (V4L2_CID_XILINX_TPG + 7)
+/* The row of horizontal cross hair location */
+#define V4L2_CID_XILINX_TPG_CROSS_HAIR_ROW      (V4L2_CID_XILINX_TPG + 8)
+/* The colum of vertical cross hair location */
+#define V4L2_CID_XILINX_TPG_CROSS_HAIR_COLUMN   (V4L2_CID_XILINX_TPG + 9)
+/* Set starting point of sine wave for horizontal component */
+#define V4L2_CID_XILINX_TPG_ZPLATE_HOR_START    (V4L2_CID_XILINX_TPG + 10)
+/* Set speed of the horizontal component */
+#define V4L2_CID_XILINX_TPG_ZPLATE_HOR_SPEED    (V4L2_CID_XILINX_TPG + 11)
+/* Set starting point of sine wave for vertical component */
+#define V4L2_CID_XILINX_TPG_ZPLATE_VER_START    (V4L2_CID_XILINX_TPG + 12)
+/* Set speed of the vertical component */
+#define V4L2_CID_XILINX_TPG_ZPLATE_VER_SPEED    (V4L2_CID_XILINX_TPG + 13)
+/* Moving box size */
+#define V4L2_CID_XILINX_TPG_BOX_SIZE            (V4L2_CID_XILINX_TPG + 14)
+/* Moving box color */
+#define V4L2_CID_XILINX_TPG_BOX_COLOR           (V4L2_CID_XILINX_TPG + 15)
+/* Upper limit count of generated stuck pixels */
+#define V4L2_CID_XILINX_TPG_STUCK_PIXEL_THRESH  (V4L2_CID_XILINX_TPG + 16)
+/* Noise level */
+#define V4L2_CID_XILINX_TPG_NOISE_GAIN          (V4L2_CID_XILINX_TPG + 17)
+
+#endif /* __UAPI_XILINX_V4L2_CONTROLS_H__ */