V4L/DVB (4686): Cxusb: add support for DViCO FusionHDTV DVB-T Dual Digital 2

Add support for DViCO FusionHDTV DVB-T Dual Digital 2 USB, which
is identical to the usb portion of DViCO FusionHDTV DVB-T Dual Digital 1.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 17 insertions, 9 deletions

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 5ebfa3f08546..43f39069ef34 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -505,14 +505,16 @@ 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) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_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) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD) },
+                { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) },
                 {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, cxusb_table);
@@ -653,7 +655,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties = {
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
-        .num_device_descs = 2,
+        .num_device_descs = 3,
         .devices = {
                 {   "DViCO FusionHDTV DVB-T Dual USB",
                         { &cxusb_table[3], NULL },
@@ -663,6 +665,10 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties = {
                         { &cxusb_table[9],  NULL },
                         { &cxusb_table[10], NULL },
                 },
+                {   "DViCO FusionHDTV DVB-T Dual Digital 2",
+                        { &cxusb_table[11], NULL },
+                        { &cxusb_table[12], NULL },
+                },
         }
 };
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 35bd92803730..4d6b069536ce 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -106,10 +106,12 @@
 #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_DIGITALNOW_BLUEBIRD_DEE1601_COLD        0xdb54
-#define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM        0xdb55
+#define USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD              0xdb50
+#define USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM              0xdb51
+#define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD              0xdb58
+#define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM              0xdb59
+#define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD 0xdb54
+#define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM 0xdb55
 #define USB_PID_MEDION_MD95700                          0x0932
 #define USB_PID_KYE_DVB_T_COLD                          0x701e
 #define USB_PID_KYE_DVB_T_WARM                          0x701f