staging: vc04_services: isp: Add support for 14bit Bayer

The only thing missing was a set of defines, therefore add them in.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
index 40ca0f6..f590c20 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
@@ -254,6 +254,43 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
                .colorspace         = V4L2_COLORSPACE_RAW,
                .step_size          = 2,
        }, {
+               /* 14 bit */
+               .fourcc             = V4L2_PIX_FMT_SRGGB14P,
+               .depth              = 14,
+               .bytesperline_align = 32,
+               .flags              = 0,
+               .mmal_fmt           = MMAL_ENCODING_BAYER_SRGGB14P,
+               .size_multiplier_x2 = 2,
+               .colorspace         = V4L2_COLORSPACE_RAW,
+               .step_size          = 2,
+       }, {
+               .fourcc             = V4L2_PIX_FMT_SBGGR14P,
+               .depth              = 14,
+               .bytesperline_align = 32,
+               .flags              = 0,
+               .mmal_fmt           = MMAL_ENCODING_BAYER_SBGGR14P,
+               .size_multiplier_x2 = 2,
+               .colorspace         = V4L2_COLORSPACE_RAW,
+               .step_size          = 2,
+       }, {
+               .fourcc             = V4L2_PIX_FMT_SGRBG14P,
+               .depth              = 14,
+               .bytesperline_align = 32,
+               .flags              = 0,
+               .mmal_fmt           = MMAL_ENCODING_BAYER_SGRBG14P,
+               .size_multiplier_x2 = 2,
+               .colorspace         = V4L2_COLORSPACE_RAW,
+               .step_size          = 2,
+       }, {
+               .fourcc             = V4L2_PIX_FMT_SGBRG14P,
+               .depth              = 14,
+               .bytesperline_align = 32,
+               .flags              = 0,
+               .mmal_fmt           = MMAL_ENCODING_BAYER_SGBRG14P,
+               .size_multiplier_x2 = 2,
+               .colorspace         = V4L2_COLORSPACE_RAW,
+               .step_size          = 2,
+       }, {
                /* 16 bit */
                .fourcc             = V4L2_PIX_FMT_SRGGB16,
                .depth              = 16,

diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
index 8d904fc..4288d50 100644 (file)
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
@@ -90,6 +90,12 @@
 #define MMAL_ENCODING_BAYER_SGBRG12P   MMAL_FOURCC('p', 'G', '1', '2')
 #define MMAL_ENCODING_BAYER_SRGGB12P   MMAL_FOURCC('p', 'R', '1', '2')
 
+//14 bit per pixel Bayer formats.
+#define MMAL_ENCODING_BAYER_SBGGR14P   MMAL_FOURCC('p', 'B', 'E', 'E')
+#define MMAL_ENCODING_BAYER_SGBRG14P   MMAL_FOURCC('p', 'G', 'E', 'E')
+#define MMAL_ENCODING_BAYER_SGRBG14P   MMAL_FOURCC('p', 'g', 'E', 'E')
+#define MMAL_ENCODING_BAYER_SRGGB14P   MMAL_FOURCC('p', 'R', 'E', 'E')
+
 /* 16 bit per pixel Bayer formats. */
 #define MMAL_ENCODING_BAYER_SBGGR16    MMAL_FOURCC('B', 'G', '1', '6')
 #define MMAL_ENCODING_BAYER_SGBRG16    MMAL_FOURCC('G', 'B', '1', '6')