diff options
| author | Steven Toth <stoth@hauppauge.com> | 2008-04-18 21:36:06 -0400 |
|---|---|---|
| committer | Steven Toth <stoth@hauppauge.com> | 2008-04-18 21:36:06 -0400 |
| commit | 028b650ff39328bbebc163ce60dfd72051ef0d9f (patch) | |
| tree | e00ac5a933e324796c497be6186bdcb0b9ebfc8d /linux/drivers/media/video | |
| parent | 6cf332c75e35b850b4c9c08f2085eb0201712d77 (diff) | |
| download | mediapointer-dvb-s2-028b650ff39328bbebc163ce60dfd72051ef0d9f.tar.gz mediapointer-dvb-s2-028b650ff39328bbebc163ce60dfd72051ef0d9f.tar.bz2 | |
cx23885: Load any module dependencies accordingly.
From: Steven Toth <stoth@hauppauge.com>
For boards that require the avcore (cx25840) to be active, ensure
it gets loaded.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-cards.c | 15 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-core.c | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-cards.c b/linux/drivers/media/video/cx23885/cx23885-cards.c index 89228b455..0c25b7dd1 100644 --- a/linux/drivers/media/video/cx23885/cx23885-cards.c +++ b/linux/drivers/media/video/cx23885/cx23885-cards.c @@ -365,11 +365,6 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) cx_clear(GP0_IO, 0x00000005); mdelay(20); cx_set(GP0_IO, 0x00050005); -#if 0 - /* Tell the internal A/V decoder to switch its attached mux - * to transport */ - cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_STD, &norm); -#endif break; } } @@ -437,6 +432,16 @@ void cx23885_card_setup(struct cx23885_dev *dev) ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; } + /* Certain boards support analog, or require the avcore to be + * loaded, ensure this happens. + */ + switch (dev->board) { + case CX23885_BOARD_HAUPPAUGE_HVR1800: + case CX23885_BOARD_HAUPPAUGE_HVR1800lp: + case CX23885_BOARD_HAUPPAUGE_HVR1700: + request_module("cx25840"); + break; + } } /* ------------------------------------------------------------------ */ diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c index 309c17586..968b31716 100644 --- a/linux/drivers/media/video/cx23885/cx23885-core.c +++ b/linux/drivers/media/video/cx23885/cx23885-core.c @@ -745,8 +745,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) cx23885_i2c_register(&dev->i2c_bus[0]); cx23885_i2c_register(&dev->i2c_bus[1]); cx23885_i2c_register(&dev->i2c_bus[2]); - cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL); cx23885_card_setup(dev); + cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL); cx23885_ir_init(dev); if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) { |