diff options
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 17 | ||||
| -rw-r--r-- | v4l/ChangeLog | 6 |
3 files changed, 21 insertions, 16 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index c8e06e182..390c450eb 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.19 2005/06/17 20:49:30 nsh Exp $ + * $Id: tuner-core.c,v 1.20 2005/06/18 05:20:46 nsh Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -172,6 +172,18 @@ static void set_type(struct i2c_client *c, unsigned int type) case TUNER_TEA5767: tea5767_tuner_init(c); break; + case TUNER_PHILIPS_FMD1216ME_MK3: + buffer[0] = 0x0b; + buffer[1] = 0xdc; + buffer[2] = 0x9c; + buffer[3] = 0x60; + i2c_master_send(c,buffer,4); + mdelay(1); + buffer[2] = 0x86; + buffer[3] = 0x54; + i2c_master_send(c,buffer,4); + default_tuner_init(c); + break; default: default_tuner_init(c); break; diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index f98d2d222..6e7823aeb 100644 --- a/linux/drivers/media/video/tuner-simple.c +++ b/linux/drivers/media/video/tuner-simple.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-simple.c,v 1.25 2005/06/16 08:29:49 nsh Exp $ + * $Id: tuner-simple.c,v 1.26 2005/06/18 05:20:46 nsh Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -505,20 +505,7 @@ int default_tuner_init(struct i2c_client *c) t->radio_freq = default_set_radio_freq; t->has_signal = tuner_signal; t->is_stereo = tuner_stereo; - /* initialize hybrid tuners to analog mode */ - switch (t->type) { - case TUNER_PHILIPS_FMD1216ME_MK3: - buffer[0] = 0x0b; - buffer[1] = 0xdc; - buffer[2] = 0x9c; - buffer[3] = 0x60; - i2c_master_send(c,buffer,4); - mdelay(1); - buffer[2] = 0x86; - buffer[3] = 0x54; - i2c_master_send(c,buffer,4); - break; - } + return 0; } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index afdd18613..935d603a6 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-06-18 09:06 nshmyrev + * tuner-core.c, tuner-simple.c, tda8290: + + - Move PHILIPS_FMD initialization code to set_type function, + - Fix dumb error in tda8290 tunning. + 2005-06-17 23:54 mkrufky * video-buf-dvb.c, video-buf-dvb.h: - Allow backwards compatability with kernels < 2.6.12 |