diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2015-04-17 13:12:41 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-04-19 21:23:56 -0400 |
commit | cec32a47010647e8b0603726ebb75b990a4057a4 (patch) | |
tree | 9565a0d5603112874e2dd61e77e615a5b1bf2188 /Documentation | |
parent | aa219a0dd7774e2454a5687e7d38e947a131cdee (diff) |
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')
-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> | |||
196 | <tbody valign="top"> | 196 | <tbody valign="top"> |
197 | <row id="MEDIA-BUS-FMT-RGB444-1X12"> | 197 | <row id="MEDIA-BUS-FMT-RGB444-1X12"> |
198 | <entry>MEDIA_BUS_FMT_RGB444_1X12</entry> | 198 | <entry>MEDIA_BUS_FMT_RGB444_1X12</entry> |
199 | <entry>0x100e</entry> | 199 | <entry>0x1016</entry> |
200 | <entry></entry> | 200 | <entry></entry> |
201 | &dash-ent-20; | 201 | &dash-ent-20; |
202 | <entry>r<subscript>3</subscript></entry> | 202 | <entry>r<subscript>3</subscript></entry> |
@@ -326,7 +326,7 @@ see <xref linkend="colorspaces" />.</entry> | |||
326 | </row> | 326 | </row> |
327 | <row id="MEDIA-BUS-FMT-RGB565-1X16"> | 327 | <row id="MEDIA-BUS-FMT-RGB565-1X16"> |
328 | <entry>MEDIA_BUS_FMT_RGB565_1X16</entry> | 328 | <entry>MEDIA_BUS_FMT_RGB565_1X16</entry> |
329 | <entry>0x100f</entry> | 329 | <entry>0x1017</entry> |
330 | <entry></entry> | 330 | <entry></entry> |
331 | &dash-ent-16; | 331 | &dash-ent-16; |
332 | <entry>r<subscript>4</subscript></entry> | 332 | <entry>r<subscript>4</subscript></entry> |
@@ -3049,7 +3049,7 @@ see <xref linkend="colorspaces" />.</entry> | |||
3049 | </row> | 3049 | </row> |
3050 | <row id="MEDIA-BUS-FMT-YUV8-1X24"> | 3050 | <row id="MEDIA-BUS-FMT-YUV8-1X24"> |
3051 | <entry>MEDIA_BUS_FMT_YUV8_1X24</entry> | 3051 | <entry>MEDIA_BUS_FMT_YUV8_1X24</entry> |
3052 | <entry>0x2024</entry> | 3052 | <entry>0x2025</entry> |
3053 | <entry></entry> | 3053 | <entry></entry> |
3054 | <entry>-</entry> | 3054 | <entry>-</entry> |
3055 | <entry>-</entry> | 3055 | <entry>-</entry> |