1 files changed, 501 insertions, 3 deletions

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 563400277a42..406d7fba369d 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -36,6 +36,9 @@
 #include "tuner-xc2028.h"
 #include "tuner-simple.h"
 #include "mxl5005s.h"
+#include "dib7000p.h"
+#include "dib0070.h"
+#include "lgs8gl5.h"
 
 /* debug */
 static int dvb_usb_cxusb_debug;
@@ -109,6 +112,25 @@ static void cxusb_nano2_led(struct dvb_usb_device *d, int onoff)
         cxusb_bluebird_gpio_rw(d, 0x40, onoff ? 0 : 0x40);
 }
 
+static int cxusb_d680_dmb_gpio_tuner(struct dvb_usb_device *d,
+                u8 addr, int onoff)
+{
+        u8  o[2] = {addr, onoff};
+        u8  i;
+        int rc;
+
+        rc = cxusb_ctrl_msg(d, CMD_GPIO_WRITE, o, 2, &i, 1);
+
+        if (rc < 0)
+                return rc;
+        if (i == 0x01)
+                return 0;
+        else {
+                deb_info("gpio_write failed.\n");
+                return -EIO;
+        }
+}
+
 /* I2C */
 static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                           int num)
@@ -262,6 +284,20 @@ static int cxusb_nano2_power_ctrl(struct dvb_usb_device *d, int onoff)
         return rc;
 }
 
+static int cxusb_d680_dmb_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+        int ret;
+        u8  b;
+        ret = cxusb_power_ctrl(d, onoff);
+        if (!onoff)
+                return ret;
+
+        msleep(128);
+        cxusb_ctrl_msg(d, CMD_DIGITAL, NULL, 0, &b, 1);
+        msleep(100);
+        return ret;
+}
+
 static int cxusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 {
         u8 buf[2] = { 0x03, 0x00 };
@@ -283,6 +319,67 @@ static int cxusb_aver_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         return 0;
 }
 
+static void cxusb_d680_dmb_drain_message(struct dvb_usb_device *d)
+{
+        int       ep = d->props.generic_bulk_ctrl_endpoint;
+        const int timeout = 100;
+        const int junk_len = 32;
+        u8        *junk;
+        int       rd_count;
+
+        /* Discard remaining data in video pipe */
+        junk = kmalloc(junk_len, GFP_KERNEL);
+        if (!junk)
+                return;
+        while (1) {
+                if (usb_bulk_msg(d->udev,
+                        usb_rcvbulkpipe(d->udev, ep),
+                        junk, junk_len, &rd_count, timeout) < 0)
+                        break;
+                if (!rd_count)
+                        break;
+        }
+        kfree(junk);
+}
+
+static void cxusb_d680_dmb_drain_video(struct dvb_usb_device *d)
+{
+        struct usb_data_stream_properties *p = &d->props.adapter[0].stream;
+        const int timeout = 100;
+        const int junk_len = p->u.bulk.buffersize;
+        u8        *junk;
+        int       rd_count;
+
+        /* Discard remaining data in video pipe */
+        junk = kmalloc(junk_len, GFP_KERNEL);
+        if (!junk)
+                return;
+        while (1) {
+                if (usb_bulk_msg(d->udev,
+                        usb_rcvbulkpipe(d->udev, p->endpoint),
+                        junk, junk_len, &rd_count, timeout) < 0)
+                        break;
+                if (!rd_count)
+                        break;
+        }
+        kfree(junk);
+}
+
+static int cxusb_d680_dmb_streaming_ctrl(
+                struct dvb_usb_adapter *adap, int onoff)
+{
+        if (onoff) {
+                u8 buf[2] = { 0x03, 0x00 };
+                cxusb_d680_dmb_drain_video(adap->dev);
+                return cxusb_ctrl_msg(adap->dev, CMD_STREAMING_ON,
+                        buf, sizeof(buf), NULL, 0);
+        } else {
+                int ret = cxusb_ctrl_msg(adap->dev,
+                        CMD_STREAMING_OFF, NULL, 0, NULL, 0);
+                return ret;
+        }
+}
+
 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;
@@ -335,6 +432,32 @@ static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
         return 0;
 }
 
+static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d, u32 *event,
+                int *state)
+{
+        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        u8 ircode[2];
+        int i;
+
+        *event = 0;
+        *state = REMOTE_NO_KEY_PRESSED;
+
+        if (cxusb_ctrl_msg(d, 0x10, NULL, 0, ircode, 2) < 0)
+                return 0;
+
+        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 dvico_mce_rc_keys[] = {
         { 0xfe, 0x02, KEY_TV },
         { 0xfe, 0x0e, KEY_MP3 },
@@ -422,6 +545,44 @@ static struct dvb_usb_rc_key dvico_portable_rc_keys[] = {
         { 0xfc, 0x00, KEY_UNKNOWN },    /* HD */
 };
 
+static struct dvb_usb_rc_key d680_dmb_rc_keys[] = {
+        { 0x00, 0x38, KEY_UNKNOWN },    /* TV/AV */
+        { 0x08, 0x0c, KEY_ZOOM },
+        { 0x08, 0x00, KEY_0 },
+        { 0x00, 0x01, KEY_1 },
+        { 0x08, 0x02, KEY_2 },
+        { 0x00, 0x03, KEY_3 },
+        { 0x08, 0x04, KEY_4 },
+        { 0x00, 0x05, KEY_5 },
+        { 0x08, 0x06, KEY_6 },
+        { 0x00, 0x07, KEY_7 },
+        { 0x08, 0x08, KEY_8 },
+        { 0x00, 0x09, KEY_9 },
+        { 0x00, 0x0a, KEY_MUTE },
+        { 0x08, 0x29, KEY_BACK },
+        { 0x00, 0x12, KEY_CHANNELUP },
+        { 0x08, 0x13, KEY_CHANNELDOWN },
+        { 0x00, 0x2b, KEY_VOLUMEUP },
+        { 0x08, 0x2c, KEY_VOLUMEDOWN },
+        { 0x00, 0x20, KEY_UP },
+        { 0x08, 0x21, KEY_DOWN },
+        { 0x00, 0x11, KEY_LEFT },
+        { 0x08, 0x10, KEY_RIGHT },
+        { 0x00, 0x0d, KEY_OK },
+        { 0x08, 0x1f, KEY_RECORD },
+        { 0x00, 0x17, KEY_PLAYPAUSE },
+        { 0x08, 0x16, KEY_PLAYPAUSE },
+        { 0x00, 0x0b, KEY_STOP },
+        { 0x08, 0x27, KEY_FASTFORWARD },
+        { 0x00, 0x26, KEY_REWIND },
+        { 0x08, 0x1e, KEY_UNKNOWN },    /* Time Shift */
+        { 0x00, 0x0e, KEY_UNKNOWN },    /* Snapshot */
+        { 0x08, 0x2d, KEY_UNKNOWN },    /* Mouse Cursor */
+        { 0x00, 0x0f, KEY_UNKNOWN },    /* Minimize/Maximize */
+        { 0x08, 0x14, KEY_UNKNOWN },    /* Shuffle */
+        { 0x00, 0x25, KEY_POWER },
+};
+
 static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)
 {
         static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x28 };
@@ -527,6 +688,24 @@ static struct mxl5005s_config aver_a868r_tuner = {
         .AgcMasterByte   = 0x00,
 };
 
+/* FIXME: needs tweaking */
+static struct mxl5005s_config d680_dmb_tuner = {
+        .i2c_address     = 0x63,
+        .if_freq         = 36125000UL,
+        .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)
 {
@@ -563,7 +742,8 @@ static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg)
+static int dvico_bluebird_xc2028_callback(void *ptr, int component,
+                                          int command, int arg)
 {
         struct dvb_usb_adapter *adap = ptr;
         struct dvb_usb_device *d = adap->dev;
@@ -591,14 +771,16 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap)
         struct xc2028_config      cfg = {
                 .i2c_adap  = &adap->dev->i2c_adap,
                 .i2c_addr  = 0x61,
-                .callback  = dvico_bluebird_xc2028_callback,
         };
         static struct xc2028_ctrl ctl = {
-                .fname       = "xc3028-v27.fw",
+                .fname       = XC2028_DEFAULT_FIRMWARE,
                 .max_len     = 64,
                 .demod       = XC3028_FE_ZARLINK456,
         };
 
+        /* FIXME: generalize & move to common area */
+        adap->fe->callback = dvico_bluebird_xc2028_callback;
+
         fe = dvb_attach(xc2028_attach, adap->fe, &cfg);
         if (fe == NULL || fe->ops.tuner_ops.set_config == NULL)
                 return -EIO;
@@ -615,6 +797,14 @@ static int cxusb_mxl5003s_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
+static int cxusb_d680_dmb_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct dvb_frontend *fe;
+        fe = dvb_attach(mxl5005s_attach, adap->fe,
+                        &adap->dev->i2c_adap, &d680_dmb_tuner);
+        return (fe == NULL) ? -EIO : 0;
+}
+
 static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)
 {
         u8 b;
@@ -726,6 +916,159 @@ no_IR:
         return 0;
 }
 
+static struct dibx000_agc_config dib7070_agc_config = {
+        .band_caps = BAND_UHF | BAND_VHF | BAND_LBAND | BAND_SBAND,
+
+        /*
+         * P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=5,
+         * P_agc_inv_pwm1=0, P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,
+         * P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=5, P_agc_write=0
+         */
+        .setup = (0 << 15) | (0 << 14) | (5 << 11) | (0 << 10) | (0 << 9) |
+                 (0 << 8) | (3 << 5) | (0 << 4) | (5 << 1) | (0 << 0),
+        .inv_gain = 600,
+        .time_stabiliz = 10,
+        .alpha_level = 0,
+        .thlock = 118,
+        .wbd_inv = 0,
+        .wbd_ref = 3530,
+        .wbd_sel = 1,
+        .wbd_alpha = 5,
+        .agc1_max = 65535,
+        .agc1_min = 0,
+        .agc2_max = 65535,
+        .agc2_min = 0,
+        .agc1_pt1 = 0,
+        .agc1_pt2 = 40,
+        .agc1_pt3 = 183,
+        .agc1_slope1 = 206,
+        .agc1_slope2 = 255,
+        .agc2_pt1 = 72,
+        .agc2_pt2 = 152,
+        .agc2_slope1 = 88,
+        .agc2_slope2 = 90,
+        .alpha_mant = 17,
+        .alpha_exp = 27,
+        .beta_mant = 23,
+        .beta_exp = 51,
+        .perform_agc_softsplit = 0,
+};
+
+static struct dibx000_bandwidth_config dib7070_bw_config_12_mhz = {
+        .internal = 60000,
+        .sampling = 15000,
+        .pll_prediv = 1,
+        .pll_ratio = 20,
+        .pll_range = 3,
+        .pll_reset = 1,
+        .pll_bypass = 0,
+        .enable_refdiv = 0,
+        .bypclk_div = 0,
+        .IO_CLK_en_core = 1,
+        .ADClkSrc = 1,
+        .modulo = 2,
+        /* refsel, sel, freq_15k */
+        .sad_cfg = (3 << 14) | (1 << 12) | (524 << 0),
+        .ifreq = (0 << 25) | 0,
+        .timf = 20452225,
+        .xtal_hz = 12000000,
+};
+
+static struct dib7000p_config cxusb_dualdig4_rev2_config = {
+        .output_mode = OUTMODE_MPEG2_PAR_GATED_CLK,
+        .output_mpeg2_in_188_bytes = 1,
+
+        .agc_config_count = 1,
+        .agc = &dib7070_agc_config,
+        .bw  = &dib7070_bw_config_12_mhz,
+        .tuner_is_baseband = 1,
+        .spur_protect = 1,
+
+        .gpio_dir = 0xfcef,
+        .gpio_val = 0x0110,
+
+        .gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS,
+
+        .hostbus_diversity = 1,
+};
+
+static int cxusb_dualdig4_rev2_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        if (usb_set_interface(adap->dev->udev, 0, 1) < 0)
+                err("set interface failed");
+
+        cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
+
+        cxusb_bluebird_gpio_pulse(adap->dev, 0x02, 1);
+
+        dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,
+                                 &cxusb_dualdig4_rev2_config);
+
+        adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80,
+                              &cxusb_dualdig4_rev2_config);
+        if (adap->fe == NULL)
+                return -EIO;
+
+        return 0;
+}
+
+static int dib7070_tuner_reset(struct dvb_frontend *fe, int onoff)
+{
+        return dib7000p_set_gpio(fe, 8, 0, !onoff);
+}
+
+static int dib7070_tuner_sleep(struct dvb_frontend *fe, int onoff)
+{
+        return 0;
+}
+
+static struct dib0070_config dib7070p_dib0070_config = {
+        .i2c_address = DEFAULT_DIB0070_I2C_ADDRESS,
+        .reset = dib7070_tuner_reset,
+        .sleep = dib7070_tuner_sleep,
+        .clock_khz = 12000,
+};
+
+struct dib0700_adapter_state {
+        int (*set_param_save) (struct dvb_frontend *,
+                               struct dvb_frontend_parameters *);
+};
+
+static int dib7070_set_param_override(struct dvb_frontend *fe,
+                                      struct dvb_frontend_parameters *fep)
+{
+        struct dvb_usb_adapter *adap = fe->dvb->priv;
+        struct dib0700_adapter_state *state = adap->priv;
+
+        u16 offset;
+        u8 band = BAND_OF_FREQUENCY(fep->frequency/1000);
+        switch (band) {
+        case BAND_VHF: offset = 950; break;
+        default:
+        case BAND_UHF: offset = 550; break;
+        }
+
+        dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));
+
+        return state->set_param_save(fe, fep);
+}
+
+static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        struct dib0700_adapter_state *st = adap->priv;
+        struct i2c_adapter *tun_i2c =
+                dib7000p_get_i2c_master(adap->fe,
+                                        DIBX000_I2C_INTERFACE_TUNER, 1);
+
+        if (dvb_attach(dib0070_attach, adap->fe, tun_i2c,
+            &dib7070p_dib0070_config) == NULL)
+                return -ENODEV;
+
+        st->set_param_save = adap->fe->ops.tuner_ops.set_params;
+        adap->fe->ops.tuner_ops.set_params = dib7070_set_param_override;
+        return 0;
+}
+
 static int cxusb_nano2_frontend_attach(struct dvb_usb_adapter *adap)
 {
         if (usb_set_interface(adap->dev->udev, 0, 1) < 0)
@@ -751,6 +1094,54 @@ static int cxusb_nano2_frontend_attach(struct dvb_usb_adapter *adap)
         return -EIO;
 }
 
+static struct lgs8gl5_config lgs8gl5_cfg = {
+        .demod_address = 0x19,
+};
+
+static int cxusb_d680_dmb_frontend_attach(struct dvb_usb_adapter *adap)
+{
+        struct dvb_usb_device *d = adap->dev;
+        int n;
+
+        /* Select required USB configuration */
+        if (usb_set_interface(d->udev, 0, 0) < 0)
+                err("set interface failed");
+
+        /* Unblock all USB pipes */
+        usb_clear_halt(d->udev,
+                usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
+        usb_clear_halt(d->udev,
+                usb_rcvbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
+        usb_clear_halt(d->udev,
+                usb_rcvbulkpipe(d->udev, d->props.adapter[0].stream.endpoint));
+
+        /* Drain USB pipes to avoid hang after reboot */
+        for (n = 0;  n < 5;  n++) {
+                cxusb_d680_dmb_drain_message(d);
+                cxusb_d680_dmb_drain_video(d);
+                msleep(200);
+        }
+
+        /* Reset the tuner */
+        if (cxusb_d680_dmb_gpio_tuner(d, 0x07, 0) < 0) {
+                err("clear tuner gpio failed");
+                return -EIO;
+        }
+        msleep(100);
+        if (cxusb_d680_dmb_gpio_tuner(d, 0x07, 1) < 0) {
+                err("set tuner gpio failed");
+                return -EIO;
+        }
+        msleep(100);
+
+        /* Attach frontend */
+        adap->fe = dvb_attach(lgs8gl5_attach, &lgs8gl5_cfg, &d->i2c_adap);
+        if (adap->fe == NULL)
+                return -EIO;
+
+        return 0;
+}
+
 /*
  * DViCO has shipped two devices with the same USB ID, but only one of them
  * needs a firmware download.  Check the device class details to see if they
@@ -826,9 +1217,11 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties;
 static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;
 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_dualdig4_rev2_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 struct dvb_usb_device_properties cxusb_d680_dmb_properties;
 
 static int cxusb_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
@@ -852,6 +1245,11 @@ static int cxusb_probe(struct usb_interface *intf,
                                      THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_aver_a868r_properties,
                                      THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf,
+                                     &cxusb_bluebird_dualdig4_rev2_properties,
+                                     THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf, &cxusb_d680_dmb_properties,
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0)
                 return 0;
 
@@ -876,6 +1274,8 @@ static struct usb_device_id cxusb_table [] = {
         { 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) },
+        { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2) },
+        { USB_DEVICE(USB_VID_CONEXANT, USB_PID_CONEXANT_D680_DMB) },
         {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, cxusb_table);
@@ -1321,6 +1721,104 @@ static struct dvb_usb_device_properties cxusb_aver_a868r_properties = {
         }
 };
 
+static
+struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_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_streaming_ctrl,
+                        .frontend_attach = cxusb_dualdig4_rev2_frontend_attach,
+                        .tuner_attach    = cxusb_dualdig4_rev2_tuner_attach,
+                        .size_of_priv    = sizeof(struct dib0700_adapter_state),
+                        /* parameter for the MPEG2-data transfer */
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 7,
+                                .endpoint = 0x02,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 4096,
+                                        }
+                                }
+                        },
+                },
+        },
+
+        .power_ctrl       = cxusb_bluebird_power_ctrl,
+
+        .i2c_algo         = &cxusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
+        .rc_interval      = 100,
+        .rc_key_map       = dvico_mce_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(dvico_mce_rc_keys),
+        .rc_query         = cxusb_rc_query,
+
+        .num_device_descs = 1,
+        .devices = {
+                {   "DViCO FusionHDTV DVB-T Dual Digital 4 (rev 2)",
+                        { NULL },
+                        { &cxusb_table[17], NULL },
+                },
+        }
+};
+
+static struct dvb_usb_device_properties cxusb_d680_dmb_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_d680_dmb_streaming_ctrl,
+                        .frontend_attach  = cxusb_d680_dmb_frontend_attach,
+                        .tuner_attach     = cxusb_d680_dmb_tuner_attach,
+
+                        /* parameter for the MPEG2-data transfer */
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 5,
+                                .endpoint = 0x02,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 8192,
+                                        }
+                                }
+                        },
+                },
+        },
+
+        .power_ctrl       = cxusb_d680_dmb_power_ctrl,
+
+        .i2c_algo         = &cxusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
+        .rc_interval      = 100,
+        .rc_key_map       = d680_dmb_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(d680_dmb_rc_keys),
+        .rc_query         = cxusb_d680_dmb_rc_query,
+
+        .num_device_descs = 1,
+        .devices = {
+                {
+                        "Conexant DMB-TH Stick",
+                        { NULL },
+                        { &cxusb_table[18], NULL },
+                },
+        }
+};
+
 static struct usb_driver cxusb_driver = {
         .name           = "dvb_usb_cxusb",
         .probe          = cxusb_probe,