Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (277 commits)
  V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms.
  V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups
  V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels
  V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings
  V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on
  V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C
  V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c
  V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places
  V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF
  V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on"
  V4L/DVB (8390): videodev: add comment and remove magic number.
  V4L/DVB (8389): videodev: simplify get_index()
  V4L/DVB (8387): Some cosmetic changes
  V4L/DVB (8381): ov7670: fix compile warnings
  V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name.
  V4L/DVB (8379): saa7127: Make device detection optional
  V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup
  V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct
  V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup
  V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver.
  ...

13 files changed, 1116 insertions, 72 deletions

diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index f00a0eb40420..a577c0f89f67 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -76,6 +76,7 @@ config DVB_USB_DIB0700
         select DVB_DIB3000MC
         select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_MT2266 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
         select DVB_TUNER_DIB0070
         help
           Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
@@ -107,6 +108,8 @@ config DVB_USB_CXUSB
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the Conexant USB2.0 hybrid reference design.
           Currently, only DVB and ATSC modes are supported, analog mode
@@ -120,6 +123,8 @@ config DVB_USB_M920X
         depends on DVB_USB
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
+        select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.
           Currently, only devices with a product id of
@@ -241,3 +246,13 @@ config DVB_USB_AF9005_REMOTE
           Say Y here to support the default remote control decoding for the
           Afatech AF9005 based receiver.
 
+config DVB_USB_ANYSEE
+        tristate "Anysee DVB-T/C USB2.0 support"
+        depends on DVB_USB
+        select DVB_PLL if !DVB_FE_CUSTOMISE
+        select DVB_MT352 if !DVB_FE_CUSTOMISE
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+        select DVB_TDA10023 if !DVB_FE_CUSTOMISE
+        help
+          Say Y here to support the Anysee E30, Anysee E30 Plus or
+          Anysee E30 C Plus DVB USB2.0 receiver.
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index c6511a6c0ab8..44c11e45e564 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -61,6 +61,9 @@ obj-$(CONFIG_DVB_USB_AF9005) += dvb-usb-af9005.o
 dvb-usb-af9005-remote-objs = af9005-remote.o
 obj-$(CONFIG_DVB_USB_AF9005_REMOTE) += dvb-usb-af9005-remote.o
 
