tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (6994): usbvision: add Pinnacle Studio PCTV USB (NTSC) FM V3

Add the "Pinnacle Studio PCTV USB (NTSC) FM" device.
This is the third occurrence of the same device designation...

Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

authored by

Thierry MERLE and committed by
Mauro Carvalho Chehab eeec4b38 e9ca1c79

+19 -1
+1
Documentation/video4linux/CARDLIST.usbvision
··· 62 62 61 -> Pinnacle Studio Linx Video input cable (PAL) [2304:0301] 63 63 62 -> Pinnacle PCTV Bungee USB (PAL) FM [2304:0419] 64 64 63 -> Hauppauge WinTv-USB [2400:4200] 65 + 64 -> Pinnacle Studio PCTV USB (NTSC) FM V3 [2304:0113]
+17 -1
drivers/media/video/usbvision/usbvision-cards.c
··· 901 901 .Y_Offset = -1, 902 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 918 [PINNA_PCTV_USB_PAL_FM_V2] = { 905 919 .Interface = -1, 906 920 .Codec = CODEC_SAA7113, ··· 1058 1044 { USB_DEVICE(0x0573, 0x4d2a), .driver_info=HPG_WINTV_PRO_NTSC_MN }, 1059 1045 { USB_DEVICE(0x0573, 0x4d2b), .driver_info=HPG_WINTV_PRO_NTSC_MN_V2 }, 1060 1046 { USB_DEVICE(0x0573, 0x4d2c), .driver_info=HPG_WINTV_PRO_PAL }, 1061 - { USB_DEVICE(0x0573, 0x4d20), .driver_info=HPG_WINTV_PRO_NTSC_MN_V3 }, 1047 + { USB_DEVICE(0x0573, 0x4d20), .driver_info = HPG_WINTV_PRO_NTSC_MN_V3 }, 1062 1048 { USB_DEVICE(0x0573, 0x4d21), .driver_info=HPG_WINTV_PRO_PAL_BG }, 1063 1049 { USB_DEVICE(0x0573, 0x4d22), .driver_info=HPG_WINTV_PRO_PAL_I }, 1064 1050 { USB_DEVICE(0x0573, 0x4d23), .driver_info=HPG_WINTV_PRO_PAL_SECAM_L }, ··· 1088 1074 { USB_DEVICE(0x2304, 0x0110), .driver_info=PINNA_PCTV_USB_PAL_FM }, 1089 1075 { USB_DEVICE(0x2304, 0x0111), .driver_info=MIRO_PCTV_USB }, 1090 1076 { USB_DEVICE(0x2304, 0x0112), .driver_info=PINNA_PCTV_USB_NTSC_FM }, 1077 + { USB_DEVICE(0x2304, 0x0113), 1078 + .driver_info = PINNA_PCTV_USB_NTSC_FM_V3 }, 1091 1079 { USB_DEVICE(0x2304, 0x0210), .driver_info=PINNA_PCTV_USB_PAL_FM_V2 }, 1092 1080 { USB_DEVICE(0x2304, 0x0212), .driver_info=PINNA_PCTV_USB_NTSC_FM_V2 }, 1093 1081 { USB_DEVICE(0x2304, 0x0214), .driver_info=PINNA_PCTV_USB_PAL_FM_V3 },
+1
drivers/media/video/usbvision/usbvision-cards.h
··· 62 62 #define PINNA_LINX_VD_IN_CAB_PAL 61 63 63 #define PINNA_PCTV_BUNGEE_PAL_FM 62 64 64 #define HPG_WINTV 63 65 + #define PINNA_PCTV_USB_NTSC_FM_V3 64 65 66 66 67 extern const int usbvision_device_data_size;