From ed608c5f3c538c9973bfa3d4bdc028decfecc01a Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Tue, 15 Sep 2009 14:37:20 -0300
Subject: [PATCH] --- yaml --- r: 164159 b: refs/heads/master c:
 e558170a91677d3065be3922bb4467d8969d875c h: refs/heads/master i:   164157:
 d4447c6a0769364f877e7ae010d29bd347518d6f   164155:
 a6532c603aff5628544bbf14d3e48c7455c0cf4f   164151:
 0bbac1856792ecd8c537dbd5c5f60a2a0e51a2c7   164143:
 bf67109208d0b07b2bc6142ff289663b8f5ae49b   164127:
 e44d3c31d015566bf77269bf19b665147cef6ab2   164095:
 b4f5e5e90b8e648d1b70cb265b414799988d354e v: v3

---
 [refs]                                        |  2 +-
 .../Documentation/video4linux/CARDLIST.tuner  |  1 +
 .../drivers/media/common/tuners/tuner-types.c | 23 +++++++++++++++++++
 trunk/include/media/tuner.h                   |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1c914ef85851..fda5a566adc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 707ca1e30f087f9a6d144693dafc4b67880678c2
+refs/heads/master: e558170a91677d3065be3922bb4467d8969d875c
diff --git a/trunk/Documentation/video4linux/CARDLIST.tuner b/trunk/Documentation/video4linux/CARDLIST.tuner
index ba9fa679e2d3..3561b09fb416 100644
--- a/trunk/Documentation/video4linux/CARDLIST.tuner
+++ b/trunk/Documentation/video4linux/CARDLIST.tuner
@@ -79,3 +79,4 @@ tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner
 tuner=79 - Philips PAL/SECAM multi (FM1216 MK5)
 tuner=80 - Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough
 tuner=81 - Partsnic (Daewoo) PTI-5NF05
+tuner=82 - Philips CU1216L
diff --git a/trunk/drivers/media/common/tuners/tuner-types.c b/trunk/drivers/media/common/tuners/tuner-types.c
index 5c6ef1e23c94..a2204df796ec 100644
--- a/trunk/drivers/media/common/tuners/tuner-types.c
+++ b/trunk/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,12 @@ 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,
+	},
 };
 EXPORT_SYMBOL(tuners);
 
diff --git a/trunk/include/media/tuner.h b/trunk/include/media/tuner.h
index c146f2f530b0..b1f57e175e9a 100644
--- a/trunk/include/media/tuner.h
+++ b/trunk/include/media/tuner.h
@@ -127,6 +127,7 @@
 #define TUNER_PHILIPS_FM1216MK5		79
 #define TUNER_PHILIPS_FQ1216LME_MK3	80	/* Active loopthrough, no FM */
 #define TUNER_PARTSNIC_PTI_5NF05	81
+#define TUNER_PHILIPS_CU1216L           82
 
 /* tv card specific */
 #define TDA9887_PRESENT 		(1<<0)