diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
index 32a783635649..13d0b5891fb7 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -179,70 +179,67 @@
- MEDIA_ENT_T_DEVNODE
- Unknown device node
+ MEDIA_ENT_T_UNKNOWN and MEDIA_ENT_T_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, radio or vbi device node
+ V4L video streaming input or output entity
- MEDIA_ENT_T_DEVNODE_FB
- Frame buffer device node
+ MEDIA_ENT_T_V4L2_VBI
+ V4L VBI streaming input or output entity
- MEDIA_ENT_T_DEVNODE_ALSA
- ALSA card
+ MEDIA_ENT_T_V4L2_SWRADIO
+ V4L Software Digital Radio (SDR) streaming input or output entity
MEDIA_ENT_T_DVB_DEMOD
- DVB frontend devnode
+ DVB demodulator entity
MEDIA_ENT_T_DVB_DEMUX
- DVB demux devnode
+ DVB demux entity. Can be implemented in hardware or in Kernelspace
MEDIA_ENT_T_DVB_TSOUT
- DVB DVR devnode
+ DVB Transport Stream output entity
MEDIA_ENT_T_DVB_CA
- DVB CAM devnode
+ DVB Conditional Access module (CAM) entity
MEDIA_ENT_T_DVB_DEMOD_NET_DECAP
- DVB network devnode
-
-
- MEDIA_ENT_T_V4L2_SUBDEV
- Unknown V4L sub-device
+ DVB network ULE/MLE de-encapsulation entity. Can be implemented in hardware or in Kernelspace
MEDIA_ENT_T_V4L2_SUBDEV_SENSOR
- Video sensor
+ Camera image sensor entity
MEDIA_ENT_T_V4L2_SUBDEV_FLASH
- Flash controller
+ Flash controller entity
MEDIA_ENT_T_V4L2_SUBDEV_LENS
- Lens controller
+ Lens controller entity
MEDIA_ENT_T_V4L2_SUBDEV_DECODER
- Video decoder, the basic function of the video decoder is to
- accept analogue video from a wide variety of sources such as
+ 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
- either NTSC, PAL or HD format and still occasionally SECAM, separate
- it into its component parts, luminance and chrominance, and output
- it in some digital video standard, with appropriate embedded timing
+ either NTSC, PAL, SECAM or HD format, separating the stream
+ into its component parts, luminance and chrominance, and output
+ it in some digital video standard, with appropriate timing
signals.
MEDIA_ENT_T_V4L2_SUBDEV_TUNER
- TV and/or radio tuner
+ Digital TV, analog TV, radio and/or software radio tuner