V4L/DVB (3310): DViCO Dual Digital DVB-T / USB bluebird updates

- Add support for the USB portion of the DViCO Dual Digital board.
Patch correct "warm" USB IDs into bluebird firmware before download.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 2c1b1e5992a35f8abc5c75ff01104d7ab0f3fe28..9622a79d6e6846de6ec071c024db4a40199279f3 100644 (file)
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -26,6 +26,8 @@
 
 #include "cx22702.h"
 #include "lgdt330x.h"
+#include "mt352.h"
+#include "mt352_priv.h"
 
 /* debug */
 int dvb_usb_cxusb_debug;
@@ -157,6 +159,27 @@ static int cxusb_streaming_ctrl(struct dvb_usb_device *d, int onoff)
        return 0;
 }
 
+static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)
+{
+       static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x38 };
+       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;
+}
+
 struct cx22702_config cxusb_cx22702_config = {
        .demod_address = 0x63,
 
@@ -172,6 +195,12 @@ struct lgdt330x_config cxusb_lgdt330x_config = {
        .pll_set       = dvb_usb_pll_set_i2c,
 };
 
+struct mt352_config cxusb_dee1601_config = {
+       .demod_address = 0x0f,
+       .demod_init    = cxusb_dee1601_demod_init,
+       .pll_set       = dvb_usb_pll_set,
+};
+
 /* Callbacks for DVB USB */
 static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_device *d)
 {
@@ -193,6 +222,13 @@ static int cxusb_lgh064f_tuner_attach(struct dvb_usb_device *d)
        return 0;
 }
 
+static int cxusb_dee1601_tuner_attach(struct dvb_usb_device *d)
+{
+       d->pll_addr = 0x61;
+       d->pll_desc = &dvb_pll_thomson_dtt7579;
+       return 0;
+}
+
 static int cxusb_cx22702_frontend_attach(struct dvb_usb_device *d)
 {
        u8 b;
@@ -220,15 +256,31 @@ static int cxusb_lgdt330x_frontend_attach(struct dvb_usb_device *d)
        return -EIO;
 }
 
+static int cxusb_dee1601_frontend_attach(struct dvb_usb_device *d)
+{
+       if (usb_set_interface(d->udev,0,0) < 0)
+               err("set interface failed");
+
+       cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);
+
+       if ((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL)
+               return 0;
+
+       return -EIO;
+}
+
 /* DVB USB Driver stuff */
 static struct dvb_usb_properties cxusb_medion_properties;
 static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties;
+static struct dvb_usb_properties cxusb_bluebird_dee1601_properties;
 
 static int cxusb_probe(struct usb_interface *intf,
                const struct usb_device_id *id)
 {
        if (dvb_usb_device_init(intf,&cxusb_medion_properties,THIS_MODULE,NULL) == 0 ||
-               dvb_usb_device_init(intf,&cxusb_bluebird_lgh064f_properties,THIS_MODULE,NULL) == 0) {
+               dvb_usb_device_init(intf,&cxusb_bluebird_lgh064f_properties,THIS_MODULE,NULL) == 0 ||
+               dvb_usb_device_init(intf,&cxusb_bluebird_dee1601_properties,THIS_MODULE,NULL) == 0
+               ){
                return 0;
        }
 
@@ -239,6 +291,8 @@ static struct usb_device_id cxusb_table [] = {
                { USB_DEVICE(USB_VID_MEDION, USB_PID_MEDION_MD95700) },
                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_COLD) },
                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_WARM) },
+               { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DEE1601_COLD) },
+               { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DEE1601_WARM) },
                {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, cxusb_table);
@@ -318,6 +372,45 @@ static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties = {
        }
 };
 
+static struct dvb_usb_properties cxusb_bluebird_dee1601_properties = {
+       .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+       .usb_ctrl         = CYPRESS_FX2,
+       .firmware         = "dvb-usb-bluebird-01.fw",
+       /* use usb alt setting 0 for EP4 transfer (dvb-t),
+          use usb alt setting 7 for EP2 transfer (atsc) */
+
+       .size_of_priv     = sizeof(struct cxusb_state),
+
+       .streaming_ctrl   = cxusb_streaming_ctrl,
+       .power_ctrl       = cxusb_power_ctrl,
+       .frontend_attach  = cxusb_dee1601_frontend_attach,
+       .tuner_attach     = cxusb_dee1601_tuner_attach,
+
+       .i2c_algo         = &cxusb_i2c_algo,
+
+       .generic_bulk_ctrl_endpoint = 0x01,
+       /* parameter for the MPEG2-data transfer */
+       .urb = {
+               .type = DVB_USB_BULK,
+               .count = 5,
+               .endpoint = 0x04,
+               .u = {
+                       .bulk = {
+                               .buffersize = 8192,
+                       }
+               }
+       },
+
+       .num_device_descs = 1,
+       .devices = {
+               {   "DViCO FusionHDTV DVB-T Dual USB",
+                       { &cxusb_table[3], NULL },
+                       { &cxusb_table[4], NULL },
+               },
+       }
+};
+
 static struct usb_driver cxusb_driver = {
        .name           = "dvb_usb_cxusb",
        .probe          = cxusb_probe,

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
index 51ce7403999b7015a792cce29cd808d56b5edf42..b2670476c3f2ec22b2537d9c53957958916ba2ae 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
@@ -74,6 +74,27 @@ static int usb_cypress_load_firmware(struct usb_device *udev, const struct firmw
        return ret;
 }
 
+/*
+ * DViCO bluebird firmware needs the "warm" product ID to be patched into the
+ * firmware file before download.
+ */
+#define BLUEBIRD_01_ID_OFFSET 6638
+static int dvb_usb_patch_dvico_firmware(struct usb_device *udev, const struct firmware *fw)
+{
+       if (fw->size < BLUEBIRD_01_ID_OFFSET + 4)
+               return -EINVAL;
+
+       if (fw->data[BLUEBIRD_01_ID_OFFSET] == (USB_VID_DVICO & 0xff) &&
+           fw->data[BLUEBIRD_01_ID_OFFSET + 1] == USB_VID_DVICO >> 8) {
+               fw->data[BLUEBIRD_01_ID_OFFSET + 2] = udev->descriptor.idProduct + 1;
+               fw->data[BLUEBIRD_01_ID_OFFSET + 3] = udev->descriptor.idProduct >> 8;
+
+               return 0;
+       }
+
+       return -EINVAL;
+}
+
 int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_properties *props)
 {
        int ret;
@@ -88,6 +109,12 @@ int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_properties
 
        info("downloading firmware from file '%s'",props->firmware);
 
+       if (le16_to_cpu(udev->descriptor.idVendor) == USB_VID_DVICO) {
+               ret = dvb_usb_patch_dvico_firmware(udev, fw);
+               if (ret != 0)
+                       warn("this firmware file not recognised");
+       }
+
        switch (props->usb_ctrl) {
                case CYPRESS_AN2135:
                case CYPRESS_AN2235:

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 784adfe1c0701948f68bb65ecba398af9107d317..d229343832265f175af3f7778e3b556ed817ac34 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -86,13 +86,15 @@
 #define USB_PID_WINTV_NOVA_T_USB2_COLD         0x9300
 #define USB_PID_WINTV_NOVA_T_USB2_WARM         0x9301
 #define USB_PID_NEBULA_DIGITV                          0x0201
-#define USB_PID_DVICO_BLUEBIRD_LGZ201          0xdb00
-#define USB_PID_DVICO_BLUEBIRD_TH7579          0xdb10
 #define USB_PID_DVICO_BLUEBIRD_LGDT                    0xd820
-#define USB_PID_DVICO_BLUEBIRD_LGZ201_1                0xdb01
-#define USB_PID_DVICO_BLUEBIRD_TH7579_2                0xdb11
 #define USB_PID_DVICO_BLUEBIRD_LG064F_COLD             0xd500
-#define USB_PID_DVICO_BLUEBIRD_LG064F_WARM             0xd700
+#define USB_PID_DVICO_BLUEBIRD_LG064F_WARM             0xd501
+#define USB_PID_DVICO_BLUEBIRD_LGZ201_COLD             0xdb00
+#define USB_PID_DVICO_BLUEBIRD_LGZ201_WARM             0xdb01
+#define USB_PID_DVICO_BLUEBIRD_TH7579_COLD             0xdb10
+#define USB_PID_DVICO_BLUEBIRD_TH7579_WARM             0xdb11
+#define USB_PID_DVICO_BLUEBIRD_DEE1601_COLD            0xdb50
+#define USB_PID_DVICO_BLUEBIRD_DEE1601_WARM            0xdb51
 #define USB_PID_MEDION_MD95700                         0x0932
 #define USB_PID_KYE_DVB_T_COLD                         0x701e
 #define USB_PID_KYE_DVB_T_WARM                         0x701f