diff options
| author | Gerd Knorr <devnull@localhost> | 2005-02-10 09:24:12 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-02-10 09:24:12 +0000 |
| commit | d181639581de477cc7fbb3fc044e5a7c1c91074e (patch) | |
| tree | d46e9d2e6c7cd1fbe96c72c48aee4d7ea4e07234 | |
| parent | e64835004be4d0f94e94e7cdea08caac3a025e58 (diff) | |
| download | mediapointer-dvb-s2-d181639581de477cc7fbb3fc044e5a7c1c91074e.tar.gz mediapointer-dvb-s2-d181639581de477cc7fbb3fc044e5a7c1c91074e.tar.bz2 | |
- some tuner fixups.
| -rw-r--r-- | linux/drivers/media/video/tda8290.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 8 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 3 | ||||
| -rw-r--r-- | v4l/scripts/update | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c index 6c54d9e82..739e96fee 100644 --- a/linux/drivers/media/video/tda8290.c +++ b/linux/drivers/media/video/tda8290.c @@ -1,5 +1,5 @@ /* - * $Id: tda8290.c,v 1.2 2005/02/09 19:27:21 kraxel Exp $ + * $Id: tda8290.c,v 1.3 2005/02/10 09:24:12 kraxel Exp $ * * i2c tv tuner chip device driver * controls the philips tda8290+75 tuner chip combo. @@ -11,9 +11,6 @@ /* ---------------------------------------------------------------------- */ -#define I2C_ADDR_TDA8290 0x4b -#define I2C_ADDR_TDA8275 0x61 - struct freq_entry { u16 freq; u8 value; diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 0fdc2fcf6..45ac397f2 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-core.c,v 1.2 2005/02/09 19:27:21 kraxel Exp $ + * $Id: tuner-core.c,v 1.3 2005/02/10 09:24:12 kraxel Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -28,6 +28,7 @@ /* standard i2c insmod options */ static unsigned short normal_i2c[] = { + 0x4b, /* tda8290 */ I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { @@ -146,6 +147,7 @@ static void set_type(struct i2c_client *c, unsigned int type, char *source) if (type >= tuner_count) return; + t->type = type; switch (t->type) { case TUNER_MT2032: microtune_init(c); @@ -221,6 +223,9 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) t->type = UNSET; t->radio_if2 = 10700*1000; // 10.7MHz - FM radio + if (I2C_ADDR_TDA8290 == client->addr) + t->type = TUNER_PHILIPS_TDA8290; + i2c_attach_client(client); return 0; } @@ -228,6 +233,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) static int tuner_probe(struct i2c_adapter *adap) { if (0 != addr) { + normal_i2c[0] = addr; normal_i2c_range[0] = addr; normal_i2c_range[1] = addr; } diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 369c70904..d4c8a026b 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -136,6 +136,9 @@ #ifdef __KERNEL__ +#define I2C_ADDR_TDA8290 0x4b +#define I2C_ADDR_TDA8275 0x61 + struct tuner { unsigned int type; /* chip type */ unsigned int freq; /* keep track of the current settings */ diff --git a/v4l/scripts/update b/v4l/scripts/update index e03fb5a55..eed259a2e 100644 --- a/v4l/scripts/update +++ b/v4l/scripts/update @@ -73,7 +73,7 @@ xinsmod tveeprom debug=0 xinsmod dvb-pll debug=0 xinsmod btcx-risc debug=0 xinsmod ir-common debug=0 repeat=0 -xinsmod tuner debug=1 +xinsmod tuner tuner_debug=1 xinsmod tda9887 debug=0 qss=1 xinsmod msp3400 debug=0 |