7 files changed, 110 insertions, 51 deletions

diff --git a/drivers/media/dvb/frontends/dib3000-common.c b/drivers/media/dvb/frontends/dib3000-common.c
index 47ab02e133d1..1a4f1f7c228a 100644
--- a/drivers/media/dvb/frontends/dib3000-common.c
+++ b/drivers/media/dvb/frontends/dib3000-common.c
@@ -73,7 +73,7 @@ u16 dib3000_seq[2][2][2] =     /* fft,gua,   inv   */
         };
 
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de");
-MODULE_DESCRIPTION("Common functions for the dib3000mb/dib3000mc dvb-frontend drivers");
+MODULE_DESCRIPTION("Common functions for the dib3000mb/dib3000mc dvb frontend drivers");
 MODULE_LICENSE("GPL");
 
 EXPORT_SYMBOL(dib3000_seq);
diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
index 80687c130836..2d5475b5c063 100644
--- a/drivers/media/dvb/frontends/dib3000.h
+++ b/drivers/media/dvb/frontends/dib3000.h
@@ -32,9 +32,8 @@ struct dib3000_config
         u8 demod_address;
 
         /* PLL maintenance and the i2c address of the PLL */
-        u8 (*pll_addr)(struct dvb_frontend *fe);
-        int (*pll_init)(struct dvb_frontend *fe, u8 pll_buf[5]);
-        int (*pll_set)(struct dvb_frontend *fe, struct dvb_frontend_parameters* params, u8 pll_buf[5]);
+        int (*pll_init)(struct dvb_frontend *fe);
+        int (*pll_set)(struct dvb_frontend *fe, struct dvb_frontend_parameters* params);
 };
 
 struct dib_fe_xfer_ops
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index 6f52d649e97e..cd434b7cf9db 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -48,8 +48,6 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-a
 #define deb_setf(args...) dprintk(0x04,args)
 #define deb_getf(args...) dprintk(0x08,args)
 
-static int dib3000mb_tuner_pass_ctrl(struct dvb_frontend *fe, int onoff, u8 pll_addr);
-
 static int dib3000mb_get_frontend(struct dvb_frontend* fe,
                                   struct dvb_frontend_parameters *fep);
 
@@ -61,10 +59,8 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,
         fe_code_rate_t fe_cr = FEC_NONE;
         int search_state, seq;
 
-        if (tuner && state->config.pll_addr && state->config.pll_set) {
-                dib3000mb_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config.pll_set(fe, fep, NULL);
-                dib3000mb_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
+        if (tuner && state->config.pll_set) {
+                state->config.pll_set(fe, fep);
 
                 deb_setf("bandwidth: ");
                 switch (ofdm->bandwidth) {
@@ -389,11 +385,8 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode)
 
         wr(DIB3000MB_REG_DATA_IN_DIVERSITY, DIB3000MB_DATA_DIVERSITY_IN_OFF);
 
-        if (state->config.pll_init) {
-                dib3000mb_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config.pll_init(fe,NULL);
-                dib3000mb_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
-        }
+        if (state->config.pll_init)
+                state->config.pll_init(fe);
 
         return 0;
 }
@@ -623,7 +616,7 @@ static int dib3000mb_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)
 {
         struct dib3000_state* state = fe->demodulator_priv;
 
-        *unc = rd(DIB3000MB_REG_UNC);
+        *unc = rd(DIB3000MB_REG_PACKET_ERROR_RATE);
         return 0;
 }
 
@@ -638,9 +631,6 @@ static int dib3000mb_sleep(struct dvb_frontend* fe)
 static int dib3000mb_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
 {
         tune->min_delay_ms = 800;
-        tune->step_size = 166667;
-        tune->max_drift = 166667 * 2;
-
         return 0;
 }
 
