7 files changed, 433 insertions, 109 deletions

diff --git a/drivers/media/usb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/Kconfig
index fa0b2931d305..c5d95662e2e1 100644
--- a/drivers/media/usb/dvb-usb/Kconfig
+++ b/drivers/media/usb/dvb-usb/Kconfig
@@ -202,8 +202,12 @@ config DVB_USB_TTUSB2
         select DVB_TDA10086 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_LNBP21 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_TDA826X if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_TDA10023 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_TDA10048 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_TDA827X if MEDIA_SUBDRV_AUTOSELECT
         help
-          Say Y here to support the Pinnacle 400e DVB-S USB2.0 receiver. The
+          Say Y here to support the Pinnacle 400e DVB-S USB2.0 receiver and
+          the TechnoTrend CT-3650 CI DVB-C/T USB2.0 receiver. The
           firmware protocol used by this module is similar to the one used by the
           old ttusb-driver - that's why the module is called dvb-usb-ttusb2.
 
@@ -267,9 +271,11 @@ config DVB_USB_DW2102
         select DVB_MT312 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_ZL10039 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_M88RS2000 if MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to support the DvbWorld, TeVii, Prof DVB-S/S2 USB2.0
           receivers.
diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index 19b5ed2825d7..bf2a908d74cf 100644
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -561,10 +561,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
                 }
         }
 
