---

yaml --- r: 179458 b: refs/heads/master c: 51d20db h: refs/heads/master v: v3
git-mirror · Jan 17, 2010 · 5dcde21 · 5dcde21
1 parent 2251216
commit 5dcde21
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2687d832fe0141015e2391f3755d9499e6efb83e
+refs/heads/master: 51d20db8bb9c5a14ac2320664289f13bd52625c6
diff --git a/trunk/drivers/media/dvb/mantis/mantis_core.c b/trunk/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/trunk/drivers/media/dvb/mantis/mantis_dvb.c b/trunk/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/trunk/drivers/media/dvb/mantis/mantis_vp2033.h b/trunk/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;