[media] ttusb2: add support for the dvb-t part of CT-3650 v3

Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 33 insertions, 12 deletions

diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c
index 93f6a75c238e..7f105946a434 100644
--- a/drivers/media/dvb/frontends/tda10048.c
+++ b/drivers/media/dvb/frontends/tda10048.c
@@ -206,15 +206,16 @@ static struct init_tab {
 static struct pll_tab {
         u32     clk_freq_khz;
         u32     if_freq_khz;
-        u8      m, n, p;
 } pll_tab[] = {
-        { TDA10048_CLK_4000,  TDA10048_IF_36130, 10, 0, 0 },
-        { TDA10048_CLK_16000, TDA10048_IF_3300,  10, 3, 0 },
-        { TDA10048_CLK_16000, TDA10048_IF_3500,  10, 3, 0 },
-        { TDA10048_CLK_16000, TDA10048_IF_3800,  10, 3, 0 },
-        { TDA10048_CLK_16000, TDA10048_IF_4000,  10, 3, 0 },
-        { TDA10048_CLK_16000, TDA10048_IF_4300,  10, 3, 0 },
-        { TDA10048_CLK_16000, TDA10048_IF_36130, 10, 3, 0 },
+        { TDA10048_CLK_4000,  TDA10048_IF_36130 },
+        { TDA10048_CLK_16000, TDA10048_IF_3300 },
+        { TDA10048_CLK_16000, TDA10048_IF_3500 },
+        { TDA10048_CLK_16000, TDA10048_IF_3800 },
+        { TDA10048_CLK_16000, TDA10048_IF_4000 },
+        { TDA10048_CLK_16000, TDA10048_IF_4300 },
+        { TDA10048_CLK_16000, TDA10048_IF_4500 },
+        { TDA10048_CLK_16000, TDA10048_IF_5000 },
+        { TDA10048_CLK_16000, TDA10048_IF_36130 },
 };
 
 static int tda10048_writereg(struct tda10048_state *state, u8 reg, u8 data)
@@ -460,9 +461,6 @@ static int tda10048_set_if(struct dvb_frontend *fe, enum fe_bandwidth bw)
 
                         state->freq_if_hz = pll_tab[i].if_freq_khz * 1000;
                         state->xtal_hz = pll_tab[i].clk_freq_khz * 1000;
-                        state->pll_mfactor = pll_tab[i].m;
-                        state->pll_nfactor = pll_tab[i].n;
-                        state->pll_pfactor = pll_tab[i].p;
                         break;
                 }
         }
@@ -781,6 +779,10 @@ static int tda10048_init(struct dvb_frontend *fe)
 
         dprintk(1, "%s()\n", __func__);
 
+        /* PLL */
+        init_tab[4].data = (u8)(state->pll_mfactor);
+        init_tab[5].data = (u8)(state->pll_nfactor) | 0x40;
+
         /* Apply register defaults */
         for (i = 0; i < ARRAY_SIZE(init_tab); i++)
                 tda10048_writereg(state, init_tab[i].reg, init_tab[i].data);
@@ -1123,7 +1125,7 @@ struct dvb_frontend *tda10048_attach(const struct tda10048_config *config,
         /* setup the state and clone the config */
         memcpy(&state->config, config, sizeof(*config));
         state->i2c = i2c;
-        state->fwloaded = 0;
+        state->fwloaded = config->no_firmware;
         state->bandwidth = BANDWIDTH_8_MHZ;
 
         /* check if the demod is present */
@@ -1135,6 +1137,17 @@ struct dvb_frontend *tda10048_attach(const struct tda10048_config *config,
                 sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
+        /* set pll */
+        if (config->set_pll) {
+                state->pll_mfactor = config->pll_m;
+                state->pll_nfactor = config->pll_n;
+                state->pll_pfactor = config->pll_p;
+        } else {
+                state->pll_mfactor = 10;
+                state->pll_nfactor = 3;
+                state->pll_pfactor = 0;
+        }
+
         /* Establish any defaults the the user didn't pass */
         tda10048_establish_defaults(&state->frontend);
 
diff --git a/drivers/media/dvb/frontends/tda10048.h b/drivers/media/dvb/frontends/tda10048.h
index 8828ceaf74bb..fb2ef5ac9487 100644
--- a/drivers/media/dvb/frontends/tda10048.h
+++ b/drivers/media/dvb/frontends/tda10048.h
@@ -51,6 +51,7 @@ struct tda10048_config {
 #define TDA10048_IF_4300  4300
 #define TDA10048_IF_4500  4500
 #define TDA10048_IF_4750  4750
+#define TDA10048_IF_5000  5000
 #define TDA10048_IF_36130 36130
         u16 dtv6_if_freq_khz;
         u16 dtv7_if_freq_khz;
@@ -62,6 +63,13 @@ struct tda10048_config {
 
         /* Disable I2C gate access */
         u8 disable_gate_access;
+
+        bool no_firmware;
+
+        bool set_pll;
+        u8 pll_m;
+        u8 pll_p;
+        u8 pll_n;
 };
 
 #if defined(CONFIG_DVB_TDA10048) || \