+dvb-usb-anysee-objs = anysee.o
+obj-$(CONFIG_DVB_USB_ANYSEE) += dvb-usb-anysee.o
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 # due to tuner-xc3028
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
new file mode 100644
index 000000000000..adfd4fc82efd
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -0,0 +1,553 @@
+/*
+ * DVB USB Linux driver for Anysee E30 DVB-C & DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
+ *
+ *    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 Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO:
+ * - add smart card reader support for Conditional Access (CA)
+ *
+ * Card reader in Anysee is nothing more than ISO 7816 card reader.
+ * There is no hardware CAM in any Anysee device sold.
+ * In my understanding it should be implemented by making own module
+ * for ISO 7816 card reader, like dvb_ca_en50221 is implemented. This
+ * module registers serial interface that can be used to communicate
+ * with any ISO 7816 smart card.
+ *
+ * Any help according to implement serial smart card reader support
+ * is highly welcome!
+ */
+
+#include "anysee.h"
+#include "tda1002x.h"
+#include "mt352.h"
+#include "mt352_priv.h"
+#include "zl10353.h"
+
+/* debug */
+static int dvb_usb_anysee_debug;
+module_param_named(debug, dvb_usb_anysee_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+struct mutex anysee_usb_mutex;
+
+static int anysee_ctrl_msg(struct dvb_usb_device *d, u8 *sbuf, u8 slen,
+        u8 *rbuf, u8 rlen)
+{
+        struct anysee_state *state = d->priv;
+        int act_len, ret;
+        u8 buf[64];
+
+        if (slen > sizeof(buf))
+                slen = sizeof(buf);
+        memcpy(&buf[0], sbuf, slen);
+        buf[60] = state->seq++;
+
+        if (mutex_lock_interruptible(&anysee_usb_mutex) < 0)
+                return -EAGAIN;
+
+        /* We need receive one message more after dvb_usb_generic_rw due
+           to weird transaction flow, which is 1 x send + 2 x receive. */
+        ret = dvb_usb_generic_rw(d, buf, sizeof(buf), buf, sizeof(buf), 0);
+
+        if (!ret) {
+                /* receive 2nd answer */
+                ret = usb_bulk_msg(d->udev, usb_rcvbulkpipe(d->udev,
+                        d->props.generic_bulk_ctrl_endpoint), buf, sizeof(buf),
+                        &act_len, 2000);
+                if (ret)
+                        err("%s: recv bulk message failed: %d", __func__, ret);
+                else {
+                        deb_xfer("<<< ");
+                        debug_dump(buf, act_len, deb_xfer);
+                }
+        }
+
+        /* read request, copy returned data to return buf */
+        if (!ret && rbuf && rlen)
+                memcpy(rbuf, buf, rlen);
+
+        mutex_unlock(&anysee_usb_mutex);
+
+        return ret;
+}
+
+static int anysee_read_reg(struct dvb_usb_device *d, u16 reg, u8 *val)
+{
+        u8 buf[] = {CMD_REG_READ, reg >> 8, reg & 0xff, 0x01};
+        int ret;
+        ret = anysee_ctrl_msg(d, buf, sizeof(buf), val, 1);
+        deb_info("%s: reg:%04x val:%02x\n", __func__, reg, *val);
+        return ret;
+}
+
+static int anysee_write_reg(struct dvb_usb_device *d, u16 reg, u8 val)
+{
+        u8 buf[] = {CMD_REG_WRITE, reg >> 8, reg & 0xff, 0x01, val};
+        deb_info("%s: reg:%04x val:%02x\n", __func__, reg, val);
+        return anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0);
+}
+
+static int anysee_get_hw_info(struct dvb_usb_device *d, u8 *id)
+{
+        u8 buf[] = {CMD_GET_HW_INFO};
+        return anysee_ctrl_msg(d, buf, sizeof(buf), id, 3);
+}
+
+static int anysee_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
+{
+        u8 buf[] = {CMD_STREAMING_CTRL, (u8)onoff, 0x00};
+        deb_info("%s: onoff:%02x\n", __func__, onoff);
+        return anysee_ctrl_msg(adap->dev, buf, sizeof(buf), NULL, 0);
+}
+
+static int anysee_led_ctrl(struct dvb_usb_device *d, u8 mode, u8 interval)
+{
+        u8 buf[] = {CMD_LED_AND_IR_CTRL, 0x01, mode, interval};
+        deb_info("%s: state:%02x interval:%02x\n", __func__, mode, interval);
+        return anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0);
+}
+
+static int anysee_ir_ctrl(struct dvb_usb_device *d, u8 onoff)
+{
+        u8 buf[] = {CMD_LED_AND_IR_CTRL, 0x02, onoff};
+        deb_info("%s: onoff:%02x\n", __func__, onoff);
+        return anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0);
+}
+
+static int anysee_init(struct dvb_usb_device *d)
+{
+        int ret;
+        /* LED light */
+        ret = anysee_led_ctrl(d, 0x01, 0x03);
+        if (ret)
+                return ret;
+
+        /* enable IR */
+        ret = anysee_ir_ctrl(d, 1);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+/* I2C */
+static int anysee_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
+        int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int ret, inc, i = 0;
+
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        while (i < num) {
+                if (num > i + 1 && (msg[i+1].flags & I2C_M_RD)) {
+                        u8 buf[6];
+                        buf[0] = CMD_I2C_READ;
+                        buf[1] = msg[i].addr + 1;
+                        buf[2] = msg[i].buf[0];
+                        buf[3] = 0x00;
+                        buf[4] = 0x00;
+                        buf[5] = 0x01;
+                        ret = anysee_ctrl_msg(d, buf, sizeof(buf), msg[i+1].buf,
+                                msg[i+1].len);
+                        inc = 2;
+                } else {
+                        u8 buf[4+msg[i].len];
+                        buf[0] = CMD_I2C_WRITE;
+                        buf[1] = msg[i].addr;
+                        buf[2] = msg[i].len;
+                        buf[3] = 0x01;
+                        memcpy(&buf[4], msg[i].buf, msg[i].len);
+                        ret = anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0);
+                        inc = 1;
+                }
+                if (ret)
+                        return ret;
+
+                i += inc;
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+
+        return i;
+}
+
+static u32 anysee_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm anysee_i2c_algo = {
+        .master_xfer   = anysee_master_xfer,
+        .functionality = anysee_i2c_func,
+};
+
+static int anysee_mt352_demod_init(struct dvb_frontend *fe)
+{
+        static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x28 };
+        static u8 reset []         = { RESET,      0x80 };
+        static u8 adc_ctl_1_cfg [] = { ADC_CTL_1,  0x40 };
+        static u8 agc_cfg []       = { AGC_TARGET, 0x28, 0x20 };
+        static u8 gpp_ctl_cfg []   = { GPP_CTL,    0x33 };
+        static u8 capt_range_cfg[] = { CAPT_RANGE, 0x32 };
+
+        mt352_write(fe, clock_config,   sizeof(clock_config));
+        udelay(200);
+        mt352_write(fe, reset,          sizeof(reset));
+        mt352_write(fe, adc_ctl_1_cfg,  sizeof(adc_ctl_1_cfg));
+
+        mt352_write(fe, agc_cfg,        sizeof(agc_cfg));
+        mt352_write(fe, gpp_ctl_cfg,    sizeof(gpp_ctl_cfg));
+        mt352_write(fe, capt_range_cfg, sizeof(capt_range_cfg));
+
+        return 0;
+}
+
+/* Callbacks for DVB USB */
+static struct tda10023_config anysee_tda10023_config = {
+        .demod_address = 0x1a,
+        .invert = 0,
+        .xtal   = 16000000,
+        .pll_m  = 11,
+        .pll_p  = 3,
+        .pll_n  = 1,
+        .output_mode = TDA10023_OUTPUT_MODE_PARALLEL_C,
+        .deltaf = 0xfeeb,
+};
+
+static struct mt352_config anysee_mt352_config = {
+        .demod_address = 0x1e,
+        .demod_init    = anysee_mt352_demod_init,
+};
+
+static struct zl10353_config anysee_zl10353_config = {
+        .demod_address = 0x1e,
+        .parallel_ts = 1,
+};
+
+static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        int ret;
+        struct anysee_state *state = adap->dev->priv;
+        u8 hw_info[3];
+        u8 io_d; /* IO port D */
+
+        /* check which hardware we have
+           We must do this call two times to get reliable values (hw bug). */
+        ret = anysee_get_hw_info(adap->dev, hw_info);
+        if (ret)
+                return ret;
+        ret = anysee_get_hw_info(adap->dev, hw_info);
+        if (ret)
+                return ret;
+
+        /* Meaning of these info bytes are guessed. */
+        info("firmware version:%d.%d.%d hardware id:%d",
+                0, hw_info[1], hw_info[2], hw_info[0]);
+
+        ret = anysee_read_reg(adap->dev, 0xb0, &io_d); /* IO port D */
+        if (ret)
+                return ret;
+        deb_info("%s: IO port D:%02x\n", __func__, io_d);
+
+        /* Select demod using trial and error method. */
+
+        /* Try to attach demodulator in following order:
+              model      demod     hw  firmware
+           1. E30        MT352     02  0.2.1
+           2. E30        ZL10353   02  0.2.1
+           3. E30 Plus   ZL10353   06  0.1.0
+           4. E30C Plus  TDA10023  0a  0.1.0    rev 0.2
+           4. E30C Plus  TDA10023  0f  0.1.2    rev 0.4
+        */
+
+        /* Zarlink MT352 DVB-T demod inside of Samsung DNOS404ZH102A NIM */
+        adap->fe = dvb_attach(mt352_attach, &anysee_mt352_config,
+                              &adap->dev->i2c_adap);
+        if (adap->fe != NULL) {
+                state->tuner = DVB_PLL_THOMSON_DTT7579;
+                return 0;
+        }
+
+        /* Zarlink ZL10353 DVB-T demod inside of Samsung DNOS404ZH103A NIM */
+        adap->fe = dvb_attach(zl10353_attach, &anysee_zl10353_config,
+                              &adap->dev->i2c_adap);
+        if (adap->fe != NULL) {
+                state->tuner = DVB_PLL_THOMSON_DTT7579;
+                return 0;
+        }
+
+        /* connect demod on IO port D for TDA10023 & ZL10353 */
+        ret = anysee_write_reg(adap->dev, 0xb0, 0x25);
+        if (ret)
+                return ret;
+
+        /* Zarlink ZL10353 DVB-T demod inside of Samsung DNOS404ZH103A NIM */
+        adap->fe = dvb_attach(zl10353_attach, &anysee_zl10353_config,
+                              &adap->dev->i2c_adap);
+        if (adap->fe != NULL) {
+                state->tuner = DVB_PLL_THOMSON_DTT7579;
+                return 0;
+        }
+
+        /* IO port E - E30C rev 0.4 board requires this */
+        ret = anysee_write_reg(adap->dev, 0xb1, 0xa7);
+        if (ret)
+                return ret;
+
+        /* Philips TDA10023 DVB-C demod */
+        adap->fe = dvb_attach(tda10023_attach, &anysee_tda10023_config,
+                              &adap->dev->i2c_adap, 0x48);
+        if (adap->fe != NULL) {
+                state->tuner = DVB_PLL_SAMSUNG_DTOS403IH102A;
+                return 0;
+        }
+
+        /* return IO port D to init value for safe */
+        ret = anysee_write_reg(adap->dev, 0xb0, io_d);
+        if (ret)
+                return ret;
+
+        err("Unkown Anysee version: %02x %02x %02x. "\
+            "Please report the <linux-dvb@linuxtv.org>.",
+            hw_info[0], hw_info[1], hw_info[2]);
+
+        return -ENODEV;
+}
+
+static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct anysee_state *state = adap->dev->priv;
+        deb_info("%s: \n", __func__);
+
+        switch (state->tuner) {
+        case DVB_PLL_THOMSON_DTT7579:
+                /* Thomson dtt7579 (not sure) PLL inside of:
+                   Samsung DNOS404ZH102A NIM
+                   Samsung DNOS404ZH103A NIM */
+                dvb_attach(dvb_pll_attach, adap->fe, 0x61,
+                           NULL, DVB_PLL_THOMSON_DTT7579);
+                break;
+        case DVB_PLL_SAMSUNG_DTOS403IH102A:
+                /* Unknown PLL inside of Samsung DTOS403IH102A tuner module */
+                dvb_attach(dvb_pll_attach, adap->fe, 0xc0,
+                           &adap->dev->i2c_adap, DVB_PLL_SAMSUNG_DTOS403IH102A);
+                break;
+        }
+
+        return 0;
+}
+
+static int anysee_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+        u8 buf[] = {CMD_GET_IR_CODE};
+        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        u8 ircode[2];
+        int i, ret;
+
+        ret = anysee_ctrl_msg(d, buf, sizeof(buf), &ircode[0], 2);
+        if (ret)
+                return ret;
+
+        *event = 0;
+        *state = REMOTE_NO_KEY_PRESSED;
+
+        for (i = 0; i < d->props.rc_key_map_size; i++) {
+                if (keymap[i].custom == ircode[0] &&
+                    keymap[i].data == ircode[1]) {
+                        *event = keymap[i].event;
+                        *state = REMOTE_KEY_PRESSED;
+                        return 0;
+                }
+        }
+        return 0;
+}
+
+static struct dvb_usb_rc_key anysee_rc_keys[] = {
+        { 0x01, 0x00, KEY_0 },
+        { 0x01, 0x01, KEY_1 },
+        { 0x01, 0x02, KEY_2 },
+        { 0x01, 0x03, KEY_3 },
+        { 0x01, 0x04, KEY_4 },
+        { 0x01, 0x05, KEY_5 },
+        { 0x01, 0x06, KEY_6 },
+        { 0x01, 0x07, KEY_7 },
+        { 0x01, 0x08, KEY_8 },
+        { 0x01, 0x09, KEY_9 },
+        { 0x01, 0x0a, KEY_POWER },
+        { 0x01, 0x0b, KEY_DOCUMENTS },    /* * */
+        { 0x01, 0x19, KEY_FAVORITES },
+        { 0x01, 0x20, KEY_SLEEP },
+        { 0x01, 0x21, KEY_MODE },         /* 4:3 / 16:9 select */
+        { 0x01, 0x22, KEY_ZOOM },
+        { 0x01, 0x47, KEY_TEXT },
+        { 0x01, 0x16, KEY_TV },           /* TV / radio select */
+        { 0x01, 0x1e, KEY_LANGUAGE },     /* Second Audio Program */
+        { 0x01, 0x1a, KEY_SUBTITLE },
+        { 0x01, 0x1b, KEY_CAMERA },       /* screenshot */
+        { 0x01, 0x42, KEY_MUTE },
+        { 0x01, 0x0e, KEY_MENU },
+        { 0x01, 0x0f, KEY_EPG },
+        { 0x01, 0x17, KEY_INFO },
+        { 0x01, 0x10, KEY_EXIT },
+        { 0x01, 0x13, KEY_VOLUMEUP },
+        { 0x01, 0x12, KEY_VOLUMEDOWN },
+        { 0x01, 0x11, KEY_CHANNELUP },
+        { 0x01, 0x14, KEY_CHANNELDOWN },
+        { 0x01, 0x15, KEY_OK },
+        { 0x01, 0x1d, KEY_RED },
+        { 0x01, 0x1f, KEY_GREEN },
+        { 0x01, 0x1c, KEY_YELLOW },
+        { 0x01, 0x44, KEY_BLUE },
+        { 0x01, 0x0c, KEY_SHUFFLE },      /* snapshot */
+        { 0x01, 0x48, KEY_STOP },
+        { 0x01, 0x50, KEY_PLAY },
+        { 0x01, 0x51, KEY_PAUSE },
+        { 0x01, 0x49, KEY_RECORD },
+        { 0x01, 0x18, KEY_PREVIOUS },     /* |<< */
+        { 0x01, 0x0d, KEY_NEXT },         /* >>| */
+        { 0x01, 0x24, KEY_PROG1 },        /* F1 */
+        { 0x01, 0x25, KEY_PROG2 },        /* F2 */
+};
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties anysee_properties;
+
+static int anysee_probe(struct usb_interface *intf,
+                        const struct usb_device_id *id)
+{
+        struct dvb_usb_device *d;
+        struct usb_host_interface *alt;
+        int ret;
+
+        mutex_init(&anysee_usb_mutex);
+
+        /* There is one interface with two alternate settings.
+           Alternate setting 0 is for bulk transfer.
+           Alternate setting 1 is for isochronous transfer.
+           We use bulk transfer (alternate setting 0). */
+        if (intf->num_altsetting < 1)
+                return -ENODEV;
+
+        ret = dvb_usb_device_init(intf, &anysee_properties, THIS_MODULE, &d,
+                adapter_nr);
+        if (ret)
+                return ret;
+
+        alt = usb_altnum_to_altsetting(intf, 0);
+        if (alt == NULL) {
+                deb_info("%s: no alt found!\n", __func__);
+                return -ENODEV;
+        }
+
+        ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
+                alt->desc.bAlternateSetting);
+        if (ret)
+                return ret;
+
+        if (d)
+                ret = anysee_init(d);
+
+        return ret;
+}
+
+static struct usb_device_id anysee_table [] = {
+        { USB_DEVICE(USB_VID_CYPRESS, USB_PID_ANYSEE) },
+        { USB_DEVICE(USB_VID_AMT,     USB_PID_ANYSEE) },
+        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, anysee_table);
+
+static struct dvb_usb_device_properties anysee_properties = {
+        .caps             = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl         = DEVICE_SPECIFIC,
+
+        .size_of_priv     = sizeof(struct anysee_state),
+
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .streaming_ctrl   = anysee_streaming_ctrl,
+                        .frontend_attach  = anysee_frontend_attach,
+                        .tuner_attach     = anysee_tuner_attach,
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 8,
+                                .endpoint = 0x82,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 512,
+                                        }
+                                }
+                        },
+                }
+        },
+
+        .rc_key_map       = anysee_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(anysee_rc_keys),
+        .rc_query         = anysee_rc_query,
+        .rc_interval      = 200,  /* windows driver uses 500ms */
+
+        .i2c_algo         = &anysee_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 1,
+
+        .num_device_descs = 1,
+        .devices = {
+                {
+                        .name = "Anysee DVB USB2.0",
+                        .cold_ids = {NULL},
+                        .warm_ids = {&anysee_table[0],
+                                     &anysee_table[1], NULL},
+                },
+        }
+};
+
+static struct usb_driver anysee_driver = {
+        .name       = "dvb_usb_anysee",
+        .probe      = anysee_probe,
+        .disconnect = dvb_usb_device_exit,
+        .id_table   = anysee_table,
+};
+
+/* module stuff */
+static int __init anysee_module_init(void)
+{
+        int ret;
+
+        ret = usb_register(&anysee_driver);
+        if (ret)
+                err("%s: usb_register failed. Error number %d", __func__, ret);
+
+        return ret;
+}
+
+static void __exit anysee_module_exit(void)
+{
+        /* deregister this driver from the USB subsystem */
+        usb_deregister(&anysee_driver);
+}
+
+module_init(anysee_module_init);
+module_exit(anysee_module_exit);
+
+MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
+MODULE_DESCRIPTION("Driver Anysee E30 DVB-C & DVB-T USB2.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/anysee.h b/drivers/media/dvb/dvb-usb/anysee.h
new file mode 100644
index 000000000000..7ca01ff6e13c
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/anysee.h
@@ -0,0 +1,304 @@
+/*
+ * DVB USB Linux driver for Anysee E30 DVB-C & DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2007 Antti Palosaari <crope@iki.fi>
+ *
+ *    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 Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO:
+ * - add smart card reader support for Conditional Access (CA)
+ *
+ * Card reader in Anysee is nothing more than ISO 7816 card reader.
+ * There is no hardware CAM in any Anysee device sold.
+ * In my understanding it should be implemented by making own module
+ * for ISO 7816 card reader, like dvb_ca_en50221 is implemented. This
+ * module registers serial interface that can be used to communicate
+ * with any ISO 7816 smart card.
+ *
+ * Any help according to implement serial smart card reader support
+ * is highly welcome!
+ */
+
+#ifndef _DVB_USB_ANYSEE_H_
+#define _DVB_USB_ANYSEE_H_
+
+#define DVB_USB_LOG_PREFIX "anysee"
+#include "dvb-usb.h"
+
+#define deb_info(args...) dprintk(dvb_usb_anysee_debug, 0x01, args)
+#define deb_xfer(args...) dprintk(dvb_usb_anysee_debug, 0x02, args)
+#define deb_rc(args...)   dprintk(dvb_usb_anysee_debug, 0x04, args)
+#define deb_reg(args...)  dprintk(dvb_usb_anysee_debug, 0x08, args)
+#define deb_i2c(args...)  dprintk(dvb_usb_anysee_debug, 0x10, args)
+#define deb_fw(args...)   dprintk(dvb_usb_anysee_debug, 0x20, args)
+
+enum cmd {
+        CMD_I2C_READ            = 0x33,
+        CMD_I2C_WRITE           = 0x31,
+        CMD_REG_READ            = 0xb0,
+        CMD_REG_WRITE           = 0xb1,
+        CMD_STREAMING_CTRL      = 0x12,
+        CMD_LED_AND_IR_CTRL     = 0x16,
+        CMD_GET_IR_CODE         = 0x41,
+        CMD_GET_HW_INFO         = 0x19,
+        CMD_SMARTCARD           = 0x34,
+};
+
+struct anysee_state {
+        u8 tuner;
+        u8 seq;
+};
+
+#endif
+
+/***************************************************************************
+ * USB API description (reverse engineered)
+ ***************************************************************************
+
+Transaction flow:
+=================
+BULK[00001] >>> REQUEST PACKET 64 bytes
+BULK[00081] <<< REPLY PACKET #1 64 bytes (PREVIOUS TRANSACTION REPLY)
+BULK[00081] <<< REPLY PACKET #2 64 bytes (CURRENT TRANSACTION REPLY)
+
+General reply packet(s) are always used if not own reply defined.
+
+============================================================================
+| 00-63 | GENERAL REPLY PACKET #1 (PREVIOUS REPLY)
+============================================================================
+|    00 | reply data (if any) from previous transaction
+|       | Just same reply packet as returned during previous transaction.
+|       | Needed only if reply is missed in previous transaction.
+|       | Just skip normally.
+----------------------------------------------------------------------------
+| 01-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | GENERAL REPLY PACKET #2 (CURRENT REPLY)
+============================================================================
+|    00 | reply data (if any)
+----------------------------------------------------------------------------
+| 01-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | I2C WRITE REQUEST PACKET
+============================================================================
+|    00 | 0x31 I2C write command
+----------------------------------------------------------------------------
+|    01 | i2c address
+----------------------------------------------------------------------------
+|    02 | data length
+|       | 0x02 (for typical I2C reg / val pair)
+----------------------------------------------------------------------------
+|    03 | 0x01
+----------------------------------------------------------------------------
+| 04-   | data
+----------------------------------------------------------------------------
+|   -59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | I2C READ REQUEST PACKET
+============================================================================
+|    00 | 0x33 I2C read command
+----------------------------------------------------------------------------
+|    01 | i2c address + 1
+----------------------------------------------------------------------------
+|    02 | register
+----------------------------------------------------------------------------
+|    03 | 0x00
+----------------------------------------------------------------------------
+|    04 | 0x00
+----------------------------------------------------------------------------
+|    05 | 0x01
+----------------------------------------------------------------------------
+| 06-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | USB CONTROLLER REGISTER WRITE REQUEST PACKET
+============================================================================
+|    00 | 0xb1 register write command
+----------------------------------------------------------------------------
+| 01-02 | register
+----------------------------------------------------------------------------
+|    03 | 0x01
+----------------------------------------------------------------------------
+|    04 | value
+----------------------------------------------------------------------------
+| 05-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | USB CONTROLLER REGISTER READ REQUEST PACKET
+============================================================================
+|    00 | 0xb0 register read command
+----------------------------------------------------------------------------
+| 01-02 | register
+----------------------------------------------------------------------------
+|    03 | 0x01
+----------------------------------------------------------------------------
+| 04-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | LED CONTROL REQUEST PACKET
+============================================================================
+|    00 | 0x16 LED and IR control command
+----------------------------------------------------------------------------
+|    01 | 0x01 (LED)
+----------------------------------------------------------------------------
+|    03 | 0x00 blink
+|       | 0x01 lights continuously
+----------------------------------------------------------------------------
+|    04 | blink interval
+|       | 0x00 fastest (looks like LED lights continuously)
+|       | 0xff slowest
+----------------------------------------------------------------------------
+| 05-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | IR CONTROL REQUEST PACKET
+============================================================================
+|    00 | 0x16 LED and IR control command
+----------------------------------------------------------------------------
+|    01 | 0x02 (IR)
+----------------------------------------------------------------------------
+|    03 | 0x00 IR disabled
+|       | 0x01 IR enabled
+----------------------------------------------------------------------------
+| 04-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | STREAMING CONTROL REQUEST PACKET
+============================================================================
+|    00 | 0x12 streaming control command
+----------------------------------------------------------------------------
+|    01 | 0x00 streaming disabled
+|       | 0x01 streaming enabled
+----------------------------------------------------------------------------
+|    02 | 0x00
+----------------------------------------------------------------------------
+| 03-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | REMOTE CONTROL REQUEST PACKET
+============================================================================
+|    00 | 0x41 remote control command
+----------------------------------------------------------------------------
+| 01-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | REMOTE CONTROL REPLY PACKET
+============================================================================
+|    00 | 0x00 code not received
+|       | 0x01 code received
+----------------------------------------------------------------------------
+|    01 | remote control code
+----------------------------------------------------------------------------
+| 02-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | GET HARDWARE INFO REQUEST PACKET
+============================================================================
+|    00 | 0x19 get hardware info command
+----------------------------------------------------------------------------
+| 01-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | GET HARDWARE INFO REPLY PACKET
+============================================================================
+|    00 | hardware id
+----------------------------------------------------------------------------
+| 01-02 | firmware version
+----------------------------------------------------------------------------
+| 03-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+============================================================================
+| 00-63 | SMART CARD READER PACKET
+============================================================================
+|    00 | 0x34 smart card reader command
+----------------------------------------------------------------------------
+|    xx |
+----------------------------------------------------------------------------
+| xx-59 | don't care
+----------------------------------------------------------------------------
+|    60 | packet sequence number
+----------------------------------------------------------------------------
+| 61-63 | don't care
+----------------------------------------------------------------------------
+
+*/
diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/dvb/dvb-usb/au6610.c
index 2ccb90fa60c8..eb34cc3894e0 100644
--- a/drivers/media/dvb/dvb-usb/au6610.c
+++ b/drivers/media/dvb/dvb-usb/au6610.c
@@ -1,24 +1,31 @@
-/* DVB USB compliant linux driver for Sigmatek DVB-110 DVB-T USB2.0 receiver
+/*
+ * DVB USB Linux driver for Alcor Micro AU6610 DVB-T USB2.0.
  *
  * Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
  *
- *      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 Free
- *      Software Foundation, version 2.
+ *    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 Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
  *
- * see Documentation/dvb/README.dvb-usb for more information
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include "au6610.h"
-
 #include "zl10353.h"
 #include "qt1010.h"
 
 /* debug */
 static int dvb_usb_au6610_debug;
 module_param_named(debug, dvb_usb_au6610_debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
-
+MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr,
@@ -42,9 +49,8 @@ static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr,
         }
 
         ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), operation,
-                              USB_TYPE_VENDOR|USB_DIR_IN, addr << 1, index, usb_buf,
-                              sizeof(usb_buf), AU6610_USB_TIMEOUT);
-
+                              USB_TYPE_VENDOR|USB_DIR_IN, addr << 1, index,
+                              usb_buf, sizeof(usb_buf), AU6610_USB_TIMEOUT);
         if (ret < 0)
                 return ret;
 
@@ -116,15 +122,6 @@ static struct i2c_algorithm au6610_i2c_algo = {
 };
 
 /* Callbacks for DVB USB */
-static int au6610_identify_state(struct usb_device *udev,
-                                 struct dvb_usb_device_properties *props,
-                                 struct dvb_usb_device_description **desc,
-                                 int *cold)
-{
-        *cold = 0;
-        return 0;
-}
-
 static struct zl10353_config au6610_zl10353_config = {
         .demod_address = 0x0f,
         .no_tuner = 1,
@@ -133,12 +130,12 @@ static struct zl10353_config au6610_zl10353_config = {
 
 static int au6610_zl10353_frontend_attach(struct dvb_usb_adapter *adap)
 {
-        if ((adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config,
-                                   &adap->dev->i2c_adap)) != NULL) {
-                return 0;
-        }
+        adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config,
+                &adap->dev->i2c_adap);
+        if (adap->fe == NULL)
+                return -ENODEV;
 
-        return -EIO;
+        return 0;
 }
 
 static struct qt1010_config au6610_qt1010_config = {
@@ -171,7 +168,7 @@ static int au6610_probe(struct usb_interface *intf,
                 alt = usb_altnum_to_altsetting(intf, AU6610_ALTSETTING);
 
                 if (alt == NULL) {
-                        deb_rc("no alt found!\n");
+                        deb_info("%s: no alt found!\n", __func__);
                         return -ENODEV;
                 }
                 ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
@@ -181,18 +178,19 @@ static int au6610_probe(struct usb_interface *intf,
         return ret;
 }
 
-
 static struct usb_device_id au6610_table [] = {
         { USB_DEVICE(USB_VID_ALCOR_MICRO, USB_PID_SIGMATEK_DVB_110) },
         { }             /* Terminating entry */
 };
-MODULE_DEVICE_TABLE (usb, au6610_table);
+MODULE_DEVICE_TABLE(usb, au6610_table);
 
 static struct dvb_usb_device_properties au6610_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
         .usb_ctrl = DEVICE_SPECIFIC,
-        .size_of_priv     = 0,
-        .identify_state   = au6610_identify_state,
+
+        .size_of_priv = 0,
+
         .num_adapters = 1,
         .adapter = {
                 {
@@ -206,20 +204,22 @@ static struct dvb_usb_device_properties au6610_properties = {
                                 .u = {
                                         .isoc = {
                                                 .framesperurb = 40,
-                                                .framesize = 942,   /* maximum packet size */
-                                                .interval = 1.25,   /* 125 us */
+                                                .framesize = 942,
+                                                .interval = 1,
                                         }
                                 }
                         },
                 }
         },
+
         .i2c_algo = &au6610_i2c_algo,
+
         .num_device_descs = 1,
         .devices = {
                 {
-                        "Sigmatek DVB-110 DVB-T USB2.0",
-                        { &au6610_table[0], NULL },
-                        { NULL },
+                        .name = "Sigmatek DVB-110 DVB-T USB2.0",
+                        .cold_ids = {NULL},
+                        .warm_ids = {&au6610_table[0], NULL},
                 },
         }
 };
@@ -236,12 +236,11 @@ static int __init au6610_module_init(void)
 {
         int ret;
 
-        if ((ret = usb_register(&au6610_driver))) {
+        ret = usb_register(&au6610_driver);
+        if (ret)
                 err("usb_register failed. Error number %d", ret);
-                return ret;
-        }
 
-        return 0;
+        return ret;
 }
 
 static void __exit au6610_module_exit(void)
@@ -250,10 +249,10 @@ static void __exit au6610_module_exit(void)
         usb_deregister(&au6610_driver);
 }
 
