diff options
author | Manuel Capinha <mcapinha@gmail.com> | 2005-06-24 01:04:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:06:38 -0400 |
commit | 239df2e2b0e1f4f69fdf76fb67e865824029e8ab (patch) | |
tree | 57088068f1f464c9d1c71f9a4e9dccfcd5106c66 /drivers/media/video/cx88/cx88-cards.c | |
parent | d81ef559daf2a8afa9292035d58b00e7cb23dd1a (diff) |
[PATCH] v4l: add support for PixelView Ultra Pro
The following patch adds support for the PixelView Ultra Pro video capture
card in v4l.
- It removes the remote control key definitions from ir-kbd-gpio.c and
moves them to ir-common.c so that they can be shared between bt878 and
cx88 based cards.
- The patch also moves the FUSIONHDTV_3_GOLD_Q card from number 27 to 28
to regain compatibility with the V4L cvs.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-cards.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 98e40026aa4d..1c036cc36fe1 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -628,6 +628,27 @@ struct cx88_board cx88_boards[] = { | |||
628 | .gpio1 = 0x0000e07f, | 628 | .gpio1 = 0x0000e07f, |
629 | }} | 629 | }} |
630 | }, | 630 | }, |
631 | [CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO] = { | ||
632 | .name = "PixelView PlayTV Ultra Pro (Stereo)", | ||
633 | .tuner_type = 38, | ||
634 | .input = {{ | ||
635 | .type = CX88_VMUX_TELEVISION, | ||
636 | .vmux = 0, | ||
637 | .gpio0 = 0xbf61, // internal decoder | ||
638 | },{ | ||
639 | .type = CX88_VMUX_COMPOSITE1, | ||
640 | .vmux = 1, | ||
641 | .gpio0 = 0xbf63, | ||
642 | },{ | ||
643 | .type = CX88_VMUX_SVIDEO, | ||
644 | .vmux = 2, | ||
645 | .gpio0 = 0xbf63, | ||
646 | }}, | ||
647 | .radio = { | ||
648 | .type = CX88_RADIO, | ||
649 | .gpio0 = 0xbf60, | ||
650 | }, | ||
651 | }, | ||
631 | }; | 652 | }; |
632 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); | 653 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); |
633 | 654 | ||