[media] V4L: DocBook: Add V4L2_MBUS_FMT_YUV10_1X30 media bus pixel code

This patch adds definition of media bus code for YUV pixel format
transferred in 30-bit samples where each component has 10 bits width.

[mchehab@redhat.com: fix a merge conflict at v4l2-mediabus.h]
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 6f341d1..cc51372 100644 (file)
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -973,27 +973,37 @@
          <colspec colname="id" align="left" />
          <colspec colname="code" align="center"/>
          <colspec colname="bit" />
-         <colspec colnum="4" colname="b19" align="center" />
-         <colspec colnum="5" colname="b18" align="center" />
-         <colspec colnum="6" colname="b17" align="center" />
-         <colspec colnum="7" colname="b16" align="center" />
-         <colspec colnum="8" colname="b15" align="center" />
-         <colspec colnum="9" colname="b14" align="center" />
-         <colspec colnum="10" colname="b13" align="center" />
-         <colspec colnum="11" colname="b12" align="center" />
-         <colspec colnum="12" colname="b11" align="center" />
-         <colspec colnum="13" colname="b10" align="center" />
-         <colspec colnum="14" colname="b09" align="center" />
-         <colspec colnum="15" colname="b08" align="center" />
-         <colspec colnum="16" colname="b07" align="center" />
-         <colspec colnum="17" colname="b06" align="center" />
-         <colspec colnum="18" colname="b05" align="center" />
-         <colspec colnum="19" colname="b04" align="center" />
-         <colspec colnum="20" colname="b03" align="center" />
-         <colspec colnum="21" colname="b02" align="center" />
-         <colspec colnum="22" colname="b01" align="center" />
-         <colspec colnum="23" colname="b00" align="center" />
-         <spanspec namest="b19" nameend="b00" spanname="b0" />
+         <colspec colnum="4" colname="b29" align="center" />
+         <colspec colnum="5" colname="b28" align="center" />
+         <colspec colnum="6" colname="b27" align="center" />
+         <colspec colnum="7" colname="b26" align="center" />
+         <colspec colnum="8" colname="b25" align="center" />
+         <colspec colnum="9" colname="b24" align="center" />
+         <colspec colnum="10" colname="b23" align="center" />
+         <colspec colnum="11" colname="b22" align="center" />
+         <colspec colnum="12" colname="b21" align="center" />
+         <colspec colnum="13" colname="b20" align="center" />
+         <colspec colnum="14" colname="b19" align="center" />
+         <colspec colnum="15" colname="b18" align="center" />
+         <colspec colnum="16" colname="b17" align="center" />
+         <colspec colnum="17" colname="b16" align="center" />
+         <colspec colnum="18" colname="b15" align="center" />
+         <colspec colnum="19" colname="b14" align="center" />
+         <colspec colnum="20" colname="b13" align="center" />
+         <colspec colnum="21" colname="b12" align="center" />
+         <colspec colnum="22" colname="b11" align="center" />
+         <colspec colnum="23" colname="b10" align="center" />
+         <colspec colnum="24" colname="b09" align="center" />
+         <colspec colnum="25" colname="b08" align="center" />
+         <colspec colnum="26" colname="b07" align="center" />
+         <colspec colnum="27" colname="b06" align="center" />
+         <colspec colnum="28" colname="b05" align="center" />
+         <colspec colnum="29" colname="b04" align="center" />
+         <colspec colnum="30" colname="b03" align="center" />
+         <colspec colnum="31" colname="b02" align="center" />
+         <colspec colnum="32" colname="b01" align="center" />
+         <colspec colnum="33" colname="b00" align="center" />
+         <spanspec namest="b29" nameend="b00" spanname="b0" />
          <thead>
            <row>
              <entry>Identifier</entry>
@@ -1005,6 +1015,16 @@
              <entry></entry>
              <entry></entry>
              <entry>Bit</entry>
+             <entry>29</entry>
+             <entry>28</entry>
+             <entry>27</entry>
+             <entry>26</entry>
+             <entry>25</entry>
+             <entry>24</entry>
+             <entry>23</entry>
+             <entry>22</entry>
+             <entry>21</entry>
+             <entry>10</entry>
              <entry>19</entry>
              <entry>18</entry>
              <entry>17</entry>
@@ -1032,16 +1052,8 @@
              <entry>V4L2_MBUS_FMT_Y8_1X8</entry>
              <entry>0x2001</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1107,16 +1119,8 @@
              <entry>V4L2_MBUS_FMT_UYVY8_1_5X8</entry>
              <entry>0x2002</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>u<subscript>7</subscript></entry>
