diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index b2d5a0363cba..18730b96e1e6 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -86,7 +86,7 @@
green and 5-bit blue values padded on the high bit, transferred as 2 8-bit
samples per pixel with the most significant bits (padding, red and half of
the green value) transferred first will be named
- V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE.
+ MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE.
The following tables list existing packed RGB formats.
@@ -176,8 +176,8 @@
-
- V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE
+
+ MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE
0x1001
&dash-ent-24;
@@ -204,8 +204,8 @@
b1
b0
-
- V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE
+
+ MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE
0x1002
&dash-ent-24;
@@ -232,8 +232,8 @@
r1
r0
-
- V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE
+
+ MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE
0x1003
&dash-ent-24;
@@ -260,8 +260,8 @@
b1
b0
-
- V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE
+
+ MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE
0x1004
&dash-ent-24;
@@ -288,8 +288,8 @@
g4
g3
-
- V4L2_MBUS_FMT_BGR565_2X8_BE
+
+ MEDIA_BUS_FMT_BGR565_2X8_BE
0x1005
&dash-ent-24;
@@ -316,8 +316,8 @@
r1
r0
-
- V4L2_MBUS_FMT_BGR565_2X8_LE
+
+ MEDIA_BUS_FMT_BGR565_2X8_LE
0x1006
&dash-ent-24;
@@ -344,8 +344,8 @@
g4
g3
-
- V4L2_MBUS_FMT_RGB565_2X8_BE
+
+ MEDIA_BUS_FMT_RGB565_2X8_BE
0x1007
&dash-ent-24;
@@ -372,8 +372,8 @@
b1
b0
-
- V4L2_MBUS_FMT_RGB565_2X8_LE
+
+ MEDIA_BUS_FMT_RGB565_2X8_LE
0x1008
&dash-ent-24;
@@ -400,8 +400,8 @@
g4
g3
-
- V4L2_MBUS_FMT_RGB666_1X18
+
+ MEDIA_BUS_FMT_RGB666_1X18
0x1009
&dash-ent-14;
@@ -424,8 +424,8 @@
b1
b0
-
- V4L2_MBUS_FMT_RGB888_1X24
+
+ MEDIA_BUS_FMT_RGB888_1X24
0x100a
&dash-ent-8;
@@ -454,8 +454,8 @@
b1
b0
-
- V4L2_MBUS_FMT_RGB888_2X12_BE
+
+ MEDIA_BUS_FMT_RGB888_2X12_BE
0x100b
&dash-ent-20;
@@ -490,8 +490,8 @@
b1
b0
-
- V4L2_MBUS_FMT_RGB888_2X12_LE
+
+ MEDIA_BUS_FMT_RGB888_2X12_LE
0x100c
&dash-ent-20;
@@ -526,8 +526,8 @@
g5
g4
-
- V4L2_MBUS_FMT_ARGB888_1X32
+
+ MEDIA_BUS_FMT_ARGB888_1X32
0x100d
a7
@@ -600,7 +600,7 @@
For instance, a format with uncompressed 10-bit Bayer components
arranged in a red, green, green, blue pattern transferred as 2 8-bit
samples per pixel with the least significant bits transferred first will
- be named V4L2_MBUS_FMT_SRGGB10_2X8_PADHI_LE.
+ be named MEDIA_BUS_FMT_SRGGB10_2X8_PADHI_LE.
@@ -663,8 +663,8 @@
-
- V4L2_MBUS_FMT_SBGGR8_1X8
+
+ MEDIA_BUS_FMT_SBGGR8_1X8
0x3001
-
@@ -680,8 +680,8 @@
b1
b0
-
- V4L2_MBUS_FMT_SGBRG8_1X8
+
+ MEDIA_BUS_FMT_SGBRG8_1X8
0x3013
-
@@ -697,8 +697,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SGRBG8_1X8
+
+ MEDIA_BUS_FMT_SGRBG8_1X8
0x3002
-
@@ -714,8 +714,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SRGGB8_1X8
+
+ MEDIA_BUS_FMT_SRGGB8_1X8
0x3014
-
@@ -731,8 +731,8 @@
r1
r0
-
- V4L2_MBUS_FMT_SBGGR10_ALAW8_1X8
+
+ MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8
0x3015
-
@@ -748,8 +748,8 @@
b1
b0
-
- V4L2_MBUS_FMT_SGBRG10_ALAW8_1X8
+
+ MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8
0x3016
-
@@ -765,8 +765,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8
+
+ MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8
0x3017
-
@@ -782,8 +782,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SRGGB10_ALAW8_1X8
+
+ MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8
0x3018
-
@@ -799,8 +799,8 @@
r1
r0
-
- V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8
+
+ MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8
0x300b
-
@@ -816,8 +816,8 @@
b1
b0
-
- V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8
+
+ MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8
0x300c
-
@@ -833,8 +833,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8
+
+ MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8
0x3009
-
@@ -850,8 +850,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8
+
+ MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8
0x300d
-
@@ -867,8 +867,8 @@
r1
r0
-
- V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE
+
+ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE
0x3003
-
@@ -901,8 +901,8 @@
b1
b0
-
- V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE
+
+ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE
0x3004
-
@@ -935,8 +935,8 @@
b9
b8
-
- V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE
+
+ MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE
0x3005
-
@@ -969,8 +969,8 @@
0
0
-
- V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE
+
+ MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE
0x3006
-
@@ -1003,8 +1003,8 @@
b3
b2
-
- V4L2_MBUS_FMT_SBGGR10_1X10
+
+ MEDIA_BUS_FMT_SBGGR10_1X10
0x3007
-
@@ -1020,8 +1020,8 @@
b1
b0
-
- V4L2_MBUS_FMT_SGBRG10_1X10
+
+ MEDIA_BUS_FMT_SGBRG10_1X10
0x300e
-
@@ -1037,8 +1037,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SGRBG10_1X10
+
+ MEDIA_BUS_FMT_SGRBG10_1X10
0x300a
-
@@ -1054,8 +1054,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SRGGB10_1X10
+
+ MEDIA_BUS_FMT_SRGGB10_1X10
0x300f
-
@@ -1071,8 +1071,8 @@
r1
r0
-
- V4L2_MBUS_FMT_SBGGR12_1X12
+
+ MEDIA_BUS_FMT_SBGGR12_1X12
0x3008
b11
@@ -1088,8 +1088,8 @@
b1
b0
-
- V4L2_MBUS_FMT_SGBRG12_1X12
+
+ MEDIA_BUS_FMT_SGBRG12_1X12
0x3010
g11
@@ -1105,8 +1105,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SGRBG12_1X12
+
+ MEDIA_BUS_FMT_SGRBG12_1X12
0x3011
g11
@@ -1122,8 +1122,8 @@
g1
g0
-
- V4L2_MBUS_FMT_SRGGB12_1X12
+
+ MEDIA_BUS_FMT_SRGGB12_1X12
0x3012
r11
@@ -1175,7 +1175,7 @@
For instance, a format where pixels are encoded as 8-bit YUV values
downsampled to 4:2:2 and transferred as 2 8-bit bus samples per pixel in the
- U, Y, V, Y order will be named V4L2_MBUS_FMT_UYVY8_2X8.
+ U, Y, V, Y order will be named MEDIA_BUS_FMT_UYVY8_2X8.
lists existing packed YUV
@@ -1280,8 +1280,8 @@
-
- V4L2_MBUS_FMT_Y8_1X8
+
+ MEDIA_BUS_FMT_Y8_1X8
0x2001
&dash-ent-24;
@@ -1294,8 +1294,8 @@
y1
y0
-
- V4L2_MBUS_FMT_UV8_1X8
+
+ MEDIA_BUS_FMT_UV8_1X8
0x2015
&dash-ent-24;
@@ -1322,8 +1322,8 @@
v1
v0
-
- V4L2_MBUS_FMT_UYVY8_1_5X8
+
+ MEDIA_BUS_FMT_UYVY8_1_5X8
0x2002
&dash-ent-24;
@@ -1406,8 +1406,8 @@
y1
y0
-
- V4L2_MBUS_FMT_VYUY8_1_5X8
+
+ MEDIA_BUS_FMT_VYUY8_1_5X8
0x2003
&dash-ent-24;
@@ -1490,8 +1490,8 @@
y1
y0
-
- V4L2_MBUS_FMT_YUYV8_1_5X8
+
+ MEDIA_BUS_FMT_YUYV8_1_5X8
0x2004
&dash-ent-24;
@@ -1574,8 +1574,8 @@
v1
v0
-
- V4L2_MBUS_FMT_YVYU8_1_5X8
+
+ MEDIA_BUS_FMT_YVYU8_1_5X8
0x2005
&dash-ent-24;
@@ -1658,8 +1658,8 @@
u1
u0
-
- V4L2_MBUS_FMT_UYVY8_2X8
+
+ MEDIA_BUS_FMT_UYVY8_2X8
0x2006
&dash-ent-24;
@@ -1714,8 +1714,8 @@
y1
y0
-
- V4L2_MBUS_FMT_VYUY8_2X8
+
+ MEDIA_BUS_FMT_VYUY8_2X8
0x2007
&dash-ent-24;
@@ -1770,8 +1770,8 @@
y1
y0
-
- V4L2_MBUS_FMT_YUYV8_2X8
+
+ MEDIA_BUS_FMT_YUYV8_2X8
0x2008
&dash-ent-24;
@@ -1826,8 +1826,8 @@
v1
v0
-
- V4L2_MBUS_FMT_YVYU8_2X8
+
+ MEDIA_BUS_FMT_YVYU8_2X8
0x2009
&dash-ent-24;
@@ -1882,8 +1882,8 @@
u1
u0
-
- V4L2_MBUS_FMT_Y10_1X10
+
+ MEDIA_BUS_FMT_Y10_1X10
0x200a
&dash-ent-22;
@@ -1898,8 +1898,8 @@
y1
y0
-
- V4L2_MBUS_FMT_UYVY10_2X10
+
+ MEDIA_BUS_FMT_UYVY10_2X10
0x2018
&dash-ent-22;
@@ -1962,8 +1962,8 @@
y1
y0
-
- V4L2_MBUS_FMT_VYUY10_2X10
+
+ MEDIA_BUS_FMT_VYUY10_2X10
0x2019
&dash-ent-22;
@@ -2026,8 +2026,8 @@
y1
y0
-
- V4L2_MBUS_FMT_YUYV10_2X10
+
+ MEDIA_BUS_FMT_YUYV10_2X10
0x200b
&dash-ent-22;
@@ -2090,8 +2090,8 @@
v1
v0
-
- V4L2_MBUS_FMT_YVYU10_2X10
+
+ MEDIA_BUS_FMT_YVYU10_2X10
0x200c
&dash-ent-22;
@@ -2154,8 +2154,8 @@
u1
u0
-
- V4L2_MBUS_FMT_Y12_1X12
+
+ MEDIA_BUS_FMT_Y12_1X12
0x2013
&dash-ent-20;
@@ -2172,8 +2172,8 @@
y1
y0
-
- V4L2_MBUS_FMT_UYVY8_1X16
+
+ MEDIA_BUS_FMT_UYVY8_1X16
0x200f
&dash-ent-16;
@@ -2216,8 +2216,8 @@
y1
y0
-
- V4L2_MBUS_FMT_VYUY8_1X16
+
+ MEDIA_BUS_FMT_VYUY8_1X16
0x2010
&dash-ent-16;
@@ -2260,8 +2260,8 @@
y1
y0
-
- V4L2_MBUS_FMT_YUYV8_1X16
+
+ MEDIA_BUS_FMT_YUYV8_1X16
0x2011
&dash-ent-16;
@@ -2304,8 +2304,8 @@
v1
v0
-
- V4L2_MBUS_FMT_YVYU8_1X16
+
+ MEDIA_BUS_FMT_YVYU8_1X16
0x2012
&dash-ent-16;
@@ -2348,8 +2348,8 @@
u1
u0
-
- V4L2_MBUS_FMT_YDYUYDYV8_1X16
+
+ MEDIA_BUS_FMT_YDYUYDYV8_1X16
0x2014
&dash-ent-16;
@@ -2436,8 +2436,8 @@
v1
v0
-
- V4L2_MBUS_FMT_UYVY10_1X20
+
+ MEDIA_BUS_FMT_UYVY10_1X20
0x201a
&dash-ent-12;
@@ -2488,8 +2488,8 @@
y1
y0
-
- V4L2_MBUS_FMT_VYUY10_1X20
+
+ MEDIA_BUS_FMT_VYUY10_1X20
0x201b
&dash-ent-12;
@@ -2540,8 +2540,8 @@
y1
y0
-
- V4L2_MBUS_FMT_YUYV10_1X20
+
+ MEDIA_BUS_FMT_YUYV10_1X20
0x200d
&dash-ent-12;
@@ -2592,8 +2592,8 @@
v1
v0
-
- V4L2_MBUS_FMT_YVYU10_1X20
+
+ MEDIA_BUS_FMT_YVYU10_1X20
0x200e
&dash-ent-12;
@@ -2644,8 +2644,8 @@
u1
u0
-
- V4L2_MBUS_FMT_YUV10_1X30
+
+ MEDIA_BUS_FMT_YUV10_1X30
0x2016
-
@@ -2681,8 +2681,8 @@
v1
v0
-
- V4L2_MBUS_FMT_AYUV8_1X32
+
+ MEDIA_BUS_FMT_AYUV8_1X32
0x2017
a7
@@ -2718,8 +2718,8 @@
v1
v0
-
- V4L2_MBUS_FMT_UYVY12_2X12
+
+ MEDIA_BUS_FMT_UYVY12_2X12
0x201c
&dash-ent-20;
@@ -2790,8 +2790,8 @@
y1
y0
-
- V4L2_MBUS_FMT_VYUY12_2X12
+
+ MEDIA_BUS_FMT_VYUY12_2X12
0x201d
&dash-ent-20;
@@ -2862,8 +2862,8 @@
y1
y0
-
- V4L2_MBUS_FMT_YUYV12_2X12
+
+ MEDIA_BUS_FMT_YUYV12_2X12
0x201e
&dash-ent-20;
@@ -2934,8 +2934,8 @@
v1
v0
-
- V4L2_MBUS_FMT_YVYU12_2X12
+
+ MEDIA_BUS_FMT_YVYU12_2X12
0x201f
&dash-ent-20;
@@ -3006,8 +3006,8 @@
u1
u0
-
- V4L2_MBUS_FMT_UYVY12_1X24
+
+ MEDIA_BUS_FMT_UYVY12_1X24
0x2020
&dash-ent-8;
@@ -3066,8 +3066,8 @@
y1
y0
-
- V4L2_MBUS_FMT_VYUY12_1X24
+
+ MEDIA_BUS_FMT_VYUY12_1X24
0x2021
&dash-ent-8;
@@ -3126,8 +3126,8 @@
y1
y0
-
- V4L2_MBUS_FMT_YUYV12_1X24
+
+ MEDIA_BUS_FMT_YUYV12_1X24
0x2022
&dash-ent-8;
@@ -3186,8 +3186,8 @@
v1
v0
-
- V4L2_MBUS_FMT_YVYU12_1X24
+
+ MEDIA_BUS_FMT_YVYU12_1X24
0x2023
&dash-ent-8;
@@ -3366,8 +3366,8 @@
-
- V4L2_MBUS_FMT_AHSV8888_1X32
+
+ MEDIA_BUS_FMT_AHSV8888_1X32
0x6001
a7
@@ -3422,7 +3422,7 @@
For instance, for a JPEG baseline process and an 8-bit bus width
- the format will be named V4L2_MBUS_FMT_JPEG_1X8.
+ the format will be named MEDIA_BUS_FMT_JPEG_1X8.
The following table lists existing JPEG compressed formats.
@@ -3441,8 +3441,8 @@
-
- V4L2_MBUS_FMT_JPEG_1X8
+
+ MEDIA_BUS_FMT_JPEG_1X8
0x4001
Besides of its usage for the parallel bus this format is
recommended for transmission of JPEG data over MIPI CSI bus
@@ -3484,8 +3484,8 @@ interface and may change in the future.
-
- V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8
+
+ MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8
0x5001
Interleaved raw UYVY and JPEG image format with embedded