diff options
-rw-r--r-- | drivers/media/video/tuner-simple.c | 4 | ||||
-rw-r--r-- | drivers/media/video/tveeprom.c | 22 | ||||
-rw-r--r-- | include/media/tuner.h | 2 |
3 files changed, 17 insertions, 11 deletions
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c index 3af055970dd2..b75ad2d4488a 100644 --- a/drivers/media/video/tuner-simple.c +++ b/drivers/media/video/tuner-simple.c | |||
@@ -222,7 +222,7 @@ static struct tunertype tuners[] = { | |||
222 | 16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, /* UHF band untested */ | 222 | 16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, /* UHF band untested */ |
223 | { "tda8290+75", Philips, PAL|NTSC, | 223 | { "tda8290+75", Philips, PAL|NTSC, |
224 | /* see tda8290.c for details */ }, | 224 | /* see tda8290.c for details */ }, |
225 | { "LG PAL (TAPE series)", LGINNOTEK, PAL, | 225 | { "TCL 2002MB", TCL, PAL, |
226 | 16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623}, | 226 | 16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623}, |
227 | { "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL, | 227 | { "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL, |
228 | 16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 }, | 228 | 16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 }, |
@@ -233,7 +233,7 @@ static struct tunertype tuners[] = { | |||
233 | { "Ymec TVision TVF-5533MF", Philips, NTSC, | 233 | { "Ymec TVision TVF-5533MF", Philips, NTSC, |
234 | 16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732}, | 234 | 16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732}, |
235 | 235 | ||
236 | /* 60-66 */ | 236 | /* 60-67 */ |
237 | { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC, | 237 | { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC, |
238 | 16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732}, | 238 | 16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732}, |
239 | { "Tena TNF9533-D/IF/TNF9533-B/DF", Philips, PAL, | 239 | { "Tena TNF9533-D/IF/TNF9533-B/DF", Philips, PAL, |
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 5344d5592199..6453b71f2997 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
@@ -200,15 +200,21 @@ hauppauge_tuner[] = | |||
200 | { TUNER_ABSENT, "Philips FQ1286A MK4"}, | 200 | { TUNER_ABSENT, "Philips FQ1286A MK4"}, |
201 | { TUNER_ABSENT, "Philips FQ1216ME MK5"}, | 201 | { TUNER_ABSENT, "Philips FQ1216ME MK5"}, |
202 | { TUNER_ABSENT, "Philips FQ1236 MK5"}, | 202 | { TUNER_ABSENT, "Philips FQ1236 MK5"}, |
203 | { TUNER_ABSENT, "Unspecified"}, | 203 | { TUNER_ABSENT, "Samsung TCPG_6121P30A"}, |
204 | { TUNER_LG_PAL_TAPE, "LG PAL (TAPE Series)"}, | 204 | { TUNER_TCL_2002MB, "TCL 2002MB_3H"}, |
205 | { TUNER_ABSENT, "Unspecified"}, | 205 | { TUNER_ABSENT, "TCL 2002MI_3H"}, |
206 | { TUNER_TCL_2002N, "TCL 2002N 5H"}, | 206 | { TUNER_TCL_2002N, "TCL 2002N 5H"}, |
207 | /* 100-103 */ | 207 | /* 100-109 */ |
208 | { TUNER_ABSENT, "Unspecified"}, | 208 | { TUNER_ABSENT, "Philips FMD1216ME"}, |
209 | { TUNER_TEA5767, "Philips TEA5767HN FM Radio"}, | 209 | { TUNER_TEA5767, "Philips TEA5768HL FM Radio"}, |
210 | { TUNER_ABSENT, "Unspecified"}, | 210 | { TUNER_ABSENT, "Panasonic ENV57H12D5"}, |
211 | { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05 4"}, | 211 | { TUNER_ABSENT, "TCL MFNM05-4"}, |
212 | { TUNER_ABSENT, "TCL MNM05-4"}, | ||
213 | { TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"}, | ||
214 | { TUNER_ABSENT, "TCL MQNM05-4"}, | ||
215 | { TUNER_ABSENT, "LG TAPC-W701D"}, | ||
216 | { TUNER_ABSENT, "TCL 9886P-WM"}, | ||
217 | { TUNER_ABSENT, "TCL 1676NM-WM"}, | ||
212 | }; | 218 | }; |
213 | 219 | ||
214 | /* This list is supplied by Hauppauge. Thanks! */ | 220 | /* This list is supplied by Hauppauge. Thanks! */ |
diff --git a/include/media/tuner.h b/include/media/tuner.h index 4f47eac90caf..bf925702fbbf 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -95,7 +95,7 @@ | |||
95 | #define TUNER_THOMSON_DTT7610 52 | 95 | #define TUNER_THOMSON_DTT7610 52 |
96 | #define TUNER_PHILIPS_FQ1286 53 | 96 | #define TUNER_PHILIPS_FQ1286 53 |
97 | #define TUNER_PHILIPS_TDA8290 54 | 97 | #define TUNER_PHILIPS_TDA8290 54 |
98 | #define TUNER_LG_PAL_TAPE 55 /* Hauppauge PVR-150 PAL */ | 98 | #define TUNER_TCL_2002MB 55 /* Hauppauge PVR-150 PAL */ |
99 | 99 | ||
100 | #define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */ | 100 | #define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */ |
101 | #define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */ | 101 | #define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */ |