V4L/DVB (12309): Add output clock configuration for stv6110 tuner.

Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/stv6110.c b/drivers/media/dvb/frontends/stv6110.c
index 70efac869d28e9cbb6945c6610736a76009fa516..5aabb782e3112b43d6b632929d2f44b8cbbbb6f7 100644 (file)
--- a/drivers/media/dvb/frontends/stv6110.c
+++ b/drivers/media/dvb/frontends/stv6110.c
@@ -36,6 +36,7 @@ struct stv6110_priv {
        struct i2c_adapter *i2c;
 
        u32 mclk;
+       u8 clk_div;
        u8 regs[8];
 };
 
@@ -221,6 +222,10 @@ static int stv6110_init(struct dvb_frontend *fe)
        priv->regs[RSTV6110_CTRL1] |=
                                ((((priv->mclk / 1000000) - 16) & 0x1f) << 3);
 
+       /* divisor value for the output clock */
+       priv->regs[RSTV6110_CTRL2] &= ~0xc0;
+       priv->regs[RSTV6110_CTRL2] |= (priv->clk_div << 6);
+
        stv6110_write_regs(fe, &priv->regs[RSTV6110_CTRL1], RSTV6110_CTRL1, 8);
        msleep(1);
        stv6110_set_bandwidth(fe, 72000000);
@@ -418,6 +423,10 @@ struct dvb_frontend *stv6110_attach(struct dvb_frontend *fe,
        };
        int ret;
 
+       /* divisor value for the output clock */
+       reg0[2] &= ~0xc0;
+       reg0[2] |= (config->clk_div << 6);
+
        if (fe->ops.i2c_gate_ctrl)
                fe->ops.i2c_gate_ctrl(fe, 1);
 
@@ -436,6 +445,7 @@ struct dvb_frontend *stv6110_attach(struct dvb_frontend *fe,
        priv->i2c_address = config->i2c_address;
        priv->i2c = i2c;
        priv->mclk = config->mclk;
+       priv->clk_div = config->clk_div;
 
        memcpy(&priv->regs, &reg0[1], 8);
 

diff --git a/drivers/media/dvb/frontends/stv6110.h b/drivers/media/dvb/frontends/stv6110.h
index 1c0314d6aa558b053783ebe0a323935e34a7407a..2574e1fba9d78c141abd5f94efa5b182bd19bab1 100644 (file)
--- a/drivers/media/dvb/frontends/stv6110.h
+++ b/drivers/media/dvb/frontends/stv6110.h
@@ -42,6 +42,7 @@ struct stv6110_config {
        u8 i2c_address;
        u32 mclk;
        int iq_wiring;
+       u8 clk_div;     /* divisor value for the output clock */
 };
 
 #if defined(CONFIG_DVB_STV6110) || (defined(CONFIG_DVB_STV6110_MODULE) \