[media] soc_camera: Add RGB666 & RGB888 formats

Based on work done by Katsuya Matsubara.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 14 insertions, 2 deletions

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 2cc70cf318bf..ff77d08c30fd 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -292,12 +292,17 @@ struct soc_camera_sense {
 #define SOCAM_DATAWIDTH_8       SOCAM_DATAWIDTH(8)
 #define SOCAM_DATAWIDTH_9       SOCAM_DATAWIDTH(9)
 #define SOCAM_DATAWIDTH_10      SOCAM_DATAWIDTH(10)
+#define SOCAM_DATAWIDTH_12      SOCAM_DATAWIDTH(12)
 #define SOCAM_DATAWIDTH_15      SOCAM_DATAWIDTH(15)
 #define SOCAM_DATAWIDTH_16      SOCAM_DATAWIDTH(16)
+#define SOCAM_DATAWIDTH_18      SOCAM_DATAWIDTH(18)
+#define SOCAM_DATAWIDTH_24      SOCAM_DATAWIDTH(24)
 
 #define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \
                               SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \
-                              SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)
+                              SOCAM_DATAWIDTH_12 | SOCAM_DATAWIDTH_15 | \
+                              SOCAM_DATAWIDTH_16 | SOCAM_DATAWIDTH_18 | \
+                              SOCAM_DATAWIDTH_24)
 
 static inline void soc_camera_limit_side(int *start, int *length,
                 unsigned int start_min,
diff --git a/include/media/soc_mediabus.h b/include/media/soc_mediabus.h
index 0dc6f4625b92..d33f6d059692 100644
--- a/include/media/soc_mediabus.h
+++ b/include/media/soc_mediabus.h
@@ -26,6 +26,8 @@
  * @SOC_MBUS_PACKING_VARIABLE:  compressed formats with variable packing
  * @SOC_MBUS_PACKING_1_5X8:     used for packed YUV 4:2:0 formats, where 4
  *                              pixels occupy 6 bytes in RAM
+ * @SOC_MBUS_PACKING_EXTEND32:  sample width (e.g., 24 bits) has to be extended
+ *                              to 32 bits
  */
 enum soc_mbus_packing {
         SOC_MBUS_PACKING_NONE,
@@ -34,6 +36,7 @@ enum soc_mbus_packing {
         SOC_MBUS_PACKING_EXTEND16,
         SOC_MBUS_PACKING_VARIABLE,
         SOC_MBUS_PACKING_1_5X8,
+        SOC_MBUS_PACKING_EXTEND32,
 };
 
 /**
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h
index b9b7bea04537..6ee63d09b32d 100644
--- a/include/uapi/linux/v4l2-mediabus.h
+++ b/include/uapi/linux/v4l2-mediabus.h
@@ -37,7 +37,7 @@
 enum v4l2_mbus_pixelcode {
         V4L2_MBUS_FMT_FIXED = 0x0001,
 
-        /* RGB - next is 0x1009 */
+        /* RGB - next is 0x100d */
         V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE = 0x1001,
         V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE = 0x1002,
         V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE = 0x1003,
@@ -46,6 +46,10 @@ enum v4l2_mbus_pixelcode {
         V4L2_MBUS_FMT_BGR565_2X8_LE = 0x1006,
         V4L2_MBUS_FMT_RGB565_2X8_BE = 0x1007,
         V4L2_MBUS_FMT_RGB565_2X8_LE = 0x1008,
+        V4L2_MBUS_FMT_RGB666_1X18 = 0x1009,
+        V4L2_MBUS_FMT_RGB888_1X24 = 0x100a,
+        V4L2_MBUS_FMT_RGB888_2X12_BE = 0x100b,
+        V4L2_MBUS_FMT_RGB888_2X12_LE = 0x100c,
 
         /* YUV (including grey) - next is 0x2017 */
         V4L2_MBUS_FMT_Y8_1X8 = 0x2001,