summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-06-18 05:20:46 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-06-18 05:20:46 +0000
commitf359857fbf93aaad2f4f20b7735178bdbf784d26 (patch)
tree6b52cc8d89fc8e6b856bdf6e2cbb345e5a254a9d /linux/drivers/media
parent2feb602917856a8805a8395869c1a9f19e9ffb0a (diff)
downloadmediapointer-dvb-s2-f359857fbf93aaad2f4f20b7735178bdbf784d26.tar.gz
mediapointer-dvb-s2-f359857fbf93aaad2f4f20b7735178bdbf784d26.tar.bz2
* tuner-core.c, tuner-simple.c, tda8290:
- Move PHILIPS_FMD initialization code to set_type function, - Fix dumb error in tda8290 tunning.
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/tuner-core.c14
-rw-r--r--linux/drivers/media/video/tuner-simple.c17
2 files changed, 15 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;
}