diff options
Diffstat (limited to 'drivers/media/video/usbvision')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-cards.c | 18 | ||||
-rw-r--r-- | drivers/media/video/usbvision/usbvision-cards.h | 1 |
2 files changed, 18 insertions, 1 deletions
diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c index f09eb102731b..503b13beb922 100644 --- a/drivers/media/video/usbvision/usbvision-cards.c +++ b/drivers/media/video/usbvision/usbvision-cards.c | |||
@@ -901,6 +901,20 @@ struct usbvision_device_data_st usbvision_device_data[] = { | |||
901 | .Y_Offset = -1, | 901 | .Y_Offset = -1, |
902 | .ModelString = "Pinnacle Studio PCTV USB (NTSC) FM", | 902 | .ModelString = "Pinnacle Studio PCTV USB (NTSC) FM", |
903 | }, | 903 | }, |
904 | [PINNA_PCTV_USB_NTSC_FM_V3] = { | ||
905 | .Interface = -1, | ||
906 | .Codec = CODEC_SAA7111, | ||
907 | .VideoChannels = 3, | ||
908 | .VideoNorm = V4L2_STD_NTSC, | ||
909 | .AudioChannels = 1, | ||
910 | .Radio = 1, | ||
911 | .vbi = 1, | ||
912 | .Tuner = 1, | ||
913 | .TunerType = TUNER_PHILIPS_NTSC_M, | ||
914 | .X_Offset = -1, | ||
915 | .Y_Offset = -1, | ||
916 | .ModelString = "Pinnacle Studio PCTV USB (NTSC) FM V3", | ||
917 | }, | ||
904 | [PINNA_PCTV_USB_PAL_FM_V2] = { | 918 | [PINNA_PCTV_USB_PAL_FM_V2] = { |
905 | .Interface = -1, | 919 | .Interface = -1, |
906 | .Codec = CODEC_SAA7113, | 920 | .Codec = CODEC_SAA7113, |
@@ -1044,7 +1058,7 @@ struct usb_device_id usbvision_table [] = { | |||
1044 | { USB_DEVICE(0x0573, 0x4d2a), .driver_info=HPG_WINTV_PRO_NTSC_MN }, | 1058 | { USB_DEVICE(0x0573, 0x4d2a), .driver_info=HPG_WINTV_PRO_NTSC_MN }, |
1045 | { USB_DEVICE(0x0573, 0x4d2b), .driver_info=HPG_WINTV_PRO_NTSC_MN_V2 }, | 1059 | { USB_DEVICE(0x0573, 0x4d2b), .driver_info=HPG_WINTV_PRO_NTSC_MN_V2 }, |
1046 | { USB_DEVICE(0x0573, 0x4d2c), .driver_info=HPG_WINTV_PRO_PAL }, | 1060 | { USB_DEVICE(0x0573, 0x4d2c), .driver_info=HPG_WINTV_PRO_PAL }, |
1047 | { USB_DEVICE(0x0573, 0x4d20), .driver_info=HPG_WINTV_PRO_NTSC_MN_V3 }, | 1061 | { USB_DEVICE(0x0573, 0x4d20), .driver_info = HPG_WINTV_PRO_NTSC_MN_V3 }, |
1048 | { USB_DEVICE(0x0573, 0x4d21), .driver_info=HPG_WINTV_PRO_PAL_BG }, | 1062 | { USB_DEVICE(0x0573, 0x4d21), .driver_info=HPG_WINTV_PRO_PAL_BG }, |
1049 | { USB_DEVICE(0x0573, 0x4d22), .driver_info=HPG_WINTV_PRO_PAL_I }, | 1063 | { USB_DEVICE(0x0573, 0x4d22), .driver_info=HPG_WINTV_PRO_PAL_I }, |
1050 | { USB_DEVICE(0x0573, 0x4d23), .driver_info=HPG_WINTV_PRO_PAL_SECAM_L }, | 1064 | { USB_DEVICE(0x0573, 0x4d23), .driver_info=HPG_WINTV_PRO_PAL_SECAM_L }, |
@@ -1074,6 +1088,8 @@ struct usb_device_id usbvision_table [] = { | |||
1074 | { USB_DEVICE(0x2304, 0x0110), .driver_info=PINNA_PCTV_USB_PAL_FM }, | 1088 | { USB_DEVICE(0x2304, 0x0110), .driver_info=PINNA_PCTV_USB_PAL_FM }, |
1075 | { USB_DEVICE(0x2304, 0x0111), .driver_info=MIRO_PCTV_USB }, | 1089 | { USB_DEVICE(0x2304, 0x0111), .driver_info=MIRO_PCTV_USB }, |
1076 | { USB_DEVICE(0x2304, 0x0112), .driver_info=PINNA_PCTV_USB_NTSC_FM }, | 1090 | { USB_DEVICE(0x2304, 0x0112), .driver_info=PINNA_PCTV_USB_NTSC_FM }, |
1091 | { USB_DEVICE(0x2304, 0x0113), | ||
1092 | .driver_info = PINNA_PCTV_USB_NTSC_FM_V3 }, | ||
1077 | { USB_DEVICE(0x2304, 0x0210), .driver_info=PINNA_PCTV_USB_PAL_FM_V2 }, | 1093 | { USB_DEVICE(0x2304, 0x0210), .driver_info=PINNA_PCTV_USB_PAL_FM_V2 }, |
1078 | { USB_DEVICE(0x2304, 0x0212), .driver_info=PINNA_PCTV_USB_NTSC_FM_V2 }, | 1094 | { USB_DEVICE(0x2304, 0x0212), .driver_info=PINNA_PCTV_USB_NTSC_FM_V2 }, |
1079 | { USB_DEVICE(0x2304, 0x0214), .driver_info=PINNA_PCTV_USB_PAL_FM_V3 }, | 1095 | { USB_DEVICE(0x2304, 0x0214), .driver_info=PINNA_PCTV_USB_PAL_FM_V3 }, |
diff --git a/drivers/media/video/usbvision/usbvision-cards.h b/drivers/media/video/usbvision/usbvision-cards.h index 512c5cee4145..9c6ad22960d8 100644 --- a/drivers/media/video/usbvision/usbvision-cards.h +++ b/drivers/media/video/usbvision/usbvision-cards.h | |||
@@ -62,5 +62,6 @@ | |||
62 | #define PINNA_LINX_VD_IN_CAB_PAL 61 | 62 | #define PINNA_LINX_VD_IN_CAB_PAL 61 |
63 | #define PINNA_PCTV_BUNGEE_PAL_FM 62 | 63 | #define PINNA_PCTV_BUNGEE_PAL_FM 62 |
64 | #define HPG_WINTV 63 | 64 | #define HPG_WINTV 63 |
65 | #define PINNA_PCTV_USB_NTSC_FM_V3 64 | ||
65 | 66 | ||
66 | extern const int usbvision_device_data_size; | 67 | extern const int usbvision_device_data_size; |