aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-01-31 20:18:21 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 19:32:00 -0400
commit4e105039da20f57958a2f538048a0f1bfb576b8b (patch)
tree05265f927711b7e466ce4b02bc9a815cfe7cebd8 /drivers/media/video/cx231xx/cx231xx-cards.c
parent38f5ddc1bf12887c0abe287de359e853e12fcc19 (diff)
[media] cx231xx: Add support for PV Xcapture USB
Adds support for Pixelviex Xcapture USB grabber device. This device has one composite and one s-video entry only, plus a button. For now, the button is not supported. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-cards.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-cards.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index e04c955bd2f1..6540b8dfb6bb 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -440,6 +440,35 @@ struct cx231xx_board cx231xx_boards[] = {
440 .gpio = 0, 440 .gpio = 0,
441 } }, 441 } },
442 }, 442 },
443 [CX231XX_BOARD_PV_XCAPTURE_USB] = {
444 .name = "Pixelview Xcapture USB",
445 .tuner_type = TUNER_ABSENT,
446 .decoder = CX231XX_AVDECODER,
447 .output_mode = OUT_MODE_VIP11,
448 .demod_xfer_mode = 0,
449 .ctl_pin_status_mask = 0xFFFFFFC4,
450 .agc_analog_digital_select_gpio = 0x0c,
451 .gpio_pin_status_mask = 0x4001000,
452 .norm = V4L2_STD_NTSC,
453 .no_alt_vanc = 1,
454 .external_av = 1,
455 .dont_use_port_3 = 1,
456
457 .input = {{
458 .type = CX231XX_VMUX_COMPOSITE1,
459 .vmux = CX231XX_VIN_2_1,
460 .amux = CX231XX_AMUX_LINE_IN,
461 .gpio = NULL,
462 }, {
463 .type = CX231XX_VMUX_SVIDEO,
464 .vmux = CX231XX_VIN_1_1 |
465 (CX231XX_VIN_1_2 << 8) |
466 CX25840_SVIDEO_ON,
467 .amux = CX231XX_AMUX_LINE_IN,
468 .gpio = NULL,
469 }
470 },
471 },
443}; 472};
444const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); 473const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
445 474
@@ -469,6 +498,8 @@ struct usb_device_id cx231xx_id_table[] = {
469 .driver_info = CX231XX_BOARD_HAUPPAUGE_USBLIVE2}, 498 .driver_info = CX231XX_BOARD_HAUPPAUGE_USBLIVE2},
470 {USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000, 0x4001), 499 {USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000, 0x4001),
471 .driver_info = CX231XX_BOARD_PV_PLAYTV_USB_HYBRID}, 500 .driver_info = CX231XX_BOARD_PV_PLAYTV_USB_HYBRID},
501 {USB_DEVICE(USB_VID_PIXELVIEW, 0x5014),
502 .driver_info = CX231XX_BOARD_PV_XCAPTURE_USB},
472 {}, 503 {},
473}; 504};
474 505