Re: [PATCH 1/4] tda8290: Allow disabling I2C gate
On Monday 04 February 2013 03:19:37 Michael Krufky wrote:
> On Fri, Feb 1, 2013 at 3:21 PM, Ondrej Zary
wrote:
> > Allow disabling I2C gate handling by external configuration.
> > This is required by cards that have all devices on a single I2C bus,
> > like AverMedia A706.
> >
> > Signed-off-by: Ondrej Zary
> > ---
> > drivers/media/tuners/tda8290.c | 49
> > +++ drivers/media/tuners/tda8290.h |
> > 1 +
> > 2 files changed, 30 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/media/tuners/tda8290.c
> > b/drivers/media/tuners/tda8290.c index 8c48521..a2b7a9f 100644
> > --- a/drivers/media/tuners/tda8290.c
> > +++ b/drivers/media/tuners/tda8290.c
> > @@ -233,7 +233,8 @@ static void tda8290_set_params(struct dvb_frontend
> > *fe, }
> >
> >
> > - tda8290_i2c_bridge(fe, 1);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
> >
> > if (fe->ops.tuner_ops.set_analog_params)
> > fe->ops.tuner_ops.set_analog_params(fe, params);
> > @@ -302,7 +303,8 @@ static void tda8290_set_params(struct dvb_frontend
> > *fe, }
> > }
> >
> > - tda8290_i2c_bridge(fe, 0);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> > tuner_i2c_xfer_send(&priv->i2c_props, if_agc_set, 2);
> > }
> >
> > @@ -424,7 +426,8 @@ static void tda8295_set_params(struct dvb_frontend
> > *fe, tuner_i2c_xfer_send(&priv->i2c_props, blanking_mode, 2); msleep(20);
> >
> > - tda8295_i2c_bridge(fe, 1);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
> >
> > if (fe->ops.tuner_ops.set_analog_params)
> > fe->ops.tuner_ops.set_analog_params(fe, params);
> > @@ -437,7 +440,8 @@ static void tda8295_set_params(struct dvb_frontend
> > *fe, else
> > tuner_dbg("tda8295 not locked, no signal?\n");
> >
> > - tda8295_i2c_bridge(fe, 0);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> > }
> >
> >
> > /*-*/
> > @@ -465,11 +469,13 @@ static void tda8290_standby(struct dvb_frontend
> > *fe) unsigned char tda8290_agc_tri[] = { 0x02, 0x20 };
> > struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags=0,
> > .buf=cb1, .len = 2};
> >
> > - tda8290_i2c_bridge(fe, 1);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
> > if (priv->ver & TDA8275A)
> > cb1[1] = 0x90;
> > i2c_transfer(priv->i2c_props.adap, &msg, 1);
> > - tda8290_i2c_bridge(fe, 0);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> > tuner_i2c_xfer_send(&priv->i2c_props, tda8290_agc_tri, 2);
> > tuner_i2c_xfer_send(&priv->i2c_props, tda8290_standby, 2);
> > }
> > @@ -537,9 +543,11 @@ static void tda8290_init_tuner(struct dvb_frontend
> > *fe) if (priv->ver & TDA8275A)
> > msg.buf = tda8275a_init;
> >
> > - tda8290_i2c_bridge(fe, 1);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
> > i2c_transfer(priv->i2c_props.adap, &msg, 1);
> > - tda8290_i2c_bridge(fe, 0);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> > }
> >
> >
> > /*-*/
> > @@ -565,19 +573,13 @@ static struct tda18271_config
> > tda829x_tda18271_config = { static int tda829x_find_tuner(struct
> > dvb_frontend *fe)
> > {
> > struct tda8290_priv *priv = fe->analog_demod_priv;
> > - struct analog_demod_ops *analog_ops = &fe->ops.analog_ops;
> > int i, ret, tuners_found;
> > u32 tuner_addrs;
> > u8 data;
> > struct i2c_msg msg = { .flags = I2C_M_RD, .buf = &data, .len = 1
> > };
> >
> > - if (!analog_ops->i2c_gate_ctrl) {
> > - printk(KERN_ERR "tda8290: no gate control were
> > provided!\n"); -
> > - return -EINVAL;
> > - }
> > -
> > - analog_ops->i2c_gate_ctrl(fe, 1);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
> >
> > /* probe for tuner chip */
> > tuners_found = 0;
> > @@ -595,7 +597,8 @@ static int tda829x_find_tuner(struct dvb_frontend
> > *fe) give a response now
> > */
> >
> > - analog_ops->i2c_gate_ctrl(fe, 0);
> > + if (fe->ops.analog_ops.i2c_gate_ctrl)
> > + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> >
> > if (tuners_found > 1)
> > for (i = 0; i < tuners_found; i++) {
> > @@ -618,12 +621,14 @@ static int tda829x_find_tuner(struct dvb_fro
Re: [PATCH 1/4] tda8290: Allow disabling I2C gate
On Fri, Feb 1, 2013 at 3:21 PM, Ondrej Zary wrote:
> Allow disabling I2C gate handling by external configuration.
> This is required by cards that have all devices on a single I2C bus,
> like AverMedia A706.
>
> Signed-off-by: Ondrej Zary
> ---
> drivers/media/tuners/tda8290.c | 49 +++
> drivers/media/tuners/tda8290.h |1 +
> 2 files changed, 30 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/media/tuners/tda8290.c b/drivers/media/tuners/tda8290.c
> index 8c48521..a2b7a9f 100644
> --- a/drivers/media/tuners/tda8290.c
> +++ b/drivers/media/tuners/tda8290.c
> @@ -233,7 +233,8 @@ static void tda8290_set_params(struct dvb_frontend *fe,
> }
>
>
> - tda8290_i2c_bridge(fe, 1);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
>
> if (fe->ops.tuner_ops.set_analog_params)
> fe->ops.tuner_ops.set_analog_params(fe, params);
> @@ -302,7 +303,8 @@ static void tda8290_set_params(struct dvb_frontend *fe,
> }
> }
>
> - tda8290_i2c_bridge(fe, 0);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> tuner_i2c_xfer_send(&priv->i2c_props, if_agc_set, 2);
> }
>
> @@ -424,7 +426,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
> tuner_i2c_xfer_send(&priv->i2c_props, blanking_mode, 2);
> msleep(20);
>
> - tda8295_i2c_bridge(fe, 1);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
>
> if (fe->ops.tuner_ops.set_analog_params)
> fe->ops.tuner_ops.set_analog_params(fe, params);
> @@ -437,7 +440,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
> else
> tuner_dbg("tda8295 not locked, no signal?\n");
>
> - tda8295_i2c_bridge(fe, 0);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> }
>
> /*-*/
> @@ -465,11 +469,13 @@ static void tda8290_standby(struct dvb_frontend *fe)
> unsigned char tda8290_agc_tri[] = { 0x02, 0x20 };
> struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags=0, .buf=cb1,
> .len = 2};
>
> - tda8290_i2c_bridge(fe, 1);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
> if (priv->ver & TDA8275A)
> cb1[1] = 0x90;
> i2c_transfer(priv->i2c_props.adap, &msg, 1);
> - tda8290_i2c_bridge(fe, 0);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> tuner_i2c_xfer_send(&priv->i2c_props, tda8290_agc_tri, 2);
> tuner_i2c_xfer_send(&priv->i2c_props, tda8290_standby, 2);
> }
> @@ -537,9 +543,11 @@ static void tda8290_init_tuner(struct dvb_frontend *fe)
> if (priv->ver & TDA8275A)
> msg.buf = tda8275a_init;
>
> - tda8290_i2c_bridge(fe, 1);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
> i2c_transfer(priv->i2c_props.adap, &msg, 1);
> - tda8290_i2c_bridge(fe, 0);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
> }
>
> /*-*/
> @@ -565,19 +573,13 @@ static struct tda18271_config tda829x_tda18271_config =
> {
> static int tda829x_find_tuner(struct dvb_frontend *fe)
> {
> struct tda8290_priv *priv = fe->analog_demod_priv;
> - struct analog_demod_ops *analog_ops = &fe->ops.analog_ops;
> int i, ret, tuners_found;
> u32 tuner_addrs;
> u8 data;
> struct i2c_msg msg = { .flags = I2C_M_RD, .buf = &data, .len = 1 };
>
> - if (!analog_ops->i2c_gate_ctrl) {
> - printk(KERN_ERR "tda8290: no gate control were provided!\n");
> -
> - return -EINVAL;
> - }
> -
> - analog_ops->i2c_gate_ctrl(fe, 1);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
>
> /* probe for tuner chip */
> tuners_found = 0;
> @@ -595,7 +597,8 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
>give a response now
> */
>
> - analog_ops->i2c_gate_ctrl(fe, 0);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
>
> if (tuners_found > 1)
> for (i = 0; i < tuners_found; i++) {
> @@ -618,12 +621,14 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
> priv->tda827x_addr = tuner_addrs;
> msg.addr = tuner_addrs;
>
> - analog_ops->i2c_gate_ctrl(fe, 1);
> + if (fe->ops.analog_ops.i2c_gate_ctrl)
> + fe->ops.analog_ops.i2c_gate_ctr
[PATCH 1/4] tda8290: Allow disabling I2C gate
Allow disabling I2C gate handling by external configuration.
This is required by cards that have all devices on a single I2C bus,
like AverMedia A706.
Signed-off-by: Ondrej Zary
---
drivers/media/tuners/tda8290.c | 49 +++
drivers/media/tuners/tda8290.h |1 +
2 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/drivers/media/tuners/tda8290.c b/drivers/media/tuners/tda8290.c
index 8c48521..a2b7a9f 100644
--- a/drivers/media/tuners/tda8290.c
+++ b/drivers/media/tuners/tda8290.c
@@ -233,7 +233,8 @@ static void tda8290_set_params(struct dvb_frontend *fe,
}
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (fe->ops.tuner_ops.set_analog_params)
fe->ops.tuner_ops.set_analog_params(fe, params);
@@ -302,7 +303,8 @@ static void tda8290_set_params(struct dvb_frontend *fe,
}
}
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
tuner_i2c_xfer_send(&priv->i2c_props, if_agc_set, 2);
}
@@ -424,7 +426,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
tuner_i2c_xfer_send(&priv->i2c_props, blanking_mode, 2);
msleep(20);
- tda8295_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (fe->ops.tuner_ops.set_analog_params)
fe->ops.tuner_ops.set_analog_params(fe, params);
@@ -437,7 +440,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
else
tuner_dbg("tda8295 not locked, no signal?\n");
- tda8295_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
}
/*-*/
@@ -465,11 +469,13 @@ static void tda8290_standby(struct dvb_frontend *fe)
unsigned char tda8290_agc_tri[] = { 0x02, 0x20 };
struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags=0, .buf=cb1,
.len = 2};
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (priv->ver & TDA8275A)
cb1[1] = 0x90;
i2c_transfer(priv->i2c_props.adap, &msg, 1);
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
tuner_i2c_xfer_send(&priv->i2c_props, tda8290_agc_tri, 2);
tuner_i2c_xfer_send(&priv->i2c_props, tda8290_standby, 2);
}
@@ -537,9 +543,11 @@ static void tda8290_init_tuner(struct dvb_frontend *fe)
if (priv->ver & TDA8275A)
msg.buf = tda8275a_init;
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
i2c_transfer(priv->i2c_props.adap, &msg, 1);
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
}
/*-*/
@@ -565,19 +573,13 @@ static struct tda18271_config tda829x_tda18271_config = {
static int tda829x_find_tuner(struct dvb_frontend *fe)
{
struct tda8290_priv *priv = fe->analog_demod_priv;
- struct analog_demod_ops *analog_ops = &fe->ops.analog_ops;
int i, ret, tuners_found;
u32 tuner_addrs;
u8 data;
struct i2c_msg msg = { .flags = I2C_M_RD, .buf = &data, .len = 1 };
- if (!analog_ops->i2c_gate_ctrl) {
- printk(KERN_ERR "tda8290: no gate control were provided!\n");
-
- return -EINVAL;
- }
-
- analog_ops->i2c_gate_ctrl(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
/* probe for tuner chip */
tuners_found = 0;
@@ -595,7 +597,8 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
give a response now
*/
- analog_ops->i2c_gate_ctrl(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
if (tuners_found > 1)
for (i = 0; i < tuners_found; i++) {
@@ -618,12 +621,14 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
priv->tda827x_addr = tuner_addrs;
msg.addr = tuner_addrs;
- analog_ops->i2c_gate_ctrl(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
ret = i2c_transfer(priv->i2c_props.adap, &msg, 1);
if (ret != 1) {
tuner_warn("tuner access failed!\n");
- analog_ops->i2c_gate_ctrl(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+
Re: [PATCH 1/4] tda8290: Allow disabling I2C gate
On 01/21/2013 08:28 PM, Ondrej Zary wrote:
On Monday 21 January 2013 10:06:01 Antti Palosaari wrote:
On 01/21/2013 10:18 AM, Ondrej Zary wrote:
On Monday 21 January 2013, Antti Palosaari wrote:
On 01/20/2013 11:22 PM, Ondrej Zary wrote:
Allow disabling I2C gate handling by external configuration.
This is required by cards that have all devices on a single I2C bus,
like AverMedia A706.
My personal opinion is that I2C gate control should be disabled setting
callback to NULL (same for the other unwanted callbacks too). There is
checks for callback existence in DVB-core, it does not call callback if
it is NULL.
This is TDA8290 internal I2C gate which is used by tda8290 internally and
also by tda827x or tda18271.
That sounds like there is some logical problems in the driver then, not
split correctly?
What I think, scenario is tda8290 is analog decoder, tda18271 is silicon
tuner, which is connected (usually) to the tda8290 I2C bus. tda18271
calls tda8290 I2C-gate control when needed. Analog or digital demod
should not call its own I2C gate directly - and if it was done in some
weird reason then it should call own callback conditionally, checking
whether or not it is NULL.
Something like this? It seems to work for both cases (I2C gate control
enabled and disabled) - tested with Pinnacle PCTV 110i and this AverMedia
A706.
Yes, that looks more what it should be. Main problem there is that this
driver access directly to the tuner and due to that it needs to call its
own gate control. It indicates that tuner is not split out from that
analog demod driver correctly. There is TDA8275 (RF-tuner) and TDA8275A
(RF-tuner) drivers integrated to that TDA8290 (analog demod) driver.
Third used RF-tuner is TDA18271, which is split correctly to own module.
As it is old driver, without a large interest, there is no idea to spend
time splitting those two tuners out. Anyhow, that patch looks good, but
is it too risky?
Reviewed-by: Antti Palosaari
regards
Antti
---
drivers/media/tuners/tda8290.c | 49 +++
drivers/media/tuners/tda8290.h |1 +
2 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/drivers/media/tuners/tda8290.c b/drivers/media/tuners/tda8290.c
index 8c48521..a2b7a9f 100644
--- a/drivers/media/tuners/tda8290.c
+++ b/drivers/media/tuners/tda8290.c
@@ -233,7 +233,8 @@ static void tda8290_set_params(struct dvb_frontend *fe,
}
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (fe->ops.tuner_ops.set_analog_params)
fe->ops.tuner_ops.set_analog_params(fe, params);
@@ -302,7 +303,8 @@ static void tda8290_set_params(struct dvb_frontend *fe,
}
}
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
tuner_i2c_xfer_send(&priv->i2c_props, if_agc_set, 2);
}
@@ -424,7 +426,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
tuner_i2c_xfer_send(&priv->i2c_props, blanking_mode, 2);
msleep(20);
- tda8295_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (fe->ops.tuner_ops.set_analog_params)
fe->ops.tuner_ops.set_analog_params(fe, params);
@@ -437,7 +440,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
else
tuner_dbg("tda8295 not locked, no signal?\n");
- tda8295_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
}
/*-*/
@@ -465,11 +469,13 @@ static void tda8290_standby(struct dvb_frontend *fe)
unsigned char tda8290_agc_tri[] = { 0x02, 0x20 };
struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags=0, .buf=cb1,
.len = 2};
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (priv->ver & TDA8275A)
cb1[1] = 0x90;
i2c_transfer(priv->i2c_props.adap, &msg, 1);
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
tuner_i2c_xfer_send(&priv->i2c_props, tda8290_agc_tri, 2);
tuner_i2c_xfer_send(&priv->i2c_props, tda8290_standby, 2);
}
@@ -537,9 +543,11 @@ static void tda8290_init_tuner(struct dvb_frontend *fe)
if (priv->ver & TDA8275A)
msg.buf = tda8275a_init;
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
i2c_transfer(priv->i2c_props.adap, &msg, 1);
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+
Re: [PATCH 1/4] tda8290: Allow disabling I2C gate
On Monday 21 January 2013 10:06:01 Antti Palosaari wrote:
> On 01/21/2013 10:18 AM, Ondrej Zary wrote:
> > On Monday 21 January 2013, Antti Palosaari wrote:
> >> On 01/20/2013 11:22 PM, Ondrej Zary wrote:
> >>> Allow disabling I2C gate handling by external configuration.
> >>> This is required by cards that have all devices on a single I2C bus,
> >>> like AverMedia A706.
> >>
> >> My personal opinion is that I2C gate control should be disabled setting
> >> callback to NULL (same for the other unwanted callbacks too). There is
> >> checks for callback existence in DVB-core, it does not call callback if
> >> it is NULL.
> >
> > This is TDA8290 internal I2C gate which is used by tda8290 internally and
> > also by tda827x or tda18271.
>
> That sounds like there is some logical problems in the driver then, not
> split correctly?
>
> What I think, scenario is tda8290 is analog decoder, tda18271 is silicon
> tuner, which is connected (usually) to the tda8290 I2C bus. tda18271
> calls tda8290 I2C-gate control when needed. Analog or digital demod
> should not call its own I2C gate directly - and if it was done in some
> weird reason then it should call own callback conditionally, checking
> whether or not it is NULL.
Something like this? It seems to work for both cases (I2C gate control
enabled and disabled) - tested with Pinnacle PCTV 110i and this AverMedia
A706.
---
drivers/media/tuners/tda8290.c | 49 +++
drivers/media/tuners/tda8290.h |1 +
2 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/drivers/media/tuners/tda8290.c b/drivers/media/tuners/tda8290.c
index 8c48521..a2b7a9f 100644
--- a/drivers/media/tuners/tda8290.c
+++ b/drivers/media/tuners/tda8290.c
@@ -233,7 +233,8 @@ static void tda8290_set_params(struct dvb_frontend *fe,
}
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (fe->ops.tuner_ops.set_analog_params)
fe->ops.tuner_ops.set_analog_params(fe, params);
@@ -302,7 +303,8 @@ static void tda8290_set_params(struct dvb_frontend *fe,
}
}
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
tuner_i2c_xfer_send(&priv->i2c_props, if_agc_set, 2);
}
@@ -424,7 +426,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
tuner_i2c_xfer_send(&priv->i2c_props, blanking_mode, 2);
msleep(20);
- tda8295_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (fe->ops.tuner_ops.set_analog_params)
fe->ops.tuner_ops.set_analog_params(fe, params);
@@ -437,7 +440,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
else
tuner_dbg("tda8295 not locked, no signal?\n");
- tda8295_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
}
/*-*/
@@ -465,11 +469,13 @@ static void tda8290_standby(struct dvb_frontend *fe)
unsigned char tda8290_agc_tri[] = { 0x02, 0x20 };
struct i2c_msg msg = {.addr = priv->tda827x_addr, .flags=0, .buf=cb1,
.len = 2};
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
if (priv->ver & TDA8275A)
cb1[1] = 0x90;
i2c_transfer(priv->i2c_props.adap, &msg, 1);
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
tuner_i2c_xfer_send(&priv->i2c_props, tda8290_agc_tri, 2);
tuner_i2c_xfer_send(&priv->i2c_props, tda8290_standby, 2);
}
@@ -537,9 +543,11 @@ static void tda8290_init_tuner(struct dvb_frontend *fe)
if (priv->ver & TDA8275A)
msg.buf = tda8275a_init;
- tda8290_i2c_bridge(fe, 1);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 1);
i2c_transfer(priv->i2c_props.adap, &msg, 1);
- tda8290_i2c_bridge(fe, 0);
+ if (fe->ops.analog_ops.i2c_gate_ctrl)
+ fe->ops.analog_ops.i2c_gate_ctrl(fe, 0);
}
/*-*/
@@ -565,19 +573,13 @@ static struct tda18271_config tda829x_tda18271_config = {
static int tda829x_find_tuner(struct dvb_frontend *fe)
{
struct tda8290_priv *priv = fe->analog_demod_priv;
- struct analog_demod_ops *analog_ops = &fe->ops.analog_ops;
int i, ret, tuners_found;
u32 tuner_addrs;
u8 data;
struct i2c_msg msg = { .flags = I2C_M_RD, .buf = &data, .len = 1 };
- if (!analog_ops->i2c_gate_ctrl) {
- printk(KERN_ERR "tda
Re: [PATCH 1/4] tda8290: Allow disabling I2C gate
On 01/21/2013 10:18 AM, Ondrej Zary wrote: On Monday 21 January 2013, Antti Palosaari wrote: On 01/20/2013 11:22 PM, Ondrej Zary wrote: Allow disabling I2C gate handling by external configuration. This is required by cards that have all devices on a single I2C bus, like AverMedia A706. My personal opinion is that I2C gate control should be disabled setting callback to NULL (same for the other unwanted callbacks too). There is checks for callback existence in DVB-core, it does not call callback if it is NULL. This is TDA8290 internal I2C gate which is used by tda8290 internally and also by tda827x or tda18271. That sounds like there is some logical problems in the driver then, not split correctly? What I think, scenario is tda8290 is analog decoder, tda18271 is silicon tuner, which is connected (usually) to the tda8290 I2C bus. tda18271 calls tda8290 I2C-gate control when needed. Analog or digital demod should not call its own I2C gate directly - and if it was done in some weird reason then it should call own callback conditionally, checking whether or not it is NULL. regards Antti -- http://palosaari.fi/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/4] tda8290: Allow disabling I2C gate
On Monday 21 January 2013, Antti Palosaari wrote:
> On 01/20/2013 11:22 PM, Ondrej Zary wrote:
> > Allow disabling I2C gate handling by external configuration.
> > This is required by cards that have all devices on a single I2C bus,
> > like AverMedia A706.
>
> My personal opinion is that I2C gate control should be disabled setting
> callback to NULL (same for the other unwanted callbacks too). There is
> checks for callback existence in DVB-core, it does not call callback if
> it is NULL.
This is TDA8290 internal I2C gate which is used by tda8290 internally and also
by tda827x or tda18271.
> regards
> Antti
>
> > Signed-off-by: Ondrej Zary
> > ---
> > drivers/media/tuners/tda8290.c | 13 +++--
> > drivers/media/tuners/tda8290.h |1 +
> > 2 files changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/tuners/tda8290.c
> > b/drivers/media/tuners/tda8290.c index 8c48521..16dfbf2 100644
> > --- a/drivers/media/tuners/tda8290.c
> > +++ b/drivers/media/tuners/tda8290.c
> > @@ -54,6 +54,7 @@ struct tda8290_priv {
> > #define TDA18271 16
> >
> > struct tda827x_config cfg;
> > + bool no_i2c_gate;
> > };
> >
> >
> > /*-*/
> > @@ -66,6 +67,9 @@ static int tda8290_i2c_bridge(struct dvb_frontend *fe,
> > int close) unsigned char disable[2] = { 0x21, 0x00 };
> > unsigned char *msg;
> >
> > + if (priv->no_i2c_gate)
> > + return 0;
> > +
> > if (close) {
> > msg = enable;
> > tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
> > @@ -88,6 +92,9 @@ static int tda8295_i2c_bridge(struct dvb_frontend *fe,
> > int close) unsigned char buf[3] = { 0x45, 0x01, 0x00 };
> > unsigned char *msg;
> >
> > + if (priv->no_i2c_gate)
> > + return 0;
> > +
> > if (close) {
> > msg = enable;
> > tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
> > @@ -740,8 +747,10 @@ struct dvb_frontend *tda829x_attach(struct
> > dvb_frontend *fe, priv->i2c_props.addr = i2c_addr;
> > priv->i2c_props.adap = i2c_adap;
> > priv->i2c_props.name = "tda829x";
> > - if (cfg)
> > - priv->cfg.config = cfg->lna_cfg;
> > + if (cfg) {
> > + priv->cfg.config = cfg->lna_cfg;
> > + priv->no_i2c_gate = cfg->no_i2c_gate;
> > + }
> >
> > if (tda8290_probe(&priv->i2c_props) == 0) {
> > priv->ver = TDA8290;
> > diff --git a/drivers/media/tuners/tda8290.h
> > b/drivers/media/tuners/tda8290.h index 7e288b2..9959cc8 100644
> > --- a/drivers/media/tuners/tda8290.h
> > +++ b/drivers/media/tuners/tda8290.h
> > @@ -26,6 +26,7 @@ struct tda829x_config {
> > unsigned int probe_tuner:1;
> > #define TDA829X_PROBE_TUNER 0
> > #define TDA829X_DONT_PROBE 1
> > + unsigned int no_i2c_gate:1;
> > };
> >
> > #if defined(CONFIG_MEDIA_TUNER_TDA8290) ||
> > (defined(CONFIG_MEDIA_TUNER_TDA8290_MODULE) && defined(MODULE))
--
Ondrej Zary
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/4] tda8290: Allow disabling I2C gate
On 01/20/2013 11:22 PM, Ondrej Zary wrote:
Allow disabling I2C gate handling by external configuration.
This is required by cards that have all devices on a single I2C bus,
like AverMedia A706.
My personal opinion is that I2C gate control should be disabled setting
callback to NULL (same for the other unwanted callbacks too). There is
checks for callback existence in DVB-core, it does not call callback if
it is NULL.
regards
Antti
Signed-off-by: Ondrej Zary
---
drivers/media/tuners/tda8290.c | 13 +++--
drivers/media/tuners/tda8290.h |1 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/media/tuners/tda8290.c b/drivers/media/tuners/tda8290.c
index 8c48521..16dfbf2 100644
--- a/drivers/media/tuners/tda8290.c
+++ b/drivers/media/tuners/tda8290.c
@@ -54,6 +54,7 @@ struct tda8290_priv {
#define TDA18271 16
struct tda827x_config cfg;
+ bool no_i2c_gate;
};
/*-*/
@@ -66,6 +67,9 @@ static int tda8290_i2c_bridge(struct dvb_frontend *fe, int
close)
unsigned char disable[2] = { 0x21, 0x00 };
unsigned char *msg;
+ if (priv->no_i2c_gate)
+ return 0;
+
if (close) {
msg = enable;
tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
@@ -88,6 +92,9 @@ static int tda8295_i2c_bridge(struct dvb_frontend *fe, int
close)
unsigned char buf[3] = { 0x45, 0x01, 0x00 };
unsigned char *msg;
+ if (priv->no_i2c_gate)
+ return 0;
+
if (close) {
msg = enable;
tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
@@ -740,8 +747,10 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend
*fe,
priv->i2c_props.addr = i2c_addr;
priv->i2c_props.adap = i2c_adap;
priv->i2c_props.name = "tda829x";
- if (cfg)
- priv->cfg.config = cfg->lna_cfg;
+ if (cfg) {
+ priv->cfg.config = cfg->lna_cfg;
+ priv->no_i2c_gate = cfg->no_i2c_gate;
+ }
if (tda8290_probe(&priv->i2c_props) == 0) {
priv->ver = TDA8290;
diff --git a/drivers/media/tuners/tda8290.h b/drivers/media/tuners/tda8290.h
index 7e288b2..9959cc8 100644
--- a/drivers/media/tuners/tda8290.h
+++ b/drivers/media/tuners/tda8290.h
@@ -26,6 +26,7 @@ struct tda829x_config {
unsigned int probe_tuner:1;
#define TDA829X_PROBE_TUNER 0
#define TDA829X_DONT_PROBE 1
+ unsigned int no_i2c_gate:1;
};
#if defined(CONFIG_MEDIA_TUNER_TDA8290) ||
(defined(CONFIG_MEDIA_TUNER_TDA8290_MODULE) && defined(MODULE))
--
http://palosaari.fi/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/4] tda8290: Allow disabling I2C gate
Allow disabling I2C gate handling by external configuration.
This is required by cards that have all devices on a single I2C bus,
like AverMedia A706.
Signed-off-by: Ondrej Zary
---
drivers/media/tuners/tda8290.c | 13 +++--
drivers/media/tuners/tda8290.h |1 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/media/tuners/tda8290.c b/drivers/media/tuners/tda8290.c
index 8c48521..16dfbf2 100644
--- a/drivers/media/tuners/tda8290.c
+++ b/drivers/media/tuners/tda8290.c
@@ -54,6 +54,7 @@ struct tda8290_priv {
#define TDA18271 16
struct tda827x_config cfg;
+ bool no_i2c_gate;
};
/*-*/
@@ -66,6 +67,9 @@ static int tda8290_i2c_bridge(struct dvb_frontend *fe, int
close)
unsigned char disable[2] = { 0x21, 0x00 };
unsigned char *msg;
+ if (priv->no_i2c_gate)
+ return 0;
+
if (close) {
msg = enable;
tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
@@ -88,6 +92,9 @@ static int tda8295_i2c_bridge(struct dvb_frontend *fe, int
close)
unsigned char buf[3] = { 0x45, 0x01, 0x00 };
unsigned char *msg;
+ if (priv->no_i2c_gate)
+ return 0;
+
if (close) {
msg = enable;
tuner_i2c_xfer_send(&priv->i2c_props, msg, 2);
@@ -740,8 +747,10 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend
*fe,
priv->i2c_props.addr = i2c_addr;
priv->i2c_props.adap = i2c_adap;
priv->i2c_props.name = "tda829x";
- if (cfg)
- priv->cfg.config = cfg->lna_cfg;
+ if (cfg) {
+ priv->cfg.config = cfg->lna_cfg;
+ priv->no_i2c_gate = cfg->no_i2c_gate;
+ }
if (tda8290_probe(&priv->i2c_props) == 0) {
priv->ver = TDA8290;
diff --git a/drivers/media/tuners/tda8290.h b/drivers/media/tuners/tda8290.h
index 7e288b2..9959cc8 100644
--- a/drivers/media/tuners/tda8290.h
+++ b/drivers/media/tuners/tda8290.h
@@ -26,6 +26,7 @@ struct tda829x_config {
unsigned int probe_tuner:1;
#define TDA829X_PROBE_TUNER 0
#define TDA829X_DONT_PROBE 1
+ unsigned int no_i2c_gate:1;
};
#if defined(CONFIG_MEDIA_TUNER_TDA8290) ||
(defined(CONFIG_MEDIA_TUNER_TDA8290_MODULE) && defined(MODULE))
--
Ondrej Zary
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
