diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-27 05:42:26 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:42 -0500 |
commit | 122b77e59ed2de0692dfe45c87a93e98156fe03a (patch) | |
tree | dd48299537ee437914e94e33bf8e827aba0410eb /drivers/media/video/em28xx/em28xx.h | |
parent | 0ec202d183b4e3d3e4d06612a29e25466889c328 (diff) |
V4L/DVB (9760): em28xx: move gpio lines into board table description
Instead of a large, ugly switch specifying the gpio tables for each
device, let's move it into the boards struct. This also helps to see
what boards have already the gpio's for DVB.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index e41015d2e722..fdc225c617ef 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -304,11 +304,18 @@ enum em28xx_aout { | |||
304 | EM28XX_AOUT_SURR = 1 << 4, | 304 | EM28XX_AOUT_SURR = 1 << 4, |
305 | }; | 305 | }; |
306 | 306 | ||
307 | struct em28xx_reg_seq { | ||
308 | int reg; | ||
309 | unsigned char val, mask; | ||
310 | int sleep; | ||
311 | }; | ||
312 | |||
307 | struct em28xx_input { | 313 | struct em28xx_input { |
308 | enum enum28xx_itype type; | 314 | enum enum28xx_itype type; |
309 | unsigned int vmux; | 315 | unsigned int vmux; |
310 | enum em28xx_amux amux; | 316 | enum em28xx_amux amux; |
311 | enum em28xx_aout aout; | 317 | enum em28xx_aout aout; |
318 | struct em28xx_reg_seq *gpio; | ||
312 | }; | 319 | }; |
313 | 320 | ||
314 | #define INPUT(nr) (&em28xx_boards[dev->model].input[nr]) | 321 | #define INPUT(nr) (&em28xx_boards[dev->model].input[nr]) |
@@ -319,12 +326,6 @@ enum em28xx_decoder { | |||
319 | EM28XX_SAA711X, | 326 | EM28XX_SAA711X, |
320 | }; | 327 | }; |
321 | 328 | ||
322 | struct em28xx_reg_seq { | ||
323 | int reg; | ||
324 | unsigned char val, mask; | ||
325 | int sleep; | ||
326 | }; | ||
327 | |||
328 | struct em28xx_board { | 329 | struct em28xx_board { |
329 | char *name; | 330 | char *name; |
330 | int vchannels; | 331 | int vchannels; |
@@ -334,6 +335,8 @@ struct em28xx_board { | |||
334 | /* i2c flags */ | 335 | /* i2c flags */ |
335 | unsigned int tda9887_conf; | 336 | unsigned int tda9887_conf; |
336 | 337 | ||
338 | struct em28xx_reg_seq *dvb_gpio; | ||
339 | |||
337 | unsigned int is_em2800:1; | 340 | unsigned int is_em2800:1; |
338 | unsigned int has_msp34xx:1; | 341 | unsigned int has_msp34xx:1; |
339 | unsigned int mts_firmware:1; | 342 | unsigned int mts_firmware:1; |