Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / frontends / dvb-pll.c

diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 7a25f872c094c494c7d4512a4677af0d39d46e1a..a054894ff481867842ca344632b3feba1393e729 100644 (file)
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -48,10 +48,6 @@ static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-static unsigned int input[DVB_PLL_MAX] = { [ 0 ... (DVB_PLL_MAX-1) ] = 0 };
-module_param_array(input, int, NULL, 0644);
-MODULE_PARM_DESC(input,"specify rf input choice, 0 for autoselect (default)");
-
 static unsigned int id[DVB_PLL_MAX] =
        { [ 0 ... (DVB_PLL_MAX-1) ] = DVB_PLL_UNDEFINED };
 module_param_array(id, int, NULL, 0644);
@@ -80,13 +76,6 @@ struct dvb_pll_desc {
 /* ----------------------------------------------------------- */
 /* descriptions                                                */
 
-
-/*     0x04 = 166.67 kHz divider
-
-       0x80 = AGC Time constant 50ms Iagc = 9 uA
-       0x20 = AGC Take over point = 112 dBuV */
-static u8 tua603x_agc112[] = { 2, 0x80|0x40|0x18|0x04|0x01, 0x80|0x20 };
-
 static struct dvb_pll_desc dvb_pll_thomson_dtt7579 = {
        .name  = "Thomson dtt7579",
        .min   = 177000000,
@@ -102,7 +91,6 @@ static struct dvb_pll_desc dvb_pll_thomson_dtt7579 = {
        },
 };
 
-
 static void thomson_dtt759x_bw(struct dvb_frontend *fe, u8 *buf,
                               const struct dvb_frontend_parameters *params)
 {
@@ -143,7 +131,6 @@ static struct dvb_pll_desc dvb_pll_lg_z201 = {
        },
 };
 
-
 static struct dvb_pll_desc dvb_pll_unknown_1 = {
        .name  = "unknown 1", /* used by dntv live dvb-t */
        .min   = 174000000,
@@ -252,38 +239,6 @@ static struct dvb_pll_desc dvb_pll_tua6034 = {
        },
 };
 
-
-/* Philips FMD1216ME
- * used in Medion Hybrid PCMCIA card and USB Box
- */
-static void fmd1216me_bw(struct dvb_frontend *fe, u8 *buf,
-                        const struct dvb_frontend_parameters *params)
-{
-       if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ &&
-           params->frequency >= 158870000)
-               buf[3] |= 0x08;
-}
-
-static struct dvb_pll_desc dvb_pll_fmd1216me = {
-       .name = "Philips FMD1216ME",
-       .min = 50870000,
-       .max = 858000000,
-       .iffreq= 36125000,
-       .set   = fmd1216me_bw,
-       .initdata = tua603x_agc112,
-       .sleepdata = (u8[]){ 4, 0x9c, 0x60, 0x85, 0x54 },
-       .count = 7,
-       .entries = {
-               { 143870000, 166667, 0xbc, 0x41 },
-               { 158870000, 166667, 0xf4, 0x41 },
-               { 329870000, 166667, 0xbc, 0x42 },
-               { 441870000, 166667, 0xf4, 0x42 },
-               { 625870000, 166667, 0xbc, 0x44 },
-               { 803870000, 166667, 0xf4, 0x44 },
-               { 999999999, 166667, 0xfc, 0x44 },
-       }
-};
-
 /* ALPS TDED4
  * used in Nebula-Cards and USB boxes
  */
@@ -326,55 +281,6 @@ static struct dvb_pll_desc dvb_pll_tdhu2 = {
        }
 };
 
-/* Philips TUV1236D
- * used in ATI HDTV Wonder
- */
-static void tuv1236d_rf(struct dvb_frontend *fe, u8 *buf,
-                       const struct dvb_frontend_parameters *params)
-{
-       struct dvb_pll_priv *priv = fe->tuner_priv;
-       unsigned int new_rf = input[priv->nr];
-
-       if ((new_rf == 0) || (new_rf > 2)) {
-               switch (params->u.vsb.modulation) {
-                       case QAM_64:
-                       case QAM_256:
-                               new_rf = 1;
-                               break;
-                       case VSB_8:
-                       default:
-                               new_rf = 2;
-               }
-       }
-
-       switch (new_rf) {
-               case 1:
-                       buf[3] |= 0x08;
-                       break;
-               case 2:
-                       buf[3] &= ~0x08;
-                       break;
-               default:
-                       printk(KERN_WARNING
-                              "%s: unhandled rf input selection: %d",
-                              __FUNCTION__, new_rf);
-       }
-}
-
-static struct dvb_pll_desc dvb_pll_tuv1236d = {
-       .name  = "Philips TUV1236D",
-       .min   =  54000000,
-       .max   = 864000000,
-       .iffreq= 44000000,
-       .set   = tuv1236d_rf,
-       .count = 3,
-       .entries = {
-               { 157250000, 62500, 0xc6, 0x41 },
-               { 454000000, 62500, 0xc6, 0x42 },
-               { 999999999, 62500, 0xc6, 0x44 },
-       },
-};
-
 /* Samsung TBMV30111IN / TBMV30712IN1
  * used in Air2PC ATSC - 2nd generation (nxt2002)
  */
