diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 0c2b1f2e87544b6f6395ee78ce73279d32582006..f72c1cc93a9b0d6aa8b888afb7f80393620f9bda 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -97,31 +97,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Identifier
@@ -133,6 +141,14 @@
Bit
+ 31
+ 30
+ 29
+ 28
+ 27
+ 26
+ 25
+ 24
23
22
21
@@ -164,7 +180,7 @@
V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE
0x1001
- &dash-ent-16;
+ &dash-ent-24;
0
0
0
@@ -178,7 +194,7 @@
- &dash-ent-16;
+ &dash-ent-24;
g3
g2
g1
@@ -192,7 +208,7 @@
V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE
0x1002
- &dash-ent-16;
+ &dash-ent-24;
g3
g2
g1
@@ -206,7 +222,7 @@
- &dash-ent-16;
+ &dash-ent-24;
0
0
0
@@ -220,7 +236,7 @@
V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE
0x1003
- &dash-ent-16;
+ &dash-ent-24;
0
r4
r3
@@ -234,7 +250,7 @@
- &dash-ent-16;
+ &dash-ent-24;
g2
g1
g0
@@ -248,7 +264,7 @@
V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE
0x1004
- &dash-ent-16;
+ &dash-ent-24;
g2
g1
g0
@@ -262,7 +278,7 @@
- &dash-ent-16;
+ &dash-ent-24;
0
r4
r3
@@ -276,7 +292,7 @@
V4L2_MBUS_FMT_BGR565_2X8_BE
0x1005
- &dash-ent-16;
+ &dash-ent-24;
b4
b3
b2
@@ -290,7 +306,7 @@
- &dash-ent-16;
+ &dash-ent-24;
g2
g1
g0
@@ -304,7 +320,7 @@
V4L2_MBUS_FMT_BGR565_2X8_LE
0x1006
- &dash-ent-16;
+ &dash-ent-24;
g2
g1
g0
@@ -318,7 +334,7 @@
- &dash-ent-16;
+ &dash-ent-24;
b4
b3
b2
@@ -332,7 +348,7 @@
V4L2_MBUS_FMT_RGB565_2X8_BE
0x1007
- &dash-ent-16;
+ &dash-ent-24;
r4
r3
r2
@@ -346,7 +362,7 @@
- &dash-ent-16;
+ &dash-ent-24;
g2
g1
g0
@@ -360,7 +376,7 @@
V4L2_MBUS_FMT_RGB565_2X8_LE
0x1008
- &dash-ent-16;
+ &dash-ent-24;
g2
g1
g0
@@ -374,7 +390,7 @@
- &dash-ent-16;
+ &dash-ent-24;
r4
r3
r2
@@ -388,12 +404,7 @@
V4L2_MBUS_FMT_RGB666_1X18
0x1009
- -
- -
- -
- -
- -
- -
+ &dash-ent-14;
r5
r4
r3
@@ -417,6 +428,7 @@
V4L2_MBUS_FMT_RGB888_1X24
0x100a
+ &dash-ent-8;
r7
r6
r5
@@ -446,9 +458,7 @@
V4L2_MBUS_FMT_RGB888_2X12_BE
0x100b
- &dash-ent-10;
- -
- -
+ &dash-ent-20;
r7
r6
r5
@@ -466,9 +476,7 @@
- &dash-ent-10;
- -
- -
+ &dash-ent-20;
g3
g2
g1
@@ -486,9 +494,7 @@
V4L2_MBUS_FMT_RGB888_2X12_LE
0x100c
- &dash-ent-10;
- -
- -
+ &dash-ent-20;
g3
g2
g1
@@ -506,9 +512,7 @@
- &dash-ent-10;
- -
- -
+ &dash-ent-20;
r7
r6
r5
@@ -522,6 +526,43 @@
g5
g4
+
+ V4L2_MBUS_FMT_ARGB888_1X32
+ 0x100d
+
+ a7
+ a6
+ a5
+ a4
+ a3
+ a2
+ a1
+ a0
+ r7
+ r6
+ r5
+ r4
+ r3
+ r2
+ r1
+ r0
+ g7
+ g6
+ g5
+ g4
+ g3
+ g2
+ g1
+ g0
+ b7
+ b6
+ b5
+ b4
+ b3
+ b2
+ b1
+ b0
+
@@ -1149,6 +1190,7 @@
yx for luma component bit number x
ux for blue chroma component bit number x
vx for red chroma component bit number x
+ ax for alpha component bit number x
- for non-available bits (for positions higher than the bus width)
d for dummy bits
@@ -1159,37 +1201,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Identifier
@@ -1201,6 +1245,8 @@
Bit
+ 31
+ 30
29
28
27
@@ -1238,10 +1284,7 @@
V4L2_MBUS_FMT_Y8_1X8
0x2001
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1255,18 +1298,7 @@
V4L2_MBUS_FMT_UV8_1X8
0x2015
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1280,18 +1312,7 @@
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1305,10 +1326,7 @@
V4L2_MBUS_FMT_UYVY8_1_5X8
0x2002
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1322,10 +1340,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1339,10 +1354,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1356,10 +1368,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1373,10 +1382,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1390,10 +1396,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1407,10 +1410,7 @@
V4L2_MBUS_FMT_VYUY8_1_5X8
0x2003
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1424,10 +1424,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1441,10 +1438,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1458,10 +1452,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1475,10 +1466,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1492,10 +1480,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1509,10 +1494,7 @@
V4L2_MBUS_FMT_YUYV8_1_5X8
0x2004
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1526,10 +1508,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1543,10 +1522,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1560,10 +1536,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1577,10 +1550,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1594,10 +1564,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1611,10 +1578,7 @@
V4L2_MBUS_FMT_YVYU8_1_5X8
0x2005
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1628,10 +1592,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1645,10 +1606,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1662,10 +1620,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1679,10 +1634,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1696,10 +1648,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1713,10 +1662,7 @@
V4L2_MBUS_FMT_UYVY8_2X8
0x2006
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1730,10 +1676,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1747,10 +1690,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1764,10 +1704,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1781,10 +1718,7 @@
V4L2_MBUS_FMT_VYUY8_2X8
0x2007
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1798,10 +1732,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1815,10 +1746,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1832,10 +1760,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1849,10 +1774,7 @@
V4L2_MBUS_FMT_YUYV8_2X8
0x2008
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1866,10 +1788,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1883,10 +1802,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1900,10 +1816,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1917,10 +1830,7 @@
V4L2_MBUS_FMT_YVYU8_2X8
0x2009
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1934,10 +1844,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
v7
v6
v5
@@ -1951,10 +1858,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
y7
y6
y5
@@ -1968,10 +1872,7 @@
- &dash-ent-10;
- &dash-ent-10;
- -
- -
+ &dash-ent-24;
u7
u6
u5
@@ -1985,8 +1886,7 @@
V4L2_MBUS_FMT_Y10_1X10
0x200a
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
y9
y8
y7
@@ -2002,8 +1902,7 @@
V4L2_MBUS_FMT_YUYV10_2X10
0x200b
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
y9
y8
y7
@@ -2019,8 +1918,7 @@
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
u9
u8
u7
@@ -2036,8 +1934,7 @@
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
y9
y8
y7
@@ -2053,8 +1950,7 @@
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
v9
v8
v7
@@ -2070,8 +1966,7 @@
V4L2_MBUS_FMT_YVYU10_2X10
0x200c
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
y9
y8
y7
@@ -2087,8 +1982,7 @@
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
v9
v8
v7
@@ -2104,8 +1998,7 @@
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
y9
y8
y7
@@ -2121,8 +2014,7 @@
- &dash-ent-10;
- &dash-ent-10;
+ &dash-ent-22;
u9
u8
u7
@@ -2138,15 +2030,7 @@
V4L2_MBUS_FMT_Y12_1X12
0x2013
- &dash-ent-10;
- -
- -
- -
- -
- -
- -
- -
- -
+ &dash-ent-20;
y11
y10
y9
@@ -2164,11 +2048,7 @@
V4L2_MBUS_FMT_UYVY8_1X16
0x200f
- &dash-ent-10;
- -
- -
- -
- -
+ &dash-ent-16;
u7
u6
u5
@@ -2190,11 +2070,7 @@
- &dash-ent-10;
- -
- -
- -
- -
+ &dash-ent-16;
v7
v6
v5
@@ -2216,11 +2092,7 @@
V4L2_MBUS_FMT_VYUY8_1X16
0x2010
- &dash-ent-10;
- -
- -
- -
- -
+ &dash-ent-16;
v7
v6
v5
@@ -2242,11 +2114,7 @@
- &dash-ent-10;
- -
- -
- -
- -
+ &dash-ent-16;
u7
u6
u5
@@ -2268,11 +2136,7 @@
V4L2_MBUS_FMT_YUYV8_1X16
0x2011
- &dash-ent-10;
- -
- -
- -
- -
+ &dash-ent-16;
y7
y6
y5
@@ -2294,11 +2158,7 @@
- &dash-ent-10;
- -
- -
- -
- -
+ &dash-ent-16;
y7
y6
y5
@@ -2320,11 +2180,7 @@
V4L2_MBUS_FMT_YVYU8_1X16
0x2012
- &dash-ent-10;
- -
- -
- -
- -
+ &dash-ent-16;
y7
y6
y5
@@ -2346,11 +2202,7 @@
- &dash-ent-10;
- -
- -
- -
- -
+ &dash-ent-16;
y7
y6
y5
@@ -2372,10 +2224,7 @@
V4L2_MBUS_FMT_YDYUYDYV8_1X16
0x2014
- -
- -
- -
- -
+ &dash-ent-16;
y7
y6
y5
@@ -2397,10 +2246,7 @@
- -
- -
- -
- -
+ &dash-ent-16;
y7
y6
y5
@@ -2422,10 +2268,7 @@
- -
- -
- -
- -
+ &dash-ent-16;
y7
y6
y5
@@ -2447,10 +2290,7 @@
- -
- -
- -
- -
+ &dash-ent-16;
y7
y6
y5
@@ -2472,7 +2312,7 @@
V4L2_MBUS_FMT_YUYV10_1X20
0x200d
- &dash-ent-10;
+ &dash-ent-12;
y9
y8
y7
@@ -2498,7 +2338,7 @@
- &dash-ent-10;
+ &dash-ent-12;
y9
y8
y7
@@ -2524,7 +2364,7 @@
V4L2_MBUS_FMT_YVYU10_1X20
0x200e
- &dash-ent-10;
+ &dash-ent-12;
y9
y8
y7
@@ -2550,7 +2390,7 @@
- &dash-ent-10;
+ &dash-ent-12;
y9
y8
y7
@@ -2576,6 +2416,8 @@
V4L2_MBUS_FMT_YUV10_1X30
0x2016
+ -
+ -
y9
y8
y7
@@ -2607,6 +2449,43 @@
v1
v0
+
+ V4L2_MBUS_FMT_AYUV8_1X32
+ 0x2017
+
+ a7
+ a6
+ a5
+ a4
+ a3
+ a2
+ a1
+ a0
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+ v7
+ v6
+ v5
+ v4
+ v3
+ v2
+ v1
+ v0
+
diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl
index 6a8b7158697f9ae58b33e82d2f7becd772a6c4aa..07e7eea52a0bac6301f27956834f9c1ff08f9d75 100644
--- a/Documentation/DocBook/media_api.tmpl
+++ b/Documentation/DocBook/media_api.tmpl
@@ -22,8 +22,14 @@
http://linuxtv.org/repo/">
+--------">
----------">
+------------">
+--------------">
----------------">
+--------------------">
+----------------------">
+------------------------">
]>
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h
index 6ee63d09b32d01b36d8d4b38efccfc73cd625677..a9601257bb431536bdcbe83584d5a3cec526cde8 100644
--- a/include/uapi/linux/v4l2-mediabus.h
+++ b/include/uapi/linux/v4l2-mediabus.h
@@ -37,7 +37,7 @@
enum v4l2_mbus_pixelcode {
V4L2_MBUS_FMT_FIXED = 0x0001,
- /* RGB - next is 0x100d */
+ /* RGB - next is 0x100e */
V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE = 0x1001,
V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE = 0x1002,
V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE = 0x1003,
@@ -50,8 +50,9 @@ enum v4l2_mbus_pixelcode {
V4L2_MBUS_FMT_RGB888_1X24 = 0x100a,
V4L2_MBUS_FMT_RGB888_2X12_BE = 0x100b,
V4L2_MBUS_FMT_RGB888_2X12_LE = 0x100c,
+ V4L2_MBUS_FMT_ARGB8888_1X32 = 0x100d,
- /* YUV (including grey) - next is 0x2017 */
+ /* YUV (including grey) - next is 0x2018 */
V4L2_MBUS_FMT_Y8_1X8 = 0x2001,
V4L2_MBUS_FMT_UV8_1X8 = 0x2015,
V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002,
@@ -74,6 +75,7 @@ enum v4l2_mbus_pixelcode {
V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
V4L2_MBUS_FMT_YUV10_1X30 = 0x2016,
+ V4L2_MBUS_FMT_AYUV8_1X32 = 0x2017,
/* Bayer - next is 0x3019 */
V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,