diff --git a/Documentation/DocBook/media/dvb/fe-set-voltage.xml b/Documentation/DocBook/media/dvb/fe-set-voltage.xml
new file mode 100644
index 000000000000..a1ee5f9c28e0
--- /dev/null
+++ b/Documentation/DocBook/media/dvb/fe-set-voltage.xml
@@ -0,0 +1,94 @@
+
+
+ ioctl FE_SET_VOLTAGE
+ &manvol;
+
+
+
+ FE_SET_VOLTAGE
+ Allow setting the DC level sent to the antenna subsystem.
+
+
+
+
+
+ int ioctl
+ int fd
+ int request
+ &fe-sec-voltage; *voltage
+
+
+
+
+
+ Arguments
+
+
+ fd
+
+ &fe_fd;
+
+
+
+ request
+
+ FE_SET_VOLTAGE
+
+
+
+ pointer to &fe-sec-voltage;
+
+
+
+
+
+ Description
+
+This ioctl allows to set the DC voltage level sent through the antenna
+ cable to 13V, 18V or off.
+Usually, a satellital antenna subsystems require that the digital TV
+ device to send a DC voltage to feed power to the LNBf. Depending on the
+ LNBf type, the polarization or the intermediate frequency (IF) of the LNBf
+ can controlled by the voltage level. Other devices (for example, the ones
+ that implement DISEqC and multipoint LNBf's don't need to control the
+ voltage level, provided that either 13V or 18V is sent to power up the
+ LNBf.
+NOTE: if more than one device is connected to the same antenna,
+ setting a voltage level may interfere on other devices, as they may lose
+ the capability of setting polarization or IF. So, on those
+ cases, setting the voltage to SEC_VOLTAGE_OFF while the device is not is
+ used is recommended.
+
+&return-value-dvb;
+
+
+
+enum fe_sec_voltage
+
+
+ enum fe_status
+
+ &cs-def;
+
+
+ ID
+ Description
+
+
+
+
+ SEC_VOLTAGE_13
+ Set DC voltage level to 13V
+
+ SEC_VOLTAGE_18
+ Set DC voltage level to 18V
+
+ SEC_VOLTAGE_OFF
+ Don't send any voltage to the antenna
+
+
+
+
+
+
+
diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml
index bb2cd9ef3b03..584c759b6bbe 100644
--- a/Documentation/DocBook/media/dvb/frontend.xml
+++ b/Documentation/DocBook/media/dvb/frontend.xml
@@ -75,19 +75,6 @@ specification is available at
-
-diseqc slave reply
-The voltage is usually used with non-DiSEqC capable LNBs to switch the polarzation
-(horizontal/vertical). 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_voltage {
- SEC_VOLTAGE_13,
- SEC_VOLTAGE_18
- } fe_sec_voltage_t;
-
-
-
SEC continuous tone
@@ -641,54 +628,7 @@ typedef enum fe_hierarchy {
&return-value-dvb;
-
-FE_SET_VOLTAGE
-DESCRIPTION
-
-
-This call is used to set the bus voltage. This call requires read/write
- permissions.
-
-
-SYNOPSIS
-
-
-int ioctl(int fd, int request = FE_SET_VOLTAGE,
- fe_sec_voltage_t voltage);
-
-
-
-PARAMETERS
-
-
-int fd
-
-File descriptor returned by a previous call to open().
-
-
-int request
-
-Equals FE_SET_VOLTAGE for this command.
-
-
-fe_sec_voltage_t
- voltage
-
-The requested bus voltage.
-
-
-
-&return-value-dvb;
-
-
+&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 ae481bc53a9c..c1ccbc82024c 100644
--- a/include/uapi/linux/dvb/frontend.h
+++ b/include/uapi/linux/dvb/frontend.h
@@ -105,11 +105,13 @@ struct dvb_diseqc_slave_reply {
}; /* errorcode when no message was received */
-typedef enum fe_sec_voltage {
+enum fe_sec_voltage {
SEC_VOLTAGE_13,
SEC_VOLTAGE_18,
SEC_VOLTAGE_OFF
-} fe_sec_voltage_t;
+};
+
+typedef enum fe_sec_voltage fe_sec_voltage_t;
typedef enum fe_sec_tone_mode {