summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tda8290.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/tda8290.c')
-rw-r--r--linux/drivers/media/video/tda8290.c181
1 files changed, 87 insertions, 94 deletions
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c
index b6fdc01eb..de663918a 100644
--- a/linux/drivers/media/video/tda8290.c
+++ b/linux/drivers/media/video/tda8290.c
@@ -24,6 +24,8 @@
#include <linux/delay.h>
#include "compat.h"
#include <linux/videodev.h>
+#include "tuner-driver.h"
+#include "tuner-i2c.h"
#include "tda8290.h"
#include "tda827x.h"
#include "tda18271.h"
@@ -31,13 +33,8 @@
#include "i2c-compat.h"
#endif
-#if 0
-static int debug = 0;
+static int debug;
module_param(debug, int, 0644);
-#else
-static int tuner_debug;
-module_param_named(debug, tuner_debug, int, 0644);
-#endif
MODULE_PARM_DESC(debug, "enable verbose debug messages");
#define PREFIX "tda8290"
@@ -59,8 +56,6 @@ struct tda8290_priv {
#define TDA18271 16
struct tda827x_config cfg;
-
- struct tuner *t;
};
/*---------------------------------------------------------------------*/
@@ -141,31 +136,31 @@ static int tda8295_i2c_bridge(struct dvb_frontend *fe, int close)
/*---------------------------------------------------------------------*/
-static void set_audio(struct dvb_frontend *fe)
+static void set_audio(struct dvb_frontend *fe,
+ struct analog_parameters *params)
{
struct tda8290_priv *priv = fe->analog_demod_priv;
- struct tuner *t = priv->t;
char* mode;
- if (t->std & V4L2_STD_MN) {
+ if (params->std & V4L2_STD_MN) {
priv->tda8290_easy_mode = 0x01;
mode = "MN";
- } else if (t->std & V4L2_STD_B) {
+ } else if (params->std & V4L2_STD_B) {
priv->tda8290_easy_mode = 0x02;
mode = "B";
- } else if (t->std & V4L2_STD_GH) {
+ } else if (params->std & V4L2_STD_GH) {
priv->tda8290_easy_mode = 0x04;
mode = "GH";
- } else if (t->std & V4L2_STD_PAL_I) {
+ } else if (params->std & V4L2_STD_PAL_I) {
priv->tda8290_easy_mode = 0x08;
mode = "I";
- } else if (t->std & V4L2_STD_DK) {
+ } else if (params->std & V4L2_STD_DK) {
priv->tda8290_easy_mode = 0x10;
mode = "DK";
- } else if (t->std & V4L2_STD_SECAM_L) {
+ } else if (params->std & V4L2_STD_SECAM_L) {
priv->tda8290_easy_mode = 0x20;
mode = "L";
- } else if (t->std & V4L2_STD_SECAM_LC) {
+ } else if (params->std & V4L2_STD_SECAM_LC) {
priv->tda8290_easy_mode = 0x40;
mode = "LC";
} else {
@@ -176,10 +171,10 @@ static void set_audio(struct dvb_frontend *fe)
tuner_dbg("setting tda829x to system %s\n", mode);
}
-static void tda8290_set_freq(struct dvb_frontend *fe, unsigned int freq)
+static void tda8290_set_params(struct dvb_frontend *fe,
+ struct analog_parameters *params)
{
struct tda8290_priv *priv = fe->analog_demod_priv;
- struct tuner *t = priv->t;
unsigned char soft_reset[] = { 0x00, 0x00 };
unsigned char easy_mode[] = { 0x01, priv->tda8290_easy_mode };
@@ -203,16 +198,10 @@ static void tda8290_set_freq(struct dvb_frontend *fe, unsigned int freq)
pll_stat;
int i;
- struct analog_parameters params = {
- .frequency = freq,
- .mode = t->mode,
- .audmode = t->audmode,
- .std = t->std
- };
-
- set_audio(fe);
+ set_audio(fe, params);
- tuner_dbg("tda827xa config is 0x%02x\n", t->config);
+ if (priv->cfg.config)
+ tuner_dbg("tda827xa config is 0x%02x\n", *priv->cfg.config);
tuner_i2c_xfer_send(&priv->i2c_props, easy_mode, 2);
tuner_i2c_xfer_send(&priv->i2c_props, agc_out_on, 2);
tuner_i2c_xfer_send(&priv->i2c_props, soft_reset, 2);
@@ -231,7 +220,7 @@ static void tda8290_set_freq(struct dvb_frontend *fe, unsigned int freq)
tda8290_i2c_bridge(fe, 1);
if (fe->ops.tuner_ops.set_analog_params)
- fe->ops.tuner_ops.set_analog_params(fe, &params);
+ fe->ops.tuner_ops.set_analog_params(fe, params);
for (i = 0; i < 3; i++) {
tuner_i2c_xfer_send(&priv->i2c_props, &addr_pll_stat, 1);
@@ -394,23 +383,16 @@ static int tda8295_has_signal(struct dvb_frontend *fe)
/*---------------------------------------------------------------------*/
-static void tda8295_set_freq(struct dvb_frontend *fe, unsigned int freq)
+static void tda8295_set_params(struct dvb_frontend *fe,
+ struct analog_parameters *params)
{
struct tda8290_priv *priv = fe->analog_demod_priv;
- struct tuner *t = priv->t;
unsigned char blanking_mode[] = { 0x1d, 0x00 };
- struct analog_parameters params = {
- .frequency = freq,
- .mode = t->mode,
- .audmode = t->audmode,
- .std = t->std
- };
-
- set_audio(fe);
+ set_audio(fe, params);
- tuner_dbg("%s: freq = %d\n", __FUNCTION__, freq);
+ tuner_dbg("%s: freq = %d\n", __FUNCTION__, params->frequency);
tda8295_power(fe, 1);
tda8295_agc1_out(fe, 1);
@@ -427,7 +409,7 @@ static void tda8295_set_freq(struct dvb_frontend *fe, unsigned int freq)
tda8295_i2c_bridge(fe, 1);
if (fe->ops.tuner_ops.set_analog_params)
- fe->ops.tuner_ops.set_analog_params(fe, &params);
+ fe->ops.tuner_ops.set_analog_params(fe, params);
if (priv->cfg.agcf)
priv->cfg.agcf(fe);
@@ -484,13 +466,13 @@ static void tda8295_standby(struct dvb_frontend *fe)
static void tda8290_init_if(struct dvb_frontend *fe)
{
struct tda8290_priv *priv = fe->analog_demod_priv;
- struct tuner *t = priv->t;
unsigned char set_VS[] = { 0x30, 0x6F };
unsigned char set_GP00_CF[] = { 0x20, 0x01 };
unsigned char set_GP01_CF[] = { 0x20, 0x0B };
- if ((t->config == 1) || (t->config == 2))
+ if ((priv->cfg.config) &&
+ ((*priv->cfg.config == 1) || (*priv->cfg.config == 2)))
tuner_i2c_xfer_send(&priv->i2c_props, set_GP00_CF, 2);
else
tuner_i2c_xfer_send(&priv->i2c_props, set_GP01_CF, 2);
@@ -558,7 +540,6 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
{
struct tda8290_priv *priv = fe->analog_demod_priv;
struct analog_tuner_ops *ops = fe->ops.analog_demod_ops;
- struct tuner *t = priv->t;
int i, ret, tuners_found;
u32 tuner_addrs;
u8 data;
@@ -618,7 +599,7 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
if (data == 0x83) {
priv->ver |= TDA18271;
- tda18271_attach(&t->fe, priv->tda827x_addr,
+ tda18271_attach(fe, priv->tda827x_addr,
priv->i2c_props.adap);
} else {
if ((data & 0x3c) == 0)
@@ -626,40 +607,17 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
else
priv->ver |= TDA8275A;
- tda827x_attach(&t->fe, priv->tda827x_addr,
+ tda827x_attach(fe, priv->tda827x_addr,
priv->i2c_props.adap, &priv->cfg);
}
- if (t->fe.ops.tuner_ops.init)
- t->fe.ops.tuner_ops.init(&t->fe);
+ if (fe->ops.tuner_ops.init)
+ fe->ops.tuner_ops.init(fe);
- if (t->fe.ops.tuner_ops.sleep)
- t->fe.ops.tuner_ops.sleep(&t->fe);
+ if (fe->ops.tuner_ops.sleep)
+ fe->ops.tuner_ops.sleep(fe);
ops->i2c_gate_ctrl(fe, 0);
- switch (priv->ver) {
- case TDA8290 | TDA8275:
- strlcpy(t->i2c->name, "tda8290+75", sizeof(t->i2c->name));
- break;
- case TDA8295 | TDA8275:
- strlcpy(t->i2c->name, "tda8295+75", sizeof(t->i2c->name));
- break;
- case TDA8290 | TDA8275A:
- strlcpy(t->i2c->name, "tda8290+75a", sizeof(t->i2c->name));
- break;
- case TDA8295 | TDA8275A:
- strlcpy(t->i2c->name, "tda8295+75a", sizeof(t->i2c->name));
- break;
- case TDA8290 | TDA18271:
- strlcpy(t->i2c->name, "tda8290+18271", sizeof(t->i2c->name));
- break;
- case TDA8295 | TDA18271:
- strlcpy(t->i2c->name, "tda8295+18271", sizeof(t->i2c->name));
- break;
- default:
- return -EINVAL;
- }
-
return 0;
}
@@ -673,7 +631,7 @@ static int tda8290_probe(struct tuner_i2c_props *i2c_props)
tuner_i2c_xfer_recv(i2c_props, &tda8290_id[1], 1);
if (tda8290_id[1] == TDA8290_ID) {
- if (tuner_debug)
+ if (debug)
printk(KERN_DEBUG "%s: tda8290 detected @ %d-%04x\n",
__FUNCTION__, i2c_adapter_id(i2c_props->adap),
i2c_props->addr);
@@ -693,7 +651,7 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props)
tuner_i2c_xfer_recv(i2c_props, &tda8295_id[1], 1);
if (tda8295_id[1] == TDA8295_ID) {
- if (tuner_debug)
+ if (debug)
printk(KERN_DEBUG "%s: tda8295 detected @ %d-%04x\n",
__FUNCTION__, i2c_adapter_id(i2c_props->adap),
i2c_props->addr);
@@ -704,8 +662,10 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props)
}
static struct analog_tuner_ops tda8290_tuner_ops = {
- .set_tv_freq = tda8290_set_freq,
- .set_radio_freq = tda8290_set_freq,
+ .info = {
+ .name = "TDA8290",
+ },
+ .set_params = tda8290_set_params,
.has_signal = tda8290_has_signal,
.standby = tda8290_standby,
.release = tda829x_release,
@@ -713,29 +673,34 @@ static struct analog_tuner_ops tda8290_tuner_ops = {
};
static struct analog_tuner_ops tda8295_tuner_ops = {
- .set_tv_freq = tda8295_set_freq,
- .set_radio_freq = tda8295_set_freq,
+ .info = {
+ .name = "TDA8295",
+ },
+ .set_params = tda8295_set_params,
.has_signal = tda8295_has_signal,
.standby = tda8295_standby,
.release = tda829x_release,
.i2c_gate_ctrl = tda8295_i2c_bridge,
};
-int tda829x_attach(struct tuner *t)
+struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
+ struct i2c_adapter *i2c_adap, u8 i2c_addr,
+ struct tda829x_config *cfg)
{
- struct dvb_frontend *fe = &t->fe;
struct tda8290_priv *priv = NULL;
+ char *name;
priv = kzalloc(sizeof(struct tda8290_priv), GFP_KERNEL);
if (priv == NULL)
- return -ENOMEM;
+ return NULL;
fe->analog_demod_priv = priv;
- priv->i2c_props.addr = t->i2c->addr;
- priv->i2c_props.adap = t->i2c->adapter;
- priv->cfg.config = &t->config;
- priv->cfg.tuner_callback = t->tuner_callback;
- priv->t = t;
+ priv->i2c_props.addr = i2c_addr;
+ priv->i2c_props.adap = i2c_adap;
+ if (cfg) {
+ priv->cfg.config = cfg->lna_cfg;
+ priv->cfg.tuner_callback = cfg->tuner_callback;
+ }
if (tda8290_probe(&priv->i2c_props) == 0) {
priv->ver = TDA8290;
@@ -748,7 +713,31 @@ int tda829x_attach(struct tuner *t)
}
if (tda829x_find_tuner(fe) < 0)
- return -EINVAL;
+ goto fail;
+
+ switch (priv->ver) {
+ case TDA8290 | TDA8275:
+ name = "tda8290+75";
+ break;
+ case TDA8295 | TDA8275:
+ name = "tda8295+75";
+ break;
+ case TDA8290 | TDA8275A:
+ name = "tda8290+75a";
+ break;
+ case TDA8295 | TDA8275A:
+ name = "tda8295+75a";
+ break;
+ case TDA8290 | TDA18271:
+ name = "tda8290+18271";
+ break;
+ case TDA8295 | TDA18271:
+ name = "tda8295+18271";
+ break;
+ default:
+ goto fail;
+ }
+ tuner_info("type set to %s\n", name);
if (priv->ver & TDA8290) {
tda8290_init_tuner(fe);
@@ -756,19 +745,23 @@ int tda829x_attach(struct tuner *t)
} else if (priv->ver & TDA8295)
tda8295_init_if(fe);
- tuner_info("type set to %s\n", t->i2c->name);
-
+#if 0
t->mode = V4L2_TUNER_ANALOG_TV;
+#endif
+ return fe;
- return 0;
+fail:
+ tda829x_release(fe);
+ fe->ops.analog_demod_ops = NULL;
+ return NULL;
}
EXPORT_SYMBOL_GPL(tda829x_attach);
-int tda829x_probe(struct tuner *t)
+int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr)
{
struct tuner_i2c_props i2c_props = {
- .adap = t->i2c->adapter,
- .addr = t->i2c->addr
+ .adap = i2c_adap,
+ .addr = i2c_addr,
};
unsigned char soft_reset[] = { 0x00, 0x00 };
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 19:39:32 +0000