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 /include/uapi/linux | |
| 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 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/media-bus-format.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h index 83ea46f4be51..73c78f18a328 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h | |||
| @@ -33,13 +33,13 @@ | |||
| 33 | 33 | ||
| 34 | #define MEDIA_BUS_FMT_FIXED 0x0001 | 34 | #define MEDIA_BUS_FMT_FIXED 0x0001 |
| 35 | 35 | ||
| 36 | /* RGB - next is 0x1016 */ | 36 | /* RGB - next is 0x1018 */ |
| 37 | #define MEDIA_BUS_FMT_RGB444_1X12 0x100e | 37 | #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 |
| 38 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 | 38 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 |
| 39 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 | 39 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 |
| 40 | #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE 0x1003 | 40 | #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE 0x1003 |
| 41 | #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE 0x1004 | 41 | #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE 0x1004 |
| 42 | #define MEDIA_BUS_FMT_RGB565_1X16 0x100f | 42 | #define MEDIA_BUS_FMT_RGB565_1X16 0x1017 |
| 43 | #define MEDIA_BUS_FMT_BGR565_2X8_BE 0x1005 | 43 | #define MEDIA_BUS_FMT_BGR565_2X8_BE 0x1005 |
| 44 | #define MEDIA_BUS_FMT_BGR565_2X8_LE 0x1006 | 44 | #define MEDIA_BUS_FMT_BGR565_2X8_LE 0x1006 |
| 45 | #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007 | 45 | #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007 |
| @@ -56,7 +56,7 @@ | |||
| 56 | #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 | 56 | #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 |
| 57 | #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d | 57 | #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d |
| 58 | 58 | ||
| 59 | /* YUV (including grey) - next is 0x2025 */ | 59 | /* YUV (including grey) - next is 0x2026 */ |
| 60 | #define MEDIA_BUS_FMT_Y8_1X8 0x2001 | 60 | #define MEDIA_BUS_FMT_Y8_1X8 0x2001 |
| 61 | #define MEDIA_BUS_FMT_UV8_1X8 0x2015 | 61 | #define MEDIA_BUS_FMT_UV8_1X8 0x2015 |
| 62 | #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 | 62 | #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 |
| @@ -82,7 +82,7 @@ | |||
| 82 | #define MEDIA_BUS_FMT_VYUY10_1X20 0x201b | 82 | #define MEDIA_BUS_FMT_VYUY10_1X20 0x201b |
| 83 | #define MEDIA_BUS_FMT_YUYV10_1X20 0x200d | 83 | #define MEDIA_BUS_FMT_YUYV10_1X20 0x200d |
| 84 | #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e | 84 | #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e |
| 85 | #define MEDIA_BUS_FMT_YUV8_1X24 0x2024 | 85 | #define MEDIA_BUS_FMT_YUV8_1X24 0x2025 |
| 86 | #define MEDIA_BUS_FMT_YUV10_1X30 0x2016 | 86 | #define MEDIA_BUS_FMT_YUV10_1X30 0x2016 |
| 87 | #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 | 87 | #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 |
| 88 | #define MEDIA_BUS_FMT_UYVY12_2X12 0x201c | 88 | #define MEDIA_BUS_FMT_UYVY12_2X12 0x201c |