mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
V4L/DVB (3378): Restore power on defaults of tda9887 after tda8290 probe
The probing code for tda8290 changes the state of the tda9887 GP ports. The patch assumes that if probing for tda8290 failed, this must be a tda9887 and restores its power on defaults. This should solve the module load order issue with some pinnacle cards. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
2175771e15
commit
14c255b2b2
2 changed files with 7 additions and 5 deletions
|
@ -2187,7 +2187,7 @@ struct saa7134_board saa7134_boards[] = {
|
|||
.radio_type = UNSET,
|
||||
.tuner_addr = 0x61,
|
||||
.radio_addr = ADDR_UNSET,
|
||||
.tda9887_conf = TDA9887_PRESENT,
|
||||
.tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
|
||||
.mpeg = SAA7134_MPEG_DVB,
|
||||
.inputs = {{
|
||||
.name = name_tv,
|
||||
|
@ -2211,7 +2211,7 @@ struct saa7134_board saa7134_boards[] = {
|
|||
.radio_type = UNSET,
|
||||
.tuner_addr = 0x61,
|
||||
.radio_addr = ADDR_UNSET,
|
||||
.tda9887_conf = TDA9887_PRESENT,
|
||||
.tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
|
||||
.mpeg = SAA7134_MPEG_DVB,
|
||||
.inputs = {{
|
||||
.name = name_tv,
|
||||
|
|
|
@ -580,9 +580,10 @@ int tda8290_init(struct i2c_client *c)
|
|||
|
||||
int tda8290_probe(struct i2c_client *c)
|
||||
{
|
||||
unsigned char soft_reset[] = { 0x00, 0x00 };
|
||||
unsigned char easy_mode_b[] = { 0x01, 0x02 };
|
||||
unsigned char easy_mode_g[] = { 0x01, 0x04 };
|
||||
unsigned char soft_reset[] = { 0x00, 0x00 };
|
||||
unsigned char easy_mode_b[] = { 0x01, 0x02 };
|
||||
unsigned char easy_mode_g[] = { 0x01, 0x04 };
|
||||
unsigned char restore_9886[] = { 0x00, 0xd6, 0x30 };
|
||||
unsigned char addr_dto_lsb = 0x07;
|
||||
unsigned char data;
|
||||
|
||||
|
@ -599,6 +600,7 @@ int tda8290_probe(struct i2c_client *c)
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
i2c_master_send(c, restore_9886, 3);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue