diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.tuner | 1 | ||||
-rw-r--r-- | drivers/media/common/tuners/tuner-types.c | 30 | ||||
-rw-r--r-- | include/media/tuner.h | 1 |
3 files changed, 32 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner index 691d2f37dc57..22c1c55979c1 100644 --- a/Documentation/video4linux/CARDLIST.tuner +++ b/Documentation/video4linux/CARDLIST.tuner | |||
@@ -76,3 +76,4 @@ tuner=75 - Philips TEA5761 FM Radio | |||
76 | tuner=76 - Xceive 5000 tuner | 76 | tuner=76 - Xceive 5000 tuner |
77 | tuner=77 - TCL tuner MF02GIP-5N-E | 77 | tuner=77 - TCL tuner MF02GIP-5N-E |
78 | tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner | 78 | tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner |
79 | tuner=79 - Philips PAL/SECAM multi (FM1216 MK5) | ||
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c index 7c0bc064c008..a9ce5b2ce082 100644 --- a/drivers/media/common/tuners/tuner-types.c +++ b/drivers/media/common/tuners/tuner-types.c | |||
@@ -578,6 +578,31 @@ static struct tuner_params tuner_fm1216me_mk3_params[] = { | |||
578 | }, | 578 | }, |
579 | }; | 579 | }; |
580 | 580 | ||
581 | /* ------------ TUNER_PHILIPS_FM1216MK5 - Philips PAL ------------ */ | ||
582 | |||
583 | static struct tuner_range tuner_fm1216mk5_pal_ranges[] = { | ||
584 | { 16 * 158.00 /*MHz*/, 0xce, 0x01, }, | ||
585 | { 16 * 441.00 /*MHz*/, 0xce, 0x02, }, | ||
586 | { 16 * 864.00 , 0xce, 0x04, }, | ||
587 | }; | ||
588 | |||
589 | static struct tuner_params tuner_fm1216mk5_params[] = { | ||
590 | { | ||
591 | .type = TUNER_PARAM_TYPE_PAL, | ||
592 | .ranges = tuner_fm1216mk5_pal_ranges, | ||
593 | .count = ARRAY_SIZE(tuner_fm1216mk5_pal_ranges), | ||
594 | .cb_first_if_lower_freq = 1, | ||
595 | .has_tda9887 = 1, | ||
596 | .port1_active = 1, | ||
597 | .port2_active = 1, | ||
598 | .port2_invert_for_secam_lc = 1, | ||
599 | .port1_fm_high_sensitivity = 1, | ||
600 | .default_top_mid = -2, | ||
601 | .default_top_secam_mid = -2, | ||
602 | .default_top_secam_high = -2, | ||
603 | }, | ||
604 | }; | ||
605 | |||
581 | /* ------------ TUNER_LG_NTSC_NEW_TAPC - LGINNOTEK NTSC ------------ */ | 606 | /* ------------ TUNER_LG_NTSC_NEW_TAPC - LGINNOTEK NTSC ------------ */ |
582 | 607 | ||
583 | static struct tuner_params tuner_lg_ntsc_new_tapc_params[] = { | 608 | static struct tuner_params tuner_lg_ntsc_new_tapc_params[] = { |
@@ -1694,6 +1719,11 @@ struct tunertype tuners[] = { | |||
1694 | .initdata = tua603x_agc112, | 1719 | .initdata = tua603x_agc112, |
1695 | .sleepdata = (u8[]){ 4, 0x9c, 0x60, 0x85, 0x54 }, | 1720 | .sleepdata = (u8[]){ 4, 0x9c, 0x60, 0x85, 0x54 }, |
1696 | }, | 1721 | }, |
1722 | [TUNER_PHILIPS_FM1216MK5] = { /* Philips PAL */ | ||
1723 | .name = "Philips PAL/SECAM multi (FM1216 MK5)", | ||
1724 | .params = tuner_fm1216mk5_params, | ||
1725 | .count = ARRAY_SIZE(tuner_fm1216mk5_params), | ||
1726 | }, | ||
1697 | }; | 1727 | }; |
1698 | EXPORT_SYMBOL(tuners); | 1728 | EXPORT_SYMBOL(tuners); |
1699 | 1729 | ||
diff --git a/include/media/tuner.h b/include/media/tuner.h index 7d4e2db78076..735a2a941166 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -124,6 +124,7 @@ | |||
124 | #define TUNER_XC5000 76 /* Xceive Silicon Tuner */ | 124 | #define TUNER_XC5000 76 /* Xceive Silicon Tuner */ |
125 | #define TUNER_TCL_MF02GIP_5N 77 /* TCL MF02GIP_5N */ | 125 | #define TUNER_TCL_MF02GIP_5N 77 /* TCL MF02GIP_5N */ |
126 | #define TUNER_PHILIPS_FMD1216MEX_MK3 78 | 126 | #define TUNER_PHILIPS_FMD1216MEX_MK3 78 |
127 | #define TUNER_PHILIPS_FM1216MK5 79 | ||
127 | 128 | ||
128 | /* tv card specific */ | 129 | /* tv card specific */ |
129 | #define TDA9887_PRESENT (1<<0) | 130 | #define TDA9887_PRESENT (1<<0) |