-module_init (au6610_module_init);
-module_exit (au6610_module_exit);
+module_init(au6610_module_init);
+module_exit(au6610_module_exit);
 
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
-MODULE_DESCRIPTION("Driver Sigmatek DVB-110 DVB-T USB2.0 / AU6610");
+MODULE_DESCRIPTION("Driver for Alcor Micro AU6610 DVB-T USB2.0");
 MODULE_VERSION("0.1");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/au6610.h b/drivers/media/dvb/dvb-usb/au6610.h
index 4161b054c713..7849abe2c614 100644
--- a/drivers/media/dvb/dvb-usb/au6610.h
+++ b/drivers/media/dvb/dvb-usb/au6610.h
@@ -1,10 +1,30 @@
+/*
+ * DVB USB Linux driver for Alcor Micro AU6610 DVB-T USB2.0.
+ *
+ * Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
+ *
+ *    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 Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 #ifndef _DVB_USB_AU6610_H_
 #define _DVB_USB_AU6610_H_
 
 #define DVB_USB_LOG_PREFIX "au6610"
 #include "dvb-usb.h"
 
-#define deb_rc(args...)   dprintk(dvb_usb_au6610_debug,0x01,args)
+#define deb_info(args...)   dprintk(dvb_usb_au6610_debug, 0x01, args)
 
 #define AU6610_REQ_I2C_WRITE    0x14
 #define AU6610_REQ_I2C_READ     0x13
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 0286156704f2..578afce6884c 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -35,6 +35,7 @@
 #include "zl10353.h"
 #include "tuner-xc2028.h"
 #include "tuner-simple.h"
+#include "mxl5005s.h"
 
 /* debug */
 static int dvb_usb_cxusb_debug;
