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

Pull media updates from Mauro Carvalho Chehab:

 - Some documentation updates and a few new pixel formats

 - Stop btcx-risc abuse by cx88 and move it to bt8xx driver

 - New platform driver: am437x

 - New webcam driver: toptek

 - New remote controller hardware protocols added to img-ir driver

 - Removal of a few very old drivers that relies on old kABIs and are
   for very hard to find hardware: parallel port webcam drivers
   (bw-qcam, c-cam, pms and w9966), tlg2300, Video In/Out for SGI (vino)

 - Removal of the USB Telegent driver (tlg2300).  The company that
   developed this driver has long gone and the hardware is hard to find.
   As it relies on a legacy set of kABI symbols and nobody seems to care
   about it, remove it.

 - several improvements at rtl2832 driver

 - conversion on cx28521 and au0828 to use videobuf2 (VB2)

 - several improvements, fixups and board additions

* tag 'media/v3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (321 commits)
  [media] dvb_net: Convert local hex dump to print_hex_dump_debug
  [media] dvb_net: Use standard debugging facilities
  [media] dvb_net: Use vsprintf %pM extension to print Ethernet addresses
  [media] staging: lirc_serial: adjust boolean assignments
  [media] stb0899: use sign_extend32() for sign extension
  [media] si2168: add support for 1.7MHz bandwidth
  [media] si2168: return error if set_frontend is called with invalid parameters
  [media] lirc_dev: avoid potential null-dereference
  [media] mn88472: simplify bandwidth registers setting code
  [media] dvb: tc90522: re-add symbol-rate report
  [media] lmedm04: add read snr, signal strength and ber call backs
  [media] lmedm04: Create frontend call back for read status
  [media] lmedm04: create frontend callbacks for signal/snr/ber/ucblocks
  [media] lmedm04: Fix usb_submit_urb BOGUS urb xfer, pipe 1 != type 3 in interrupt urb
  [media] lmedm04: Increase Interupt due time to 200 msec
  [media] cx88-dvb: whitespace cleanup
  [media] rtl28xxu: properly initialize pdata
  [media] rtl2832: declare functions as static
  [media] rtl2830: declare functions as static
  [media] rtl2832_sdr: add kernel-doc comments for platform_data
  ...

2 files changed, 35 insertions, 29 deletions

diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index cbb5790a35cd..e9744202fa29 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -25,6 +25,7 @@
 #define __LINUX_HDMI_H_
 
 #include <linux/types.h>
+#include <linux/device.h>
 
 enum hdmi_infoframe_type {
         HDMI_INFOFRAME_TYPE_VENDOR = 0x81,
@@ -52,12 +53,18 @@ enum hdmi_colorspace {
         HDMI_COLORSPACE_RGB,
         HDMI_COLORSPACE_YUV422,
         HDMI_COLORSPACE_YUV444,
+        HDMI_COLORSPACE_YUV420,
+        HDMI_COLORSPACE_RESERVED4,
+        HDMI_COLORSPACE_RESERVED5,
+        HDMI_COLORSPACE_RESERVED6,
+        HDMI_COLORSPACE_IDO_DEFINED,
 };
 
 enum hdmi_scan_mode {
         HDMI_SCAN_MODE_NONE,
         HDMI_SCAN_MODE_OVERSCAN,
         HDMI_SCAN_MODE_UNDERSCAN,
+        HDMI_SCAN_MODE_RESERVED,
 };
 
 enum hdmi_colorimetry {
@@ -71,6 +78,7 @@ enum hdmi_picture_aspect {
         HDMI_PICTURE_ASPECT_NONE,
         HDMI_PICTURE_ASPECT_4_3,
         HDMI_PICTURE_ASPECT_16_9,
+        HDMI_PICTURE_ASPECT_RESERVED,
 };
 
 enum hdmi_active_aspect {
@@ -92,12 +100,18 @@ enum hdmi_extended_colorimetry {
         HDMI_EXTENDED_COLORIMETRY_S_YCC_601,
         HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601,
         HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB,
+
+        /* The following EC values are only defined in CEA-861-F. */
+        HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,
+        HDMI_EXTENDED_COLORIMETRY_BT2020,
+        HDMI_EXTENDED_COLORIMETRY_RESERVED,
 };
 
 enum hdmi_quantization_range {
         HDMI_QUANTIZATION_RANGE_DEFAULT,
         HDMI_QUANTIZATION_RANGE_LIMITED,
         HDMI_QUANTIZATION_RANGE_FULL,
+        HDMI_QUANTIZATION_RANGE_RESERVED,
 };
 
 /* non-uniform picture scaling */
@@ -114,7 +128,7 @@ enum hdmi_ycc_quantization_range {
 };
 
 enum hdmi_content_type {
-        HDMI_CONTENT_TYPE_NONE,
+        HDMI_CONTENT_TYPE_GRAPHICS,
         HDMI_CONTENT_TYPE_PHOTO,
         HDMI_CONTENT_TYPE_CINEMA,
         HDMI_CONTENT_TYPE_GAME,
@@ -194,6 +208,7 @@ enum hdmi_audio_coding_type {
         HDMI_AUDIO_CODING_TYPE_MLP,
         HDMI_AUDIO_CODING_TYPE_DST,
         HDMI_AUDIO_CODING_TYPE_WMA_PRO,
+        HDMI_AUDIO_CODING_TYPE_CXT,
 };
 
 enum hdmi_audio_sample_size {
@@ -215,10 +230,25 @@ enum hdmi_audio_sample_frequency {
 };
 
 enum hdmi_audio_coding_type_ext {
-        HDMI_AUDIO_CODING_TYPE_EXT_STREAM,
+        /* Refer to Audio Coding Type (CT) field in Data Byte 1 */
+        HDMI_AUDIO_CODING_TYPE_EXT_CT,
+
+        /*
+         * The next three CXT values are defined in CEA-861-E only.
+         * They do not exist in older versions, and in CEA-861-F they are
+         * defined as 'Not in use'.
+         */
         HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC,
         HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2,
         HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND,
+
+        /* The following CXT values are only defined in CEA-861-F. */
+        HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC,
+        HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_V2,
+        HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC,
+        HDMI_AUDIO_CODING_TYPE_EXT_DRA,
+        HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_SURROUND,
+        HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC_SURROUND = 10,
 };
 
 struct hdmi_audio_infoframe {
@@ -299,5 +329,8 @@ union hdmi_infoframe {
 
 ssize_t
 hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, size_t size);
+int hdmi_infoframe_unpack(union hdmi_infoframe *frame, void *buffer);
+void hdmi_infoframe_log(const char *level, struct device *dev,
+                        union hdmi_infoframe *frame);
 
 #endif /* _DRM_HDMI_H */
diff --git a/include/linux/platform_data/vsp1.h b/include/linux/platform_data/vsp1.h
deleted file mode 100644
index 63170e2614b3..000000000000
--- a/include/linux/platform_data/vsp1.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * vsp1.h  --  R-Car VSP1 Platform Data
- *
- * Copyright (C) 2013 Renesas Corporation
- *
- * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-#ifndef __PLATFORM_VSP1_H__
-#define __PLATFORM_VSP1_H__
-
-#define VSP1_HAS_LIF            (1 << 0)
-#define VSP1_HAS_LUT            (1 << 1)
-#define VSP1_HAS_SRU            (1 << 2)
-
-struct vsp1_platform_data {
-        unsigned int features;
-        unsigned int rpf_count;
-        unsigned int uds_count;
-        unsigned int wpf_count;
-};
-
-#endif /* __PLATFORM_VSP1_H__ */