diff --git a/Documentation/DocBook/media/dvb/fe-set-tone.xml b/Documentation/DocBook/media/dvb/fe-set-tone.xml
new file mode 100644
index 000000000000..b4b1f5303170
--- /dev/null
+++ b/Documentation/DocBook/media/dvb/fe-set-tone.xml
@@ -0,0 +1,88 @@
+
+
+ ioctl FE_SET_TONE
+ &manvol;
+
+
+
+ FE_SET_TONE
+ Sets/resets the generation of the continuous 22kHz tone.
+
+
+
+
+
+ int ioctl
+ int fd
+ int request
+ &fe-sec-tone-mode; *tone
+
+
+
+
+
+ Arguments
+
+
+ fd
+
+ &fe_fd;
+
+
+
+ request
+
+ FE_SET_TONE
+
+
+
+ pointer to &fe-sec-tone-mode;
+
+
+
+
+
+ Description
+
+This ioctl is used to set the generation of the continuous 22kHz tone.
+ This call requires read/write permissions.
+Usually, satellital antenna subsystems require that the digital TV
+ device to send a 22kHz tone in order to select between high/low band on
+ some dual-band LNBf. It is also used to send signals to DiSEqC equipment,
+ but this is done using the DiSEqC ioctls.
+NOTE: if more than one device is connected to the same antenna,
+ setting a tone may interfere on other devices, as they may lose
+ the capability of selecting the band. So, it is recommended that
+ applications would change to SEC_TONE_OFF when the device is not used.
+
+&return-value-dvb;
+
+
+
+enum fe_sec_voltage
+
+
+ enum fe_sec_tone_mode
+
+ &cs-def;
+
+
+ ID
+ Description
+
+
+
+
+ SEC_TONE_ON
+ Sends a 22kHz tone burst to the antenna
+
+ SEC_TONE_OFF
+ Don't send a 22kHz tone to the antenna
+ (except if the FE_DISEQC_* ioctls are called)
+
+
+
+
+
+
+
diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml
index 584c759b6bbe..f05da4abb3fe 100644
--- a/Documentation/DocBook/media/dvb/frontend.xml
+++ b/Documentation/DocBook/media/dvb/frontend.xml
@@ -75,21 +75,6 @@ specification is available at
-
-SEC continuous tone
-
-The continuous 22KHz tone is usually used with non-DiSEqC capable LNBs to switch the
-high/low band of a dual-band LNB. When using DiSEqC epuipment this voltage has to
-be switched consistently to the DiSEqC commands as described in the DiSEqC
-spec.
-
- typedef enum fe_sec_tone_mode {
- SEC_TONE_ON,
- SEC_TONE_OFF
- } fe_sec_tone_mode_t;
-
-
-
SEC tone burst
@@ -582,52 +567,8 @@ typedef enum fe_hierarchy {
&return-value-dvb;
-
-FE_SET_TONE
-DESCRIPTION
-
-
-This call is used to set the generation of the continuous 22kHz tone. This call
- requires read/write permissions.
-
-
-SYNOPSIS
-
-
-int ioctl(int fd, int request = FE_SET_TONE,
- fe_sec_tone_mode_t tone);
-
-
-PARAMETERS
-
-
-int fd
-
-File descriptor returned by a previous call to open().
-
-
-int request
-
-Equals FE_SET_TONE for this command.
-
-
-fe_sec_tone_mode_t
- tone
-
-The requested tone generation mode (on/off).
-
-
-&return-value-dvb;
-
+&sub-fe-set-tone;
&sub-fe-set-voltage;
&sub-fe-enable-high-lnb-voltage;
&sub-fe-set-frontend-tune-mode;
diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h
index c1ccbc82024c..1a098819473f 100644
--- a/include/uapi/linux/dvb/frontend.h
+++ b/include/uapi/linux/dvb/frontend.h
@@ -114,10 +114,12 @@ enum fe_sec_voltage {
typedef enum fe_sec_voltage fe_sec_voltage_t;
-typedef enum fe_sec_tone_mode {
+enum fe_sec_tone_mode {
SEC_TONE_ON,
SEC_TONE_OFF
-} fe_sec_tone_mode_t;
+};
+
+typedef enum fe_sec_tone_mode fe_sec_tone_mode_t;
typedef enum fe_sec_mini_cmd {