8 files changed, 49 insertions, 17 deletions
diff --git a/v4l2-spec/common.sgml b/v4l2-spec/common.sgml
index ff595960b..75c7141e3 100644
--- a/v4l2-spec/common.sgml
+++ b/v4l2-spec/common.sgml
@@ -491,7 +491,7 @@ the &VIDIOC-G-MODULATOR; and &VIDIOC-S-MODULATOR; ioctl. Note that
 <constant>VIDIOC_S_MODULATOR</constant> does not switch the current
 modulator, when there is more than one at all. The modulator is solely
 determined by the current video output. Drivers must support both
-ioctls and set the <constant>V4L2_CAP_TUNER</constant> (sic) flag in
+ioctls and set the <constant>V4L2_CAP_MODULATOR</constant> flag in
 the &v4l2-capability; returned by the &VIDIOC-QUERYCAP; ioctl when the
 device has one or more modulators.</para>
     </section>
diff --git a/v4l2-spec/compat.sgml b/v4l2-spec/compat.sgml
index c1c725f35..bcc372c18 100644
--- a/v4l2-spec/compat.sgml
+++ b/v4l2-spec/compat.sgml
@@ -2300,6 +2300,9 @@ was renamed to <structname id=v4l2-chip-ident-old>v4l2_chip_ident_old</structnam
 	  <para>Finalized the RDS capture API. See <xref linkend="rds"> for
 more information.</para>
 	</listitem>
+	<listitem>
+	  <para>Added new capabilities for modulators and RDS encoders.</para>
+	</listitem>
        </orderedlist>
      </section>
    </section>
diff --git a/v4l2-spec/dev-radio.sgml b/v4l2-spec/dev-radio.sgml
index ae8367219..4d521d2a8 100644
--- a/v4l2-spec/dev-radio.sgml
+++ b/v4l2-spec/dev-radio.sgml
@@ -1,7 +1,7 @@
   <title>Radio Interface</title>
 
   <para>This interface is intended for AM and FM (analog) radio
-receivers.</para>
+receivers and transmitters.</para>
 
   <para>Conventionally V4L2 radio devices are accessed through
 character device special files named <filename>/dev/radio</filename>
@@ -14,7 +14,8 @@ numbers 64 to 127.</para>
 
     <para>Devices supporting the radio interface set the
 <constant>V4L2_CAP_RADIO</constant> and
-<constant>V4L2_CAP_TUNER</constant> flag in the
+<constant>V4L2_CAP_TUNER</constant> or
+<constant>V4L2_CAP_MODULATOR</constant> flag in the
 <structfield>capabilities</structfield> field of &v4l2-capability;
 returned by the &VIDIOC-QUERYCAP; ioctl. Other combinations of
 capability flags are reserved for future extensions.</para>
@@ -25,7 +26,7 @@ capability flags are reserved for future extensions.</para>
 
     <para>Radio devices can support <link
 linkend="control">controls</link>, and must support the <link
-linkend="tuner">tuner</link> ioctls.</para>
+linkend="tuner">tuner or modulator</link> ioctls.</para>
 
     <para>They do not support the video input or output, audio input
 or output, video standard, cropping and scaling, compression and
@@ -38,11 +39,12 @@ methods are reserved for future extensions.</para>
 
     <para>Radio devices may have a couple audio controls (as discussed
 in <xref linkend="control">) such as a volume control, possibly custom