diff --git a/drivers/media/dvb/frontends/dib3000mb_priv.h b/drivers/media/dvb/frontends/dib3000mb_priv.h
index 57e61aa5b07b..999b19047816 100644
--- a/drivers/media/dvb/frontends/dib3000mb_priv.h
+++ b/drivers/media/dvb/frontends/dib3000mb_priv.h
@@ -294,7 +294,7 @@ static u16 dib3000mb_reg_filter_coeffs[] = {
 
 static u16 dib3000mb_filter_coeffs[] = {
          226,  160,   29,
-         979,  998,   19,
+         979,  998,   19,
           22, 1019, 1006,
         1022,   12,    6,
         1017, 1017,    3,
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 888f10a5e96b..cd33705a4320 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -48,8 +48,6 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe,16=s
 #define deb_getf(args...) dprintk(0x08,args)
 #define deb_stat(args...) dprintk(0x10,args)
 
-static int dib3000mc_tuner_pass_ctrl(struct dvb_frontend *fe, int onoff, u8 pll_addr);
-
 static int dib3000mc_set_impulse_noise(struct dib3000_state * state, int mode,
         fe_transmit_mode_t transmission_mode, fe_bandwidth_t bandwidth)
 {
@@ -463,10 +461,8 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,
         int search_state,auto_val;
         u16 val;
 
-        if (tuner && state->config.pll_addr && state->config.pll_set) { /* initial call from dvb */
-                dib3000mc_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config.pll_set(fe,fep,NULL);
-                dib3000mc_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
+        if (tuner && state->config.pll_set) { /* initial call from dvb */
+                state->config.pll_set(fe,fep);
 
                 state->last_tuned_freq = fep->frequency;
         //      if (!scanboost) {
@@ -554,19 +550,15 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,
                         dib3000mc_set_adp_cfg(state,ofdm->constellation);
                 wr_foreach(dib3000mc_reg_offset,
                                 dib3000mc_offset[(ofdm->transmission_mode == TRANSMISSION_MODE_8K)+1]);
-
-
         }
         return 0;
 }
 
 static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode)
 {
-        struct dib3000_state *state;
-
+        struct dib3000_state *state = fe->demodulator_priv;
         deb_info("init start\n");
 
-        state = fe->demodulator_priv;
         state->timing_offset = 0;
         state->timing_offset_comp_done = 0;
 
@@ -649,11 +641,9 @@ static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode)
 
         set_or(DIB3000MC_REG_CLK_CFG_7,DIB3000MC_CLK_CFG_7_DIV_IN_OFF);
 
-/*      if (state->config->pll_init) {
-                dib3000mc_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config->pll_init(fe,NULL);
-                dib3000mc_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
-        }*/
+        if (state->config.pll_init)
+                state->config.pll_init(fe);
+
         deb_info("init end\n");
         return 0;
 }
@@ -688,7 +678,7 @@ static int dib3000mc_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)
 {
         struct dib3000_state* state = fe->demodulator_priv;
 
-        *unc = rd(DIB3000MC_REG_PACKET_ERROR_COUNT);
+        *unc = rd(DIB3000MC_REG_PACKET_ERRORS);
         return 0;
 }
 
