2 files changed, 36 insertions, 6 deletions

diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
index cbf307f21a63..5872f8bbf774 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -145,7 +145,21 @@
             <entry>struct</entry>
             <entry><structfield>dev</structfield></entry>
             <entry></entry>
-            <entry>Valid for (sub-)devices that create devnodes.</entry>
+            <entry>Valid for (sub-)devices that create a single device node.</entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry></entry>
+            <entry>__u32</entry>
+            <entry><structfield>major</structfield></entry>
+            <entry>Device node major number.</entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry></entry>
+            <entry>__u32</entry>
+            <entry><structfield>minor</structfield></entry>
+            <entry>Device node minor number.</entry>
           </row>
           <row>
             <entry></entry>
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 52cc2a6b19b7..4e816be3de39 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -91,6 +91,27 @@ struct media_entity_desc {
 
 #if 1
                 /*
+                 * TODO: this shouldn't have been added without
+                 * actual drivers that use this. When the first real driver
+                 * appears that sets this information, special attention
+                 * should be given whether this information is 1) enough, and
+                 * 2) can deal with udev rules that rename devices. The struct
+                 * dev would not be sufficient for this since that does not
+                 * contain the subdevice information. In addition, struct dev
+                 * can only refer to a single device, and not to multiple (e.g.
+                 * pcm and mixer devices).
+                 *
+                 * So for now mark this as a to do.
+                 */
+                struct {
+                        __u32 card;
+                        __u32 device;
+                        __u32 subdevice;
+                } alsa;
+#endif
+
+#if 1
+                /*
                  * DEPRECATED: previous node specifications. Kept just to
                  * avoid breaking compilation, but media_entity_desc.dev
                  * should be used instead. In particular, alsa and dvb
@@ -106,11 +127,6 @@ struct media_entity_desc {
                         __u32 major;
                         __u32 minor;
                 } fb;
-                struct {
-                        __u32 card;
-                        __u32 device;
-                        __u32 subdevice;
-                } alsa;
                 int dvb;
 #endif