@@ -43,9 +44,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_ST
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-#define deb_info(args...)   dprintk(dvb_usb_cxusb_debug,0x01,args)
-#define deb_i2c(args...)    if (d->udev->descriptor.idVendor == USB_VID_MEDION) \
-                                dprintk(dvb_usb_cxusb_debug,0x01,args)
+#define deb_info(args...)   dprintk(dvb_usb_cxusb_debug, 0x03, args)
+#define deb_i2c(args...)    dprintk(dvb_usb_cxusb_debug, 0x02, args)
 
 static int cxusb_ctrl_msg(struct dvb_usb_device *d,
                           u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
@@ -202,6 +202,46 @@ static int cxusb_power_ctrl(struct dvb_usb_device *d, int onoff)
                 return cxusb_ctrl_msg(d, CMD_POWER_OFF, &b, 1, NULL, 0);
 }
 
+static int cxusb_aver_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        int ret;
+        if (!onoff)
+                return cxusb_ctrl_msg(d, CMD_POWER_OFF, NULL, 0, NULL, 0);
+        if (d->state == DVB_USB_STATE_INIT &&
+            usb_set_interface(d->udev, 0, 0) < 0)
+                err("set interface failed");
+        do; while (!(ret = cxusb_ctrl_msg(d, CMD_POWER_ON, NULL, 0, NULL, 0)) &&
+                   !(ret = cxusb_ctrl_msg(d, 0x15, NULL, 0, NULL, 0)) &&
+                   !(ret = cxusb_ctrl_msg(d, 0x17, NULL, 0, NULL, 0)) && 0);
+        if (!ret) {
+                /* FIXME: We don't know why, but we need to configure the
+                 * lgdt3303 with the register settings below on resume */
+                int i;
+                u8 buf, bufs[] = {
+                        0x0e, 0x2, 0x00, 0x7f,
+                        0x0e, 0x2, 0x02, 0xfe,
+                        0x0e, 0x2, 0x02, 0x01,
+                        0x0e, 0x2, 0x00, 0x03,
+                        0x0e, 0x2, 0x0d, 0x40,
+                        0x0e, 0x2, 0x0e, 0x87,
+                        0x0e, 0x2, 0x0f, 0x8e,
+                        0x0e, 0x2, 0x10, 0x01,
+                        0x0e, 0x2, 0x14, 0xd7,
+                        0x0e, 0x2, 0x47, 0x88,
+                };
+                msleep(20);
+                for (i = 0; i < sizeof(bufs)/sizeof(u8); i += 4/sizeof(u8)) {
+                        ret = cxusb_ctrl_msg(d, CMD_I2C_WRITE,
+                                             bufs+i, 4, &buf, 1);
+                        if (ret)
+                                break;
+                        if (buf != 0x8)
+                                return -EREMOTEIO;
+                }
+        }
+        return ret;
+}
+
 static int cxusb_bluebird_power_ctrl(struct dvb_usb_device *d, int onoff)
 {
         u8 b = 0;
@@ -233,6 +273,16 @@ static int cxusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         return 0;
 }
 
