1 files changed, 90 insertions, 5 deletions

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 16410ac20092..a16531fa937a 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -310,31 +310,47 @@ static struct drxd_config em28xx_drxd = {
         .disable_i2c_gate_ctrl = 1,
 };
 
-struct drxk_config terratec_h5_drxk = {
+static struct drxk_config terratec_h5_drxk = {
         .adr = 0x29,
         .single_master = 1,
         .no_i2c_bridge = 1,
         .microcode_name = "dvb-usb-terratec-h5-drxk.fw",
+        .qam_demod_parameter_count = 2,
 };
 
-struct drxk_config hauppauge_930c_drxk = {
+static struct drxk_config hauppauge_930c_drxk = {
         .adr = 0x29,
         .single_master = 1,
         .no_i2c_bridge = 1,
         .microcode_name = "dvb-usb-hauppauge-hvr930c-drxk.fw",
         .chunk_size = 56,
+        .qam_demod_parameter_count = 2,
 };
 
-struct drxk_config maxmedia_ub425_tc_drxk = {
+struct drxk_config terratec_htc_stick_drxk = {
         .adr = 0x29,
         .single_master = 1,
         .no_i2c_bridge = 1,
+        .microcode_name = "dvb-usb-terratec-htc-stick-drxk.fw",
+        .chunk_size = 54,
+        .qam_demod_parameter_count = 2,
+        /* Required for the antenna_gpio to disable LNA. */
+        .antenna_dvbt = true,
+        /* The windows driver uses the same. This will disable LNA. */
+        .antenna_gpio = 0x6,
 };
 
-struct drxk_config pctv_520e_drxk = {
+static struct drxk_config maxmedia_ub425_tc_drxk = {
+        .adr = 0x29,
+        .single_master = 1,
+        .no_i2c_bridge = 1,
+};
+
+static struct drxk_config pctv_520e_drxk = {
         .adr = 0x29,
         .single_master = 1,
         .microcode_name = "dvb-demod-drxk-pctv.fw",
+        .qam_demod_parameter_count = 2,
         .chunk_size = 58,
         .antenna_dvbt = true, /* disable LNA */
         .antenna_gpio = (1 << 2), /* disable LNA */
@@ -473,6 +489,57 @@ static void terratec_h5_init(struct em28xx *dev)
         em28xx_gpio_set(dev, terratec_h5_end);
 };
 
+static void terratec_htc_stick_init(struct em28xx *dev)
+{
+        int i;
+
+        /*
+         * GPIO configuration:
+         * 0xff: unknown (does not affect DVB-T).
+         * 0xf6: DRX-K (demodulator).
+         * 0xe6: unknown (does not affect DVB-T).
+         * 0xb6: unknown (does not affect DVB-T).
+         */
+        struct em28xx_reg_seq terratec_htc_stick_init[] = {
+                {EM28XX_R08_GPIO,       0xff,   0xff,   10},
+                {EM2874_R80_GPIO,       0xf6,   0xff,   100},
+                {EM2874_R80_GPIO,       0xe6,   0xff,   50},
+                {EM2874_R80_GPIO,       0xf6,   0xff,   100},
+                { -1,                   -1,     -1,     -1},
+        };
+        struct em28xx_reg_seq terratec_htc_stick_end[] = {
+                {EM2874_R80_GPIO,       0xb6,   0xff,   100},
+                {EM2874_R80_GPIO,       0xf6,   0xff,   50},
+                { -1,                   -1,     -1,     -1},
+        };
+
+        /* Init the analog decoder? */
+        struct {
+                unsigned char r[4];
+                int len;
+        } regs[] = {
+                {{ 0x06, 0x02, 0x00, 0x31 }, 4},
+                {{ 0x01, 0x02 }, 2},
+                {{ 0x01, 0x02, 0x00, 0xc6 }, 4},
+                {{ 0x01, 0x00 }, 2},
+                {{ 0x01, 0x00, 0xff, 0xaf }, 4},
+        };
+
+        em28xx_gpio_set(dev, terratec_htc_stick_init);
+
+        em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x40);
+        msleep(10);
+        em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x44);
+        msleep(10);
+
+        dev->i2c_client.addr = 0x82 >> 1;
+
+        for (i = 0; i < ARRAY_SIZE(regs); i++)
+                i2c_master_send(&dev->i2c_client, regs[i].r, regs[i].len);
+
+        em28xx_gpio_set(dev, terratec_htc_stick_end);
+};
+
 static void pctv_520e_init(struct em28xx *dev)
 {
         /*
@@ -944,7 +1011,6 @@ static int em28xx_dvb_init(struct em28xx *dev)
                 break;
         }
         case EM2884_BOARD_TERRATEC_H5:
-        case EM2884_BOARD_CINERGY_HTC_STICK:
                 terratec_h5_init(dev);
 
                 dvb->fe[0] = dvb_attach(drxk_attach, &terratec_h5_drxk, &dev->i2c_adap);
@@ -1021,6 +1087,25 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         }
                 }
                 break;
+        case EM2884_BOARD_CINERGY_HTC_STICK:
+                terratec_htc_stick_init(dev);
+
+                /* attach demodulator */
+                dvb->fe[0] = dvb_attach(drxk_attach, &terratec_htc_stick_drxk,
+                                        &dev->i2c_adap);
+                if (!dvb->fe[0]) {
+                        result = -EINVAL;
+                        goto out_free;
+                }
+
+                /* Attach the demodulator. */
+                if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
+                                &dev->i2c_adap,
+                                &em28xx_cxd2820r_tda18271_config)) {
+                        result = -EINVAL;
+                        goto out_free;
+                }
+                break;
         default:
                 em28xx_errdev("/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n");