Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
  [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
  mb86a20s: Add a few more register settings at the init seq
  mb86a20s: Group registers into the same line
  [media] [PATCH] don't reset the delivery system on DTV_CLEAR
  [media] [BUG] it913x-fe fix typo error making SNR levels unstable
  [media] cx23885: Query the CX25840 during enum_input for status
  [media] cx25840: Add support for g_input_status
  [media] rc-videomate-m1f.c Rename to match remote controler name
  [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
  [media] convert drivers/media/* to use module_platform_driver()
  [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
  [media] Exynos4 JPEG codec v4l2 driver
  [media] doc: v4l: selection: choose pixels as units for selection rectangles
  [media] v4l: s5p-tv: mixer: fix setup of VP scaling
  [media] v4l: s5p-tv: mixer: add support for selection API
  [media] v4l: emulate old crop API using extended crop/compose API
  [media] doc: v4l: add documentation for selection API
  [media] doc: v4l: add binary images for selection API
  [media] v4l: add support for selection api
  [media] hd29l2: fix review findings
  ...

1 files changed, 17 insertions, 2 deletions

diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index 3bc8a61efe30..ffee1fbbc001 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -334,9 +334,10 @@ typedef enum fe_rolloff {
                 <title>fe_delivery_system type</title>
                 <para>Possible values: </para>
 <programlisting>
+
 typedef enum fe_delivery_system {
         SYS_UNDEFINED,
-        SYS_DVBC_ANNEX_AC,
+        SYS_DVBC_ANNEX_A,
         SYS_DVBC_ANNEX_B,
         SYS_DVBT,
         SYS_DSS,
@@ -353,6 +354,7 @@ typedef enum fe_delivery_system {
         SYS_DAB,
         SYS_DVBT2,
         SYS_TURBO,
+        SYS_DVBC_ANNEX_C,
 } fe_delivery_system_t;
 </programlisting>
                 </section>
@@ -647,6 +649,18 @@ typedef enum fe_hierarchy {
                         many data types via a single multiplex. The API will soon support this
                         at which point this section will be expanded.</para>
         </section>
+        <section id="DTV_ENUM_DELSYS">
+                <title><constant>DTV_ENUM_DELSYS</constant></title>
+                <para>A Multi standard frontend needs to advertise the delivery systems provided.
+                        Applications need to enumerate the provided delivery systems, before using
+                        any other operation with the frontend. Prior to it's introduction,
+                        FE_GET_INFO was used to determine a frontend type. A frontend which
+                        provides more than a single delivery system, FE_GET_INFO doesn't help much.
+                        Applications which intends to use a multistandard frontend must enumerate
+                        the delivery systems associated with it, rather than trying to use
+                        FE_GET_INFO. In the case of a legacy frontend, the result is just the same
+                        as with FE_GET_INFO, but in a more structured format </para>
+        </section>
 </section>
         <section id="frontend-property-terrestrial-systems">
         <title>Properties used on terrestrial delivery systems</title>
@@ -767,7 +781,8 @@ typedef enum fe_hierarchy {
         <title>Properties used on cable delivery systems</title>
         <section id="dvbc-params">
                 <title>DVB-C delivery system</title>
-                <para>The DVB-C Annex-A/C is the widely used cable standard. Transmission uses QAM modulation.</para>
+                <para>The DVB-C Annex-A is the widely used cable standard. Transmission uses QAM modulation.</para>
+                <para>The DVB-C Annex-C is optimized for 6MHz, and is used in Japan. It supports a subset of the Annex A modulation types, and a roll-off of 0.13, instead of 0.15</para>
                 <para>The following parameters are valid for DVB-C Annex A/C:</para>
                 <itemizedlist mark='opencircle'>
                         <listitem><para><link linkend="DTV-API-VERSION"><constant>DTV_API_VERSION</constant></link></para></listitem>