-        if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) {
-                err("could not acquire lock");
-                return -EINTR;
-        }
+        mutex_lock(&adap->dev->usb_mutex);
 
         st->buf[0] = REQUEST_ENABLE_VIDEO;
         /* this bit gives a kind of command,
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
index 169196ec2d4e..1adf325012f7 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -38,41 +38,41 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)
 
                 memcpy(&adap->props, &d->props.adapter[n], sizeof(struct dvb_usb_adapter_properties));
 
-        for (o = 0; o < adap->props.num_frontends; o++) {
-                struct dvb_usb_adapter_fe_properties *props = &adap->props.fe[o];
-                /* speed - when running at FULL speed we need a HW PID filter */
-                if (d->udev->speed == USB_SPEED_FULL && !(props->caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
-                        err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
-                        return -ENODEV;
-                }
+                for (o = 0; o < adap->props.num_frontends; o++) {
+                        struct dvb_usb_adapter_fe_properties *props = &adap->props.fe[o];
+                        /* speed - when running at FULL speed we need a HW PID filter */
+                        if (d->udev->speed == USB_SPEED_FULL && !(props->caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
+                                err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
+                                return -ENODEV;
+                        }
 
-                if ((d->udev->speed == USB_SPEED_FULL && props->caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
-                        (props->caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
-                        info("will use the device's hardware PID filter (table count: %d).", props->pid_filter_count);
-                        adap->fe_adap[o].pid_filtering  = 1;
-                        adap->fe_adap[o].max_feed_count = props->pid_filter_count;
-                } else {
-                        info("will pass the complete MPEG2 transport stream to the software demuxer.");
-                        adap->fe_adap[o].pid_filtering  = 0;
-                        adap->fe_adap[o].max_feed_count = 255;
-                }
+                        if ((d->udev->speed == USB_SPEED_FULL && props->caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
+                                (props->caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
+                                info("will use the device's hardware PID filter (table count: %d).", props->pid_filter_count);
+                                adap->fe_adap[o].pid_filtering  = 1;
+                                adap->fe_adap[o].max_feed_count = props->pid_filter_count;
+                        } else {
+                                info("will pass the complete MPEG2 transport stream to the software demuxer.");
+                                adap->fe_adap[o].pid_filtering  = 0;
+                                adap->fe_adap[o].max_feed_count = 255;
+                        }
 
-                if (!adap->fe_adap[o].pid_filtering &&
-                        dvb_usb_force_pid_filter_usage &&
-                        props->caps & DVB_USB_ADAP_HAS_PID_FILTER) {
-                        info("pid filter enabled by module option.");
-                        adap->fe_adap[o].pid_filtering  = 1;
-                        adap->fe_adap[o].max_feed_count = props->pid_filter_count;
-                }
+                        if (!adap->fe_adap[o].pid_filtering &&
+                                dvb_usb_force_pid_filter_usage &&
+                                props->caps & DVB_USB_ADAP_HAS_PID_FILTER) {
+                                info("pid filter enabled by module option.");
+                                adap->fe_adap[o].pid_filtering  = 1;
+                                adap->fe_adap[o].max_feed_count = props->pid_filter_count;
+                        }
 
-                if (props->size_of_priv > 0) {
-                        adap->fe_adap[o].priv = kzalloc(props->size_of_priv, GFP_KERNEL);
-                        if (adap->fe_adap[o].priv == NULL) {
-                                err("no memory for priv for adapter %d fe %d.", n, o);
-                                return -ENOMEM;
+                        if (props->size_of_priv > 0) {
+                                adap->fe_adap[o].priv = kzalloc(props->size_of_priv, GFP_KERNEL);
+                                if (adap->fe_adap[o].priv == NULL) {
+                                        err("no memory for priv for adapter %d fe %d.", n, o);
+                                        return -ENOMEM;
+                                }
                         }
                 }
-        }
 
                 if (adap->props.size_of_priv > 0) {
                         adap->priv = kzalloc(adap->props.size_of_priv, GFP_KERNEL);
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 9382895b1b88..9578a6761f1b 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -1,9 +1,9 @@
 /* DVB USB framework compliant Linux driver for the
  *      DVBWorld DVB-S 2101, 2102, DVB-S2 2104, DVB-C 3101,
- *      TeVii S600, S630, S650, S660, S480,
+ *      TeVii S600, S630, S650, S660, S480, S421, S632
  *      Prof 1100, 7500,
  *      Geniatech SU3000 Cards
- * Copyright (C) 2008-2011 Igor M. Liplianin (liplianin@me.by)
+ * Copyright (C) 2008-2012 Igor M. Liplianin (liplianin@me.by)
  *
  *      This program is free software; you can redistribute it and/or modify it
  *      under the terms of the GNU General Public License as published by the
@@ -22,11 +22,14 @@
 #include "tda1002x.h"
 #include "mt312.h"
 #include "zl10039.h"
+#include "ts2020.h"
 #include "ds3000.h"
 #include "stv0900.h"
 #include "stv6110.h"
 #include "stb6100.h"
 #include "stb6100_proc.h"
+#include "m88rs2000.h"
+#include "ts2020.h"
 
 #ifndef USB_PID_DW2102
 #define USB_PID_DW2102 0x2102
@@ -68,6 +71,14 @@
 #define USB_PID_PROF_1100 0xb012
 #endif
 
+#ifndef USB_PID_TEVII_S421
+#define USB_PID_TEVII_S421 0xd421
+#endif
+
+#ifndef USB_PID_TEVII_S632
+#define USB_PID_TEVII_S632 0xd632
+#endif
+
 #define DW210X_READ_MSG 0
 #define DW210X_WRITE_MSG 1
 
@@ -80,6 +91,15 @@
 #define DW2102_RC_QUERY (0x1a00)
 #define DW2102_LED_CTRL (0x1b00)
 
+#define DW2101_FIRMWARE "dvb-usb-dw2101.fw"
+#define DW2102_FIRMWARE "dvb-usb-dw2102.fw"
+#define DW2104_FIRMWARE "dvb-usb-dw2104.fw"
+#define DW3101_FIRMWARE "dvb-usb-dw3101.fw"
+#define S630_FIRMWARE   "dvb-usb-s630.fw"
+#define S660_FIRMWARE   "dvb-usb-s660.fw"
+#define P1100_FIRMWARE  "dvb-usb-p1100.fw"
+#define P7500_FIRMWARE  "dvb-usb-p7500.fw"
+
 #define err_str "did not find the firmware file. (%s) " \
                 "Please see linux/Documentation/dvb/ for more details " \
                 "on firmware-problems."
@@ -534,7 +554,7 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 }
                 /*case 0x55: cx24116
                 case 0x6a: stv0903
-                case 0x68: ds3000, stv0903
+                case 0x68: ds3000, stv0903, rs2000
                 case 0x60: ts2020, stv6110, stb6100
                 case 0xa0: eeprom */
                 default: {
@@ -932,6 +952,17 @@ static struct ds3000_config dw2104_ds3000_config = {
         .demod_address = 0x68,
 };
 
+static struct ts2020_config dw2104_ts2020_config  = {
+        .tuner_address = 0x60,
+        .clk_out_div = 1,
+};
+
+static struct ds3000_config s660_ds3000_config = {
+        .demod_address = 0x68,
+        .ci_mode = 1,
+        .set_lock_led = dw210x_led_ctrl,
+};
+
 static struct stv0900_config dw2104a_stv0900_config = {
         .demod_address = 0x6a,
         .demod_mode = 0,
@@ -981,6 +1012,30 @@ static struct stv0900_config prof_7500_stv0900_config = {
 static struct ds3000_config su3000_ds3000_config = {
         .demod_address = 0x68,
         .ci_mode = 1,
+        .set_lock_led = dw210x_led_ctrl,
+};
+
+static u8 m88rs2000_inittab[] = {
+        DEMOD_WRITE, 0x9a, 0x30,
+        DEMOD_WRITE, 0x00, 0x01,
+        WRITE_DELAY, 0x19, 0x00,
+        DEMOD_WRITE, 0x00, 0x00,
+        DEMOD_WRITE, 0x9a, 0xb0,
+        DEMOD_WRITE, 0x81, 0xc1,
+        DEMOD_WRITE, 0x81, 0x81,
+        DEMOD_WRITE, 0x86, 0xc6,
+        DEMOD_WRITE, 0x9a, 0x30,
+        DEMOD_WRITE, 0xf0, 0x80,
+        DEMOD_WRITE, 0xf1, 0xbf,
+        DEMOD_WRITE, 0xb0, 0x45,
+        DEMOD_WRITE, 0xb2, 0x01,
+        DEMOD_WRITE, 0x9a, 0xb0,
+        0xff, 0xaa, 0xff
+};
+
+static struct m88rs2000_config s421_m88rs2000_config = {
+        .demod_addr = 0x68,
+        .inittab = m88rs2000_inittab,
 };
 
 static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
@@ -1033,6 +1088,8 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
         d->fe_adap[0].fe = dvb_attach(ds3000_attach, &dw2104_ds3000_config,
                         &d->dev->i2c_adap);
         if (d->fe_adap[0].fe != NULL) {
+                dvb_attach(ts2020_attach, d->fe_adap[0].fe,
+                        &dw2104_ts2020_config, &d->dev->i2c_adap);
                 d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
                 info("Attached DS3000!\n");
                 return 0;
@@ -1139,12 +1196,15 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d)
         struct s6x0_state *st = (struct s6x0_state *)d->dev->priv;
         u8 obuf[] = {7, 1};
 
-        d->fe_adap[0].fe = dvb_attach(ds3000_attach, &dw2104_ds3000_config,
+        d->fe_adap[0].fe = dvb_attach(ds3000_attach, &s660_ds3000_config,
                         &d->dev->i2c_adap);
 
         if (d->fe_adap[0].fe == NULL)
                 return -EIO;
 
+        dvb_attach(ts2020_attach, d->fe_adap[0].fe, &dw2104_ts2020_config,
+                &d->dev->i2c_adap);
+
         st->old_set_voltage = d->fe_adap[0].fe->ops.set_voltage;
         d->fe_adap[0].fe->ops.set_voltage = s660_set_voltage;
 
@@ -1182,6 +1242,14 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d)
                 err("command 0x0e transfer failed.");
 
         obuf[0] = 0xe;
+        obuf[1] = 0x02;
+        obuf[2] = 1;
+
+        if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
+                err("command 0x0e transfer failed.");
+        msleep(300);
+
+        obuf[0] = 0xe;
         obuf[1] = 0x83;
         obuf[2] = 0;
 
@@ -1205,9 +1273,40 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d)
         if (d->fe_adap[0].fe == NULL)
                 return -EIO;
 
-        info("Attached DS3000!\n");
+        if (dvb_attach(ts2020_attach, d->fe_adap[0].fe,
+                                &dw2104_ts2020_config,
+                                &d->dev->i2c_adap)) {
+                info("Attached DS3000/TS2020!\n");
+                return 0;
+        }
 
-        return 0;
+        info("Failed to attach DS3000/TS2020!\n");
+        return -EIO;
+}
+
+static int m88rs2000_frontend_attach(struct dvb_usb_adapter *d)
+{
+        u8 obuf[] = { 0x51 };
+        u8 ibuf[] = { 0 };
+
+        if (dvb_usb_generic_rw(d->dev, obuf, 1, ibuf, 1, 0) < 0)
+                err("command 0x51 transfer failed.");
+
+        d->fe_adap[0].fe = dvb_attach(m88rs2000_attach, &s421_m88rs2000_config,
+                                        &d->dev->i2c_adap);
+
+        if (d->fe_adap[0].fe == NULL)
+                return -EIO;
+
+        if (dvb_attach(ts2020_attach, d->fe_adap[0].fe,
+                                &dw2104_ts2020_config,
+                                &d->dev->i2c_adap)) {
+                info("Attached RS2000/TS2020!\n");
+                return 0;
+        }
+
+        info("Failed to attach RS2000/TS2020!\n");
+        return -EIO;
 }
 
 static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)
@@ -1447,6 +1546,8 @@ enum dw2102_table_entry {
         TEVII_S480_1,
         TEVII_S480_2,
         X3M_SPC1400HD,
+        TEVII_S421,
+        TEVII_S632,
 };
 
 static struct usb_device_id dw2102_table[] = {
@@ -1465,6 +1566,8 @@ static struct usb_device_id dw2102_table[] = {
         [TEVII_S480_1] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)},
         [TEVII_S480_2] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},
         [X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},
+        [TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
+        [TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
         { }
 };
 
@@ -1478,13 +1581,12 @@ static int dw2102_load_firmware(struct usb_device *dev,
         u8 reset;
         u8 reset16[] = {0, 0, 0, 0, 0, 0, 0};
         const struct firmware *fw;
-        const char *fw_2101 = "dvb-usb-dw2101.fw";
 
         switch (dev->descriptor.idProduct) {
         case 0x2101:
-                ret = request_firmware(&fw, fw_2101, &dev->dev);
+                ret = request_firmware(&fw, DW2101_FIRMWARE, &dev->dev);
                 if (ret != 0) {
-                        err(err_str, fw_2101);
+                        err(err_str, DW2101_FIRMWARE);
                         return ret;
                 }
                 break;
@@ -1586,7 +1688,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
 static struct dvb_usb_device_properties dw2102_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
-        .firmware = "dvb-usb-dw2102.fw",
+        .firmware = DW2102_FIRMWARE,
         .no_reconnect = 1,
 
         .i2c_algo = &dw2102_serit_i2c_algo,
@@ -1641,7 +1743,7 @@ static struct dvb_usb_device_properties dw2102_properties = {
 static struct dvb_usb_device_properties dw2104_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
-        .firmware = "dvb-usb-dw2104.fw",
+        .firmware = DW2104_FIRMWARE,
         .no_reconnect = 1,
 
         .i2c_algo = &dw2104_i2c_algo,
@@ -1691,7 +1793,7 @@ static struct dvb_usb_device_properties dw2104_properties = {
 static struct dvb_usb_device_properties dw3101_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
-        .firmware = "dvb-usb-dw3101.fw",
+        .firmware = DW3101_FIRMWARE,
         .no_reconnect = 1,
 
         .i2c_algo = &dw3101_i2c_algo,
@@ -1739,7 +1841,7 @@ static struct dvb_usb_device_properties s6x0_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
         .size_of_priv = sizeof(struct s6x0_state),
-        .firmware = "dvb-usb-s630.fw",
+        .firmware = S630_FIRMWARE,
         .no_reconnect = 1,
 
         .i2c_algo = &s6x0_i2c_algo,
@@ -1814,6 +1916,19 @@ static struct dvb_usb_device_description d7500 = {
         {NULL},
 };
 
+struct dvb_usb_device_properties *s421;
+static struct dvb_usb_device_description d421 = {
+        "TeVii S421 PCI",
+        {&dw2102_table[TEVII_S421], NULL},
+        {NULL},
+};
+
+static struct dvb_usb_device_description d632 = {
+        "TeVii S632 USB",
+        {&dw2102_table[TEVII_S632], NULL},
+        {NULL},
+};
+
 static struct dvb_usb_device_properties su3000_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
@@ -1879,7 +1994,7 @@ static int dw2102_probe(struct usb_interface *intf,
                 return -ENOMEM;
         /* copy default structure */
         /* fill only different fields */
-        p1100->firmware = "dvb-usb-p1100.fw";
+        p1100->firmware = P1100_FIRMWARE;
         p1100->devices[0] = d1100;
         p1100->rc.legacy.rc_map_table = rc_map_tbs_table;
         p1100->rc.legacy.rc_map_size = ARRAY_SIZE(rc_map_tbs_table);
@@ -1891,7 +2006,7 @@ static int dw2102_probe(struct usb_interface *intf,
                 kfree(p1100);
                 return -ENOMEM;
         }
-        s660->firmware = "dvb-usb-s660.fw";
+        s660->firmware = S660_FIRMWARE;
         s660->num_device_descs = 3;
         s660->devices[0] = d660;
         s660->devices[1] = d480_1;
@@ -1905,12 +2020,26 @@ static int dw2102_probe(struct usb_interface *intf,
                 kfree(s660);
                 return -ENOMEM;
         }
-        p7500->firmware = "dvb-usb-p7500.fw";
+        p7500->firmware = P7500_FIRMWARE;
         p7500->devices[0] = d7500;
         p7500->rc.legacy.rc_map_table = rc_map_tbs_table;
         p7500->rc.legacy.rc_map_size = ARRAY_SIZE(rc_map_tbs_table);
         p7500->adapter->fe[0].frontend_attach = prof_7500_frontend_attach;
 
+
+        s421 = kmemdup(&su3000_properties,
+                       sizeof(struct dvb_usb_device_properties), GFP_KERNEL);
+        if (!s421) {
+                kfree(p1100);
+                kfree(s660);
+                kfree(p7500);
+                return -ENOMEM;
+        }
+        s421->num_device_descs = 2;
+        s421->devices[0] = d421;
+        s421->devices[1] = d632;
+        s421->adapter->fe[0].frontend_attach = m88rs2000_frontend_attach;
+
         if (0 == dvb_usb_device_init(intf, &dw2102_properties,
                         THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &dw2104_properties,
@@ -1925,6 +2054,8 @@ static int dw2102_probe(struct usb_interface *intf,
                         THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, p7500,
                         THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf, s421,
+                        THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &su3000_properties,
                                      THIS_MODULE, NULL, adapter_nr))
                 return 0;
@@ -1943,9 +2074,17 @@ module_usb_driver(dw2102_driver);
 
 MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");
 MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"
-                                " DVB-C 3101 USB2.0,"
-                                " TeVii S600, S630, S650, S660, S480,"
-                                " Prof 1100, 7500 USB2.0,"
-                                " Geniatech SU3000 devices");
+                        " DVB-C 3101 USB2.0,"
+                        " TeVii S600, S630, S650, S660, S480, S421, S632"
+                        " Prof 1100, 7500 USB2.0,"
+                        " Geniatech SU3000 devices");
 MODULE_VERSION("0.1");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE(DW2101_FIRMWARE);
+MODULE_FIRMWARE(DW2102_FIRMWARE);
+MODULE_FIRMWARE(DW2104_FIRMWARE);
+MODULE_FIRMWARE(DW3101_FIRMWARE);
+MODULE_FIRMWARE(S630_FIRMWARE);
+MODULE_FIRMWARE(S660_FIRMWARE);
+MODULE_FIRMWARE(P1100_FIRMWARE);
+MODULE_FIRMWARE(P7500_FIRMWARE);
diff --git a/drivers/media/usb/dvb-usb/friio-fe.c b/drivers/media/usb/dvb-usb/friio-fe.c
index 90a70c66a96e..d56f927fc31a 100644
--- a/drivers/media/usb/dvb-usb/friio-fe.c
+++ b/drivers/media/usb/dvb-usb/friio-fe.c
@@ -421,11 +421,10 @@ struct dvb_frontend *jdvbt90502_attach(struct dvb_usb_device *d)
 
         /* setup the state */
         state->i2c = &d->i2c_adap;
-        memcpy(&state->config, &friio_fe_config, sizeof(friio_fe_config));
+        state->config = friio_fe_config;
 
         /* create dvb_frontend */
-        memcpy(&state->frontend.ops, &jdvbt90502_ops,
-               sizeof(jdvbt90502_ops));
+        state->frontend.ops = jdvbt90502_ops;
         state->frontend.demodulator_priv = state;
 
         if (jdvbt90502_init(&state->frontend) < 0)
diff --git a/drivers/media/usb/dvb-usb/m920x.c b/drivers/media/usb/dvb-usb/m920x.c
index 661bb75be955..92afeb20650f 100644
--- a/drivers/media/usb/dvb-usb/m920x.c
+++ b/drivers/media/usb/dvb-usb/m920x.c
@@ -16,6 +16,7 @@
 #include "qt1010.h"
 #include "tda1004x.h"
 #include "tda827x.h"
+#include "mt2060.h"
 
 #include <media/tuner.h>
 #include "tuner-simple.h"
@@ -63,23 +64,33 @@ static inline int m920x_write(struct usb_device *udev, u8 request,
         return ret;
 }
 
+static inline int m920x_write_seq(struct usb_device *udev, u8 request,
+                                  struct m920x_inits *seq)
+{
+        int ret;
+        while (seq->address) {
+                ret = m920x_write(udev, request, seq->data, seq->address);
+                if (ret != 0)
+                        return ret;
+
+                seq++;
+        }
+
+        return ret;
+}
+
 static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq)
 {
         int ret = 0, i, epi, flags = 0;
         int adap_enabled[M9206_MAX_ADAPTERS] = { 0 };
 
         /* Remote controller init. */
-        if (d->props.rc.legacy.rc_query) {
+        if (d->props.rc.legacy.rc_query || d->props.rc.core.rc_query) {
                 deb("Initialising remote control\n");
-                while (rc_seq->address) {
-                        if ((ret = m920x_write(d->udev, M9206_CORE,
-                                               rc_seq->data,
-                                               rc_seq->address)) != 0) {
-                                deb("Initialising remote control failed\n");
-                                return ret;
-                        }
-
-                        rc_seq++;
+                ret = m920x_write_seq(d->udev, M9206_CORE, rc_seq);
+                if (ret != 0) {
+                        deb("Initialising remote control failed\n");
+                        return ret;
                 }
 
                 deb("Initialising remote control success\n");
@@ -130,9 +141,50 @@ static int m920x_init_ep(struct usb_interface *intf)
                                  alt->desc.bAlternateSetting);
 }
 
-static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static inline void m920x_parse_rc_state(struct dvb_usb_device *d, u8 rc_state,
+                                        int *state)
 {
         struct m920x_state *m = d->priv;
+
+        switch (rc_state) {
+        case 0x80:
+                *state = REMOTE_NO_KEY_PRESSED;
+                break;
+
+        case 0x88: /* framing error or "invalid code" */
+        case 0x99:
+        case 0xc0:
+        case 0xd8:
+                *state = REMOTE_NO_KEY_PRESSED;
+                m->rep_count = 0;
+                break;
+
+        case 0x93:
+        case 0x92:
+        case 0x83: /* pinnacle PCTV310e */
+        case 0x82:
+                m->rep_count = 0;
+                *state = REMOTE_KEY_PRESSED;
+                break;
+
+        case 0x91:
+        case 0x81: /* pinnacle PCTV310e */
+                /* prevent immediate auto-repeat */
+                if (++m->rep_count > 2)
+                        *state = REMOTE_KEY_REPEAT;
+                else
+                        *state = REMOTE_NO_KEY_PRESSED;
+                break;
+
+        default:
+                deb("Unexpected rc state %02x\n", rc_state);
+                *state = REMOTE_NO_KEY_PRESSED;
+                break;
+        }
+}
+
+static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
         int i, ret = 0;
         u8 *rc_state;
 
@@ -140,51 +192,22 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         if (!rc_state)
                 return -ENOMEM;
 
-        if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, rc_state, 1)) != 0)
+        ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE,
+                         rc_state, 1);
+        if (ret != 0)
                 goto out;
 
-        if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, rc_state + 1, 1)) != 0)
+        ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY,
+                         rc_state + 1, 1);
+        if (ret != 0)
                 goto out;
 
+        m920x_parse_rc_state(d, rc_state[0], state);
+
         for (i = 0; i < d->props.rc.legacy.rc_map_size; i++)
                 if (rc5_data(&d->props.rc.legacy.rc_map_table[i]) == rc_state[1]) {
                         *event = d->props.rc.legacy.rc_map_table[i].keycode;
-
-                        switch(rc_state[0]) {
-                        case 0x80:
-                                *state = REMOTE_NO_KEY_PRESSED;
-                                goto out;
-
-                        case 0x88: /* framing error or "invalid code" */
-                        case 0x99:
-                        case 0xc0:
-                        case 0xd8:
-                                *state = REMOTE_NO_KEY_PRESSED;
-                                m->rep_count = 0;
-                                goto out;
-
-                        case 0x93:
-                        case 0x92:
-                        case 0x83: /* pinnacle PCTV310e */
-                        case 0x82:
-                                m->rep_count = 0;
-                                *state = REMOTE_KEY_PRESSED;
-                                goto out;
-
-                        case 0x91:
-                        case 0x81: /* pinnacle PCTV310e */
-                                /* prevent immediate auto-repeat */
-                                if (++m->rep_count > 2)
-                                        *state = REMOTE_KEY_REPEAT;
-                                else
-                                        *state = REMOTE_NO_KEY_PRESSED;
-                                goto out;
-
-                        default:
-                                deb("Unexpected rc state %02x\n", rc_state[0]);
-                                *state = REMOTE_NO_KEY_PRESSED;
-                                goto out;
-                        }
+                        goto out;
                 }
 
         if (rc_state[1] != 0)
@@ -197,6 +220,38 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         return ret;
 }
 
+static int m920x_rc_core_query(struct dvb_usb_device *d)
+{
+        int ret = 0;
+        u8 *rc_state;
+        int state;
+
+        rc_state = kmalloc(2, GFP_KERNEL);
+        if (!rc_state)
+                return -ENOMEM;
+
+        if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_STATE, &rc_state[0], 1)) != 0)
+                goto out;
+
+        if ((ret = m920x_read(d->udev, M9206_CORE, 0x0, M9206_RC_KEY, &rc_state[1], 1)) != 0)
+                goto out;
+
+        deb("state=0x%02x keycode=0x%02x\n", rc_state[0], rc_state[1]);
+
+        m920x_parse_rc_state(d, rc_state[0], &state);
+
+        if (state == REMOTE_NO_KEY_PRESSED)
+                rc_keyup(d->rc_dev);
+        else if (state == REMOTE_KEY_REPEAT)
+                rc_repeat(d->rc_dev);
+        else
+                rc_keydown(d->rc_dev, rc_state[1], 0);
+
+out:
+        kfree(rc_state);
+        return ret;
+}
+
 /* I2C */
 static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)
 {
@@ -496,6 +551,12 @@ static struct qt1010_config m920x_qt1010_config = {
         .i2c_address = 0x62
 };
 
+static struct mt2060_config m920x_mt2060_config = {
+        .i2c_address = 0x60, /* 0xc0 */
+        .clock_out = 0,
+};
+
+
 /* Callbacks for DVB USB */
 static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap)
 {
@@ -510,6 +571,37 @@ static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
+static int m920x_mt352_frontend_attach_vp7049(struct dvb_usb_adapter *adap)
+{
+        struct m920x_inits vp7049_fe_init_seq[] = {
+                /* XXX without these commands the frontend cannot be detected,
+                 * they must be sent BEFORE the frontend is attached */
+                { 0xff28,         0x00 },
+                { 0xff23,         0x00 },
+                { 0xff28,         0x00 },
+                { 0xff23,         0x00 },
+                { 0xff21,         0x20 },
+                { 0xff21,         0x60 },
+                { 0xff28,         0x00 },
+                { 0xff22,         0x00 },
+                { 0xff20,         0x30 },
+                { 0xff20,         0x20 },
+                { 0xff20,         0x30 },
+                { } /* terminating entry */
+        };
+        int ret;
+
+        deb("%s\n", __func__);
+
+        ret = m920x_write_seq(adap->dev->udev, M9206_CORE, vp7049_fe_init_seq);
+        if (ret != 0) {
+                deb("Initialization of vp7049 frontend failed.");
+                return ret;
+        }
+
+        return m920x_mt352_frontend_attach(adap);
+}
+
 static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap)
 {
         deb("%s\n",__func__);
@@ -574,6 +666,18 @@ static int m920x_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
+static int m920x_mt2060_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        deb("%s\n", __func__);
+
+        if (dvb_attach(mt2060_attach, adap->fe_adap[0].fe, &adap->dev->i2c_adap,
+                       &m920x_mt2060_config, 1220) == NULL)
+                return -ENODEV;
+
+        return 0;
+}
+
+
 /* device-specific initialization */
 static struct m920x_inits megasky_rc_init [] = {
         { M9206_RC_INIT2, 0xa8 },
@@ -591,7 +695,7 @@ static struct m920x_inits tvwalkertwin_rc_init [] = {
 };
 
 static struct m920x_inits pinnacle310e_init[] = {
-        /* without these the tuner don't work */
+        /* without these the tuner doesn't work */
         { 0xff20,         0x9b },
         { 0xff22,         0x70 },
 
@@ -602,6 +706,15 @@ static struct m920x_inits pinnacle310e_init[] = {
         { } /* terminating entry */
 };
 
+static struct m920x_inits vp7049_rc_init[] = {
+        { 0xff28,         0x00 },
+        { 0xff23,         0x00 },
+        { 0xff21,         0x70 },
+        { M9206_RC_INIT2, 0x00 },
+        { M9206_RC_INIT1, 0xff },
+        { } /* terminating entry */
+};
+
 /* ir keymaps */
 static struct rc_map_table rc_map_megasky_table[] = {
         { 0x0012, KEY_POWER },
@@ -704,6 +817,7 @@ static struct dvb_usb_device_properties digivox_mini_ii_properties;
 static struct dvb_usb_device_properties tvwalkertwin_properties;
 static struct dvb_usb_device_properties dposh_properties;
 static struct dvb_usb_device_properties pinnacle_pctv310e_properties;
+static struct dvb_usb_device_properties vp7049_properties;
 
 static int m920x_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
@@ -756,6 +870,13 @@ static int m920x_probe(struct usb_interface *intf,
                         goto found;
                 }
 
+                ret = dvb_usb_device_init(intf, &vp7049_properties,
+                                          THIS_MODULE, &d, adapter_nr);
+                if (ret == 0) {
+                        rc_init_seq = vp7049_rc_init;
+                        goto found;
+                }
+
                 return ret;
         } else {
                 /* Another interface on a multi-tuner device */
@@ -787,6 +908,7 @@ static struct usb_device_id m920x_table [] = {
                 { USB_DEVICE(USB_VID_DPOSH, USB_PID_DPOSH_M9206_COLD) },
                 { USB_DEVICE(USB_VID_DPOSH, USB_PID_DPOSH_M9206_WARM) },
                 { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_PINNACLE_PCTV310E) },
+                { USB_DEVICE(USB_VID_AZUREWAVE, USB_PID_TWINHAN_VP7049) },
                 { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, m920x_table);
@@ -1079,6 +1201,61 @@ static struct dvb_usb_device_properties pinnacle_pctv310e_properties = {
         }
 };
 
+static struct dvb_usb_device_properties vp7049_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .firmware = "dvb-usb-vp7049-0.95.fw",
+        .download_firmware = m920x_firmware_download,
+
+        .rc.core = {
+                .rc_interval    = 150,
+                .rc_codes       = RC_MAP_TWINHAN_VP1027_DVBS,
+                .rc_query       = m920x_rc_core_query,
+                .allowed_protos = RC_TYPE_UNKNOWN,
+        },
+
+        .size_of_priv     = sizeof(struct m920x_state),
+
+        .identify_state   = m920x_identify_state,
+        .num_adapters = 1,
+        .adapter = {{
+                .num_frontends = 1,
+                .fe = {{
+
+                .caps = DVB_USB_ADAP_HAS_PID_FILTER |
+                        DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+
+                .pid_filter_count = 8,
+                .pid_filter       = m920x_pid_filter,
+                .pid_filter_ctrl  = m920x_pid_filter_ctrl,
+
+                .frontend_attach  = m920x_mt352_frontend_attach_vp7049,
+                .tuner_attach     = m920x_mt2060_tuner_attach,
+
+                .stream = {
+                        .type = USB_BULK,
+                        .count = 8,
+                        .endpoint = 0x81,
+                        .u = {
+                                 .bulk = {
+                                         .buffersize = 512,
+                                 }
+                        }
+                },
+                } },
+        } },
+        .i2c_algo         = &m920x_i2c_algo,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "DTV-DVB UDTT7049",
+                        { &m920x_table[7], NULL },
+                        { NULL },
+                }
+         }
+};
+
 static struct usb_driver m920x_driver = {
         .name           = "dvb_usb_m920x",
         .probe          = m920x_probe,
diff --git a/drivers/media/usb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c
index bcdac225ebe1..2ce3d19c58ef 100644
--- a/drivers/media/usb/dvb-usb/ttusb2.c
+++ b/drivers/media/usb/dvb-usb/ttusb2.c
@@ -620,6 +620,8 @@ static struct usb_device_id ttusb2_table [] = {
                 USB_PID_TECHNOTREND_CONNECT_S2400) },
         { USB_DEVICE(USB_VID_TECHNOTREND,
                 USB_PID_TECHNOTREND_CONNECT_CT3650) },
+        { USB_DEVICE(USB_VID_TECHNOTREND,
+                USB_PID_TECHNOTREND_CONNECT_S2400_8KEEPROM) },
         {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, ttusb2_table);
@@ -721,12 +723,16 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400 = {
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
-        .num_device_descs = 1,
+        .num_device_descs = 2,
         .devices = {
                 {   "Technotrend TT-connect S-2400",
                         { &ttusb2_table[2], NULL },
                         { NULL },
                 },
+                {   "Technotrend TT-connect S-2400 (8kB EEPROM)",
+                        { &ttusb2_table[4], NULL },
+                        { NULL },
+                },
         }
 };