In order to have subsytem agnostic media bus format definitions we've
moved media bus definition to include/uapi/linux/media-bus-format.h and
prefixed enum values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.
Update the v4l documentation accordingly.
Signed-off-by: Boris Brezillon boris.brezil...@free-electrons.com
---
Documentation/DocBook/media/Makefile | 2 +-
Documentation/DocBook/media/v4l/subdev-formats.xml | 308 ++---
include/uapi/linux/v4l2-mediabus.h | 2 +
3 files changed, 157 insertions(+), 155 deletions(-)
diff --git a/Documentation/DocBook/media/Makefile
b/Documentation/DocBook/media/Makefile
index 8bf7c61..181b7f4 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -86,7 +86,7 @@ ENUMS = \
$(shell perl -ne 'print $$1 if /^enum\s+([^\s]+)\s+/'
$(srctree)/include/uapi/linux/dvb/net.h) \
$(shell perl -ne 'print $$1 if /^enum\s+([^\s]+)\s+/'
$(srctree)/include/uapi/linux/dvb/video.h) \
$(shell perl -ne 'print $$1 if /^enum\s+([^\s]+)\s+/'
$(srctree)/include/uapi/linux/media.h) \
- $(shell perl -ne 'print $$1 if /^enum\s+([^\s]+)\s+/'
$(srctree)/include/uapi/linux/v4l2-mediabus.h) \
+ $(shell perl -ne 'print $$1 if /^enum\s+([^\s]+)\s+/'
$(srctree)/include/uapi/linux/media-bus-format.h) \
$(shell perl -ne 'print $$1 if /^enum\s+([^\s]+)\s+/'
$(srctree)/include/uapi/linux/v4l2-subdev.h)
STRUCTS = \
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml
b/Documentation/DocBook/media/v4l/subdev-formats.xml
index b2d5a03..18730b9 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
- constantV4L2_MBUS_FMT_RGB555_2X8_PADHI_BE/constant.
+ constantMEDIA_BUS_FMT_RGB555_2X8_PADHI_BE/constant.
/para
paraThe following tables list existing packed RGB formats./para
@@ -176,8 +176,8 @@
/row
/thead
tbody valign=top
- row id=V4L2-MBUS-FMT-RGB444-2X8-PADHI-BE
- entryV4L2_MBUS_FMT_RGB444_2X8_PADHI_BE/entry
+ row id=MEDIA-BUS-FMT-RGB444-2X8-PADHI-BE
+ entryMEDIA_BUS_FMT_RGB444_2X8_PADHI_BE/entry
entry0x1001/entry
entry/entry
dash-ent-24;
@@ -204,8 +204,8 @@
entrybsubscript1/subscript/entry
entrybsubscript0/subscript/entry
/row
- row id=V4L2-MBUS-FMT-RGB444-2X8-PADHI-LE
- entryV4L2_MBUS_FMT_RGB444_2X8_PADHI_LE/entry
+ row id=MEDIA-BUS-FMT-RGB444-2X8-PADHI-LE
+ entryMEDIA_BUS_FMT_RGB444_2X8_PADHI_LE/entry
entry0x1002/entry
entry/entry
dash-ent-24;
@@ -232,8 +232,8 @@
entryrsubscript1/subscript/entry
entryrsubscript0/subscript/entry
/row
- row id=V4L2-MBUS-FMT-RGB555-2X8-PADHI-BE
- entryV4L2_MBUS_FMT_RGB555_2X8_PADHI_BE/entry
+ row id=MEDIA-BUS-FMT-RGB555-2X8-PADHI-BE
+ entryMEDIA_BUS_FMT_RGB555_2X8_PADHI_BE/entry
entry0x1003/entry
entry/entry
dash-ent-24;
@@ -260,8 +260,8 @@
entrybsubscript1/subscript/entry
entrybsubscript0/subscript/entry
/row
- row id=V4L2-MBUS-FMT-RGB555-2X8-PADHI-LE
- entryV4L2_MBUS_FMT_RGB555_2X8_PADHI_LE/entry
+ row id=MEDIA-BUS-FMT-RGB555-2X8-PADHI-LE
+ entryMEDIA_BUS_FMT_RGB555_2X8_PADHI_LE/entry
entry0x1004/entry
entry/entry
dash-ent-24;
@@ -288,8 +288,8 @@
entrygsubscript4/subscript/entry
entrygsubscript3/subscript/entry
/row
- row id=V4L2-MBUS-FMT-BGR565-2X8-BE
- entryV4L2_MBUS_FMT_BGR565_2X8_BE/entry
+ row id=MEDIA-BUS-FMT-BGR565-2X8-BE
+ entryMEDIA_BUS_FMT_BGR565_2X8_BE/entry
entry0x1005/entry
entry/entry
dash-ent-24;
@@ -316,8 +316,8 @@
entryrsubscript1/subscript/entry
entryrsubscript0/subscript/entry
/row
- row id=V4L2-MBUS-FMT-BGR565-2X8-LE
- entryV4L2_MBUS_FMT_BGR565_2X8_LE/entry
+ row id=MEDIA-BUS-FMT-BGR565-2X8-LE
+ entryMEDIA_BUS_FMT_BGR565_2X8_LE/entry
entry0x1006/entry
entry/entry
dash-ent-24;
@@ -344,8 +344,8 @@
entrygsubscript4/subscript/entry
entrygsubscript3/subscript/entry
/row
- row id=V4L2-MBUS-FMT-RGB565-2X8-BE
- entryV4L2_MBUS_FMT_RGB565_2X8_BE/entry
+ row