1 files changed, 43 insertions, 7 deletions

diff --git a/linux/drivers/media/video/cx23885/cx23885-dvb.c b/linux/drivers/media/video/cx23885/cx23885-dvb.c
index f06d31c1f..49c35f3fc 100644
--- a/linux/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c
@@ -33,6 +33,8 @@
 
 #include "s5h1409.h"
 #include "mt2131.h"
+#include "lgdt330x.h"
+#include "dvb-pll.h"
 
 static unsigned int debug = 0;
 
@@ -83,6 +85,15 @@ static struct videobuf_queue_ops dvb_qops = {
 static struct s5h1409_config hauppauge_generic_config = {
 	.demod_address = 0x32 >> 1,
 	.output_mode   = S5H1409_SERIAL_OUTPUT,
+	.gpio          = S5H1409_GPIO_ON,
+	.if_freq       = 44000,
+	.inversion     = S5H1409_INVERSION_OFF,
+	.status_mode   = S5H1409_DEMODLOCKING
+};
+
+static struct s5h1409_config hauppauge_hvr1800lp_config = {
+	.demod_address = 0x32 >> 1,
+	.output_mode   = S5H1409_SERIAL_OUTPUT,
 	.gpio          = S5H1409_GPIO_OFF,
 	.if_freq       = 44000,
 	.inversion     = S5H1409_INVERSION_OFF,
@@ -93,9 +104,16 @@ static struct mt2131_config hauppauge_generic_tunerconfig = {
 	0x61
 };
 
+static struct lgdt330x_config fusionhdtv_5_express = {
+	.demod_address = 0x0e,
+	.demod_chip = LGDT3303,
+	.serial_mpeg = 0x40,
+};
+
 static int dvb_register(struct cx23885_tsport *port)
 {
 	struct cx23885_dev *dev = port->dev;
+	struct cx23885_i2c *i2c_bus = NULL;
 
 	/* init struct videobuf_dvb */
 	port->dvb.name = dev->name;
@@ -104,16 +122,37 @@ static int dvb_register(struct cx23885_tsport *port)
 	switch (dev->board) {
 	case CX23885_BOARD_HAUPPAUGE_HVR1250:
 	case CX23885_BOARD_HAUPPAUGE_HVR1800:
-	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
+		i2c_bus = &dev->i2c_bus[0];
 		port->dvb.frontend = dvb_attach(s5h1409_attach,
 						&hauppauge_generic_config,
-						&dev->i2c_bus[0].i2c_adap);
+						&i2c_bus->i2c_adap);
 		if (port->dvb.frontend != NULL) {
 			dvb_attach(mt2131_attach, port->dvb.frontend,
-				   &dev->i2c_bus[0].i2c_adap,
+				   &i2c_bus->i2c_adap,
 				   &hauppauge_generic_tunerconfig, 0);
 		}
 		break;
+	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
+		i2c_bus = &dev->i2c_bus[0];
+		port->dvb.frontend = dvb_attach(s5h1409_attach,
+						&hauppauge_hvr1800lp_config,
+						&i2c_bus->i2c_adap);
+		if (port->dvb.frontend != NULL) {
+			dvb_attach(mt2131_attach, port->dvb.frontend,
+				   &i2c_bus->i2c_adap,
+				   &hauppauge_generic_tunerconfig, 0);
+		}
+		break;
+	case CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP:
+		i2c_bus = &dev->i2c_bus[0];
+		port->dvb.frontend = dvb_attach(lgdt330x_attach,
+						&fusionhdtv_5_express,
+						&i2c_bus->i2c_adap);
+		if (port->dvb.frontend != NULL) {
+			dvb_attach(dvb_pll_attach, port->dvb.frontend, 0x61,
+				   &i2c_bus->i2c_adap, DVB_PLL_LG_TDVS_H06XF);
+		}
+		break;
 	default:
 		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
 		       dev->name);
@@ -125,7 +164,7 @@ static int dvb_register(struct cx23885_tsport *port)
 	}
 
 	/* Put the analog decoder in standby to keep it quiet */
-	cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
+	cx23885_call_i2c_clients(i2c_bus, TUNER_SET_STANDBY, NULL);
 
 	/* register everything */
 	return videobuf_dvb_register(&port->dvb, THIS_MODULE, port,
@@ -145,8 +184,6 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
 		dev->pci_slot);
 
 	err = -ENODEV;
-	if (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB))
-		goto fail_core;
 
 	/* dvb stuff */
 	printk("%s: cx23885 based dvb card\n", dev->name);
@@ -157,7 +194,6 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
 	if (err != 0)
 		printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err);
 
- fail_core:
 	return err;
 }