diff options
author | Andy Walls <awalls@radix.net> | 2009-02-21 16:42:49 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:01 -0400 |
commit | eefe1010a4657959588afc7fb3551cfa4e8bb4a7 (patch) | |
tree | a23ed1195505ce5be7cf9687bfe553ff6fa36dbc /drivers/media/video/cx18/cx18-cards.c | |
parent | ff2a20018094c593a35f4887bbdabf8926ddb6e6 (diff) |
V4L/DVB (10759): cx18: Convert GPIO connected functions to act as v4l2_subdevices
Convert GPIO line functions, such a audio routing and device resets, to
v4l2_subdevices. This essentially completes the conversion of cx18 to the
v4l2_device/v4l2_subdevice framework. No regression testing has taken place as
of yet. Also an ivtv legacy bug with GPIO mux routing and going to/from radio
mode was commented, but not fixed.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-cards.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-cards.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c index 6644534db564..9bc221837847 100644 --- a/drivers/media/video/cx18/cx18-cards.c +++ b/drivers/media/video/cx18/cx18-cards.c | |||
@@ -56,7 +56,7 @@ static const struct cx18_card cx18_card_hvr1600_esmt = { | |||
56 | .hw_audio_ctrl = CX18_HW_418_AV, | 56 | .hw_audio_ctrl = CX18_HW_418_AV, |
57 | .hw_muxer = CX18_HW_CS5345, | 57 | .hw_muxer = CX18_HW_CS5345, |
58 | .hw_all = CX18_HW_TVEEPROM | CX18_HW_418_AV | CX18_HW_TUNER | | 58 | .hw_all = CX18_HW_TVEEPROM | CX18_HW_418_AV | CX18_HW_TUNER | |
59 | CX18_HW_CS5345 | CX18_HW_DVB, | 59 | CX18_HW_CS5345 | CX18_HW_DVB | CX18_HW_GPIO_RESET_CTRL, |
60 | .video_inputs = { | 60 | .video_inputs = { |
61 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE7 }, | 61 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE7 }, |
62 | { CX18_CARD_INPUT_SVIDEO1, 1, CX18_AV_SVIDEO1 }, | 62 | { CX18_CARD_INPUT_SVIDEO1, 1, CX18_AV_SVIDEO1 }, |
@@ -102,7 +102,7 @@ static const struct cx18_card cx18_card_hvr1600_samsung = { | |||
102 | .hw_audio_ctrl = CX18_HW_418_AV, | 102 | .hw_audio_ctrl = CX18_HW_418_AV, |
103 | .hw_muxer = CX18_HW_CS5345, | 103 | .hw_muxer = CX18_HW_CS5345, |
104 | .hw_all = CX18_HW_TVEEPROM | CX18_HW_418_AV | CX18_HW_TUNER | | 104 | .hw_all = CX18_HW_TVEEPROM | CX18_HW_418_AV | CX18_HW_TUNER | |
105 | CX18_HW_CS5345 | CX18_HW_DVB, | 105 | CX18_HW_CS5345 | CX18_HW_DVB | CX18_HW_GPIO_RESET_CTRL, |
106 | .video_inputs = { | 106 | .video_inputs = { |
107 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE7 }, | 107 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE7 }, |
108 | { CX18_CARD_INPUT_SVIDEO1, 1, CX18_AV_SVIDEO1 }, | 108 | { CX18_CARD_INPUT_SVIDEO1, 1, CX18_AV_SVIDEO1 }, |
@@ -155,7 +155,7 @@ static const struct cx18_card cx18_card_h900 = { | |||
155 | .comment = "Analog TV capture supported\n", | 155 | .comment = "Analog TV capture supported\n", |
156 | .v4l2_capabilities = CX18_CAP_ENCODER, | 156 | .v4l2_capabilities = CX18_CAP_ENCODER, |
157 | .hw_audio_ctrl = CX18_HW_418_AV, | 157 | .hw_audio_ctrl = CX18_HW_418_AV, |
158 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER, | 158 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_RESET_CTRL, |
159 | .video_inputs = { | 159 | .video_inputs = { |
160 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, | 160 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, |
161 | { CX18_CARD_INPUT_SVIDEO1, 1, | 161 | { CX18_CARD_INPUT_SVIDEO1, 1, |
@@ -202,7 +202,7 @@ static const struct cx18_card cx18_card_mpc718 = { | |||
202 | .comment = "Analog video capture works; some audio line in may not.\n", | 202 | .comment = "Analog video capture works; some audio line in may not.\n", |
203 | .v4l2_capabilities = CX18_CAP_ENCODER, | 203 | .v4l2_capabilities = CX18_CAP_ENCODER, |
204 | .hw_audio_ctrl = CX18_HW_418_AV, | 204 | .hw_audio_ctrl = CX18_HW_418_AV, |
205 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER, | 205 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_RESET_CTRL, |
206 | .video_inputs = { | 206 | .video_inputs = { |
207 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, | 207 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, |
208 | { CX18_CARD_INPUT_SVIDEO1, 1, | 208 | { CX18_CARD_INPUT_SVIDEO1, 1, |
@@ -252,8 +252,8 @@ static const struct cx18_card cx18_card_cnxt_raptor_pal = { | |||
252 | .comment = "Analog TV capture supported\n", | 252 | .comment = "Analog TV capture supported\n", |
253 | .v4l2_capabilities = CX18_CAP_ENCODER, | 253 | .v4l2_capabilities = CX18_CAP_ENCODER, |
254 | .hw_audio_ctrl = CX18_HW_418_AV, | 254 | .hw_audio_ctrl = CX18_HW_418_AV, |
255 | .hw_muxer = CX18_HW_GPIO_AUDIO_MUX, | 255 | .hw_muxer = CX18_HW_GPIO_MUX, |
256 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_AUDIO_MUX, | 256 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_MUX, |
257 | .video_inputs = { | 257 | .video_inputs = { |
258 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, | 258 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, |
259 | { CX18_CARD_INPUT_SVIDEO1, 1, | 259 | { CX18_CARD_INPUT_SVIDEO1, 1, |
@@ -307,7 +307,7 @@ static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = { | |||
307 | "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n", | 307 | "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n", |
308 | .v4l2_capabilities = CX18_CAP_ENCODER, | 308 | .v4l2_capabilities = CX18_CAP_ENCODER, |
309 | .hw_audio_ctrl = CX18_HW_418_AV, | 309 | .hw_audio_ctrl = CX18_HW_418_AV, |
310 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER, | 310 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_RESET_CTRL, |
311 | .video_inputs = { | 311 | .video_inputs = { |
312 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE6 }, | 312 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE6 }, |
313 | { CX18_CARD_INPUT_SVIDEO1, 1, | 313 | { CX18_CARD_INPUT_SVIDEO1, 1, |
@@ -351,8 +351,9 @@ static const struct cx18_card cx18_card_leadtek_pvr2100 = { | |||
351 | "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n", | 351 | "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n", |
352 | .v4l2_capabilities = CX18_CAP_ENCODER, | 352 | .v4l2_capabilities = CX18_CAP_ENCODER, |
353 | .hw_audio_ctrl = CX18_HW_418_AV, | 353 | .hw_audio_ctrl = CX18_HW_418_AV, |
354 | .hw_muxer = CX18_HW_GPIO_AUDIO_MUX, | 354 | .hw_muxer = CX18_HW_GPIO_MUX, |
355 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_AUDIO_MUX, | 355 | .hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_MUX | |
356 | CX18_HW_GPIO_RESET_CTRL, | ||
356 | .video_inputs = { | 357 | .video_inputs = { |
357 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, | 358 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, |
358 | { CX18_CARD_INPUT_SVIDEO1, 1, | 359 | { CX18_CARD_INPUT_SVIDEO1, 1, |