Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.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 190d491d5b13a4cea9fa270c9d2cb7d02e6f29a2..2168759c12874b3f5e08168ae50c8771e4d428a2 100644 (file)
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -97,7 +97,7 @@
 #define MEDIA_BUS_FMT_YUV10_1X30               0x2016
 #define MEDIA_BUS_FMT_AYUV8_1X32               0x2017
 
-/* Bayer - next is     0x3019 */
+/* Bayer - next is     0x3021 */
 #define MEDIA_BUS_FMT_SBGGR8_1X8               0x3001
 #define MEDIA_BUS_FMT_SGBRG8_1X8               0x3013
 #define MEDIA_BUS_FMT_SGRBG8_1X8               0x3002
@@ -122,6 +122,14 @@
 #define MEDIA_BUS_FMT_SGBRG12_1X12             0x3010
 #define MEDIA_BUS_FMT_SGRBG12_1X12             0x3011
 #define MEDIA_BUS_FMT_SRGGB12_1X12             0x3012
+#define MEDIA_BUS_FMT_SBGGR14_1X14             0x3019
+#define MEDIA_BUS_FMT_SGBRG14_1X14             0x301a
+#define MEDIA_BUS_FMT_SGRBG14_1X14             0x301b
+#define MEDIA_BUS_FMT_SRGGB14_1X14             0x301c
+#define MEDIA_BUS_FMT_SBGGR16_1X16             0x301d
+#define MEDIA_BUS_FMT_SGBRG16_1X16             0x301e
+#define MEDIA_BUS_FMT_SGRBG16_1X16             0x301f
+#define MEDIA_BUS_FMT_SRGGB16_1X16             0x3020
 
 /* JPEG compressed formats - next is   0x4002 */
 #define MEDIA_BUS_FMT_JPEG_1X8                 0x4001