Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

[safe/jmp/linux-2.6] / include / media / v4l2-chip-ident.h

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index f3fdada..56abf21 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -39,6 +39,7 @@ enum {
 
        /* module saa7115: reserved range 101-149 */
        V4L2_IDENT_SAA7111 = 101,
+       V4L2_IDENT_SAA7111A = 102,
        V4L2_IDENT_SAA7113 = 103,
        V4L2_IDENT_SAA7114 = 104,
        V4L2_IDENT_SAA7115 = 105,
@@ -60,15 +61,28 @@ enum {
        V4L2_IDENT_OV7670 = 250,
        V4L2_IDENT_OV7720 = 251,
        V4L2_IDENT_OV7725 = 252,
+       V4L2_IDENT_OV7660 = 253,
+       V4L2_IDENT_OV9650 = 254,
+       V4L2_IDENT_OV9655 = 255,
+       V4L2_IDENT_SOI968 = 256,
+       V4L2_IDENT_OV9640 = 257,
 
        /* module saa7146: reserved range 300-309 */
        V4L2_IDENT_SAA7146 = 300,
 
-       /* Conexant MPEG encoder/decoders: reserved range 410-420 */
+       /* Conexant MPEG encoder/decoders: reserved range 400-420 */
+       V4L2_IDENT_CX23418_843 = 403, /* Integrated A/V Decoder on the '418 */
        V4L2_IDENT_CX23415 = 415,
        V4L2_IDENT_CX23416 = 416,
+       V4L2_IDENT_CX23417 = 417,
        V4L2_IDENT_CX23418 = 418,
 
+       /* module au0828 */
+       V4L2_IDENT_AU0828 = 828,
+
+       /* module indycam: just ident 2000 */
+       V4L2_IDENT_INDYCAM = 2000,
+
        /* module bt819: reserved range 810-819 */
        V4L2_IDENT_BT815A = 815,
        V4L2_IDENT_BT817A = 817,
@@ -88,6 +102,11 @@ enum {
        /* module vp27smpx: just ident 2700 */
        V4L2_IDENT_VP27SMPX = 2700,
 
+       /* module vpx3220: reserved range: 3210-3229 */
+       V4L2_IDENT_VPX3214C = 3214,
+       V4L2_IDENT_VPX3216B = 3216,
+       V4L2_IDENT_VPX3220A = 3220,
+
        /* module tvp5150 */
        V4L2_IDENT_TVP5150 = 5150,
 
@@ -113,6 +132,36 @@ enum {
        V4L2_IDENT_SAA6752HS = 6752,
        V4L2_IDENT_SAA6752HS_AC3 = 6753,
 
+       /* modules tef6862: just ident 6862 */
+       V4L2_IDENT_TEF6862 = 6862,
+
+       /* module tvp7002: just ident 7002 */
+       V4L2_IDENT_TVP7002 = 7002,
+
+       /* module adv7170: just ident 7170 */
+       V4L2_IDENT_ADV7170 = 7170,
+
+       /* module adv7175: just ident 7175 */
+       V4L2_IDENT_ADV7175 = 7175,
+
+       /* module adv7180: just ident 7180 */
+       V4L2_IDENT_ADV7180 = 7180,
+
+       /* module saa7185: just ident 7185 */
+       V4L2_IDENT_SAA7185 = 7185,
+
+       /* module saa7191: just ident 7191 */
+       V4L2_IDENT_SAA7191 = 7191,
+
+       /* module ths7303: just ident 7303 */
+       V4L2_IDENT_THS7303 = 7303,
+
+       /* module adv7343: just ident 7343 */
+       V4L2_IDENT_ADV7343 = 7343,
+
+       /* module saa7706h: just ident 7706 */
+       V4L2_IDENT_SAA7706H = 7706,
+
        /* module wm8739: just ident 8739 */
        V4L2_IDENT_WM8739 = 8739,
 
@@ -122,20 +171,32 @@ enum {
        /* module tda9840: just ident 9840 */
        V4L2_IDENT_TDA9840 = 9840,
 
-       /* module tw9910: just ident 9910 */
-       V4L2_IDENT_TW9910 = 9910,
+       /* module cafe_ccic, just ident 8801 */
+       V4L2_IDENT_CAFE = 8801,
 
-       /* module cs53132a: just ident 53132 */
-       V4L2_IDENT_CS53l32A = 53132,
+       /* module mt9v011, just ident 8243 */
+       V4L2_IDENT_MT9V011 = 8243,
 
-       /* module upd64031a: just ident 64031 */
-       V4L2_IDENT_UPD64031A = 64031,
+       /* module cx23885 and cx25840 */
+       V4L2_IDENT_CX23885    = 8850,
+       V4L2_IDENT_CX23885_AV = 8851, /* Integrated A/V decoder */
+       V4L2_IDENT_CX23887    = 8870,
+       V4L2_IDENT_CX23887_AV = 8871, /* Integrated A/V decoder */
+       V4L2_IDENT_CX23888    = 8880,
+       V4L2_IDENT_CX23888_AV = 8881, /* Integrated A/V decoder */
+       V4L2_IDENT_CX23888_IR = 8882, /* Integrated infrared controller */
 
-       /* module upd64083: just ident 64083 */
-       V4L2_IDENT_UPD64083 = 64083,
+       /* module tw9910: just ident 9910 */
+       V4L2_IDENT_TW9910 = 9910,
 
-       /* module m52790: just ident 52790 */
-       V4L2_IDENT_M52790 = 52790,
+       /* module sn9c20x: just ident 10000 */
+       V4L2_IDENT_SN9C20X = 10000,
+
+       /* module cx231xx and cx25840 */
+       V4L2_IDENT_CX2310X_AV = 23099, /* Integrated A/V decoder; not in '100 */
+       V4L2_IDENT_CX23100    = 23100,
+       V4L2_IDENT_CX23101    = 23101,
+       V4L2_IDENT_CX23102    = 23102,
 
        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
        V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
@@ -213,6 +274,28 @@ enum {
        V4L2_IDENT_MT9V022IX7ATC        = 45010, /* No way to detect "normal" I77ATx */
        V4L2_IDENT_MT9V022IX7ATM        = 45015, /* and "lead free" IA7ATx chips */
        V4L2_IDENT_MT9T031              = 45020,
+       V4L2_IDENT_MT9T111              = 45021,
+       V4L2_IDENT_MT9T112              = 45022,
+       V4L2_IDENT_MT9V111              = 45031,
+       V4L2_IDENT_MT9V112              = 45032,
+
+       /* HV7131R CMOS sensor: just ident 46000 */
+       V4L2_IDENT_HV7131R              = 46000,
+
+       /* module cs53132a: just ident 53132 */
+       V4L2_IDENT_CS53l32A = 53132,
+
+       /* module upd64031a: just ident 64031 */
+       V4L2_IDENT_UPD64031A = 64031,
+
+       /* module upd64083: just ident 64083 */
+       V4L2_IDENT_UPD64083 = 64083,
+
+       /* module m52790: just ident 52790 */
+       V4L2_IDENT_M52790 = 52790,
+
+       /* Sharp RJ54N1CB0C, 0xCB0C = 51980 */
+       V4L2_IDENT_RJ54N1CB0C = 51980,
 };
 
 #endif