Merge branch 'topic/r820t' into patchwork

[~andy/linux] / include / media / soc_camera.h

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 2cc70cf318bf25938212eb305e571d660fb1a451..ff77d08c30fda6062bdcc45ccdf8327e1560b506 100644 (file)
--- 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,