diff options
-rw-r--r-- | drivers/media/common/tuners/tuner-simple.c | 1 | ||||
-rw-r--r-- | drivers/media/common/tuners/tuner-types.c | 16 | ||||
-rw-r--r-- | include/media/tuner.h | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c index 8abbcc5fcf95..8cf2ab609d5e 100644 --- a/drivers/media/common/tuners/tuner-simple.c +++ b/drivers/media/common/tuners/tuner-simple.c | |||
@@ -524,6 +524,7 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer) | |||
524 | buffer[3] = 0x39; | 524 | buffer[3] = 0x39; |
525 | break; | 525 | break; |
526 | case TUNER_PHILIPS_FQ1216LME_MK3: | 526 | case TUNER_PHILIPS_FQ1216LME_MK3: |
527 | case TUNER_PHILIPS_FQ1236_MK5: | ||
527 | tuner_err("This tuner doesn't have FM\n"); | 528 | tuner_err("This tuner doesn't have FM\n"); |
528 | /* Set the low band for sanity, since it covers 88-108 MHz */ | 529 | /* Set the low band for sanity, since it covers 88-108 MHz */ |
529 | buffer[3] = 0x01; | 530 | buffer[3] = 0x01; |
diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c index d9aaaca620c9..58a513bcd747 100644 --- a/drivers/media/common/tuners/tuner-types.c +++ b/drivers/media/common/tuners/tuner-types.c | |||
@@ -1353,6 +1353,17 @@ static struct tuner_params tuner_sony_btf_pxn01z_params[] = { | |||
1353 | }, | 1353 | }, |
1354 | }; | 1354 | }; |
1355 | 1355 | ||
1356 | /* ------------ TUNER_PHILIPS_FQ1236_MK5 - Philips NTSC ------------ */ | ||
1357 | |||
1358 | static struct tuner_params tuner_philips_fq1236_mk5_params[] = { | ||
1359 | { | ||
1360 | .type = TUNER_PARAM_TYPE_NTSC, | ||
1361 | .ranges = tuner_fm1236_mk3_ntsc_ranges, | ||
1362 | .count = ARRAY_SIZE(tuner_fm1236_mk3_ntsc_ranges), | ||
1363 | .has_tda9887 = 1, /* TDA9885, no FM radio */ | ||
1364 | }, | ||
1365 | }; | ||
1366 | |||
1356 | /* --------------------------------------------------------------------- */ | 1367 | /* --------------------------------------------------------------------- */ |
1357 | 1368 | ||
1358 | struct tunertype tuners[] = { | 1369 | struct tunertype tuners[] = { |
@@ -1826,6 +1837,11 @@ struct tunertype tuners[] = { | |||
1826 | .params = tuner_sony_btf_pxn01z_params, | 1837 | .params = tuner_sony_btf_pxn01z_params, |
1827 | .count = ARRAY_SIZE(tuner_sony_btf_pxn01z_params), | 1838 | .count = ARRAY_SIZE(tuner_sony_btf_pxn01z_params), |
1828 | }, | 1839 | }, |
1840 | [TUNER_PHILIPS_FQ1236_MK5] = { /* NTSC, TDA9885, no FM radio */ | ||
1841 | .name = "Philips FQ1236 MK5", | ||
1842 | .params = tuner_philips_fq1236_mk5_params, | ||
1843 | .count = ARRAY_SIZE(tuner_philips_fq1236_mk5_params), | ||
1844 | }, | ||
1829 | }; | 1845 | }; |
1830 | EXPORT_SYMBOL(tuners); | 1846 | EXPORT_SYMBOL(tuners); |
1831 | 1847 | ||
diff --git a/include/media/tuner.h b/include/media/tuner.h index 5505c5360ca3..51811eac46f1 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -130,6 +130,7 @@ | |||
130 | #define TUNER_PHILIPS_CU1216L 82 | 130 | #define TUNER_PHILIPS_CU1216L 82 |
131 | #define TUNER_NXP_TDA18271 83 | 131 | #define TUNER_NXP_TDA18271 83 |
132 | #define TUNER_SONY_BTF_PXN01Z 84 | 132 | #define TUNER_SONY_BTF_PXN01Z 84 |
133 | #define TUNER_PHILIPS_FQ1236_MK5 85 /* NTSC, TDA9885, no FM radio */ | ||
133 | 134 | ||
134 | /* tv card specific */ | 135 | /* tv card specific */ |
135 | #define TDA9887_PRESENT (1<<0) | 136 | #define TDA9887_PRESENT (1<<0) |