@@ -737,10 +727,7 @@ static int dib3000mc_sleep(struct dvb_frontend* fe)
 
 static int dib3000mc_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
 {
-        tune->min_delay_ms = 2000;
-        tune->step_size = 166667;
-        tune->max_drift = 166667 * 2;
-
+        tune->min_delay_ms = 1000;
         return 0;
 }
 
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 2a3c2ce7b2aa..f73b5f48e235 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -1,6 +1,4 @@
 /*
- * $Id: dvb-pll.c,v 1.7 2005/02/10 11:52:02 kraxel Exp $
- *
  * descriptions + helper functions for simple dvb plls.
  *
  * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
@@ -114,6 +112,92 @@ struct dvb_pll_desc dvb_pll_unknown_1 = {
 };
 EXPORT_SYMBOL(dvb_pll_unknown_1);
 
+/* Infineon TUA6010XS
+ * used in Thomson Cable Tuner
+ */
+struct dvb_pll_desc dvb_pll_tua6010xs = {
+        .name  = "Infineon TUA6010XS",
+        .min   =  44250000,
+        .max   = 858000000,
+        .count = 3,
+        .entries = {
+                {  115750000, 36125000, 62500, 0x8e, 0x03 },
+                {  403250000, 36125000, 62500, 0x8e, 0x06 },
+                {  999999999, 36125000, 62500, 0x8e, 0x85 },
+        },
+};
+EXPORT_SYMBOL(dvb_pll_tua6010xs);
+
+/* Panasonic env57h1xd5 (some Philips PLL ?) */
+struct dvb_pll_desc dvb_pll_env57h1xd5 = {
+        .name  = "Panasonic ENV57H1XD5",
+        .min   =  44250000,
+        .max   = 858000000,
+        .count = 4,
+        .entries = {
+                {  153000000, 36291666, 166666, 0xc2, 0x41 },
+                {  470000000, 36291666, 166666, 0xc2, 0x42 },
+                {  526000000, 36291666, 166666, 0xc2, 0x84 },
+                {  999999999, 36291666, 166666, 0xc2, 0xa4 },
+        },
+};
+EXPORT_SYMBOL(dvb_pll_env57h1xd5);
+
+/* Philips TDA6650/TDA6651
+ * used in Panasonic ENV77H11D5
+ */
+static void tda665x_bw(u8 *buf, int bandwidth)
+{
+        if (bandwidth == BANDWIDTH_8_MHZ)
+                buf[3] |= 0x08;
+}
+
+struct dvb_pll_desc dvb_pll_tda665x = {
+        .name  = "Philips TDA6650/TDA6651",
+        .min   =  44250000,
+        .max   = 858000000,
+        .setbw = tda665x_bw,
+        .count = 12,
+        .entries = {
+                {   93834000, 36249333, 166667, 0xca, 0x61 /* 011 0 0 0  01 */ },
+                {  123834000, 36249333, 166667, 0xca, 0xa1 /* 101 0 0 0  01 */ },
+                {  161000000, 36249333, 166667, 0xca, 0xa1 /* 101 0 0 0  01 */ },
+                {  163834000, 36249333, 166667, 0xca, 0xc2 /* 110 0 0 0  10 */ },
+                {  253834000, 36249333, 166667, 0xca, 0x62 /* 011 0 0 0  10 */ },
+                {  383834000, 36249333, 166667, 0xca, 0xa2 /* 101 0 0 0  10 */ },
+                {  443834000, 36249333, 166667, 0xca, 0xc2 /* 110 0 0 0  10 */ },
+                {  444000000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0  11 */ },
+                {  583834000, 36249333, 166667, 0xca, 0x63 /* 011 0 0 0  11 */ },
+                {  793834000, 36249333, 166667, 0xca, 0xa3 /* 101 0 0 0  11 */ },
+                {  444834000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0  11 */ },
+                {  861000000, 36249333, 166667, 0xca, 0xe3 /* 111 0 0 0  11 */ },
+        }
+};
+EXPORT_SYMBOL(dvb_pll_tda665x);
+
+/* Infineon TUA6034
+ * used in LG TDTP E102P
+ */
+static void tua6034_bw(u8 *buf, int bandwidth)
+{
+        if (BANDWIDTH_7_MHZ != bandwidth)
+                buf[3] |= 0x08;
+}
+
+struct dvb_pll_desc dvb_pll_tua6034 = {
+        .name  = "Infineon TUA6034",
+        .min   =  44250000,
+        .max   = 858000000,
+        .count = 3,
+        .setbw = tua6034_bw,
+        .entries = {
+                {  174500000, 36166667, 62500, 0xce, 0x01 },
+                {  230000000, 36166667, 62500, 0xce, 0x02 },
+                {  999999999, 36166667, 62500, 0xce, 0x04 },
+        },
+};
+EXPORT_SYMBOL(dvb_pll_tua6034);
+
 /* ----------------------------------------------------------- */
 /* code                                                        */
 
@@ -160,9 +244,3 @@ EXPORT_SYMBOL(dvb_pll_configure);
 MODULE_DESCRIPTION("dvb pll library");
 MODULE_AUTHOR("Gerd Knorr");
 MODULE_LICENSE("GPL");
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index c4c3c56c4a81..b796778624b6 100644
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -1,5 +1,5 @@
 /*
- * $Id: dvb-pll.h,v 1.2 2005/02/10 11:43:41 kraxel Exp $
+ * descriptions + helper functions for simple dvb plls.
  */
 
 #ifndef __DVB_PLL_H__
@@ -17,7 +17,7 @@ struct dvb_pll_desc {
                 u32 stepsize;
                 u8  cb1;
                 u8  cb2;
-        } entries[9];
+        } entries[12];
 };
 
 extern struct dvb_pll_desc dvb_pll_thomson_dtt7579;
@@ -26,6 +26,11 @@ extern struct dvb_pll_desc dvb_pll_thomson_dtt7610;
 extern struct dvb_pll_desc dvb_pll_lg_z201;
 extern struct dvb_pll_desc dvb_pll_unknown_1;
 
+extern struct dvb_pll_desc dvb_pll_tua6010xs;
+extern struct dvb_pll_desc dvb_pll_env57h1xd5;
+extern struct dvb_pll_desc dvb_pll_tua6034;
+extern struct dvb_pll_desc dvb_pll_tda665x;
+
 int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
                       u32 freq, int bandwidth);