aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/CARDLIST.tuner2
-rw-r--r--drivers/media/video/tuner-types.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 9b02dbb2a753..a88c02d23805 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -40,7 +40,7 @@ tuner=38 - Philips PAL/SECAM multi (FM1216ME MK3)
40tuner=39 - LG NTSC (newer TAPC series) 40tuner=39 - LG NTSC (newer TAPC series)
41tuner=40 - HITACHI V7-J180AT 41tuner=40 - HITACHI V7-J180AT
42tuner=41 - Philips PAL_MK (FI1216 MK) 42tuner=41 - Philips PAL_MK (FI1216 MK)
43tuner=42 - Philips 1236D ATSC/NTSC dual in 43tuner=42 - Philips FCV1236D ATSC/NTSC dual in
44tuner=43 - Philips NTSC MK3 (FM1236MK3 or FM1236/F) 44tuner=43 - Philips NTSC MK3 (FM1236MK3 or FM1236/F)
45tuner=44 - Philips 4 in 1 (ATI TV Wonder Pro/Conexant) 45tuner=44 - Philips 4 in 1 (ATI TV Wonder Pro/Conexant)
46tuner=45 - Microtune 4049 FM5 46tuner=45 - Microtune 4049 FM5
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index 03849a166e55..e761244c2184 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -594,19 +594,19 @@ static struct tuner_params tuner_philips_pal_mk_params[] = {
594 }, 594 },
595}; 595};
596 596
597/* ------------ TUNER_PHILIPS_ATSC - Philips ATSC ------------ */ 597/* ---- TUNER_PHILIPS_ATSC - Philips FCV1236D (ATSC/NTSC) ---- */
598 598
599static struct tuner_range tuner_philips_atsc_ranges[] = { 599static struct tuner_range tuner_philips_fcv1236d_ranges[] = {
600 { 16 * 157.25 /*MHz*/, 0x8e, 0xa0, }, 600 { 16 * 157.25 /*MHz*/, 0x8e, 0xa0, },
601 { 16 * 454.00 /*MHz*/, 0x8e, 0x90, }, 601 { 16 * 454.00 /*MHz*/, 0x8e, 0x90, },
602 { 16 * 999.99 , 0x8e, 0x30, }, 602 { 16 * 999.99 , 0x8e, 0x30, },
603}; 603};
604 604
605static struct tuner_params tuner_philips_atsc_params[] = { 605static struct tuner_params tuner_philips_fcv1236d_params[] = {
606 { 606 {
607 .type = TUNER_PARAM_TYPE_NTSC, 607 .type = TUNER_PARAM_TYPE_NTSC,
608 .ranges = tuner_philips_atsc_ranges, 608 .ranges = tuner_philips_fcv1236d_ranges,
609 .count = ARRAY_SIZE(tuner_philips_atsc_ranges), 609 .count = ARRAY_SIZE(tuner_philips_fcv1236d_ranges),
610 }, 610 },
611}; 611};
612 612
@@ -1296,9 +1296,9 @@ struct tunertype tuners[] = {
1296 .count = ARRAY_SIZE(tuner_philips_pal_mk_params), 1296 .count = ARRAY_SIZE(tuner_philips_pal_mk_params),
1297 }, 1297 },
1298 [TUNER_PHILIPS_ATSC] = { /* Philips ATSC */ 1298 [TUNER_PHILIPS_ATSC] = { /* Philips ATSC */
1299 .name = "Philips 1236D ATSC/NTSC dual in", 1299 .name = "Philips FCV1236D ATSC/NTSC dual in",
1300 .params = tuner_philips_atsc_params, 1300 .params = tuner_philips_fcv1236d_params,
1301 .count = ARRAY_SIZE(tuner_philips_atsc_params), 1301 .count = ARRAY_SIZE(tuner_philips_fcv1236d_params),
1302 }, 1302 },
1303 [TUNER_PHILIPS_FM1236_MK3] = { /* Philips NTSC */ 1303 [TUNER_PHILIPS_FM1236_MK3] = { /* Philips NTSC */
1304 .name = "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", 1304 .name = "Philips NTSC MK3 (FM1236MK3 or FM1236/F)",