@@ -1132,16 +1136,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1157,16 +1153,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1182,16 +1170,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>v<subscript>7</subscript></entry>
@@ -1207,16 +1187,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1232,16 +1204,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1257,16 +1221,8 @@
              <entry>V4L2_MBUS_FMT_VYUY8_1_5X8</entry>
              <entry>0x2003</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>v<subscript>7</subscript></entry>
@@ -1282,16 +1238,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1307,16 +1255,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1332,16 +1272,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>u<subscript>7</subscript></entry>
@@ -1357,16 +1289,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1382,16 +1306,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1407,16 +1323,8 @@
              <entry>V4L2_MBUS_FMT_YUYV8_1_5X8</entry>
              <entry>0x2004</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1432,16 +1340,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1457,16 +1357,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>u<subscript>7</subscript></entry>
@@ -1482,16 +1374,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1507,16 +1391,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1532,16 +1408,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>v<subscript>7</subscript></entry>
@@ -1557,16 +1425,8 @@
              <entry>V4L2_MBUS_FMT_YVYU8_1_5X8</entry>
              <entry>0x2005</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1582,16 +1442,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1607,16 +1459,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>v<subscript>7</subscript></entry>
@@ -1632,16 +1476,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1657,16 +1493,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1682,16 +1510,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>u<subscript>7</subscript></entry>
@@ -1707,16 +1527,8 @@
              <entry>V4L2_MBUS_FMT_UYVY8_2X8</entry>
              <entry>0x2006</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>u<subscript>7</subscript></entry>
@@ -1732,16 +1544,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1754,19 +1558,11 @@
              <entry>y<subscript>0</subscript></entry>
            </row>
            <row>
-             <entry></entry>
-             <entry></entry>
-             <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             <entry></entry>
+             <entry></entry>
+             <entry></entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>v<subscript>7</subscript></entry>
@@ -1782,16 +1578,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1807,16 +1595,8 @@
              <entry>V4L2_MBUS_FMT_VYUY8_2X8</entry>
              <entry>0x2007</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>v<subscript>7</subscript></entry>
@@ -1832,16 +1612,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1857,16 +1629,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>u<subscript>7</subscript></entry>
@@ -1882,16 +1646,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1907,16 +1663,8 @@
              <entry>V4L2_MBUS_FMT_YUYV8_2X8</entry>
              <entry>0x2008</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1932,16 +1680,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>u<subscript>7</subscript></entry>
@@ -1957,16 +1697,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -1982,16 +1714,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>v<subscript>7</subscript></entry>
@@ -2007,16 +1731,8 @@
              <entry>V4L2_MBUS_FMT_YVYU8_2X8</entry>
              <entry>0x2009</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2032,16 +1748,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>v<subscript>7</subscript></entry>
@@ -2057,16 +1765,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2082,16 +1782,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>u<subscript>7</subscript></entry>
@@ -2107,16 +1799,8 @@
              <entry>V4L2_MBUS_FMT_Y10_1X10</entry>
              <entry>0x200a</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2132,16 +1816,8 @@
              <entry>V4L2_MBUS_FMT_YUYV10_2X10</entry>
              <entry>0x200b</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2157,16 +1833,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>u<subscript>9</subscript></entry>
              <entry>u<subscript>8</subscript></entry>
              <entry>u<subscript>7</subscript></entry>
@@ -2182,16 +1850,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2207,16 +1867,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>v<subscript>9</subscript></entry>
              <entry>v<subscript>8</subscript></entry>
              <entry>v<subscript>7</subscript></entry>
@@ -2232,16 +1884,8 @@
              <entry>V4L2_MBUS_FMT_YVYU10_2X10</entry>
              <entry>0x200c</entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2257,16 +1901,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>v<subscript>9</subscript></entry>
              <entry>v<subscript>8</subscript></entry>
              <entry>v<subscript>7</subscript></entry>
@@ -2282,16 +1918,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2307,16 +1935,8 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
-             <entry>-</entry>
+             &dash-ent-10;
+             &dash-ent-10;
              <entry>u<subscript>9</subscript></entry>
              <entry>u<subscript>8</subscript></entry>
              <entry>u<subscript>7</subscript></entry>
@@ -2332,6 +1952,7 @@
              <entry>V4L2_MBUS_FMT_Y12_1X12</entry>
              <entry>0x2013</entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2357,6 +1978,7 @@
              <entry>V4L2_MBUS_FMT_UYVY8_1X16</entry>
              <entry>0x200f</entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2382,6 +2004,7 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2407,6 +2030,7 @@
              <entry>V4L2_MBUS_FMT_VYUY8_1X16</entry>
              <entry>0x2010</entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2432,6 +2056,7 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2457,6 +2082,7 @@
              <entry>V4L2_MBUS_FMT_YUYV8_1X16</entry>
              <entry>0x2011</entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2482,6 +2108,7 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2507,6 +2134,7 @@
              <entry>V4L2_MBUS_FMT_YVYU8_1X16</entry>
              <entry>0x2012</entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2532,6 +2160,7 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>-</entry>
              <entry>-</entry>
              <entry>-</entry>
