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

[media] cx231xx: Add support for Terratec Grabby

Add support for the Terratec Grabby with USB ID 0ccd:00a6.

Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Tommi Rantala and committed by
Mauro Carvalho Chehab
eee1d06d ae1c75d6

+29
+28
drivers/media/usb/cx231xx/cx231xx-cards.c
··· 815 815 .gpio = NULL, 816 816 } }, 817 817 }, 818 + [CX231XX_BOARD_TERRATEC_GRABBY] = { 819 + .name = "Terratec Grabby", 820 + .tuner_type = TUNER_ABSENT, 821 + .decoder = CX231XX_AVDECODER, 822 + .output_mode = OUT_MODE_VIP11, 823 + .demod_xfer_mode = 0, 824 + .ctl_pin_status_mask = 0xFFFFFFC4, 825 + .agc_analog_digital_select_gpio = 0x0c, 826 + .gpio_pin_status_mask = 0x4001000, 827 + .norm = V4L2_STD_PAL, 828 + .no_alt_vanc = 1, 829 + .external_av = 1, 830 + .input = {{ 831 + .type = CX231XX_VMUX_COMPOSITE1, 832 + .vmux = CX231XX_VIN_2_1, 833 + .amux = CX231XX_AMUX_LINE_IN, 834 + .gpio = NULL, 835 + }, { 836 + .type = CX231XX_VMUX_SVIDEO, 837 + .vmux = CX231XX_VIN_1_1 | 838 + (CX231XX_VIN_1_2 << 8) | 839 + CX25840_SVIDEO_ON, 840 + .amux = CX231XX_AMUX_LINE_IN, 841 + .gpio = NULL, 842 + } }, 843 + }, 818 844 }; 819 845 const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); 820 846 ··· 906 880 .driver_info = CX231XX_BOARD_ELGATO_VIDEO_CAPTURE_V2}, 907 881 {USB_DEVICE(0x1f4d, 0x0102), 908 882 .driver_info = CX231XX_BOARD_OTG102}, 883 + {USB_DEVICE(USB_VID_TERRATEC, 0x00a6), 884 + .driver_info = CX231XX_BOARD_TERRATEC_GRABBY}, 909 885 {}, 910 886 }; 911 887
+1
drivers/media/usb/cx231xx/cx231xx.h
··· 77 77 #define CX231XX_BOARD_HAUPPAUGE_930C_HD_1113xx 19 78 78 #define CX231XX_BOARD_HAUPPAUGE_930C_HD_1114xx 20 79 79 #define CX231XX_BOARD_HAUPPAUGE_955Q 21 80 + #define CX231XX_BOARD_TERRATEC_GRABBY 22 80 81 81 82 /* Limits minimum and default number of buffers */ 82 83 #define CX231XX_MIN_BUF 4