71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From 0183b53c0988827e62d106f984f36752ec0ac2fd Mon Sep 17 00:00:00 2001
|
|
From: Manu Abraham <abraham.manu@gmail.com>
|
|
Date: Fri, 4 Dec 2009 04:39:48 -0300
|
|
Subject: [PATCH 022/120] V4L/DVB (13720): [Mantis/Terratec Cinergy C] Add support for the Terratec Cinergy C PCI
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Manu Abraham <manu@linuxtv.org>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
(cherry picked from commit 51d20db8bb9c5a14ac2320664289f13bd52625c6)
|
|
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
---
|
|
drivers/media/dvb/mantis/mantis_core.c | 1 +
|
|
drivers/media/dvb/mantis/mantis_dvb.c | 13 +++++++++++++
|
|
drivers/media/dvb/mantis/mantis_vp2033.h | 1 +
|
|
3 files changed, 15 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/dvb/mantis/mantis_core.c
|
|
index 16d693e..3b5fea7 100644
|
|
--- a/drivers/media/dvb/mantis/mantis_core.c
|
|
+++ b/drivers/media/dvb/mantis/mantis_core.c
|
|
@@ -111,6 +111,7 @@ static void mantis_load_config(struct mantis_pci *mantis)
|
|
mantis->hwconfig = &vp1034_mantis_config;
|
|
break;
|
|
case MANTIS_VP_2033_DVB_C: // VP-2033
|
|
+ case TERRATEC_CINERGY_C_PCI: // Terratec Cinergy C PCI
|
|
mantis->hwconfig = &vp2033_mantis_config;
|
|
break;
|
|
case MANTIS_VP_3030_DVB_T: // VP-3030
|
|
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
|
|
index f255695..e2aec0c 100644
|
|
--- a/drivers/media/dvb/mantis/mantis_dvb.c
|
|
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
|
|
@@ -251,6 +251,19 @@ int __devinit mantis_frontend_init(struct mantis_pci *mantis)
|
|
|
|
}
|
|
break;
|
|
+ case TERRATEC_CINERGY_C_PCI:
|
|
+ dprintk(verbose, MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
|
|
+ mantis->fe = tda10023_attach(&philips_cu1216_config, &mantis->adapter, read_pwm(mantis));
|
|
+ if (mantis->fe) {
|
|
+ mantis->fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set;
|
|
+ dprintk(verbose, MANTIS_ERROR, 1,
|
|
+ "found Philips CU1216 DVB-C frontend 0x%02x",
|
|
+ philips_cu1216_config.demod_address);
|
|
+
|
|
+ dprintk(verbose, MANTIS_ERROR, 1,
|
|
+ "Mantis DVB-C Philips CU1216 frontend attach success");
|
|
+ }
|
|
+ break;
|
|
default:
|
|
dprintk(verbose, MANTIS_DEBUG, 1, "Unknown frontend:[0x%02x]",
|
|
mantis->sub_device_id);
|
|
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.h b/drivers/media/dvb/mantis/mantis_vp2033.h
|
|
index fcf8b85..0a753f7 100644
|
|
--- a/drivers/media/dvb/mantis/mantis_vp2033.h
|
|
+++ b/drivers/media/dvb/mantis/mantis_vp2033.h
|
|
@@ -26,6 +26,7 @@
|
|
#include "tda1002x.h"
|
|
|
|
#define MANTIS_VP_2033_DVB_C 0x0008
|
|
+#define TERRATEC_CINERGY_C_PCI 0x1178
|
|
|
|
extern struct tda1002x_config philips_cu1216_config;
|
|
extern struct mantis_hwconfig vp2033_mantis_config;
|
|
--
|
|
1.7.1
|
|
|