Commit 480a857d authored by Gerd Knorr's avatar Gerd Knorr Committed by Linus Torvalds

[PATCH] v4l: tuner update

Minor update for the tuner module:  Add some new entries,
fix a bug in the tda8290 driver.
Signed-off-by: default avatarGerd Knorr <kraxel@bytesex.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9edf190e
/* /*
* $Id: mt20xx.c,v 1.3 2005/02/15 15:59:35 kraxel Exp $ * $Id: mt20xx.c,v 1.4 2005/03/04 09:24:56 kraxel Exp $
* *
* i2c tv tuner chip device driver * i2c tv tuner chip device driver
* controls microtune tuners, mt2032 + mt2050 at the moment. * controls microtune tuners, mt2032 + mt2050 at the moment.
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <linux/moduleparam.h>
#include <media/tuner.h> #include <media/tuner.h>
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
......
/* /*
* $Id: tda8290.c,v 1.5 2005/02/15 15:59:35 kraxel Exp $ * $Id: tda8290.c,v 1.7 2005/03/07 12:01:51 kraxel Exp $
* *
* i2c tv tuner chip device driver * i2c tv tuner chip device driver
* controls the philips tda8290+75 tuner chip combo. * controls the philips tda8290+75 tuner chip combo.
...@@ -123,7 +123,7 @@ static int tda8290_tune(struct i2c_client *c) ...@@ -123,7 +123,7 @@ static int tda8290_tune(struct i2c_client *c)
struct i2c_msg easy_mode = struct i2c_msg easy_mode =
{ I2C_ADDR_TDA8290, 0, 2, t->i2c_easy_mode }; { I2C_ADDR_TDA8290, 0, 2, t->i2c_easy_mode };
struct i2c_msg set_freq = struct i2c_msg set_freq =
{ I2C_ADDR_TDA8290, 0, 8, t->i2c_set_freq }; { I2C_ADDR_TDA8275, 0, 8, t->i2c_set_freq };
i2c_transfer(c->adapter, &easy_mode, 1); i2c_transfer(c->adapter, &easy_mode, 1);
i2c_transfer(c->adapter, i2c_msg_prolog, ARRAY_SIZE(i2c_msg_prolog)); i2c_transfer(c->adapter, i2c_msg_prolog, ARRAY_SIZE(i2c_msg_prolog));
......
/* /*
* $Id: tuner-simple.c,v 1.4 2005/02/15 15:59:35 kraxel Exp $ * $Id: tuner-simple.c,v 1.10 2005/03/08 08:38:00 kraxel Exp $
* *
* i2c tv tuner chip device driver * i2c tv tuner chip device driver
* controls all those simple 4-control-bytes style tuners. * controls all those simple 4-control-bytes style tuners.
...@@ -204,6 +204,13 @@ static struct tunertype tuners[] = { ...@@ -204,6 +204,13 @@ static struct tunertype tuners[] = {
16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, // UHF band untested 16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, // UHF band untested
{ "tda8290+75", Philips,PAL|NTSC, { "tda8290+75", Philips,PAL|NTSC,
/* see tda8290.c for details */ }, /* see tda8290.c for details */ },
{ "LG PAL (TAPE series)", LGINNOTEK, PAL,
16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623},
{ "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL,
16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
{ "Philips FQ1236A MK4", Philips, NTSC,
16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
}; };
unsigned const int tuner_count = ARRAY_SIZE(tuners); unsigned const int tuner_count = ARRAY_SIZE(tuners);
......
...@@ -93,6 +93,10 @@ ...@@ -93,6 +93,10 @@
#define TUNER_THOMSON_DTT7610 52 #define TUNER_THOMSON_DTT7610 52
#define TUNER_PHILIPS_FQ1286 53 #define TUNER_PHILIPS_FQ1286 53
#define TUNER_PHILIPS_TDA8290 54 #define TUNER_PHILIPS_TDA8290 54
#define TUNER_LG_PAL_TAPE 55 /* Hauppauge PVR-150 PAL */
#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
#define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */
#define NOTUNER 0 #define NOTUNER 0
#define PAL 1 /* PAL_BG */ #define PAL 1 /* PAL_BG */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment