diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 6f341d1eca1a..cc51372ed5e0 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -973,27 +973,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Identifier
@@ -1005,6 +1015,16 @@
Bit
+ 29
+ 28
+ 27
+ 26
+ 25
+ 24
+ 23
+ 22
+ 21
+ 10
19
18
17
@@ -1032,16 +1052,8 @@
V4L2_MBUS_FMT_Y8_1X8
0x2001
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1107,16 +1119,8 @@
V4L2_MBUS_FMT_UYVY8_1_5X8
0x2002
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
u7
@@ -1132,16 +1136,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1157,16 +1153,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1182,16 +1170,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
v7
@@ -1207,16 +1187,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1232,16 +1204,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1257,16 +1221,8 @@
V4L2_MBUS_FMT_VYUY8_1_5X8
0x2003
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
v7
@@ -1282,16 +1238,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1307,16 +1255,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1332,16 +1272,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
u7
@@ -1357,16 +1289,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1382,16 +1306,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1407,16 +1323,8 @@
V4L2_MBUS_FMT_YUYV8_1_5X8
0x2004
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1432,16 +1340,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1457,16 +1357,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
u7
@@ -1482,16 +1374,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1507,16 +1391,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1532,16 +1408,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
v7
@@ -1557,16 +1425,8 @@
V4L2_MBUS_FMT_YVYU8_1_5X8
0x2005
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1582,16 +1442,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1607,16 +1459,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
v7
@@ -1632,16 +1476,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1657,16 +1493,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1682,16 +1510,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
u7
@@ -1707,16 +1527,8 @@
V4L2_MBUS_FMT_UYVY8_2X8
0x2006
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
u7
@@ -1732,16 +1544,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1754,19 +1558,11 @@
y0
-
-
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+
+
+
+ &dash-ent-10;
+ &dash-ent-10;
-
-
v7
@@ -1782,16 +1578,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1807,16 +1595,8 @@
V4L2_MBUS_FMT_VYUY8_2X8
0x2007
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
v7
@@ -1832,16 +1612,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1857,16 +1629,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
u7
@@ -1882,16 +1646,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1907,16 +1663,8 @@
V4L2_MBUS_FMT_YUYV8_2X8
0x2008
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1932,16 +1680,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
u7
@@ -1957,16 +1697,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -1982,16 +1714,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
v7
@@ -2007,16 +1731,8 @@
V4L2_MBUS_FMT_YVYU8_2X8
0x2009
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -2032,16 +1748,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
v7
@@ -2057,16 +1765,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
y7
@@ -2082,16 +1782,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
-
-
u7
@@ -2107,16 +1799,8 @@
V4L2_MBUS_FMT_Y10_1X10
0x200a
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
y9
y8
y7
@@ -2132,16 +1816,8 @@
V4L2_MBUS_FMT_YUYV10_2X10
0x200b
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
y9
y8
y7
@@ -2157,16 +1833,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
u9
u8
u7
@@ -2182,16 +1850,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
y9
y8
y7
@@ -2207,16 +1867,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
v9
v8
v7
@@ -2232,16 +1884,8 @@
V4L2_MBUS_FMT_YVYU10_2X10
0x200c
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
y9
y8
y7
@@ -2257,16 +1901,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
v9
v8
v7
@@ -2282,16 +1918,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
y9
y8
y7
@@ -2307,16 +1935,8 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-10;
+ &dash-ent-10;
u9
u8
u7
@@ -2332,6 +1952,7 @@
V4L2_MBUS_FMT_Y12_1X12
0x2013
+ &dash-ent-10;
-
-
-
@@ -2357,6 +1978,7 @@
V4L2_MBUS_FMT_UYVY8_1X16
0x200f
+ &dash-ent-10;
-
-
-
@@ -2382,6 +2004,7 @@
+ &dash-ent-10;
-
-
-
@@ -2407,6 +2030,7 @@
V4L2_MBUS_FMT_VYUY8_1X16
0x2010
+ &dash-ent-10;
-
-
-
@@ -2432,6 +2056,7 @@
+ &dash-ent-10;
-
-
-
@@ -2457,6 +2082,7 @@
V4L2_MBUS_FMT_YUYV8_1X16
0x2011
+ &dash-ent-10;
-
-
-
@@ -2482,6 +2108,7 @@
+ &dash-ent-10;
-
-
-
@@ -2507,6 +2134,7 @@
V4L2_MBUS_FMT_YVYU8_1X16
0x2012
+ &dash-ent-10;
-
-
-
@@ -2532,6 +2160,7 @@
+ &dash-ent-10;
-
-
-
@@ -2657,6 +2286,7 @@
V4L2_MBUS_FMT_YUYV10_1X20
0x200d
+ &dash-ent-10;
y9
y8
y7
@@ -2682,6 +2312,7 @@
+ &dash-ent-10;
y9
y8
y7
@@ -2707,6 +2338,7 @@
V4L2_MBUS_FMT_YVYU10_1X20
0x200e
+ &dash-ent-10;
y9
y8
y7
@@ -2732,6 +2364,32 @@
+ &dash-ent-10;
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+ u9
+ u8
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+
+
+ V4L2_MBUS_FMT_YUV10_1X30
+ 0x2014
+
y9
y8
y7
@@ -2752,6 +2410,16 @@
u2
u1
u0
+ v9
+ v8
+ v7
+ v6
+ v5
+ v4
+ v3
+ v2
+ v1
+ v0
diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl
index f2413acfe241..1f6593deb995 100644
--- a/Documentation/DocBook/media_api.tmpl
+++ b/Documentation/DocBook/media_api.tmpl
@@ -22,6 +22,7 @@
http://linuxtv.org/repo/">
+----------">
]>
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h
index e860f55820ec..b9b7bea04537 100644
--- 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,