V4L/DVB (4775): [patch] Add Compro USB IDs

This patch adds Compro Videomate U500 to supported devices.

Signed-off-by: Tomi Koivulahti <birchbay@gmail.com>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 15 insertions, 8 deletions

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index c231a1e5204e..fe305f4430ea 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -269,11 +269,13 @@ static int stk7700p_tuner_attach(struct dvb_usb_adapter *adap)
 
 struct usb_device_id dib0700_usb_id_table[] = {
                 { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK7700P) },
+                { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK7700P_PC) },
+
                 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) },
                 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_2) },
                 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) },
                 { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) },
-                { USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK7700P_PC) },
+                { USB_DEVICE(USB_VID_COMPRO,    USB_PID_COMPRO_VIDEOMATE_U500) },
                 { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -315,20 +317,24 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                         },
                 },
 
-                .num_device_descs = 3,
+                .num_device_descs = 4,
                 .devices = {
                         {   "DiBcom STK7700P reference design",
-                                { &dib0700_usb_id_table[0], &dib0700_usb_id_table[5] },
+                                { &dib0700_usb_id_table[0], &dib0700_usb_id_table[1] },
                                 { NULL },
                         },
                         {   "Hauppauge Nova-T Stick",
-                                { &dib0700_usb_id_table[3], NULL },
+                                { &dib0700_usb_id_table[4], NULL },
                                 { NULL },
                         },
                         {   "AVerMedia AVerTV DVB-T Volar",
-                                { &dib0700_usb_id_table[4], NULL },
+                                { &dib0700_usb_id_table[5], NULL },
                                 { NULL },
                         },
+                        {   "Compro Videomate U500",
+                                { &dib0700_usb_id_table[6], NULL },
+                                { NULL },
+                        }
                 }
         }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
@@ -350,7 +356,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
                 .num_device_descs = 1,
                 .devices = {
                         {   "Hauppauge Nova-T 500 Dual DVB-T",
-                                { &dib0700_usb_id_table[1], &dib0700_usb_id_table[2], NULL },
+                                { &dib0700_usb_id_table[2], &dib0700_usb_id_table[3], NULL },
                                 { NULL },
                         },
                 }
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index fd8ba2535c08..036fb143320f 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -46,6 +46,7 @@
 #define USB_PID_COMPRO_DVBU2000_WARM                    0xd001
 #define USB_PID_COMPRO_DVBU2000_UNK_COLD                0x010c
 #define USB_PID_COMPRO_DVBU2000_UNK_WARM                0x010d
+#define USB_PID_COMPRO_VIDEOMATE_U500                   0x1e78
 #define USB_PID_DIBCOM_HOOK_DEFAULT                     0x0064
 #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM              0x0065
 #define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
@@ -111,8 +112,8 @@
 #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_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