Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14c255b2 authored by Hartmut Hackmann's avatar Hartmut Hackmann Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 2175771e

drivers/media/video/saa7134/saa7134-cards.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/media/video/tda8290.c

+5 −3
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ 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 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;

}