+static int cxusb_aver_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
+{
+        if (onoff)
+                cxusb_ctrl_msg(adap->dev, CMD_AVER_STREAM_ON, NULL, 0, NULL, 0);
+        else
+                cxusb_ctrl_msg(adap->dev, CMD_AVER_STREAM_OFF,
+                               NULL, 0, NULL, 0);
+        return 0;
+}
+
 static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
         struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
@@ -423,6 +473,12 @@ static struct lgdt330x_config cxusb_lgdt3303_config = {
         .demod_chip    = LGDT3303,
 };
 
+static struct lgdt330x_config cxusb_aver_lgdt3303_config = {
+        .demod_address       = 0x0e,
+        .demod_chip          = LGDT3303,
+        .clock_polarity_flip = 2,
+};
+
 static struct mt352_config cxusb_dee1601_config = {
         .demod_address = 0x0f,
         .demod_init    = cxusb_dee1601_demod_init,
@@ -453,6 +509,24 @@ static struct mt352_config cxusb_mt352_xc3028_config = {
         .demod_init = cxusb_mt352_demod_init,
 };
 
+/* FIXME: needs tweaking */
+static struct mxl5005s_config aver_a868r_tuner = {
+        .i2c_address     = 0x63,
+        .if_freq         = 6000000UL,
+        .xtal_freq       = CRYSTAL_FREQ_16000000HZ,
+        .agc_mode        = MXL_SINGLE_AGC,
+        .tracking_filter = MXL_TF_C,
+        .rssi_enable     = MXL_RSSI_ENABLE,
+        .cap_select      = MXL_CAP_SEL_ENABLE,
+        .div_out         = MXL_DIV_OUT_4,
+        .clock_out       = MXL_CLOCK_OUT_DISABLE,
+        .output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,
+        .top             = MXL5005S_TOP_25P2,
+        .mod_mode        = MXL_DIGITAL_MODE,
+        .if_mode         = MXL_ZERO_IF,
+        .AgcMasterByte   = 0x00,
+};
+
 /* Callbacks for DVB USB */
 static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
 {
@@ -533,6 +607,13 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
+static int cxusb_mxl5003s_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        dvb_attach(mxl5005s_attach, adap->fe,
+                   &adap->dev->i2c_adap, &aver_a868r_tuner);
+        return 0;
+}
+
 static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)
 {
         u8 b;
@@ -562,6 +643,16 @@ static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_adapter *adap)
         return -EIO;
 }
 
