V4L/DVB (13983): [STV6110x] add clk_div member to stv6110x_config structure

Using clk_div member of stv6110x_config structure the tuner's clock
output divider can be configured. It is set in stv6110x_attach.

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/stv6110x.c b/drivers/media/dvb/frontends/stv6110x.c
index 945790ef3a43d3f02ab11667733433c9a308e5c0..f931ed07e92d6083b088db293e43931f69cbe4b8 100644 (file)
--- a/drivers/media/dvb/frontends/stv6110x.c
+++ b/drivers/media/dvb/frontends/stv6110x.c
@@ -362,6 +362,7 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
 {
        struct stv6110x_state *stv6110x;
        u8 default_regs[] = {0x07, 0x11, 0xdc, 0x85, 0x17, 0x01, 0xe6, 0x1e};
+       int ret;
 
        stv6110x = kzalloc(sizeof (struct stv6110x_state), GFP_KERNEL);
        if (stv6110x == NULL)
@@ -372,6 +373,43 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
        stv6110x->devctl        = &stv6110x_ctl;
        memcpy(stv6110x->regs, default_regs, 8);
 
+       /* setup divider */
+       switch (stv6110x->config->clk_div) {
+       default:
+       case 1:
+               STV6110x_SETFIELD(stv6110x->regs[STV6110x_CTRL2], CTRL2_CO_DIV, 0);
+               break;
+       case 2:
+               STV6110x_SETFIELD(stv6110x->regs[STV6110x_CTRL2], CTRL2_CO_DIV, 1);
+               break;
+       case 4:
+               STV6110x_SETFIELD(stv6110x->regs[STV6110x_CTRL2], CTRL2_CO_DIV, 2);
+               break;
+       case 8:
+       case 0:
+               STV6110x_SETFIELD(stv6110x->regs[STV6110x_CTRL2], CTRL2_CO_DIV, 3);
+               break;
+       }
+
+       if (fe->ops.i2c_gate_ctrl) {
+               ret = fe->ops.i2c_gate_ctrl(fe, 1);
+               if (ret < 0)
+                       goto error;
+       }
+
+       ret = stv6110x_write_regs(stv6110x, 0, stv6110x->regs,
+                                 ARRAY_SIZE(stv6110x->regs));
+       if (ret < 0) {
+               dprintk(FE_ERROR, 1, "Initialization failed");
+               goto error;
+       }
+
+       if (fe->ops.i2c_gate_ctrl) {
+               ret = fe->ops.i2c_gate_ctrl(fe, 0);
+               if (ret < 0)
+                       goto error;
+       }
+
        fe->tuner_priv          = stv6110x;
        fe->ops.tuner_ops       = stv6110x_ops;
 

diff --git a/drivers/media/dvb/frontends/stv6110x.h b/drivers/media/dvb/frontends/stv6110x.h
index a38257080e0194d2ae9ecbe36d6f33929dbd90b2..2429ae6d78470a59c2a52d246d9b57a5427e8aa7 100644 (file)
--- a/drivers/media/dvb/frontends/stv6110x.h
+++ b/drivers/media/dvb/frontends/stv6110x.h
@@ -26,6 +26,7 @@
 struct stv6110x_config {
        u8      addr;
        u32     refclk;
+       u8      clk_div; /* divisor value for the output clock */
 };
 
 enum tuner_mode {