Merge branch 'pci_id_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:12:24 +0000 (16:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:12:24 +0000 (16:12 -0700)
* 'pci_id_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (7497): pvrusb2: add new usb pid for 73xxx models
  V4L/DVB (7496): pvrusb2: add new usb pid for 75xxx models

drivers/media/video/pvrusb2/pvrusb2-devattr.c

index 4df6d6d936fce8b8a208605dd109761c029dd8b4..98557ce950cd899f0795b137f68969473dc82dc6 100644 (file)
@@ -154,6 +154,37 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
 
 
 
+/*------------------------------------------------------------------------*/
+/* Hauppauge PVR-USB2 Model 73xxx */
+
+static const char *pvr2_client_73xxx[] = {
+       "cx25840",
+       "tuner",
+};
+
+static const char *pvr2_fw1_names_73xxx[] = {
+               "v4l-pvrusb2-73xxx-01.fw",
+};
+
+static const struct pvr2_device_desc pvr2_device_73xxx = {
+               .description = "WinTV PVR USB2 Model Category 73xxxx",
+               .shortname = "73xxx",
+               .client_modules.lst = pvr2_client_73xxx,
+               .client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx),
+               .fx2_firmware.lst = pvr2_fw1_names_73xxx,
+               .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
+               .flag_has_cx25840 = !0,
+               .flag_has_hauppauge_rom = !0,
+               .flag_has_analogtuner = !0,
+               .flag_has_composite = !0,
+               .flag_has_svideo = !0,
+               .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+               .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
+               .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
+};
+
+
+
 /*------------------------------------------------------------------------*/
 /* Hauppauge PVR-USB2 Model 75xxx */
 
@@ -198,8 +229,12 @@ struct usb_device_id pvr2_device_table[] = {
        { USB_DEVICE(0x11ba, 0x1001),
          .driver_info = (kernel_ulong_t)&pvr2_device_onair_usb2},
 #endif
+       { USB_DEVICE(0x2040, 0x7300),
+         .driver_info = (kernel_ulong_t)&pvr2_device_73xxx},
        { USB_DEVICE(0x2040, 0x7500),
          .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
+       { USB_DEVICE(0x2040, 0x7501),
+         .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
        { }
 };