+static int cxusb_aver_lgdt3303_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        adap->fe = dvb_attach(lgdt330x_attach, &cxusb_aver_lgdt3303_config,
+                              &adap->dev->i2c_adap);
+        if (adap->fe != NULL)
+                return 0;
+
+        return -EIO;
+}
+
 static int cxusb_mt352_frontend_attach(struct dvb_usb_adapter *adap)
 {
         /* used in both lgz201 and th7579 */
@@ -736,6 +827,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_properties;
+static struct dvb_usb_device_properties cxusb_aver_a868r_properties;
 
 static int cxusb_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
@@ -756,7 +848,10 @@ static int cxusb_probe(struct usb_interface *intf,
                                      THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf,
                                 &cxusb_bluebird_nano2_needsfirmware_properties,
-                                     THIS_MODULE, NULL, adapter_nr))
+                                     THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf, &cxusb_aver_a868r_properties,
+                                     THIS_MODULE, NULL, adapter_nr) ||
+            0)
                 return 0;
 
         return -EINVAL;
@@ -779,6 +874,7 @@ static struct usb_device_id cxusb_table [] = {
         { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4) },
         { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2) },
         { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM) },
+        { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_A868R) },
         {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, cxusb_table);
@@ -1182,6 +1278,48 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_prope
         }
 };
 
+static struct dvb_usb_device_properties cxusb_aver_a868r_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl         = CYPRESS_FX2,
+
+        .size_of_priv     = sizeof(struct cxusb_state),
+
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .streaming_ctrl   = cxusb_aver_streaming_ctrl,
+                        .frontend_attach  = cxusb_aver_lgdt3303_frontend_attach,
+                        .tuner_attach     = cxusb_mxl5003s_tuner_attach,
+                        /* parameter for the MPEG2-data transfer */
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 5,
+                                .endpoint = 0x04,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 8192,
+                                        }
+                                }
+                        },
+
+                },
+        },
+        .power_ctrl       = cxusb_aver_power_ctrl,
+
+        .i2c_algo         = &cxusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "AVerMedia AVerTVHD Volar (A868R)",
+                        { NULL },
+                        { &cxusb_table[16], NULL },
+                },
+        }
+};
+
 static struct usb_driver cxusb_driver = {
         .name           = "dvb_usb_cxusb",
         .probe          = cxusb_probe,
diff --git a/drivers/media/dvb/dvb-usb/cxusb.h b/drivers/media/dvb/dvb-usb/cxusb.h
index 4768a2c35517..1a51eafd31b9 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.h
+++ b/drivers/media/dvb/dvb-usb/cxusb.h
@@ -20,6 +20,9 @@
 #define CMD_STREAMING_ON  0x36
 #define CMD_STREAMING_OFF 0x37
 
+#define CMD_AVER_STREAM_ON  0x18
+#define CMD_AVER_STREAM_OFF 0x19
+
 #define CMD_GET_IR_CODE   0x47
 
 #define CMD_ANALOG        0x50
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index c4d40fe01d57..3dd20bfbed32 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1117,6 +1117,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
         { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_HT_EXPRESS) },
         { USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_XXS) },
         { USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_STK7700P_2) },
+        { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) },
         { 0 }           /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1372,7 +1373,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         }
                 },
 
-                .num_device_descs = 2,
+                .num_device_descs = 3,
                 .devices = {
                         {   "DiBcom STK7070PD reference design",
                                 { &dib0700_usb_id_table[17], NULL },
@@ -1381,6 +1382,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         {   "Pinnacle PCTV Dual DVB-T Diversity Stick",
                                 { &dib0700_usb_id_table[18], NULL },
                                 { NULL },
+                        },
+                        {   "Hauppauge Nova-TD Stick (52009)",
+                                { &dib0700_usb_id_table[35], NULL },
+                                { NULL },
                         }
                 }
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 23428cd30756..326f7608954b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -20,11 +20,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
         }
 
         strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-        d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
