summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 10:39:48 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 16:55:31 +0300
commit51d20db8bb9c5a14ac2320664289f13bd52625c6 (patch)
tree031300e40db9a96ac5d599f13f9478188d04ec7e /drivers/media
parent2687d832fe0141015e2391f3755d9499e6efb83e (diff)
downloadlinux-51d20db8bb9c5a14ac2320664289f13bd52625c6.tar.xz
V4L/DVB (13720): [Mantis/Terratec Cinergy C] Add support for the Terratec Cinergy C PCI
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/mantis/mantis_core.c1
-rw-r--r--drivers/media/dvb/mantis/mantis_dvb.c13
-rw-r--r--drivers/media/dvb/mantis/mantis_vp2033.h1
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 16d693eeb29e..3b5fea7d8d50 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 f2556950d18b..e2aec0c7f024 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 fcf8b85be941..0a753f7f742d 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;