aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-driver.h
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-02-21 16:42:49 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:01 -0400
commiteefe1010a4657959588afc7fb3551cfa4e8bb4a7 (patch)
treea23ed1195505ce5be7cf9687bfe553ff6fa36dbc /drivers/media/video/cx18/cx18-driver.h
parentff2a20018094c593a35f4887bbdabf8926ddb6e6 (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-driver.h')
-rw-r--r--drivers/media/video/cx18/cx18-driver.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index b81106d682ae..9ee608063b49 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -449,7 +449,7 @@ struct cx18 {
449 struct pci_dev *pci_dev; 449 struct pci_dev *pci_dev;
450 struct v4l2_device v4l2_dev; 450 struct v4l2_device v4l2_dev;
451 struct v4l2_subdev *sd_av; /* A/V decoder/digitizer sub-device */ 451 struct v4l2_subdev *sd_av; /* A/V decoder/digitizer sub-device */
452 struct v4l2_subdev *sd_extmux; /* External audio multiplexer sub-dev */ 452 struct v4l2_subdev *sd_extmux; /* External multiplexer sub-dev */
453 453
454 const struct cx18_card *card; /* card information */ 454 const struct cx18_card *card; /* card information */
455 const char *card_name; /* full name of the card */ 455 const char *card_name; /* full name of the card */
@@ -534,6 +534,8 @@ struct cx18 {
534 u32 gpio_dir; 534 u32 gpio_dir;
535 u32 gpio_val; 535 u32 gpio_val;
536 struct mutex gpio_lock; 536 struct mutex gpio_lock;
537 struct v4l2_subdev sd_gpiomux;
538 struct v4l2_subdev sd_resetctrl;
537 539
538 /* v4l2 and User settings */ 540 /* v4l2 and User settings */
539 541