-#else
         d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
-#endif
         d->i2c_adap.algo      = d->props.i2c_algo;
         d->i2c_adap.algo_data = NULL;
         d->i2c_adap.dev.parent = &d->udev->dev;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 34245d1b7dd9..e5238b31e946 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -14,6 +14,7 @@
 #define USB_VID_AFATECH                         0x15a4
 #define USB_VID_ALCOR_MICRO                     0x058f
 #define USB_VID_ALINK                           0x05e3
+#define USB_VID_AMT                             0x1c73
 #define USB_VID_ANCHOR                          0x0547
 #define USB_VID_ANSONIC                         0x10b9
 #define USB_VID_ANUBIS_ELECTRONIC               0x10fd
@@ -57,6 +58,7 @@
 #define USB_PID_AFATECH_AF9005                          0x9020
 #define USB_VID_ALINK_DTU                               0xf170
 #define USB_PID_ANSONIC_DVBT_USB                        0x6000
+#define USB_PID_ANYSEE                                  0x861f
 #define USB_PID_AVERMEDIA_DVBT_USB_COLD                 0x0001
 #define USB_PID_AVERMEDIA_DVBT_USB_WARM                 0x0002
 #define USB_PID_AVERMEDIA_DVBT_USB2_COLD                0xa800
@@ -132,9 +134,15 @@
 #define USB_PID_HAUPPAUGE_NOVA_T_STICK_3                0x7070
 #define USB_PID_HAUPPAUGE_MYTV_T                        0x7080
 #define USB_PID_HAUPPAUGE_NOVA_TD_STICK                 0x9580
+#define USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009           0x5200
 #define USB_PID_AVERMEDIA_EXPRESS                       0xb568
 #define USB_PID_AVERMEDIA_VOLAR                         0xa807
 #define USB_PID_AVERMEDIA_VOLAR_2                       0xb808
+#define USB_PID_AVERMEDIA_VOLAR_A868R                   0xa868
+#define USB_PID_AVERMEDIA_MCE_USB_M038                  0x1228
+#define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R        0x0039
+#define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R_ATSC   0x1039
+#define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R_DVBT   0x2039
 #define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
 #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
 #define USB_PID_TERRATEC_CINERGY_HT_USB_XE              0x0058
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
index 037f7ffb47b2..6f596ed41761 100644
--- a/drivers/media/dvb/dvb-usb/gl861.c
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -1,8 +1,8 @@
 /* DVB USB compliant linux driver for GL861 USB2.0 devices.
  *
  *      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 Free
- *      Software Foundation, version 2.
+ *      under the terms of the GNU General Public License as published by the
+ *      Free Software Foundation, version 2.
  *
  * see Documentation/dvb/README.dvb-usb for more information
  */
@@ -13,9 +13,9 @@
 
 /* debug */
 static int dvb_usb_gl861_debug;
-module_param_named(debug,dvb_usb_gl861_debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
-
+module_param_named(debug, dvb_usb_gl861_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))."
+        DVB_USB_DEBUG_STATUS);
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr,
@@ -70,7 +70,7 @@ static int gl861_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 /* write/read request */
                 if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
                         if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
-                                          msg[i].len, msg[i+1].buf, msg[i+1].len) < 0)
+                                msg[i].len, msg[i+1].buf, msg[i+1].len) < 0)
                                 break;
                         i++;
                 } else
@@ -102,12 +102,13 @@ static struct zl10353_config gl861_zl10353_config = {
 
 static int gl861_frontend_attach(struct dvb_usb_adapter *adap)
 {
-        if ((adap->fe = dvb_attach(zl10353_attach, &gl861_zl10353_config,
-                                   &adap->dev->i2c_adap)) != NULL) {
-                return 0;
-        }
 
-        return -EIO;
+        adap->fe = dvb_attach(zl10353_attach, &gl861_zl10353_config,
+                &adap->dev->i2c_adap);
+        if (adap->fe == NULL)
+                return -EIO;
+
+        return 0;
 }
 
 static struct qt1010_config gl861_qt1010_config = {
@@ -156,7 +157,7 @@ static struct usb_device_id gl861_table [] = {
                 { USB_DEVICE(USB_VID_ALINK, USB_VID_ALINK_DTU) },
                 { }             /* Terminating entry */
 };
-MODULE_DEVICE_TABLE (usb, gl861_table);
+MODULE_DEVICE_TABLE(usb, gl861_table);
 
 static struct dvb_usb_device_properties gl861_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -180,7 +181,7 @@ static struct dvb_usb_device_properties gl861_properties = {
                                 }
                         }
                 },
-        }},
+        } },
         .i2c_algo         = &gl861_i2c_algo,
 
         .num_device_descs = 2,
@@ -210,12 +211,11 @@ static int __init gl861_module_init(void)
 {
         int ret;
 
-        if ((ret = usb_register(&gl861_driver))) {
+        ret = usb_register(&gl861_driver);
+        if (ret)
                 err("usb_register failed. Error number %d", ret);
-                return ret;
-        }
 
-        return 0;
+        return ret;
 }
 
 static void __exit gl861_module_exit(void)
@@ -224,8 +224,8 @@ static void __exit gl861_module_exit(void)
         usb_deregister(&gl861_driver);
 }
 
-module_init (gl861_module_init);
-module_exit (gl861_module_exit);
+module_init(gl861_module_init);
+module_exit(gl861_module_exit);
 
 MODULE_AUTHOR("Carl Lundqvist <comabug@gmail.com>");
 MODULE_DESCRIPTION("Driver MSI Mega Sky 580 DVB-T USB2.0 / GL861");
diff --git a/drivers/media/dvb/dvb-usb/gl861.h b/drivers/media/dvb/dvb-usb/gl861.h
index 72a51afd5ee3..c54855e2c233 100644
--- a/drivers/media/dvb/dvb-usb/gl861.h
+++ b/drivers/media/dvb/dvb-usb/gl861.h
@@ -4,7 +4,7 @@
 #define DVB_USB_LOG_PREFIX "gl861"
 #include "dvb-usb.h"
 
-#define deb_rc(args...)   dprintk(dvb_usb_gl861_debug,0x01,args)
+#define deb_rc(args...)   dprintk(dvb_usb_gl861_debug, 0x01, args)
 
 #define GL861_WRITE             0x40
 #define GL861_READ              0xc0