Merge branch 'master' into csb1725

[mv-sheeva.git] / include / media / v4l2-mediabus.h

diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index f0cf2e7def0664d2e55f6e9e9628132dca427366..8e6559838ae32f844ec9f33626787d9b86b19316 100644 (file)
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -28,10 +28,18 @@ enum v4l2_mbus_pixelcode {
        V4L2_MBUS_FMT_YVYU8_2X8,
        V4L2_MBUS_FMT_UYVY8_2X8,
        V4L2_MBUS_FMT_VYUY8_2X8,
+       V4L2_MBUS_FMT_YVYU10_2X10,
+       V4L2_MBUS_FMT_YUYV10_2X10,
+       V4L2_MBUS_FMT_YVYU10_1X20,
+       V4L2_MBUS_FMT_YUYV10_1X20,
+       V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
+       V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE,
        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
        V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
        V4L2_MBUS_FMT_RGB565_2X8_LE,
        V4L2_MBUS_FMT_RGB565_2X8_BE,
+       V4L2_MBUS_FMT_BGR565_2X8_LE,
+       V4L2_MBUS_FMT_BGR565_2X8_BE,
        V4L2_MBUS_FMT_SBGGR8_1X8,
        V4L2_MBUS_FMT_SBGGR10_1X10,
        V4L2_MBUS_FMT_GREY8_1X8,