1 files changed, 71 insertions, 0 deletions

diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index dd600b994e69..610d5675bde6 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -34,6 +34,7 @@
 #include "si2165.h"
 #include "mb86a20s.h"
 #include "si2157.h"
+#include "lgdt3306a.h"
 
 MODULE_DESCRIPTION("driver for cx231xx based DVB cards");
 MODULE_AUTHOR("Srinivasa Deevi <srinivasa.deevi@conexant.com>");
@@ -160,6 +161,18 @@ static const struct si2165_config pctv_quatro_stick_1114xx_si2165_config = {
         .ref_freq_Hz    = 24000000,
 };
 
+static struct lgdt3306a_config hauppauge_955q_lgdt3306a_config = {
+        .i2c_addr           = 0x59,
+        .qam_if_khz         = 4000,
+        .vsb_if_khz         = 3250,
+        .deny_i2c_rptr      = 1,
+        .spectral_inversion = 1,
+        .mpeg_mode          = LGDT3306A_MPEG_SERIAL,
+        .tpclk_edge         = LGDT3306A_TPCLK_RISING_EDGE,
+        .tpvalid_polarity   = LGDT3306A_TP_VALID_HIGH,
+        .xtalMHz            = 25,
+};
+
 static inline void print_err_status(struct cx231xx *dev, int packet, int status)
 {
         char *errmsg = "Unknown";
@@ -455,6 +468,7 @@ static int register_dvb(struct cx231xx_dvb *dvb,
 
         mutex_init(&dvb->lock);
 
+
         /* register adapter */
         result = dvb_register_adapter(&dvb->adapter, dev->name, module, device,
                                       adapter_nr);
@@ -464,6 +478,7 @@ static int register_dvb(struct cx231xx_dvb *dvb,
                        dev->name, result);
                 goto fail_adapter;
         }
+        dvb_register_media_controller(&dvb->adapter, dev->media_dev);
 
         /* Ensure all frontends negotiate bus access */
         dvb->frontend->ops.ts_bus_ctrl = cx231xx_dvb_bus_ctrl;
@@ -536,6 +551,8 @@ static int register_dvb(struct cx231xx_dvb *dvb,
 
         /* register network adapter */
         dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
+        dvb_create_media_graph(&dvb->adapter);
+
         return 0;
 
 fail_fe_conn:
@@ -807,7 +824,61 @@ static int dvb_init(struct cx231xx *dev)
                 dev->dvb->i2c_client_tuner = client;
                 break;
         }
+        case CX231XX_BOARD_HAUPPAUGE_955Q:
+        {
+                struct i2c_client *client;
+                struct i2c_board_info info;
+                struct si2157_config si2157_config;
+
+                memset(&info, 0, sizeof(struct i2c_board_info));
+
+                dev->dvb->frontend = dvb_attach(lgdt3306a_attach,
+                        &hauppauge_955q_lgdt3306a_config,
+                        tuner_i2c
+                        );
+
+                if (dev->dvb->frontend == NULL) {
+                        dev_err(dev->dev,
+                                "Failed to attach LGDT3306A frontend.\n");
+                        result = -EINVAL;
+                        goto out_free;
+                }
+
+                dev->dvb->frontend->ops.i2c_gate_ctrl = NULL;
+
+                /* define general-purpose callback pointer */
+                dvb->frontend->callback = cx231xx_tuner_callback;
+
+                /* attach tuner */
+                memset(&si2157_config, 0, sizeof(si2157_config));
+                si2157_config.fe = dev->dvb->frontend;
+                si2157_config.inversion = true;
+                strlcpy(info.type, "si2157", I2C_NAME_SIZE);
+                info.addr = 0x60;
+                info.platform_data = &si2157_config;
+                request_module("si2157");
 
+                client = i2c_new_device(
+                        tuner_i2c,
+                        &info);
+                if (client == NULL || client->dev.driver == NULL) {
+                        dvb_frontend_detach(dev->dvb->frontend);
+                        result = -ENODEV;
+                        goto out_free;
+                }
+
+                if (!try_module_get(client->dev.driver->owner)) {
+                        i2c_unregister_device(client);
+                        dvb_frontend_detach(dev->dvb->frontend);
+                        result = -ENODEV;
+                        goto out_free;
+                }
+
+                dev->cx231xx_reset_analog_tuner = NULL;
+
+                dev->dvb->i2c_client_tuner = client;
+                break;
+        }
         case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
         case CX231XX_BOARD_KWORLD_UB430_USB_HYBRID: