7 files changed, 160 insertions, 18 deletions

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 358ed153865f..18d169836c9c 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -253,6 +253,26 @@ static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)
         return 0;
 }
 
+static int cxusb_mt352_demod_init(struct dvb_frontend* fe)
+{       /* used in both lgz201 and th7579 */
+        static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x39 };
+        static u8 reset []         = { RESET,      0x80 };
+        static u8 adc_ctl_1_cfg [] = { ADC_CTL_1,  0x40 };
+        static u8 agc_cfg []       = { AGC_TARGET, 0x24, 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,
 
@@ -274,6 +294,13 @@ struct mt352_config cxusb_dee1601_config = {
         .pll_set       = dvb_usb_pll_set,
 };
 
+struct mt352_config cxusb_mt352_config = {
+        /* used in both lgz201 and th7579 */
+        .demod_address = 0x0f,
+        .demod_init    = cxusb_mt352_demod_init,
+        .pll_set       = dvb_usb_pll_set,
+};
+
 /* Callbacks for DVB USB */
 static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_device *d)
 {
@@ -302,6 +329,20 @@ static int cxusb_dee1601_tuner_attach(struct dvb_usb_device *d)
         return 0;
 }
 
+static int cxusb_lgz201_tuner_attach(struct dvb_usb_device *d)
+{
+        d->pll_addr = 0x61;
+        d->pll_desc = &dvb_pll_lg_z201;
+        return 0;
+}
+
+static int cxusb_dtt7579_tuner_attach(struct dvb_usb_device *d)
+{
+        d->pll_addr = 0x60;
+        d->pll_desc = &dvb_pll_thomson_dtt7579;
+        return 0;
+}
+
 static int cxusb_cx22702_frontend_attach(struct dvb_usb_device *d)
 {
         u8 b;
@@ -329,6 +370,19 @@ static int cxusb_lgdt330x_frontend_attach(struct dvb_usb_device *d)
         return -EIO;
 }
 
+static int cxusb_mt352_frontend_attach(struct dvb_usb_device *d)
+{       /* used in both lgz201 and th7579 */
+        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_mt352_config, &d->i2c_adap)) != NULL)
+                return 0;
+
+        return -EIO;
+}
+
 static int cxusb_dee1601_frontend_attach(struct dvb_usb_device *d)
 {
         if (usb_set_interface(d->udev,0,0) < 0)
@@ -370,13 +424,17 @@ static int bluebird_patch_dvico_firmware_download(struct usb_device *udev, const
 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 struct dvb_usb_properties cxusb_bluebird_lgz201_properties;
+static struct dvb_usb_properties cxusb_bluebird_dtt7579_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_dee1601_properties,THIS_MODULE,NULL) == 0) {
+                dvb_usb_device_init(intf,&cxusb_bluebird_dee1601_properties,THIS_MODULE,NULL) == 0 ||
+                dvb_usb_device_init(intf,&cxusb_bluebird_lgz201_properties,THIS_MODULE,NULL) == 0 ||
+                dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0) {
                 return 0;
         }
 
@@ -389,6 +447,12 @@ static struct usb_device_id cxusb_table [] = {
                 { 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) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_COLD) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_WARM) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_COLD) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_WARM) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_COLD) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM) },
                 {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, cxusb_table);
@@ -505,12 +569,96 @@ static struct dvb_usb_properties cxusb_bluebird_dee1601_properties = {
                 }
         },
 
-        .num_device_descs = 1,
+        .num_device_descs = 2,
         .devices = {
                 {   "DViCO FusionHDTV DVB-T Dual USB",
                         { &cxusb_table[3], NULL },
                         { &cxusb_table[4], NULL },
                 },
+                {   "DigitalNow DVB-T Dual USB",
+                        { &cxusb_table[9],  NULL },
+                        { &cxusb_table[10], NULL },
+                },
+        }
+};
+
+static struct dvb_usb_properties cxusb_bluebird_lgz201_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl          = DEVICE_SPECIFIC,
+        .firmware          = "dvb-usb-bluebird-01.fw",
+        .download_firmware = bluebird_patch_dvico_firmware_download,
+        /* 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_mt352_frontend_attach,
+        .tuner_attach     = cxusb_lgz201_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 USB (LGZ201)",
+                        { &cxusb_table[5], NULL },
+                        { &cxusb_table[6], NULL },
+                },
+        }
+};
+
+static struct dvb_usb_properties cxusb_bluebird_dtt7579_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+        .usb_ctrl          = DEVICE_SPECIFIC,
+        .firmware          = "dvb-usb-bluebird-01.fw",
+        .download_firmware = bluebird_patch_dvico_firmware_download,
+        /* 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_mt352_frontend_attach,
+        .tuner_attach     = cxusb_dtt7579_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 USB (TH7579)",
+                        { &cxusb_table[7], NULL },
+                        { &cxusb_table[8], NULL },
+                },
         }
 };
 
diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
index 0a94ec22aeb8..cd21ddbfd054 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u-fe.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
@@ -156,10 +156,9 @@ struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d)
         struct dtt200u_fe_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct dtt200u_fe_state*) kmalloc(sizeof(struct dtt200u_fe_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct dtt200u_fe_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
-        memset(state,0,sizeof(struct dtt200u_fe_state));
 
         deb_info("attaching frontend dtt200u\n");
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index d22934383226..4a1b9e77e339 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -95,6 +95,8 @@
 #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_DIGITALNOW_BLUEBIRD_DEE1601_COLD        0xdb54
+#define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM        0xdb55
 #define USB_PID_MEDION_MD95700                          0x0932
 #define USB_PID_KYE_DVB_T_COLD                          0x701e
 #define USB_PID_KYE_DVB_T_WARM                          0x701f
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
index 2e23060cbbca..716f8bf528cd 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -154,12 +154,11 @@ int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties
         }
 
         info("found a '%s' in warm state.",desc->name);
-        d = kmalloc(sizeof(struct dvb_usb_device),GFP_KERNEL);
+                d = kzalloc(sizeof(struct dvb_usb_device),GFP_KERNEL);
         if (d == NULL) {
                 err("no memory for 'struct dvb_usb_device'");
                 return ret;
         }
-        memset(d,0,sizeof(struct dvb_usb_device));
 
         d->udev = udev;
         memcpy(&d->props,props,sizeof(struct dvb_usb_properties));
@@ -167,13 +166,12 @@ int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties
         d->owner = owner;
 
         if (d->props.size_of_priv > 0) {
-                d->priv = kmalloc(d->props.size_of_priv,GFP_KERNEL);
+                        d->priv = kzalloc(d->props.size_of_priv,GFP_KERNEL);
                 if (d->priv == NULL) {
                         err("no memory for priv in 'struct dvb_usb_device'");
                         kfree(d);
                         return -ENOMEM;
                 }
-                memset(d->priv,0,d->props.size_of_priv);
         }
 
         usb_set_intfdata(intf, d);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index 36b7048c02d2..ee821974dc60 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -175,15 +175,13 @@ static int dvb_usb_allocate_stream_buffers(struct dvb_usb_device *d, int num, un
 
         deb_mem("all in all I will use %lu bytes for streaming\n",num*size);
 
-        if ((d->buf_list = kmalloc(num*sizeof(u8 *), GFP_ATOMIC)) == NULL)
+        if ((d->buf_list = kcalloc(num, sizeof(u8 *), GFP_ATOMIC)) == NULL)
                 return -ENOMEM;
 
-        if ((d->dma_addr = kmalloc(num*sizeof(dma_addr_t), GFP_ATOMIC)) == NULL) {
+        if ((d->dma_addr = kcalloc(num, sizeof(dma_addr_t), GFP_ATOMIC)) == NULL) {
                 kfree(d->buf_list);
                 return -ENOMEM;
         }
-        memset(d->buf_list,0,num*sizeof(u8 *));
-        memset(d->dma_addr,0,num*sizeof(dma_addr_t));
 
         d->state |= DVB_USB_STATE_URB_BUF;
 
@@ -285,10 +283,9 @@ int dvb_usb_urb_init(struct dvb_usb_device *d)
         usb_clear_halt(d->udev,usb_rcvbulkpipe(d->udev,d->props.urb.endpoint));
 
         /* allocate the array for the data transfer URBs */
-        d->urb_list = kmalloc(d->props.urb.count * sizeof(struct urb *),GFP_KERNEL);
+        d->urb_list = kzalloc(d->props.urb.count * sizeof(struct urb *),GFP_KERNEL);
         if (d->urb_list == NULL)
                 return -ENOMEM;
-        memset(d->urb_list,0,d->props.urb.count * sizeof(struct urb *));
         d->state |= DVB_USB_STATE_URB_LIST;
 
         switch (d->props.urb.type) {
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index 0885d9fb2bf2..b6d95e1c9c52 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -281,10 +281,9 @@ static struct dvb_frontend_ops vp702x_fe_ops;
 
 struct dvb_frontend * vp702x_fe_attach(struct dvb_usb_device *d)
 {
-        struct vp702x_fe_state *s = kmalloc(sizeof(struct vp702x_fe_state), GFP_KERNEL);
+        struct vp702x_fe_state *s = kzalloc(sizeof(struct vp702x_fe_state), GFP_KERNEL);
         if (s == NULL)
                 goto error;
-        memset(s,0,sizeof(struct vp702x_fe_state));
 
         s->d = d;
         s->fe.ops = &vp702x_fe_ops;
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index 83f1de1e7e57..5242cca5db4a 100644
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -145,10 +145,9 @@ static struct dvb_frontend_ops vp7045_fe_ops;
 
 struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d)
 {
-        struct vp7045_fe_state *s = kmalloc(sizeof(struct vp7045_fe_state), GFP_KERNEL);
+        struct vp7045_fe_state *s = kzalloc(sizeof(struct vp7045_fe_state), GFP_KERNEL);
         if (s == NULL)
                 goto error;
-        memset(s,0,sizeof(struct vp7045_fe_state));
 
         s->d = d;
         s->fe.ops = &vp7045_fe_ops;