diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-12 12:57:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-14 01:56:44 -0400 |
commit | 9dcbf35afb7359466efdf7fb81ee32f3ae2d56a3 (patch) | |
tree | d53d41ed5a683e56e9e3dc3ad1789153ffa9297b /drivers/media/video/cx18/cx18-cards.c | |
parent | 6db6ae2165863e26b7f41af54a8cf1ef9051a608 (diff) |
V4L/DVB (7887): cx18: fix Compro H900 analog support.
Tuner, S-Video and Composite are all working for the Compro H900.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx18/cx18-cards.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-cards.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c index bf6f7edca887..0f2bfb4ba844 100644 --- a/drivers/media/video/cx18/cx18-cards.c +++ b/drivers/media/video/cx18/cx18-cards.c | |||
@@ -135,14 +135,15 @@ static const struct cx18_card_pci_info cx18_pci_h900[] = { | |||
135 | static const struct cx18_card cx18_card_h900 = { | 135 | static const struct cx18_card cx18_card_h900 = { |
136 | .type = CX18_CARD_COMPRO_H900, | 136 | .type = CX18_CARD_COMPRO_H900, |
137 | .name = "Compro VideoMate H900", | 137 | .name = "Compro VideoMate H900", |
138 | .comment = "Not yet supported!\n", | 138 | .comment = "DVB & VBI are not yet supported\n", |
139 | .v4l2_capabilities = 0, | 139 | .v4l2_capabilities = CX18_CAP_ENCODER, |
140 | .hw_audio_ctrl = CX18_HW_CX23418, | 140 | .hw_audio_ctrl = CX18_HW_CX23418, |
141 | .hw_all = CX18_HW_TUNER, | 141 | .hw_all = CX18_HW_TUNER, |
142 | .video_inputs = { | 142 | .video_inputs = { |
143 | { CX18_CARD_INPUT_VID_TUNER, 0, CX23418_COMPOSITE7 }, | 143 | { CX18_CARD_INPUT_VID_TUNER, 0, CX23418_COMPOSITE2 }, |
144 | { CX18_CARD_INPUT_SVIDEO1, 1, CX23418_SVIDEO1 }, | 144 | { CX18_CARD_INPUT_SVIDEO1, 1, |
145 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 }, | 145 | CX23418_SVIDEO_LUMA3 | CX23418_SVIDEO_CHROMA4 }, |
146 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE1 }, | ||
146 | }, | 147 | }, |
147 | .audio_inputs = { | 148 | .audio_inputs = { |
148 | { CX18_CARD_INPUT_AUD_TUNER, | 149 | { CX18_CARD_INPUT_AUD_TUNER, |
@@ -164,6 +165,7 @@ static const struct cx18_card cx18_card_h900 = { | |||
164 | .tune_lane = 0, | 165 | .tune_lane = 0, |
165 | .initial_emrs = 0, | 166 | .initial_emrs = 0, |
166 | }, | 167 | }, |
168 | .xceive_pin = 15, | ||
167 | .pci_list = cx18_pci_h900, | 169 | .pci_list = cx18_pci_h900, |
168 | .i2c = &cx18_i2c_std, | 170 | .i2c = &cx18_i2c_std, |
169 | }; | 171 | }; |