@@ -2657,6 +2286,7 @@
              <entry>V4L2_MBUS_FMT_YUYV10_1X20</entry>
              <entry>0x200d</entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2682,6 +2312,7 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2707,6 +2338,7 @@
              <entry>V4L2_MBUS_FMT_YVYU10_1X20</entry>
              <entry>0x200e</entry>
              <entry></entry>
+             &dash-ent-10;
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2732,6 +2364,32 @@
              <entry></entry>
              <entry></entry>
              <entry></entry>
+             &dash-ent-10;
+             <entry>y<subscript>9</subscript></entry>
+             <entry>y<subscript>8</subscript></entry>
+             <entry>y<subscript>7</subscript></entry>
+             <entry>y<subscript>6</subscript></entry>
+             <entry>y<subscript>5</subscript></entry>
+             <entry>y<subscript>4</subscript></entry>
+             <entry>y<subscript>3</subscript></entry>
+             <entry>y<subscript>2</subscript></entry>
+             <entry>y<subscript>1</subscript></entry>
+             <entry>y<subscript>0</subscript></entry>
+             <entry>u<subscript>9</subscript></entry>
+             <entry>u<subscript>8</subscript></entry>
+             <entry>u<subscript>7</subscript></entry>
+             <entry>u<subscript>6</subscript></entry>
+             <entry>u<subscript>5</subscript></entry>
+             <entry>u<subscript>4</subscript></entry>
+             <entry>u<subscript>3</subscript></entry>
+             <entry>u<subscript>2</subscript></entry>
+             <entry>u<subscript>1</subscript></entry>
+             <entry>u<subscript>0</subscript></entry>
+           </row>
+           <row id="V4L2-MBUS-FMT-YUV10-1X30">
+             <entry>V4L2_MBUS_FMT_YUV10_1X30</entry>
+             <entry>0x2014</entry>
+             <entry></entry>
              <entry>y<subscript>9</subscript></entry>
              <entry>y<subscript>8</subscript></entry>
              <entry>y<subscript>7</subscript></entry>
@@ -2752,6 +2410,16 @@
              <entry>u<subscript>2</subscript></entry>
              <entry>u<subscript>1</subscript></entry>
              <entry>u<subscript>0</subscript></entry>
+             <entry>v<subscript>9</subscript></entry>
+             <entry>v<subscript>8</subscript></entry>
+             <entry>v<subscript>7</subscript></entry>
+             <entry>v<subscript>6</subscript></entry>
+             <entry>v<subscript>5</subscript></entry>
+             <entry>v<subscript>4</subscript></entry>
+             <entry>v<subscript>3</subscript></entry>
+             <entry>v<subscript>2</subscript></entry>
+             <entry>v<subscript>1</subscript></entry>
+             <entry>v<subscript>0</subscript></entry>
            </row>
          </tbody>
        </tgroup>

diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl
index f2413ac..1f6593d 100644 (file)
--- a/Documentation/DocBook/media_api.tmpl
+++ b/Documentation/DocBook/media_api.tmpl
@@ -22,6 +22,7 @@
 
 <!-- LinuxTV v4l-dvb repository. -->
 <!ENTITY v4l-dvb               "<ulink url='http://linuxtv.org/repo/'>http://linuxtv.org/repo/</ulink>">
+<!ENTITY dash-ent-10            "<entry>-</entry><entry>-</entry><entry>-</entry><entry>-</entry><entry>-</entry><entry>-</entry><entry>-</entry><entry>-</entry><entry>-</entry><entry>-</entry>">
 ]>
 
 <book id="media_api">

diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h
index e860f55..b9b7bea 100644 (file)
--- a/include/uapi/linux/v4l2-mediabus.h
+++ b/include/uapi/linux/v4l2-mediabus.h
@@ -47,7 +47,7 @@ enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_RGB565_2X8_BE = 0x1007,
        V4L2_MBUS_FMT_RGB565_2X8_LE = 0x1008,
 
-       /* YUV (including grey) - next is 0x2016 */
+       /* YUV (including grey) - next is 0x2017 */
        V4L2_MBUS_FMT_Y8_1X8 = 0x2001,
        V4L2_MBUS_FMT_UV8_1X8 = 0x2015,
        V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002,
@@ -69,6 +69,7 @@ enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_YDYUYDYV8_1X16 = 0x2014,
        V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
        V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
+       V4L2_MBUS_FMT_YUV10_1X30 = 0x2016,
 
        /* Bayer - next is 0x3019 */
        V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,