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;