diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-03 20:21:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:01:55 -0500 |
commit | ea4fd5679b258d8ae85124a47b587a53ba6409de (patch) | |
tree | 0d4b5fb23dcab0664c88220782f10d05db299436 /drivers/media/video/em28xx | |
parent | 03910cc39035d27f4c85c8ad2a236cc5c9456127 (diff) |
V4L/DVB (6537): Add entry for Pixelview Prolink PlayTV USB 2.0
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 23 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 1 |
2 files changed, 23 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 4cd49415eef2..e1e7510146e1 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -328,6 +328,26 @@ struct em28xx_board em28xx_boards[] = { | |||
328 | .amux = 1, | 328 | .amux = 1, |
329 | }}, | 329 | }}, |
330 | }, | 330 | }, |
331 | [EM2820_BOARD_PROLINK_PLAYTV_USB2] = { | ||
332 | .name = "Pixelview Prolink PlayTV USB 2.0", | ||
333 | .vchannels = 3, | ||
334 | .tda9887_conf = TDA9887_PRESENT, | ||
335 | .has_tuner = 1, | ||
336 | .decoder = EM28XX_SAA7113, | ||
337 | .input = {{ | ||
338 | .type = EM28XX_VMUX_TELEVISION, | ||
339 | .vmux = SAA7115_COMPOSITE2, | ||
340 | .amux = 1, | ||
341 | },{ | ||
342 | .type = EM28XX_VMUX_COMPOSITE1, | ||
343 | .vmux = SAA7115_COMPOSITE0, | ||
344 | .amux = 1, | ||
345 | },{ | ||
346 | .type = EM28XX_VMUX_SVIDEO, | ||
347 | .vmux = SAA7115_SVIDEO3, | ||
348 | .amux = 1, | ||
349 | }}, | ||
350 | }, | ||
331 | }; | 351 | }; |
332 | const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); | 352 | const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); |
333 | 353 | ||
@@ -355,7 +375,8 @@ struct usb_device_id em28xx_id_table [] = { | |||
355 | MODULE_DEVICE_TABLE (usb, em28xx_id_table); | 375 | MODULE_DEVICE_TABLE (usb, em28xx_id_table); |
356 | 376 | ||
357 | static struct em28xx_hash_table em28xx_hash [] = { | 377 | static struct em28xx_hash_table em28xx_hash [] = { |
358 | { 0, 0, 0 }, | 378 | /* P/N: SA 60002070465 Tuner: TVF7533-MF */ |
379 | { 0x6ce05a8f, EM2820_BOARD_PROLINK_PLAYTV_USB2, TUNER_YMEC_TVF_5533MF }, | ||
359 | }; | 380 | }; |
360 | 381 | ||
361 | /* Since em28xx_pre_card_setup() requires a proper dev->model, | 382 | /* Since em28xx_pre_card_setup() requires a proper dev->model, |
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index e98dac7fc05b..209f6f9d5581 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -46,6 +46,7 @@ | |||
46 | #define EM2880_BOARD_TERRATEC_HYBRID_XS 11 | 46 | #define EM2880_BOARD_TERRATEC_HYBRID_XS 11 |
47 | #define EM2820_BOARD_KWORLD_PVRTV2800RF 12 | 47 | #define EM2820_BOARD_KWORLD_PVRTV2800RF 12 |
48 | #define EM2880_BOARD_TERRATEC_PRODIGY_XS 13 | 48 | #define EM2880_BOARD_TERRATEC_PRODIGY_XS 13 |
49 | #define EM2820_BOARD_PROLINK_PLAYTV_USB2 14 | ||
49 | 50 | ||
50 | #define UNSET -1 | 51 | #define UNSET -1 |
51 | 52 | ||