diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-23 08:58:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:21:08 -0400 |
commit | 4557af9c5338605c85fe54f5ebba3d4b14a60ab8 (patch) | |
tree | 5b03b3f3450d4c1b3ade5b0579d80a1aafef1847 /drivers/media/video/em28xx/em28xx-cards.c | |
parent | d18e2fda7133287bf8a81809816e646cf17c332e (diff) |
V4L/DVB (11825): em28xx: add Terratec Grabby
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 7cb93fbbbbf8..b4c78f2ab985 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -1347,6 +1347,22 @@ struct em28xx_board em28xx_boards[] = { | |||
1347 | .amux = EM28XX_AMUX_VIDEO, | 1347 | .amux = EM28XX_AMUX_VIDEO, |
1348 | } }, | 1348 | } }, |
1349 | }, | 1349 | }, |
1350 | [EM2860_BOARD_TERRATEC_GRABBY] = { | ||
1351 | .name = "Terratec Grabby", | ||
1352 | .vchannels = 2, | ||
1353 | .tuner_type = TUNER_ABSENT, | ||
1354 | .decoder = EM28XX_SAA711X, | ||
1355 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, | ||
1356 | .input = { { | ||
1357 | .type = EM28XX_VMUX_COMPOSITE1, | ||
1358 | .vmux = SAA7115_COMPOSITE0, | ||
1359 | .amux = EM28XX_AMUX_VIDEO2, | ||
1360 | }, { | ||
1361 | .type = EM28XX_VMUX_SVIDEO, | ||
1362 | .vmux = SAA7115_SVIDEO3, | ||
1363 | .amux = EM28XX_AMUX_VIDEO2, | ||
1364 | } }, | ||
1365 | }, | ||
1350 | }; | 1366 | }; |
1351 | const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); | 1367 | const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); |
1352 | 1368 | ||
@@ -1410,6 +1426,8 @@ struct usb_device_id em28xx_id_table[] = { | |||
1410 | .driver_info = EM2870_BOARD_TERRATEC_XS }, | 1426 | .driver_info = EM2870_BOARD_TERRATEC_XS }, |
1411 | { USB_DEVICE(0x0ccd, 0x0047), | 1427 | { USB_DEVICE(0x0ccd, 0x0047), |
1412 | .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS }, | 1428 | .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS }, |
1429 | { USB_DEVICE(0x0ccd, 0x0096), | ||
1430 | .driver_info = EM2860_BOARD_TERRATEC_GRABBY }, | ||
1413 | { USB_DEVICE(0x185b, 0x2870), | 1431 | { USB_DEVICE(0x185b, 0x2870), |
1414 | .driver_info = EM2870_BOARD_COMPRO_VIDEOMATE }, | 1432 | .driver_info = EM2870_BOARD_COMPRO_VIDEOMATE }, |
1415 | { USB_DEVICE(0x185b, 0x2041), | 1433 | { USB_DEVICE(0x185b, 0x2041), |