Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[mv-sheeva.git] / drivers / media / common / tuners / tuner-types.c

diff --git a/drivers/media/common/tuners/tuner-types.c b/drivers/media/common/tuners/tuner-types.c
index 6a7f1a417c278eff34d835029b4894fde8cedd48..2b876f3988c1f2a256525c7a0313b35466e6549e 100644 (file)
--- a/drivers/media/common/tuners/tuner-types.c
+++ b/drivers/media/common/tuners/tuner-types.c
@@ -1301,6 +1301,42 @@ static struct tuner_params tuner_fq1216lme_mk3_params[] = {
        },
 };
 
+/* ----- TUNER_PARTSNIC_PTI_5NF05 - Partsnic (Daewoo) PTI-5NF05 NTSC ----- */
+
+static struct tuner_range tuner_partsnic_pti_5nf05_ranges[] = {
+       /* The datasheet specified channel ranges and the bandswitch byte */
+       /* The control byte value of 0x8e is just a guess */
+       { 16 * 133.25 /*MHz*/, 0x8e, 0x01, }, /* Channels    2 -    B */
+       { 16 * 367.25 /*MHz*/, 0x8e, 0x02, }, /* Channels    C - W+11 */
+       { 16 * 999.99        , 0x8e, 0x08, }, /* Channels W+12 -   69 */
+};
+
+static struct tuner_params tuner_partsnic_pti_5nf05_params[] = {
+       {
+               .type   = TUNER_PARAM_TYPE_NTSC,
+               .ranges = tuner_partsnic_pti_5nf05_ranges,
+               .count  = ARRAY_SIZE(tuner_partsnic_pti_5nf05_ranges),
+               .cb_first_if_lower_freq = 1, /* not specified but safe to do */
+       },
+};
+
+/* --------- TUNER_PHILIPS_CU1216L - DVB-C NIM ------------------------- */
+
+static struct tuner_range tuner_cu1216l_ranges[] = {
+       { 16 * 160.25 /*MHz*/, 0xce, 0x01 },
+       { 16 * 444.25 /*MHz*/, 0xce, 0x02 },
+       { 16 * 999.99        , 0xce, 0x04 },
+};
+
+static struct tuner_params tuner_philips_cu1216l_params[] = {
+       {
+               .type   = TUNER_PARAM_TYPE_DIGITAL,
+               .ranges = tuner_cu1216l_ranges,
+               .count  = ARRAY_SIZE(tuner_cu1216l_ranges),
+               .iffreq = 16 * 36.125, /*MHz*/
+       },
+};
+
 /* --------------------------------------------------------------------- */
 
 struct tunertype tuners[] = {
@@ -1753,6 +1789,22 @@ struct tunertype tuners[] = {
                .params = tuner_fq1216lme_mk3_params,
                .count  = ARRAY_SIZE(tuner_fq1216lme_mk3_params),
        },
+
+       [TUNER_PARTSNIC_PTI_5NF05] = {
+               .name = "Partsnic (Daewoo) PTI-5NF05",
+               .params = tuner_partsnic_pti_5nf05_params,
+               .count  = ARRAY_SIZE(tuner_partsnic_pti_5nf05_params),
+       },
+       [TUNER_PHILIPS_CU1216L] = {
+               .name = "Philips CU1216L",
+               .params = tuner_philips_cu1216l_params,
+               .count  = ARRAY_SIZE(tuner_philips_cu1216l_params),
+               .stepsize = 62500,
+       },
+       [TUNER_NXP_TDA18271] = {
+               .name   = "NXP TDA18271",
+               /* see tda18271-fe.c for details */
+       },
 };
 EXPORT_SYMBOL(tuners);