Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into...

[linux-2.6-block.git] / include / uapi / linux / media-bus-format.h

diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 73c78f18a328b08bc7eb6e8bdf2e094518e29d18..190d491d5b13a4cea9fa270c9d2cb7d02e6f29a2 100644 (file)
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -45,6 +45,7 @@
 #define MEDIA_BUS_FMT_RGB565_2X8_BE            0x1007
 #define MEDIA_BUS_FMT_RGB565_2X8_LE            0x1008
 #define MEDIA_BUS_FMT_RGB666_1X18              0x1009
+#define MEDIA_BUS_FMT_RBG888_1X24              0x100e
 #define MEDIA_BUS_FMT_RGB666_1X24_CPADHI       0x1015
 #define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG                0x1010
 #define MEDIA_BUS_FMT_BGR888_1X24              0x1013
@@ -55,6 +56,7 @@
 #define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG                0x1011
 #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA       0x1012
 #define MEDIA_BUS_FMT_ARGB8888_1X32            0x100d
+#define MEDIA_BUS_FMT_RGB888_1X32_PADHI                0x100f
 
 /* YUV (including grey) - next is      0x2026 */
 #define MEDIA_BUS_FMT_Y8_1X8                   0x2001
@@ -73,6 +75,10 @@
 #define MEDIA_BUS_FMT_YUYV10_2X10              0x200b
 #define MEDIA_BUS_FMT_YVYU10_2X10              0x200c
 #define MEDIA_BUS_FMT_Y12_1X12                 0x2013
+#define MEDIA_BUS_FMT_UYVY12_2X12              0x201c
+#define MEDIA_BUS_FMT_VYUY12_2X12              0x201d
+#define MEDIA_BUS_FMT_YUYV12_2X12              0x201e
+#define MEDIA_BUS_FMT_YVYU12_2X12              0x201f
 #define MEDIA_BUS_FMT_UYVY8_1X16               0x200f
 #define MEDIA_BUS_FMT_VYUY8_1X16               0x2010
 #define MEDIA_BUS_FMT_YUYV8_1X16               0x2011
@@ -82,17 +88,14 @@
 #define MEDIA_BUS_FMT_VYUY10_1X20              0x201b
 #define MEDIA_BUS_FMT_YUYV10_1X20              0x200d
 #define MEDIA_BUS_FMT_YVYU10_1X20              0x200e
+#define MEDIA_BUS_FMT_VUY8_1X24                        0x2024
 #define MEDIA_BUS_FMT_YUV8_1X24                        0x2025
-#define MEDIA_BUS_FMT_YUV10_1X30               0x2016
-#define MEDIA_BUS_FMT_AYUV8_1X32               0x2017
-#define MEDIA_BUS_FMT_UYVY12_2X12              0x201c
-#define MEDIA_BUS_FMT_VYUY12_2X12              0x201d
-#define MEDIA_BUS_FMT_YUYV12_2X12              0x201e
-#define MEDIA_BUS_FMT_YVYU12_2X12              0x201f
 #define MEDIA_BUS_FMT_UYVY12_1X24              0x2020
 #define MEDIA_BUS_FMT_VYUY12_1X24              0x2021
 #define MEDIA_BUS_FMT_YUYV12_1X24              0x2022
 #define MEDIA_BUS_FMT_YVYU12_1X24              0x2023
+#define MEDIA_BUS_FMT_YUV10_1X30               0x2016
+#define MEDIA_BUS_FMT_AYUV8_1X32               0x2017
 
 /* Bayer - next is     0x3019 */
 #define MEDIA_BUS_FMT_SBGGR8_1X8               0x3001