@@ -411,50 +317,6 @@ static struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261 = {
        },
 };
 
-/*
- * Philips TD1316 Tuner.
- */
-static void td1316_bw(struct dvb_frontend *fe, u8 *buf,
-                     const struct dvb_frontend_parameters *params)
-{
-       u8 band;
-
-       /* determine band */
-       if (params->frequency < 161000000)
-               band = 1;
-       else if (params->frequency < 444000000)
-               band = 2;
-       else
-               band = 4;
-
-       buf[3] |= band;
-
-       /* setup PLL filter */
-       if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ)
-               buf[3] |= 1 << 3;
-}
-
-static struct dvb_pll_desc dvb_pll_philips_td1316 = {
-       .name  = "Philips TD1316",
-       .min   =  87000000,
-       .max   = 895000000,
-       .iffreq= 36166667,
-       .set   = td1316_bw,
-       .count = 9,
-       .entries = {
-               {  93834000, 166667, 0xca, 0x60},
-               { 123834000, 166667, 0xca, 0xa0},
-               { 163834000, 166667, 0xca, 0xc0},
-               { 253834000, 166667, 0xca, 0x60},
-               { 383834000, 166667, 0xca, 0xa0},
-               { 443834000, 166667, 0xca, 0xc0},
-               { 583834000, 166667, 0xca, 0x60},
-               { 793834000, 166667, 0xca, 0xa0},
-               { 858834000, 166667, 0xca, 0xe0},
-       },
-};
-
-
 static void opera1_bw(struct dvb_frontend *fe, u8 *buf,
                      const struct dvb_frontend_parameters *params)
 {
@@ -481,7 +343,6 @@ static struct dvb_pll_desc dvb_pll_opera1 = {
        }
 };
 
-
 /* ----------------------------------------------------------- */
 
 static struct dvb_pll_desc *pll_list[] = {
@@ -494,13 +355,10 @@ static struct dvb_pll_desc *pll_list[] = {
        [DVB_PLL_ENV57H1XD5]             = &dvb_pll_env57h1xd5,
        [DVB_PLL_TUA6034]                = &dvb_pll_tua6034,
        [DVB_PLL_TDA665X]                = &dvb_pll_tda665x,
-       [DVB_PLL_FMD1216ME]              = &dvb_pll_fmd1216me,
        [DVB_PLL_TDED4]                  = &dvb_pll_tded4,
-       [DVB_PLL_TUV1236D]               = &dvb_pll_tuv1236d,
        [DVB_PLL_TDHU2]                  = &dvb_pll_tdhu2,
        [DVB_PLL_SAMSUNG_TBMV]           = &dvb_pll_samsung_tbmv,
        [DVB_PLL_PHILIPS_SD1878_TDA8261] = &dvb_pll_philips_sd1878_tda8261,
-       [DVB_PLL_PHILIPS_TD1316]         = &dvb_pll_philips_td1316,
        [DVB_PLL_OPERA1]                 = &dvb_pll_opera1,
 };
 
@@ -747,20 +605,6 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,
                       id[priv->nr] == pll_desc_id ?
                                "insmod option" : "autodetected");
        }
-       if ((debug) || (input[priv->nr] > 0)) {
-               printk("dvb-pll[%d]", priv->nr);
-               if (i2c != NULL)
-                       printk(" %d-%04x", i2c_adapter_id(i2c), pll_addr);
-               printk(": tuner rf input will be ");
-               switch (input[priv->nr]) {
-               case 0:
-                       printk("autoselected\n");
-                       break;
-               default:
-                       printk("set to input %d (insmod option)\n",
-                              input[priv->nr]);
-               }
-       }
 
        return fe;
 }