diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index d253e8f85f4d8c06a222396d7cb1737456ff333e..9bfd468cd524fe1c821e57a0f5fea9c4c636eba4 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -2255,11 +2255,15 @@ see .
y1
y0
-
- MEDIA_BUS_FMT_UYVY8_1X16
- 0x200f
+
+ MEDIA_BUS_FMT_UYVY12_2X12
+ 0x201c
- &dash-ent-16;
+ &dash-ent-20;
+ u11
+ u10
+ u9
+ u8
u7
u6
u5
@@ -2268,6 +2272,16 @@ see .
u2
u1
u0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
y7
y6
y5
@@ -2281,7 +2295,11 @@ see .
- &dash-ent-16;
+ &dash-ent-20;
+ v11
+ v10
+ v9
+ v8
v7
v6
v5
@@ -2290,6 +2308,16 @@ see .
v2
v1
v0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
y7
y6
y5
@@ -2299,11 +2327,15 @@ see .
y1
y0
-
- MEDIA_BUS_FMT_VYUY8_1X16
- 0x2010
+
+ MEDIA_BUS_FMT_VYUY12_2X12
+ 0x201d
- &dash-ent-16;
+ &dash-ent-20;
+ v11
+ v10
+ v9
+ v8
v7
v6
v5
@@ -2312,6 +2344,16 @@ see .
v2
v1
v0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
y7
y6
y5
@@ -2325,7 +2367,11 @@ see .
- &dash-ent-16;
+ &dash-ent-20;
+ u11
+ u10
+ u9
+ u8
u7
u6
u5
@@ -2334,6 +2380,16 @@ see .
u2
u1
u0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
y7
y6
y5
@@ -2343,11 +2399,15 @@ see .
y1
y0
-
- MEDIA_BUS_FMT_YUYV8_1X16
- 0x2011
+
+ MEDIA_BUS_FMT_YUYV12_2X12
+ 0x201e
- &dash-ent-16;
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
y7
y6
y5
@@ -2356,6 +2416,16 @@ see .
y2
y1
y0
+
+
+
+
+
+ &dash-ent-20;
+ u11
+ u10
+ u9
+ u8
u7
u6
u5
@@ -2369,7 +2439,11 @@ see .
- &dash-ent-16;
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
y7
y6
y5
@@ -2378,6 +2452,16 @@ see .
y2
y1
y0
+
+
+
+
+
+ &dash-ent-20;
+ v11
+ v10
+ v9
+ v8
v7
v6
v5
@@ -2387,11 +2471,15 @@ see .
v1
v0
-
- MEDIA_BUS_FMT_YVYU8_1X16
- 0x2012
+
+ MEDIA_BUS_FMT_YVYU12_2X12
+ 0x201f
- &dash-ent-16;
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
y7
y6
y5
@@ -2400,6 +2488,16 @@ see .
y2
y1
y0
+
+
+
+
+
+ &dash-ent-20;
+ v11
+ v10
+ v9
+ v8
v7
v6
v5
@@ -2413,29 +2511,11 @@ see .
- &dash-ent-16;
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
- u7
- u6
- u5
- u4
- u3
- u2
- u1
- u0
-
-
- MEDIA_BUS_FMT_YDYUYDYV8_1X16
- 0x2014
-
- &dash-ent-16;
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
y7
y6
y5
@@ -2444,28 +2524,16 @@ see .
y2
y1
y0
- d
- d
- d
- d
- d
- d
- d
- d
- &dash-ent-16;
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
+ &dash-ent-20;
+ u11
+ u10
+ u9
+ u8
u7
u6
u5
@@ -2475,57 +2543,11 @@ see .
u1
u0
-
-
-
-
- &dash-ent-16;
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
- d
- d
- d
- d
- d
- d
- d
- d
-
-
-
-
+
+ MEDIA_BUS_FMT_UYVY8_1X16
+ 0x200f
&dash-ent-16;
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
- v7
- v6
- v5
- v4
- v3
- v2
- v1
- v0
-
-
- MEDIA_BUS_FMT_UYVY10_1X20
- 0x201a
-
- &dash-ent-12;
- u9
- u8
u7
u6
u5
@@ -2534,8 +2556,6 @@ see .
u2
u1
u0
- y9
- y8
y7
y6
y5
@@ -2549,9 +2569,7 @@ see .
- &dash-ent-12;
- v9
- v8
+ &dash-ent-16;
v7
v6
v5
@@ -2560,8 +2578,6 @@ see .
v2
v1
v0
- y9
- y8
y7
y6
y5
@@ -2571,13 +2587,11 @@ see .
y1
y0
-
- MEDIA_BUS_FMT_VYUY10_1X20
- 0x201b
+
+ MEDIA_BUS_FMT_VYUY8_1X16
+ 0x2010
- &dash-ent-12;
- v9
- v8
+ &dash-ent-16;
v7
v6
v5
@@ -2586,8 +2600,6 @@ see .
v2
v1
v0
- y9
- y8
y7
y6
y5
@@ -2601,9 +2613,7 @@ see .
- &dash-ent-12;
- u9
- u8
+ &dash-ent-16;
u7
u6
u5
@@ -2612,8 +2622,6 @@ see .
u2
u1
u0
- y9
- y8
y7
y6
y5
@@ -2623,13 +2631,11 @@ see .
y1
y0
-
- MEDIA_BUS_FMT_YUYV10_1X20
- 0x200d
+
+ MEDIA_BUS_FMT_YUYV8_1X16
+ 0x2011
- &dash-ent-12;
- y9
- y8
+ &dash-ent-16;
y7
y6
y5
@@ -2638,8 +2644,6 @@ see .
y2
y1
y0
- u9
- u8
u7
u6
u5
@@ -2653,9 +2657,7 @@ see .
- &dash-ent-12;
- y9
- y8
+ &dash-ent-16;
y7
y6
y5
@@ -2664,8 +2666,6 @@ see .
y2
y1
y0
- v9
- v8
v7
v6
v5
@@ -2675,13 +2675,11 @@ see .
v1
v0
-
- MEDIA_BUS_FMT_YVYU10_1X20
- 0x200e
+
+ MEDIA_BUS_FMT_YVYU8_1X16
+ 0x2012
- &dash-ent-12;
- y9
- y8
+ &dash-ent-16;
y7
y6
y5
@@ -2690,8 +2688,6 @@ see .
y2
y1
y0
- v9
- v8
v7
v6
v5
@@ -2705,9 +2701,51 @@ see .
- &dash-ent-12;
- y9
- y8
+ &dash-ent-16;
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+
+
+ MEDIA_BUS_FMT_YDYUYDYV8_1X16
+ 0x2014
+
+ &dash-ent-16;
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+ d
+ d
+ d
+ d
+ d
+ d
+ d
+ d
+
+
+
+
+
+ &dash-ent-16;
y7
y6
y5
@@ -2716,8 +2754,6 @@ see .
y2
y1
y0
- u9
- u8
u7
u6
u5
@@ -2727,14 +2763,11 @@ see .
u1
u0
-
- MEDIA_BUS_FMT_YUV10_1X30
- 0x2016
+
- -
- -
- y9
- y8
+
+
+ &dash-ent-16;
y7
y6
y5
@@ -2743,39 +2776,20 @@ see .
y2
y1
y0
- u9
- u8
- u7
- u6
- u5
- u4
- u3
- u2
- u1
- u0
- v9
- v8
- v7
- v6
- v5
- v4
- v3
- v2
- v1
- v0
+ d
+ d
+ d
+ d
+ d
+ d
+ d
+ d
-
- MEDIA_BUS_FMT_AYUV8_1X32
- 0x2017
+
- a7
- a6
- a5
- a4
- a3
- a2
- a1
- a0
+
+
+ &dash-ent-16;
y7
y6
y5
@@ -2784,14 +2798,6 @@ see .
y2
y1
y0
- u7
- u6
- u5
- u4
- u3
- u2
- u1
- u0
v7
v6
v5
@@ -2801,13 +2807,11 @@ see .
v1
v0
-
- MEDIA_BUS_FMT_UYVY12_2X12
- 0x201c
+
+ MEDIA_BUS_FMT_UYVY10_1X20
+ 0x201a
- &dash-ent-20;
- u11
- u10
+ &dash-ent-12;
u9
u8
u7
@@ -2818,14 +2822,6 @@ see .
u2
u1
u0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
y9
y8
y7
@@ -2841,9 +2837,7 @@ see .
- &dash-ent-20;
- v11
- v10
+ &dash-ent-12;
v9
v8
v7
@@ -2854,14 +2848,6 @@ see .
v2
v1
v0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
y9
y8
y7
@@ -2873,13 +2859,11 @@ see .
y1
y0
-
- MEDIA_BUS_FMT_VYUY12_2X12
- 0x201d
+
+ MEDIA_BUS_FMT_VYUY10_1X20
+ 0x201b
- &dash-ent-20;
- v11
- v10
+ &dash-ent-12;
v9
v8
v7
@@ -2890,14 +2874,6 @@ see .
v2
v1
v0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
y9
y8
y7
@@ -2913,9 +2889,7 @@ see .
- &dash-ent-20;
- u11
- u10
+ &dash-ent-12;
u9
u8
u7
@@ -2926,14 +2900,6 @@ see .
u2
u1
u0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
y9
y8
y7
@@ -2945,13 +2911,11 @@ see .
y1
y0
-
- MEDIA_BUS_FMT_YUYV12_2X12
- 0x201e
+
+ MEDIA_BUS_FMT_YUYV10_1X20
+ 0x200d
- &dash-ent-20;
- y11
- y10
+ &dash-ent-12;
y9
y8
y7
@@ -2962,14 +2926,6 @@ see .
y2
y1
y0
-
-
-
-
-
- &dash-ent-20;
- u11
- u10
u9
u8
u7
@@ -2985,9 +2941,7 @@ see .
- &dash-ent-20;
- y11
- y10
+ &dash-ent-12;
y9
y8
y7
@@ -2998,14 +2952,6 @@ see .
y2
y1
y0
-
-
-
-
-
- &dash-ent-20;
- v11
- v10
v9
v8
v7
@@ -3017,13 +2963,11 @@ see .
v1
v0
-
- MEDIA_BUS_FMT_YVYU12_2X12
- 0x201f
+
+ MEDIA_BUS_FMT_YVYU10_1X20
+ 0x200e
- &dash-ent-20;
- y11
- y10
+ &dash-ent-12;
y9
y8
y7
@@ -3034,14 +2978,6 @@ see .
y2
y1
y0
-
-
-
-
-
- &dash-ent-20;
- v11
- v10
v9
v8
v7
@@ -3057,9 +2993,7 @@ see .
- &dash-ent-20;
- y11
- y10
+ &dash-ent-12;
y9
y8
y7
@@ -3070,14 +3004,6 @@ see .
y2
y1
y0
-
-
-
-
-
- &dash-ent-20;
- u11
- u10
u9
u8
u7
@@ -3329,6 +3255,80 @@ see .
u1
u0
+
+ MEDIA_BUS_FMT_YUV10_1X30
+ 0x2016
+
+ -
+ -
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+ u9
+ u8
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+ v9
+ v8
+ v7
+ v6
+ v5
+ v4
+ v3
+ v2
+ v1
+ v0
+
+
+ MEDIA_BUS_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/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index b585bb32d25e85740710ff00ce69e01bcde3bf54..363a30fd8a21e7452d1f10123feae654eacb9513 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -67,6 +67,10 @@
#define MEDIA_BUS_FMT_YUYV10_2X10 0x200b
#define MEDIA_BUS_FMT_YVYU10_2X10 0x200c
#define MEDIA_BUS_FMT_Y12_1X12 0x2013
+#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
+#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
+#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
+#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
#define MEDIA_BUS_FMT_UYVY8_1X16 0x200f
#define MEDIA_BUS_FMT_VYUY8_1X16 0x2010
#define MEDIA_BUS_FMT_YUYV8_1X16 0x2011
@@ -76,16 +80,12 @@
#define MEDIA_BUS_FMT_VYUY10_1X20 0x201b
#define MEDIA_BUS_FMT_YUYV10_1X20 0x200d
#define MEDIA_BUS_FMT_YVYU10_1X20 0x200e
-#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
-#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
-#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
-#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
-#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
-#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
#define MEDIA_BUS_FMT_UYVY12_1X24 0x2020
#define MEDIA_BUS_FMT_VYUY12_1X24 0x2021
#define MEDIA_BUS_FMT_YUYV12_1X24 0x2022
#define MEDIA_BUS_FMT_YVYU12_1X24 0x2023
+#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
+#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
/* Bayer - next is 0x3019 */
#define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001