-controls. Further all radio devices have one tuner (these are
+controls. Further all radio devices have one tuner or modulator (these are
 discussed in <xref linkend="tuner">) with index number zero to select
 the radio frequency and to determine if a monaural or FM stereo
-program is received. Drivers switch automatically between AM and FM
-depending on the selected frequency. The &VIDIOC-G-TUNER; ioctl
+program is received/emitted. Drivers switch automatically between AM and FM
+depending on the selected frequency. The &VIDIOC-G-TUNER; or
+&VIDIOC-G-MODULATOR; ioctl
 reports the supported frequency range.</para>
   </section>
 
diff --git a/v4l2-spec/dev-rds.sgml b/v4l2-spec/dev-rds.sgml
index 8f357d9f0..9d59d0cb0 100644
--- a/v4l2-spec/dev-rds.sgml
+++ b/v4l2-spec/dev-rds.sgml
@@ -24,16 +24,24 @@ be needed, then please contact the linux-media mailing list: &v4l-ml;.</para>
     <para>Devices supporting the RDS capturing API
 set the <constant>V4L2_CAP_RDS_CAPTURE</constant> flag in
 the <structfield>capabilities</structfield> field of &v4l2-capability;
-returned by the &VIDIOC-QUERYCAP; ioctl.</para>
-
-    <para>Any tuner that supports RDS will set the
+returned by the &VIDIOC-QUERYCAP; ioctl.
+Any tuner that supports RDS will set the
 <constant>V4L2_TUNER_CAP_RDS</constant> flag in the <structfield>capability</structfield>
-field of &v4l2-tuner;.</para>
-
-    <para>Whether an RDS signal is present can be detected by looking at
+field of &v4l2-tuner;.
+Whether an RDS signal is present can be detected by looking at
 the <structfield>rxsubchans</structfield> field of &v4l2-tuner;: the
 <constant>V4L2_TUNER_SUB_RDS</constant> will be set if RDS data was detected.</para>
 
+    <para>Devices supporting the RDS output API
+set the <constant>V4L2_CAP_RDS_OUTPUT</constant> flag in
+the <structfield>capabilities</structfield> field of &v4l2-capability;
+returned by the &VIDIOC-QUERYCAP; ioctl.
+Any modulator that supports RDS will set the
+<constant>V4L2_TUNER_CAP_RDS</constant> flag in the <structfield>capability</structfield>
+field of &v4l2-modulator;.
+In order to enable the RDS transmission one must set the <constant>V4L2_TUNER_SUB_RDS</constant>
+bit in the <structfield>txsubchans</structfield> field of &v4l2-modulator;.</para>
+
   </section>
 
   <section>
diff --git a/v4l2-spec/pixfmt.sgml b/v4l2-spec/pixfmt.sgml
index 1be70eea0..9e6bebeb4 100644
--- a/v4l2-spec/pixfmt.sgml
+++ b/v4l2-spec/pixfmt.sgml
@@ -765,6 +765,11 @@ kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm
 	    <entry>'S910'</entry>
 	    <entry>Compressed format of the SN9C102 driver.</entry>
 	  </row>
+	  <row id="V4L2-PIX-FMT-SN9C20X-I420">
+	    <entry><constant>V4L2_PIX_FMT_SN9C20X_I420</constant></entry>
+	    <entry>'S920'</entry>
+	    <entry>YUV 4:2:0 format of the gspca sn9c20x driver.</entry>
+	  </row>
 	  <row id="V4L2-PIX-FMT-WNVA">
 	    <entry><constant>V4L2_PIX_FMT_WNVA</constant></entry>
 	    <entry>'WNVA'</entry>
diff --git a/v4l2-spec/v4l2.sgml b/v4l2-spec/v4l2.sgml
index 815e96ab5..bae7eb441 100644
--- a/v4l2-spec/v4l2.sgml
+++ b/v4l2-spec/v4l2.sgml
@@ -134,7 +134,8 @@ applications. -->
 	<revnumber>0.26</revnumber>
 	<date>2009-06-15</date>
 	<authorinitials>hv</authorinitials>
-	<revremark>Finalized the RDS capture API.</revremark>
+	<revremark>Finalized the RDS capture API. Added modulator and RDS encoder
+capabilities.</revremark>
       </revision>
 
       <revision>
diff --git a/v4l2-spec/vidioc-g-modulator.sgml b/v4l2-spec/vidioc-g-modulator.sgml
index a3ea5ef8a..945147f90 100644
--- a/v4l2-spec/vidioc-g-modulator.sgml
+++ b/v4l2-spec/vidioc-g-modulator.sgml
@@ -212,6 +212,11 @@ does not permit SAP the <constant>VIDIOC_S_MODULATOR</constant> ioctl
 shall return an &EINVAL; and driver shall fall back to mono or stereo
 mode.</entry>
 	  </row>
+	  <row>
+	    <entry><constant>V4L2_TUNER_SUB_RDS</constant></entry>
+	    <entry>0x0010</entry>
+	    <entry>Enable the RDS encoder for a radio FM transmitter.</entry>
+	  </row>
 	</tbody>
       </tgroup>
     </table>
diff --git a/v4l2-spec/vidioc-querycap.sgml b/v4l2-spec/vidioc-querycap.sgml
index 4a741f5e9..fa12ae738 100644
--- a/v4l2-spec/vidioc-querycap.sgml
+++ b/v4l2-spec/vidioc-querycap.sgml
@@ -208,9 +208,9 @@ hardware frequency seeking.</entry>
 	  <row>
 	    <entry><constant>V4L2_CAP_TUNER</constant></entry>
 	    <entry>0x00010000</entry>
-	    <entry>The device has some sort of tuner or modulator to
-receive or emit RF-modulated video signals. For more information about
-tuner and modulator programming see
+	    <entry>The device has some sort of tuner to
+receive RF-modulated video signals. For more information about
+tuner programming see
 <xref linkend="tuner">.</entry>
 	  </row>
 	  <row>
@@ -228,6 +228,14 @@ interface. For more information on audio inputs and outputs see <xref
 	    <entry>This is a radio receiver.</entry>
 	  </row>
 	  <row>
+	    <entry><constant>V4L2_CAP_MODULATOR</constant></entry>
+	    <entry>0x00080000</entry>
+	    <entry>The device has some sort of modulator to
+emit RF-modulated video/audio signals. For more information about
+modulator programming see
+<xref linkend="tuner">.</entry>
+	  </row>
+	  <row>
 	    <entry><constant>V4L2_CAP_READWRITE</constant></entry>
 	    <entry>0x01000000</entry>
 	    <entry>The device supports the <link