diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index d253e8f85f4d..9bfd468cd524 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -2255,6 +2255,294 @@ see .
y1
y0
+
+ MEDIA_BUS_FMT_UYVY12_2X12
+ 0x201c
+
+ &dash-ent-20;
+ u11
+ u10
+ u9
+ u8
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+
+
+
+
+
+ &dash-ent-20;
+ v11
+ v10
+ v9
+ v8
+ v7
+ v6
+ v5
+ v4
+ v3
+ v2
+ v1
+ v0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+
+
+ MEDIA_BUS_FMT_VYUY12_2X12
+ 0x201d
+
+ &dash-ent-20;
+ v11
+ v10
+ v9
+ v8
+ v7
+ v6
+ v5
+ v4
+ v3
+ v2
+ v1
+ v0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+
+
+
+
+
+ &dash-ent-20;
+ u11
+ u10
+ u9
+ u8
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+
+
+ MEDIA_BUS_FMT_YUYV12_2X12
+ 0x201e
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+
+
+
+
+
+ &dash-ent-20;
+ u11
+ u10
+ u9
+ u8
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+
+
+
+
+
+ &dash-ent-20;
+ v11
+ v10
+ v9
+ v8
+ v7
+ v6
+ v5
+ v4
+ v3
+ v2
+ v1
+ v0
+
+
+ MEDIA_BUS_FMT_YVYU12_2X12
+ 0x201f
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+
+
+
+
+
+ &dash-ent-20;
+ v11
+ v10
+ v9
+ v8
+ v7
+ v6
+ v5
+ v4
+ v3
+ v2
+ v1
+ v0
+
+
+
+
+
+ &dash-ent-20;
+ y11
+ y10
+ y9
+ y8
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+
+
+
+
+
+ &dash-ent-20;
+ u11
+ u10
+ u9
+ u8
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+
MEDIA_BUS_FMT_UYVY8_1X16
0x200f
@@ -2727,368 +3015,6 @@ 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
-
-
- MEDIA_BUS_FMT_UYVY12_2X12
- 0x201c
-
- &dash-ent-20;
- u11
- u10
- u9
- u8
- u7
- u6
- u5
- u4
- u3
- u2
- u1
- u0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
- y9
- y8
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
-
-
-
-
-
- &dash-ent-20;
- v11
- v10
- v9
- v8
- v7
- v6
- v5
- v4
- v3
- v2
- v1
- v0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
- y9
- y8
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
-
-
- MEDIA_BUS_FMT_VYUY12_2X12
- 0x201d
-
- &dash-ent-20;
- v11
- v10
- v9
- v8
- v7
- v6
- v5
- v4
- v3
- v2
- v1
- v0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
- y9
- y8
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
-
-
-
-
-
- &dash-ent-20;
- u11
- u10
- u9
- u8
- u7
- u6
- u5
- u4
- u3
- u2
- u1
- u0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
- y9
- y8
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
-
-
- MEDIA_BUS_FMT_YUYV12_2X12
- 0x201e
-
- &dash-ent-20;
- y11
- y10
- y9
- y8
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
-
-
-
-
-
- &dash-ent-20;
- u11
- u10
- u9
- u8
- u7
- u6
- u5
- u4
- u3
- u2
- u1
- u0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
- y9
- y8
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
-
-
-
-
-
- &dash-ent-20;
- v11
- v10
- v9
- v8
- v7
- v6
- v5
- v4
- v3
- v2
- v1
- v0
-
-
- MEDIA_BUS_FMT_YVYU12_2X12
- 0x201f
-
- &dash-ent-20;
- y11
- y10
- y9
- y8
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
-
-
-
-
-
- &dash-ent-20;
- v11
- v10
- v9
- v8
- v7
- v6
- v5
- v4
- v3
- v2
- v1
- v0
-
-
-
-
-
- &dash-ent-20;
- y11
- y10
- y9
- y8
- y7
- y6
- y5
- y4
- y3
- y2
- y1
- y0
-
-
-
-
-
- &dash-ent-20;
- u11
- u10
- u9
- u8
- u7
- u6
- u5
- u4
- u3
- u2
- u1
- u0
-
MEDIA_BUS_FMT_UYVY12_1X24
0x2020
@@ -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 b585bb32d25e..363a30fd8a21 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