diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2015-04-17 19:12:41 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-20 03:23:56 +0200 |
| commit | cec32a47010647e8b0603726ebb75b990a4057a4 (patch) | |
| tree | 9565a0d5603112874e2dd61e77e615a5b1bf2188 /Documentation/DocBook | |
| parent | Merge tag 'drm-intel-next-fixes-2015-04-15' of git://anongit.freedesktop.org/... (diff) | |
| download | linux-cec32a47010647e8b0603726ebb75b990a4057a4.tar.xz linux-cec32a47010647e8b0603726ebb75b990a4057a4.zip | |
media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
Change the constant values for RGB444_1X12, RGB565_1X16, and YUV8_1X24 media
bus formats in anticipation of a merge conflict with the media tree, where
the old values are already taken by RBG888_1X24, RGB888_1X32_PADHI, and
VUY8_1X24, respectively.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/media/v4l/subdev-formats.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml index 18b71aff48c9..553a38024745 100644 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@ -196,7 +196,7 @@ see <xref linkend="colorspaces" />.</entry> <tbody valign="top"> <row id="MEDIA-BUS-FMT-RGB444-1X12"> <entry>MEDIA_BUS_FMT_RGB444_1X12</entry> - <entry>0x100e</entry> + <entry>0x1016</entry> <entry></entry> &dash-ent-20; <entry>r<subscript>3</subscript></entry> @@ -326,7 +326,7 @@ see <xref linkend="colorspaces" />.</entry> </row> <row id="MEDIA-BUS-FMT-RGB565-1X16"> <entry>MEDIA_BUS_FMT_RGB565_1X16</entry> - <entry>0x100f</entry> + <entry>0x1017</entry> <entry></entry> &dash-ent-16; <entry>r<subscript>4</subscript></entry> @@ -3049,7 +3049,7 @@ see <xref linkend="colorspaces" />.</entry> </row> <row id="MEDIA-BUS-FMT-YUV8-1X24"> <entry>MEDIA_BUS_FMT_YUV8_1X24</entry> - <entry>0x2024</entry> + <entry>0x2025</entry> <entry></entry> <entry>-</entry> <entry>-</entry> |