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

[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 5c6ef1e23c94367d4cde56f3370fb12ac35671f2..2b876f3988c1f2a256525c7a0313b35466e6549e 100644 (file)
--- a/drivers/media/common/tuners/tuner-types.c
+++ b/drivers/media/common/tuners/tuner-types.c
@@ -1320,6 +1320,23 @@ static struct tuner_params tuner_partsnic_pti_5nf05_params[] = {
        },
 };
 
+/* --------- 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[] = {
@@ -1778,6 +1795,16 @@ struct tunertype tuners[] = {
                .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);