mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-07 15:01:44 +00:00
V4L/DVB (7648): cx23885: Load any module dependencies accordingly
For boards that require the avcore (cx25840) to be active, ensure it gets loaded. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
a780a31cee
commit
ce89cfb490
2 changed files with 11 additions and 1 deletions
|
@ -431,6 +431,16 @@ void cx23885_card_setup(struct cx23885_dev *dev)
|
||||||
ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
|
|
|
@ -744,8 +744,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
|
||||||
cx23885_i2c_register(&dev->i2c_bus[0]);
|
cx23885_i2c_register(&dev->i2c_bus[0]);
|
||||||
cx23885_i2c_register(&dev->i2c_bus[1]);
|
cx23885_i2c_register(&dev->i2c_bus[1]);
|
||||||
cx23885_i2c_register(&dev->i2c_bus[2]);
|
cx23885_i2c_register(&dev->i2c_bus[2]);
|
||||||
cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
|
|
||||||
cx23885_card_setup(dev);
|
cx23885_card_setup(dev);
|
||||||
|
cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
|
||||||
cx23885_ir_init(dev);
|
cx23885_ir_init(dev);
|
||||||
|
|
||||||
if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {
|
if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue