diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 14:41:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 14:41:56 -0300 |
| commit | 24fde1a5a09b01f9b7557998aa9a88cff2ac844b (patch) | |
| tree | 5f99adf7717ce36a3460d43a6cf05a6d043074a5 /linux/drivers | |
| parent | 82fac24573672f22d2c906f30045a40740ad8370 (diff) | |
| parent | 016e2c55c79d9394c22e6bfd93ef073caa766706 (diff) | |
| download | mediapointer-dvb-s2-24fde1a5a09b01f9b7557998aa9a88cff2ac844b.tar.gz mediapointer-dvb-s2-24fde1a5a09b01f9b7557998aa9a88cff2ac844b.tar.bz2 | |
Merging hhackmann tree.
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda8290.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 17f71932a..c67893b04 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -2215,7 +2215,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, @@ -2239,7 +2239,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, diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c index 7c1e17ebb..c0f965b03 100644 --- a/linux/drivers/media/video/tda8290.c +++ b/linux/drivers/media/video/tda8290.c @@ -589,9 +589,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; @@ -608,6 +609,7 @@ int tda8290_probe(struct i2c_client *c) return 0; } } + i2c_master_send(c, restore_9886, 3); return -1; } |