1 files changed, 78 insertions, 16 deletions
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 9aaf652b20ef..1be461a29077 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -37,10 +37,8 @@ enum {
        /* module saa7110: just ident 100 */
        V4L2_IDENT_SAA7110 = 100,
-        /* module saa7111: just ident 101 */
+        /* module saa7115: reserved range 101-149 */
        V4L2_IDENT_SAA7111 = 101,
-        /* module saa7115: reserved range 102-149 */
        V4L2_IDENT_SAA7113 = 103,
        V4L2_IDENT_SAA7114 = 104,
        V4L2_IDENT_SAA7115 = 105,
@@ -63,44 +61,96 @@ enum {
        V4L2_IDENT_OV7720 = 251,
        V4L2_IDENT_OV7725 = 252,
-        /* Conexant MPEG encoder/decoders: reserved range 410-420 */
+        /* module saa7146: reserved range 300-309 */
+        V4L2_IDENT_SAA7146 = 300,
+        /* 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_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,
+        V4L2_IDENT_BT819A = 819,
+        /* module bt856: just ident 856 */
+        V4L2_IDENT_BT856 = 856,
+        /* module bt866: just ident 866 */
+        V4L2_IDENT_BT866 = 866,
+        /* module ks0127: reserved range 1120-1129 */
+        V4L2_IDENT_KS0122S = 1122,
+        V4L2_IDENT_KS0127  = 1127,
+        V4L2_IDENT_KS0127B = 1128,
        /* 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,
+        /* module saa5246a: just ident 5246 */
+        V4L2_IDENT_SAA5246A = 5246,
+        /* module saa5249: just ident 5249 */
+        V4L2_IDENT_SAA5249 = 5249,
        /* module cs5345: just ident 5345 */
        V4L2_IDENT_CS5345 = 5345,
+        /* module tea6415c: just ident 6415 */
+        V4L2_IDENT_TEA6415C = 6415,
+        /* module tea6420: just ident 6420 */
+        V4L2_IDENT_TEA6420 = 6420,
+        /* module saa6588: just ident 6588 */
+        V4L2_IDENT_SAA6588 = 6588,
        /* module saa6752hs: reserved range 6750-6759 */
        V4L2_IDENT_SAA6752HS = 6752,
        V4L2_IDENT_SAA6752HS_AC3 = 6753,
+        /* module adv7170: just ident 7170 */
+        V4L2_IDENT_ADV7170 = 7170,
+        /* module adv7175: just ident 7175 */
+        V4L2_IDENT_ADV7175 = 7175,
+        /* module saa7185: just ident 7185 */
+        V4L2_IDENT_SAA7185 = 7185,
+        /* module saa7191: just ident 7191 */
+        V4L2_IDENT_SAA7191 = 7191,
        /* module wm8739: just ident 8739 */
        V4L2_IDENT_WM8739 = 8739,
        /* module wm8775: just ident 8775 */
        V4L2_IDENT_WM8775 = 8775,
-        /* module tw9910: just ident 9910 */
+        /* module tda9840: just ident 9840 */
-        V4L2_IDENT_TW9910 = 9910,
+        V4L2_IDENT_TDA9840 = 9840,
-        /* module cs53132a: just ident 53132 */
-        V4L2_IDENT_CS53l32A = 53132,
-        /* module upd64031a: just ident 64031 */
-        V4L2_IDENT_UPD64031A = 64031,
-        /* module upd64083: just ident 64083 */
+        /* module cafe_ccic, just ident 8801 */
-        V4L2_IDENT_UPD64083 = 64083,
+        V4L2_IDENT_CAFE = 8801,
-        /* module m52790: just ident 52790 */
+        /* module tw9910: just ident 9910 */
-        V4L2_IDENT_M52790 = 52790,
+        V4L2_IDENT_TW9910 = 9910,
        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
        V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
@@ -178,6 +228,18 @@ enum {
        V4L2_IDENT_MT9V022IX7ATC        = 45010, /* No way to detect "normal" I77ATx */
        V4L2_IDENT_MT9V022IX7ATM        = 45015, /* and "lead free" IA7ATx chips */
        V4L2_IDENT_MT9T031              = 45020,
+        /* 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,
 };
 #endif

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h index 9aaf652b20ef..1be461a29077 100644 --- a/include/media/v4l2-chip-ident.h +++ b/include/media/v4l2-chip-ident.h
@@ -37,10 +37,8 @@ enum {
37	/* module saa7110: just ident 100 */	37	/* module saa7110: just ident 100 */
38	V4L2_IDENT_SAA7110 = 100,	38	V4L2_IDENT_SAA7110 = 100,
39		39
40	/* module saa7111: just ident 101 */	40	/* module saa7115: reserved range 101-149 */
41	V4L2_IDENT_SAA7111 = 101,	41	V4L2_IDENT_SAA7111 = 101,
42
43	/* module saa7115: reserved range 102-149 */
44	V4L2_IDENT_SAA7113 = 103,	42	V4L2_IDENT_SAA7113 = 103,
45	V4L2_IDENT_SAA7114 = 104,	43	V4L2_IDENT_SAA7114 = 104,
46	V4L2_IDENT_SAA7115 = 105,	44	V4L2_IDENT_SAA7115 = 105,
@@ -63,44 +61,96 @@ enum {
63	V4L2_IDENT_OV7720 = 251,	61	V4L2_IDENT_OV7720 = 251,
64	V4L2_IDENT_OV7725 = 252,	62	V4L2_IDENT_OV7725 = 252,
65		63
66	/* Conexant MPEG encoder/decoders: reserved range 410-420 */	64	/* module saa7146: reserved range 300-309 */
		65	V4L2_IDENT_SAA7146 = 300,
		66
		67	/* Conexant MPEG encoder/decoders: reserved range 400-420 */
		68	V4L2_IDENT_CX23418_843 = 403, /* Integrated A/V Decoder on the '418 */
67	V4L2_IDENT_CX23415 = 415,	69	V4L2_IDENT_CX23415 = 415,
68	V4L2_IDENT_CX23416 = 416,	70	V4L2_IDENT_CX23416 = 416,
69	V4L2_IDENT_CX23418 = 418,	71	V4L2_IDENT_CX23418 = 418,
70		72
		73	/* module au0828 */
		74	V4L2_IDENT_AU0828 = 828,
		75
		76	/* module indycam: just ident 2000 */
		77	V4L2_IDENT_INDYCAM = 2000,
		78
		79	/* module bt819: reserved range 810-819 */
		80	V4L2_IDENT_BT815A = 815,
		81	V4L2_IDENT_BT817A = 817,
		82	V4L2_IDENT_BT819A = 819,
		83
		84	/* module bt856: just ident 856 */
		85	V4L2_IDENT_BT856 = 856,
		86
		87	/* module bt866: just ident 866 */
		88	V4L2_IDENT_BT866 = 866,
		89
		90	/* module ks0127: reserved range 1120-1129 */
		91	V4L2_IDENT_KS0122S = 1122,
		92	V4L2_IDENT_KS0127 = 1127,
		93	V4L2_IDENT_KS0127B = 1128,
		94
71	/* module vp27smpx: just ident 2700 */	95	/* module vp27smpx: just ident 2700 */
72	V4L2_IDENT_VP27SMPX = 2700,	96	V4L2_IDENT_VP27SMPX = 2700,
73		97
		98	/* module vpx3220: reserved range: 3210-3229 */
		99	V4L2_IDENT_VPX3214C = 3214,
		100	V4L2_IDENT_VPX3216B = 3216,
		101	V4L2_IDENT_VPX3220A = 3220,
		102
74	/* module tvp5150 */	103	/* module tvp5150 */
75	V4L2_IDENT_TVP5150 = 5150,	104	V4L2_IDENT_TVP5150 = 5150,
76		105
		106	/* module saa5246a: just ident 5246 */
		107	V4L2_IDENT_SAA5246A = 5246,
		108
		109	/* module saa5249: just ident 5249 */
		110	V4L2_IDENT_SAA5249 = 5249,
		111
77	/* module cs5345: just ident 5345 */	112	/* module cs5345: just ident 5345 */
78	V4L2_IDENT_CS5345 = 5345,	113	V4L2_IDENT_CS5345 = 5345,
79		114
		115	/* module tea6415c: just ident 6415 */
		116	V4L2_IDENT_TEA6415C = 6415,
		117
		118	/* module tea6420: just ident 6420 */
		119	V4L2_IDENT_TEA6420 = 6420,
		120
		121	/* module saa6588: just ident 6588 */
		122	V4L2_IDENT_SAA6588 = 6588,
		123
80	/* module saa6752hs: reserved range 6750-6759 */	124	/* module saa6752hs: reserved range 6750-6759 */
81	V4L2_IDENT_SAA6752HS = 6752,	125	V4L2_IDENT_SAA6752HS = 6752,
82	V4L2_IDENT_SAA6752HS_AC3 = 6753,	126	V4L2_IDENT_SAA6752HS_AC3 = 6753,
83		127
		128	/* module adv7170: just ident 7170 */
		129	V4L2_IDENT_ADV7170 = 7170,
		130
		131	/* module adv7175: just ident 7175 */
		132	V4L2_IDENT_ADV7175 = 7175,
		133
		134	/* module saa7185: just ident 7185 */
		135	V4L2_IDENT_SAA7185 = 7185,
		136
		137	/* module saa7191: just ident 7191 */
		138	V4L2_IDENT_SAA7191 = 7191,
		139
84	/* module wm8739: just ident 8739 */	140	/* module wm8739: just ident 8739 */
85	V4L2_IDENT_WM8739 = 8739,	141	V4L2_IDENT_WM8739 = 8739,
86		142
87	/* module wm8775: just ident 8775 */	143	/* module wm8775: just ident 8775 */
88	V4L2_IDENT_WM8775 = 8775,	144	V4L2_IDENT_WM8775 = 8775,
89		145
90	/* module tw9910: just ident 9910 */	146	/* module tda9840: just ident 9840 */
91	V4L2_IDENT_TW9910 = 9910,	147	V4L2_IDENT_TDA9840 = 9840,
92
93	/* module cs53132a: just ident 53132 */
94	V4L2_IDENT_CS53l32A = 53132,
95
96	/* module upd64031a: just ident 64031 */
97	V4L2_IDENT_UPD64031A = 64031,
98		148
99	/* module upd64083: just ident 64083 */	149	/* module cafe_ccic, just ident 8801 */
100	V4L2_IDENT_UPD64083 = 64083,	150	V4L2_IDENT_CAFE = 8801,
101		151
102	/* module m52790: just ident 52790 */	152	/* module tw9910: just ident 9910 */
103	V4L2_IDENT_M52790 = 52790,	153	V4L2_IDENT_TW9910 = 9910,
104		154
105	/* module msp3400: reserved range 34000-34999 and 44000-44999 */	155	/* module msp3400: reserved range 34000-34999 and 44000-44999 */
106	V4L2_IDENT_MSPX4XX = 34000, /* generic MSPX4XX identifier, only	156	V4L2_IDENT_MSPX4XX = 34000, /* generic MSPX4XX identifier, only
@@ -178,6 +228,18 @@ enum {
178	V4L2_IDENT_MT9V022IX7ATC = 45010, /* No way to detect "normal" I77ATx */	228	V4L2_IDENT_MT9V022IX7ATC = 45010, /* No way to detect "normal" I77ATx */
179	V4L2_IDENT_MT9V022IX7ATM = 45015, /* and "lead free" IA7ATx chips */	229	V4L2_IDENT_MT9V022IX7ATM = 45015, /* and "lead free" IA7ATx chips */
180	V4L2_IDENT_MT9T031 = 45020,	230	V4L2_IDENT_MT9T031 = 45020,
		231
		232	/* module cs53132a: just ident 53132 */
		233	V4L2_IDENT_CS53l32A = 53132,
		234
		235	/* module upd64031a: just ident 64031 */
		236	V4L2_IDENT_UPD64031A = 64031,
		237
		238	/* module upd64083: just ident 64083 */
		239	V4L2_IDENT_UPD64083 = 64083,
		240
		241	/* module m52790: just ident 52790 */
		242	V4L2_IDENT_M52790 = 52790,
181	};	243	};
182		244
183	#endif	245	#endif