diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
index 13d0b5891fb7..27f8817e7abe 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -179,56 +179,72 @@
- MEDIA_ENT_T_UNKNOWN and MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN
+ MEDIA_ENT_F_UNKNOWN and MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN
Unknown entity. That generally indicates that
a driver didn't initialize properly the entity, with is a Kernel bug
- MEDIA_ENT_T_V4L2_VIDEO
- V4L video streaming input or output entity
+ MEDIA_ENT_F_IO_V4L
+ Data streaming input and/or output entity.
- MEDIA_ENT_T_V4L2_VBI
+ MEDIA_ENT_F_IO_VBI
V4L VBI streaming input or output entity
- MEDIA_ENT_T_V4L2_SWRADIO
+ MEDIA_ENT_F_IO_SWRADIO
V4L Software Digital Radio (SDR) streaming input or output entity
- MEDIA_ENT_T_DVB_DEMOD
- DVB demodulator entity
+ MEDIA_ENT_F_IO_DTV
+ DVB Digital TV streaming input or output entity
- MEDIA_ENT_T_DVB_DEMUX
- DVB demux entity. Can be implemented in hardware or in Kernelspace
+ MEDIA_ENT_F_DTV_DEMOD
+ Digital TV demodulator entity.
- MEDIA_ENT_T_DVB_TSOUT
- DVB Transport Stream output entity
+ MEDIA_ENT_F_MPEG_TS_DEMUX
+ MPEG Transport stream demux entity. Could be implemented on hardware or in Kernelspace by the Linux DVB subsystem.
- MEDIA_ENT_T_DVB_CA
- DVB Conditional Access module (CAM) entity
+ MEDIA_ENT_F_DTV_CA
+ Digital TV Conditional Access module (CAM) entity
- MEDIA_ENT_T_DVB_DEMOD_NET_DECAP
- DVB network ULE/MLE de-encapsulation entity. Can be implemented in hardware or in Kernelspace
+ MEDIA_ENT_F_DTV_NET_DECAP
+ Digital TV network ULE/MLE desencapsulation entity. Could be implemented on hardware or in Kernelspace
- MEDIA_ENT_T_V4L2_SUBDEV_SENSOR
- Camera image sensor entity
+ MEDIA_ENT_F_CONN_RF
+ Connector for a Radio Frequency (RF) signal.
- MEDIA_ENT_T_V4L2_SUBDEV_FLASH
- Flash controller entity
+ MEDIA_ENT_F_CONN_SVIDEO
+ Connector for a S-Video signal.
- MEDIA_ENT_T_V4L2_SUBDEV_LENS
- Lens controller entity
+ MEDIA_ENT_F_CONN_COMPOSITE
+ Connector for a RGB composite signal.
- MEDIA_ENT_T_V4L2_SUBDEV_DECODER
+ MEDIA_ENT_F_CONN_TEST
+ Connector for a test generator.
+
+
+ MEDIA_ENT_F_CAM_SENSOR
+ Camera video sensor entity.
+
+
+ MEDIA_ENT_F_FLASH
+ Flash controller entity.
+
+
+ MEDIA_ENT_F_LENS
+ Lens controller entity.
+
+
+ MEDIA_ENT_F_ATV_DECODER
Analog video decoder, the basic function of the video decoder
is to accept analogue video from a wide variety of sources such as
broadcast, DVD players, cameras and video cassette recorders, in
@@ -238,8 +254,8 @@
signals.
- MEDIA_ENT_T_V4L2_SUBDEV_TUNER
- Digital TV, analog TV, radio and/or software radio tuner
+ MEDIA_ENT_F_TUNER
+ Digital TV, analog TV, radio and/or software radio tuner.