V4L/DVB (4812): Detect presence of IR receiver/IR transmitter in tveeprom
[safe/jmp/linux-2.6] / drivers / media / video / tuner-simple.c
index feaed92..63db4e9 100644 (file)
@@ -7,6 +7,11 @@
 #include <linux/i2c.h>
 #include <linux/videodev.h>
 #include <media/tuner.h>
+#include <media/v4l2-common.h>
+
+static int offset = 0;
+module_param(offset, int, 0664);
+MODULE_PARM_DESC(offset,"Allows to specify an offset for tuner");
 
 /* ---------------------------------------------------------------------- */
 
 
 /* ---------------------------------------------------------------------- */
 
-struct tunertype
-{
-       char *name;
-
-       unsigned short thresh1;  /*  band switch VHF_LO <=> VHF_HI  */
-       unsigned short thresh2;  /*  band switch VHF_HI <=> UHF     */
-       unsigned char VHF_L;
-       unsigned char VHF_H;
-       unsigned char UHF;
-       unsigned char config;
-};
-
-/*
- *     The floats in the tuner struct are computed at compile time
- *     by gcc and cast back to integers. Thus we don't violate the
- *     "no float in kernel" rule.
- */
-static struct tunertype tuners[] = {
-       /* 0-9 */
-       { "Temic PAL (4002 FH5)",                         /* TEMIC PAL */
-         16*140.25, 16*463.25, 0x02, 0x04, 0x01, 0x8e},
-       { "Philips PAL_I (FI1246 and compatibles)",       /* Philips PAL_I */
-         16*140.25, 16*463.25, 0xa0, 0x90, 0x30, 0x8e},
-       { "Philips NTSC (FI1236,FM1236 and compatibles)", /* Philips NTSC */
-         16*157.25, 16*451.25, 0xA0, 0x90, 0x30, 0x8e},
-       { "Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)",/* Philips SECAM */
-         16*168.25, 16*447.25, 0xA7, 0x97, 0x37, 0x8e},
-       { "NoTuner",                                      /* NoTuner NOTUNER */
-         0, 0, 0x00, 0x00, 0x00, 0x00},
-       { "Philips PAL_BG (FI1216 and compatibles)",      /* Philips PAL */
-         16*168.25, 16*447.25, 0xA0, 0x90, 0x30, 0x8e},
-       { "Temic NTSC (4032 FY5)",                        /* TEMIC NTSC */
-         16*157.25, 16*463.25, 0x02, 0x04, 0x01, 0x8e},
-       { "Temic PAL_I (4062 FY5)",                       /* TEMIC PAL_I */
-         16*170.00, 16*450.00, 0x02, 0x04, 0x01, 0x8e},
-       { "Temic NTSC (4036 FY5)",                        /* TEMIC NTSC */
-         16*157.25, 16*463.25, 0xa0, 0x90, 0x30, 0x8e},
-       { "Alps HSBH1",                                   /* TEMIC NTSC */
-         16*137.25, 16*385.25, 0x01, 0x02, 0x08, 0x8e},
-
-       /* 10-19 */
-       { "Alps TSBE1",                                   /* TEMIC PAL */
-         16*137.25, 16*385.25, 0x01, 0x02, 0x08, 0x8e},
-       { "Alps TSBB5",                                   /* Alps PAL_I */
-         16*133.25, 16*351.25, 0x01, 0x02, 0x08, 0x8e},
-       { "Alps TSBE5",                                   /* Alps PAL */
-         16*133.25, 16*351.25, 0x01, 0x02, 0x08, 0x8e},
-       { "Alps TSBC5",                                   /* Alps PAL */
-         16*133.25, 16*351.25, 0x01, 0x02, 0x08, 0x8e},
-       { "Temic PAL_BG (4006FH5)",                       /* TEMIC PAL */
-         16*170.00, 16*450.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "Alps TSCH6",                                   /* Alps NTSC */
-         16*137.25, 16*385.25, 0x14, 0x12, 0x11, 0x8e},
-       { "Temic PAL_DK (4016 FY5)",                      /* TEMIC PAL */
-         16*168.25, 16*456.25, 0xa0, 0x90, 0x30, 0x8e},
-       { "Philips NTSC_M (MK2)",                         /* Philips NTSC */
-         16*160.00, 16*454.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "Temic PAL_I (4066 FY5)",                       /* TEMIC PAL_I */
-         16*169.00,  16*454.00,  0xa0, 0x90, 0x30, 0x8e},
-       { "Temic PAL* auto (4006 FN5)",                   /* TEMIC PAL */
-         16*169.00,  16*454.00,  0xa0, 0x90, 0x30, 0x8e},
-
-       /* 20-29 */
-       { "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)",  /* TEMIC PAL */
-         16*141.00,  16*464.00,  0xa0, 0x90, 0x30, 0x8e},
-       { "Temic NTSC (4039 FR5)",                        /* TEMIC NTSC */
-         16*158.00,  16*453.00,  0xa0, 0x90, 0x30, 0x8e},
-       { "Temic PAL/SECAM multi (4046 FM5)",             /* TEMIC PAL */
-         16*169.00,  16*454.00,  0xa0, 0x90, 0x30, 0x8e},
-       { "Philips PAL_DK (FI1256 and compatibles)",      /* Philips PAL */
-         16*170.00, 16*450.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "Philips PAL/SECAM multi (FQ1216ME)",           /* Philips PAL */
-         16*170.00, 16*450.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "LG PAL_I+FM (TAPC-I001D)",                     /* LGINNOTEK PAL_I */
-         16*170.00, 16*450.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "LG PAL_I (TAPC-I701D)",                        /* LGINNOTEK PAL_I */
-         16*170.00, 16*450.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "LG NTSC+FM (TPI8NSR01F)",                      /* LGINNOTEK NTSC */
-         16*210.00, 16*497.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "LG PAL_BG+FM (TPI8PSB01D)",                    /* LGINNOTEK PAL */
-         16*170.00, 16*450.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "LG PAL_BG (TPI8PSB11D)",                       /* LGINNOTEK PAL */
-         16*170.00, 16*450.00, 0xa0, 0x90, 0x30, 0x8e},
-
-       /* 30-39 */
-       { "Temic PAL* auto + FM (4009 FN5)",              /* TEMIC PAL */
-         16*141.00,  16*464.00,  0xa0, 0x90, 0x30, 0x8e},
-       { "SHARP NTSC_JP (2U5JF5540)",                    /* SHARP NTSC */
-         16*137.25, 16*317.25, 0x01, 0x02, 0x08, 0x8e},
-       { "Samsung PAL TCPM9091PD27",                     /* Samsung PAL */
-         16*169, 16*464, 0xA0, 0x90, 0x30, 0x8e},
-       { "MT20xx universal",                             /* Microtune PAL|NTSC */
-         /* see mt20xx.c for details */ },
-       { "Temic PAL_BG (4106 FH5)",                      /* TEMIC PAL */
-         16*141.00,  16*464.00,  0xa0, 0x90, 0x30, 0x8e},
-       { "Temic PAL_DK/SECAM_L (4012 FY5)",              /* TEMIC PAL */
-         16*140.25,  16*463.25,  0x02, 0x04, 0x01, 0x8e},
-       { "Temic NTSC (4136 FY5)",                        /* TEMIC NTSC */
-         16*158.00,  16*453.00,  0xa0, 0x90, 0x30, 0x8e},
-       { "LG PAL (newer TAPC series)",                   /* LGINNOTEK PAL */
-         16*170.00,  16*450.00,  0x01, 0x02, 0x08, 0x8e},
-       { "Philips PAL/SECAM multi (FM1216ME MK3)",       /* Philips PAL */
-         16*158.00, 16*442.00, 0x01, 0x02, 0x04, 0x8e},
-       { "LG NTSC (newer TAPC series)",                  /* LGINNOTEK NTSC */
-         16*170.00,  16*450.00,  0x01, 0x02, 0x08, 0x8e},
-
-       /* 40-49 */
-       { "HITACHI V7-J180AT",                            /* HITACHI NTSC */
-         16*170.00,  16*450.00,  0x01, 0x02, 0x08, 0x8e},
-       { "Philips PAL_MK (FI1216 MK)",                   /* Philips PAL */
-         16*140.25, 16*463.25, 0x01, 0xc2, 0xcf, 0x8e},
-       { "Philips 1236D ATSC/NTSC daul in",              /* Philips ATSC */
-         16*157.25, 16*454.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "Philips NTSC MK3 (FM1236MK3 or FM1236/F)",     /* Philips NTSC */
-         16*160.00, 16*442.00, 0x01, 0x02, 0x04, 0x8e},
-       { "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)",  /* Philips NTSC */
-         16*160.00, 16*442.00, 0x01, 0x02, 0x04, 0x8e},
-       { "Microtune 4049 FM5",                           /* Microtune PAL */
-         16*141.00, 16*464.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "Panasonic VP27s/ENGE4324D",                    /* Panasonic NTSC */
-         16*160.00, 16*454.00, 0x01, 0x02, 0x08, 0xce},
-       { "LG NTSC (TAPE series)",                        /* LGINNOTEK NTSC */
-         16*160.00, 16*442.00, 0x01, 0x02, 0x04, 0x8e},
-       { "Tenna TNF 8831 BGFF)",                         /* Philips PAL */
-         16*161.25, 16*463.25, 0xa0, 0x90, 0x30, 0x8e},
-       { "Microtune 4042 FI5 ATSC/NTSC dual in",         /* Microtune NTSC */
-         16*162.00, 16*457.00, 0xa2, 0x94, 0x31, 0x8e},
-
-       /* 50-59 */
-       { "TCL 2002N",                                    /* TCL NTSC */
-         16*172.00, 16*448.00, 0x01, 0x02, 0x08, 0x8e},
-       { "Philips PAL/SECAM_D (FM 1256 I-H3)",           /* Philips PAL */
-         16*160.00, 16*442.00, 0x01, 0x02, 0x04, 0x8e},
-       { "Thomson DDT 7610 (ATSC/NTSC)",                 /* THOMSON ATSC */
-         16*157.25, 16*454.00, 0x39, 0x3a, 0x3c, 0x8e},
-       { "Philips FQ1286",                               /* Philips NTSC */
-         16*160.00, 16*454.00, 0x41, 0x42, 0x04, 0x8e},
-       { "tda8290+75",                                   /* Philips PAL|NTSC */
-         /* see tda8290.c for details */ },
-       { "TCL 2002MB",                                   /* TCL PAL */
-         16*170.00,  16*450.00,  0x01, 0x02, 0x08, 0xce},
-       { "Philips PAL/SECAM multi (FQ1216AME MK4)",      /* Philips PAL */
-         16*160.00, 16*442.00, 0x01, 0x02, 0x04, 0xce},
-       { "Philips FQ1236A MK4",                          /* Philips NTSC */
-         16*160.00, 16*442.00, 0x01, 0x02, 0x04, 0x8e},
-       { "Ymec TVision TVF-8531MF/8831MF/8731MF",        /* Philips NTSC */
-         16*160.00, 16*454.00, 0xa0, 0x90, 0x30, 0x8e},
-       { "Ymec TVision TVF-5533MF",                      /* Philips NTSC */
-         16*160.00, 16*454.00, 0x01, 0x02, 0x04, 0x8e},
-
-       /* 60-69 */
-       { "Thomson DDT 7611 (ATSC/NTSC)",                 /* THOMSON ATSC */
-         16*157.25, 16*454.00, 0x39, 0x3a, 0x3c, 0x8e},
-       { "Tena TNF9533-D/IF/TNF9533-B/DF",               /* Philips PAL */
-         16*160.25, 16*464.25, 0x01, 0x02, 0x04, 0x8e},
-       { "Philips TEA5767HN FM Radio",                   /* Philips RADIO */
-         /* see tea5767.c for details */},
-       { "Philips FMD1216ME MK3 Hybrid Tuner",           /* Philips PAL */
-         16*160.00, 16*442.00, 0x51, 0x52, 0x54, 0x86},
-       { "LG TDVS-H062F/TUA6034",                        /* LGINNOTEK ATSC */
-         16*160.00, 16*455.00, 0x01, 0x02, 0x04, 0x8e},
-       { "Ymec TVF66T5-B/DFF",                           /* Philips PAL */
-         16*160.25, 16*464.25, 0x01, 0x02, 0x08, 0x8e},
-       { "LG NTSC (TALN mini series)",                   /* LGINNOTEK NTSC */
-         16*137.25, 16*373.25, 0x01, 0x02, 0x08, 0x8e},
-       { "Philips TD1316 Hybrid Tuner",                  /* Philips PAL */
-         16*160.00, 16*442.00, 0xa1, 0xa2, 0xa4, 0xc8},
-       { "Philips TUV1236D ATSC/NTSC dual in",           /* Philips ATSC */
-         16*157.25, 16*454.00, 0x01, 0x02, 0x04, 0xce},
-       { "Tena TNF 5335 MF",                             /* Philips NTSC */
-         16*157.25, 16*454.00, 0x01, 0x02, 0x04, 0x8e},
-};
-
-unsigned const int tuner_count = ARRAY_SIZE(tuners);
-
-/* ---------------------------------------------------------------------- */
-
 static int tuner_getstatus(struct i2c_client *c)
 {
        unsigned char byte;
@@ -278,7 +106,7 @@ static int tuner_stereo(struct i2c_client *c)
 
        switch (t->type) {
                case TUNER_PHILIPS_FM1216ME_MK3:
-               case TUNER_PHILIPS_FM1236_MK3:
+               case TUNER_PHILIPS_FM1236_MK3:
                case TUNER_PHILIPS_FM1256_IH3:
                        stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
                        break;
@@ -295,24 +123,80 @@ static int tuner_stereo(struct i2c_client *c)
 static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
 {
        struct tuner *t = i2c_get_clientdata(c);
-       u8 config, tuneraddr;
+       u8 config, cb, tuneraddr;
        u16 div;
        struct tunertype *tun;
-       unsigned char buffer[4];
-       int rc, IFPCoff;
+       u8 buffer[4];
+       int rc, IFPCoff, i, j;
+       enum param_type desired_type;
+       struct tuner_params *params;
 
        tun = &tuners[t->type];
-       if (freq < tun->thresh1) {
-               config = tun->VHF_L;
-               tuner_dbg("tv: VHF lowrange\n");
-       } else if (freq < tun->thresh2) {
-               config = tun->VHF_H;
-               tuner_dbg("tv: VHF high range\n");
+
+       /* IFPCoff = Video Intermediate Frequency - Vif:
+               940  =16*58.75  NTSC/J (Japan)
+               732  =16*45.75  M/N STD
+               704  =16*44     ATSC (at DVB code)
+               632  =16*39.50  I U.K.
+               622.4=16*38.90  B/G D/K I, L STD
+               592  =16*37.00  D China
+               590  =16.36.875 B Australia
+               543.2=16*33.95  L' STD
+               171.2=16*10.70  FM Radio (at set_radio_freq)
+       */
+
+       if (t->std == V4L2_STD_NTSC_M_JP) {
+               IFPCoff      = 940;
+               desired_type = TUNER_PARAM_TYPE_NTSC;
+       } else if ((t->std & V4L2_STD_MN) &&
+                 !(t->std & ~V4L2_STD_MN)) {
+               IFPCoff      = 732;
+               desired_type = TUNER_PARAM_TYPE_NTSC;
+       } else if (t->std == V4L2_STD_SECAM_LC) {
+               IFPCoff      = 543;
+               desired_type = TUNER_PARAM_TYPE_SECAM;
        } else {
-               config = tun->UHF;
-               tuner_dbg("tv: UHF range\n");
+               IFPCoff      = 623;
+               desired_type = TUNER_PARAM_TYPE_PAL;
+       }
+
+       for (j = 0; j < tun->count-1; j++) {
+               if (desired_type != tun->params[j].type)
+                       continue;
+               break;
+       }
+       /* use default tuner_params if desired_type not available */
+       if (desired_type != tun->params[j].type) {
+               tuner_dbg("IFPCoff = %d: tuner_params undefined for tuner %d\n",
+                         IFPCoff,t->type);
+               j = 0;
+       }
+       params = &tun->params[j];
+
+       for (i = 0; i < params->count; i++) {
+               if (freq > params->ranges[i].limit)
+                       continue;
+               break;
+       }
+       if (i == params->count) {
+               tuner_dbg("TV frequency out of range (%d > %d)",
+                               freq, params->ranges[i - 1].limit);
+               freq = params->ranges[--i].limit;
        }
+       config = params->ranges[i].config;
+       cb     = params->ranges[i].cb;
+       /*  i == 0 -> VHF_LO
+        *  i == 1 -> VHF_HI
+        *  i == 2 -> UHF     */
+       tuner_dbg("tv: param %d, range %d\n",j,i);
 
+       div=freq + IFPCoff + offset;
+
+       tuner_dbg("Freq= %d.%02d MHz, V_IF=%d.%02d MHz, Offset=%d.%02d MHz, div=%0d\n",
+                                       freq / 16, freq % 16 * 100 / 16,
+                                       IFPCoff / 16, IFPCoff % 16 * 100 / 16,
+                                       offset / 16, offset % 16 * 100 / 16,
+                                       div);
 
        /* tv norm specific stuff for multi-norm tuners */
        switch (t->type) {
@@ -320,40 +204,40 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                /* 0x01 -> ??? no change ??? */
                /* 0x02 -> PAL BDGHI / SECAM L */
                /* 0x04 -> ??? PAL others / SECAM others ??? */
-               config &= ~0x02;
+               cb &= ~0x02;
                if (t->std & V4L2_STD_SECAM)
-                       config |= 0x02;
+                       cb |= 0x02;
                break;
 
        case TUNER_TEMIC_4046FM5:
-               config &= ~0x0f;
+               cb &= ~0x0f;
 
                if (t->std & V4L2_STD_PAL_BG) {
-                       config |= TEMIC_SET_PAL_BG;
+                       cb |= TEMIC_SET_PAL_BG;
 
                } else if (t->std & V4L2_STD_PAL_I) {
-                       config |= TEMIC_SET_PAL_I;
+                       cb |= TEMIC_SET_PAL_I;
 
                } else if (t->std & V4L2_STD_PAL_DK) {
-                       config |= TEMIC_SET_PAL_DK;
+                       cb |= TEMIC_SET_PAL_DK;
 
                } else if (t->std & V4L2_STD_SECAM_L) {
-                       config |= TEMIC_SET_PAL_L;
+                       cb |= TEMIC_SET_PAL_L;
 
                }
                break;
 
        case TUNER_PHILIPS_FQ1216ME:
-               config &= ~0x0f;
+               cb &= ~0x0f;
 
                if (t->std & (V4L2_STD_PAL_BG|V4L2_STD_PAL_DK)) {
-                       config |= PHILIPS_SET_PAL_BGDK;
+                       cb |= PHILIPS_SET_PAL_BGDK;
 
                } else if (t->std & V4L2_STD_PAL_I) {
-                       config |= PHILIPS_SET_PAL_I;
+                       cb |= PHILIPS_SET_PAL_I;
 
                } else if (t->std & V4L2_STD_SECAM_L) {
-                       config |= PHILIPS_SET_PAL_L;
+                       cb |= PHILIPS_SET_PAL_L;
 
                }
                break;
@@ -363,15 +247,15 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                /* 0x01 -> ATSC antenna input 2 */
                /* 0x02 -> NTSC antenna input 1 */
                /* 0x03 -> NTSC antenna input 2 */
-               config &= ~0x03;
+               cb &= ~0x03;
                if (!(t->std & V4L2_STD_ATSC))
-                       config |= 2;
+                       cb |= 2;
                /* FIXME: input */
                break;
 
        case TUNER_MICROTUNE_4042FI5:
                /* Set the charge pump for fast tuning */
-               tun->config |= TUNER_CHARGE_PUMP;
+               config |= TUNER_CHARGE_PUMP;
                break;
 
        case TUNER_PHILIPS_TUV1236D:
@@ -383,9 +267,9 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                buffer[1] = 0x00;
                buffer[2] = 0x17;
                buffer[3] = 0x00;
-               config &= ~0x40;
+               cb &= ~0x40;
                if (t->std & V4L2_STD_ATSC) {
-                       config |= 0x40;
+                       cb |= 0x40;
                        buffer[1] = 0x04;
                }
                /* set to the correct mode (analog or digital) */
@@ -400,53 +284,56 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                break;
        }
 
-       /*
-        * Philips FI1216MK2 remark from specification :
-        * for channel selection involving band switching, and to ensure
-        * smooth tuning to the desired channel without causing
-        * unnecessary charge pump action, it is recommended to consider
-        * the difference between wanted channel frequency and the
-        * current channel frequency.  Unnecessary charge pump action
-        * will result in very low tuning voltage which may drive the
-        * oscillator to extreme conditions.
-        *
-        * Progfou: specification says to send config data before
-        * frequency in case (wanted frequency < current frequency).
-        */
-
-       /* IFPCoff = Video Intermediate Frequency - Vif:
-               940  =16*58.75  NTSC/J (Japan)
-               732  =16*45.75  M/N STD
-               704  =16*44     ATSC (at DVB code)
-               632  =16*39.50  I U.K.
-               622.4=16*38.90  B/G D/K I, L STD
-               592  =16*37.00  D China
-               590  =16.36.875 B Australia
-               543.2=16*33.95  L' STD
-               171.2=16*10.70  FM Radio (at set_radio_freq)
-       */
-
-       if (t->std & V4L2_STD_NTSC_M_JP) {
-               IFPCoff = 940;
-       } else if (t->std & V4L2_STD_MN) {
-               IFPCoff = 732;
-       } else if (t->std & V4L2_STD_SECAM_LC) {
-               IFPCoff = 543;
-       } else {
-               IFPCoff = 623;
-       }
-
-       div=freq + IFPCoff;
-       if (t->type == TUNER_PHILIPS_SECAM && freq < t->freq) {
-               buffer[0] = tun->config;
-               buffer[1] = config;
+       if (params->cb_first_if_lower_freq && div < t->last_div) {
+               buffer[0] = config;
+               buffer[1] = cb;
                buffer[2] = (div>>8) & 0x7f;
                buffer[3] = div      & 0xff;
        } else {
                buffer[0] = (div>>8) & 0x7f;
                buffer[1] = div      & 0xff;
-               buffer[2] = tun->config;
-               buffer[3] = config;
+               buffer[2] = config;
+               buffer[3] = cb;
+       }
+       t->last_div = div;
+       if (params->has_tda9887) {
+               int config = 0;
+               int is_secam_l = (t->std & (V4L2_STD_SECAM_L | V4L2_STD_SECAM_LC)) &&
+                       !(t->std & ~(V4L2_STD_SECAM_L | V4L2_STD_SECAM_LC));
+
+               if (t->std == V4L2_STD_SECAM_LC) {
+                       if (params->port1_active ^ params->port1_invert_for_secam_lc)
+                               config |= TDA9887_PORT1_ACTIVE;
+                       if (params->port2_active ^ params->port2_invert_for_secam_lc)
+                               config |= TDA9887_PORT2_ACTIVE;
+               }
+               else {
+                       if (params->port1_active)
+                               config |= TDA9887_PORT1_ACTIVE;
+                       if (params->port2_active)
+                               config |= TDA9887_PORT2_ACTIVE;
+               }
+               if (params->intercarrier_mode)
+                       config |= TDA9887_INTERCARRIER;
+               if (is_secam_l) {
+                       if (i == 0 && params->default_top_secam_low)
+                               config |= TDA9887_TOP(params->default_top_secam_low);
+                       else if (i == 1 && params->default_top_secam_mid)
+                               config |= TDA9887_TOP(params->default_top_secam_mid);
+                       else if (params->default_top_secam_high)
+                               config |= TDA9887_TOP(params->default_top_secam_high);
+               }
+               else {
+                       if (i == 0 && params->default_top_low)
+                               config |= TDA9887_TOP(params->default_top_low);
+                       else if (i == 1 && params->default_top_mid)
+                               config |= TDA9887_TOP(params->default_top_mid);
+                       else if (params->default_top_high)
+                               config |= TDA9887_TOP(params->default_top_high);
+               }
+               if (params->default_pll_gating_18)
+                       config |= TDA9887_GATING_18;
+               i2c_clients_command(c->adapter, TDA9887_SET_CONFIG, &config);
        }
        tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
                  buffer[0],buffer[1],buffer[2],buffer[3]);
@@ -454,7 +341,20 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
        if (4 != (rc = i2c_master_send(c,buffer,4)))
                tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
 
-       if (t->type == TUNER_MICROTUNE_4042FI5) {
+       switch (t->type) {
+       case TUNER_LG_TDVS_H06XF:
+               /* Set the Auxiliary Byte. */
+               buffer[0] = buffer[2];
+               buffer[0] &= ~0x20;
+               buffer[0] |= 0x18;
+               buffer[1] = 0x20;
+               tuner_dbg("tv 0x%02x 0x%02x\n",buffer[0],buffer[1]);
+
+               if (2 != (rc = i2c_master_send(c,buffer,2)))
+                       tuner_warn("i2c i/o error: rc == %d (should be 2)\n",rc);
+               break;
+       case TUNER_MICROTUNE_4042FI5:
+       {
                // FIXME - this may also work for other tuners
                unsigned long timeout = jiffies + msecs_to_jiffies(1);
                u8 status_byte = 0;
@@ -473,16 +373,18 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                }
 
                /* Set the charge pump for optimized phase noise figure */
-               tun->config &= ~TUNER_CHARGE_PUMP;
+               config &= ~TUNER_CHARGE_PUMP;
                buffer[0] = (div>>8) & 0x7f;
                buffer[1] = div      & 0xff;
-               buffer[2] = tun->config;
-               buffer[3] = config;
+               buffer[2] = config;
+               buffer[3] = cb;
                tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
-                      buffer[0],buffer[1],buffer[2],buffer[3]);
+                         buffer[0],buffer[1],buffer[2],buffer[3]);
 
                if (4 != (rc = i2c_master_send(c,buffer,4)))
                        tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
+               break;
+       }
        }
 }
 
@@ -490,13 +392,26 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
 {
        struct tunertype *tun;
        struct tuner *t = i2c_get_clientdata(c);
-       unsigned char buffer[4];
-       unsigned div;
-       int rc;
+       u8 buffer[4];
+       u16 div;
+       int rc, j;
+       enum param_type desired_type = TUNER_PARAM_TYPE_RADIO;
+       struct tuner_params *params;
 
        tun = &tuners[t->type];
+
+       for (j = 0; j < tun->count-1; j++) {
+               if (desired_type != tun->params[j].type)
+                       continue;
+               break;
+       }
+       /* use default tuner_params if desired_type not available */
+       if (desired_type != tun->params[j].type)
+               j = 0;
+
        div = (20 * freq / 16000) + (int)(20*10.7); /* IF 10.7 MHz */
-       buffer[2] = (tun->config & ~TUNER_RATIO_MASK) | TUNER_RATIO_SELECT_50; /* 50 kHz step */
+       params = &tun->params[j];
+       buffer[2] = (params->ranges[0].config & ~TUNER_RATIO_MASK) | TUNER_RATIO_SELECT_50; /* 50 kHz step */
 
        switch (t->type) {
        case TUNER_TENA_9533_DI:
@@ -508,6 +423,9 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
        case TUNER_PHILIPS_FMD1216ME_MK3:
                buffer[3] = 0x19;
                break;
+       case TUNER_TNF_5335MF:
+               buffer[3] = 0x11;
+               break;
        case TUNER_PHILIPS_FM1256_IH3:
                div = (20 * freq) / 16000 + (int)(33.3 * 20);  /* IF 33.3 MHz */
                buffer[3] = 0x19;
@@ -523,12 +441,32 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
                buffer[3] = 0xa4;
                break;
        }
-       buffer[0] = (div>>8) & 0x7f;
-       buffer[1] = div      & 0xff;
+       if (params->cb_first_if_lower_freq && div < t->last_div) {
+               buffer[0] = buffer[2];
+               buffer[1] = buffer[3];
+               buffer[2] = (div>>8) & 0x7f;
+               buffer[3] = div      & 0xff;
+       } else {
+               buffer[0] = (div>>8) & 0x7f;
+               buffer[1] = div      & 0xff;
+       }
 
        tuner_dbg("radio 0x%02x 0x%02x 0x%02x 0x%02x\n",
               buffer[0],buffer[1],buffer[2],buffer[3]);
-
+       t->last_div = div;
+
+       if (params->has_tda9887) {
+               int config = 0;
+               if (params->port1_active && !params->port1_fm_high_sensitivity)
+                       config |= TDA9887_PORT1_ACTIVE;
+               if (params->port2_active && !params->port2_fm_high_sensitivity)
+                       config |= TDA9887_PORT2_ACTIVE;
+               if (params->intercarrier_mode)
+                       config |= TDA9887_INTERCARRIER;
+/*             if (params->port1_set_for_fm_mono)
+                       config &= ~TDA9887_PORT1_ACTIVE;*/
+               i2c_clients_command(c->adapter, TDA9887_SET_CONFIG, &config);
+       }
        if (4 != (rc = i2c_master_send(c,buffer,4)))
                tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
 }
@@ -541,10 +479,10 @@ int default_tuner_init(struct i2c_client *c)
                   t->type, tuners[t->type].name);
        strlcpy(c->name, tuners[t->type].name, sizeof(c->name));
 
-       t->tv_freq    = default_set_tv_freq;
-       t->radio_freq = default_set_radio_freq;
+       t->set_tv_freq = default_set_tv_freq;
+       t->set_radio_freq = default_set_radio_freq;
        t->has_signal = tuner_signal;
-       t->is_stereo  = tuner_stereo;
+       t->is_stereo = tuner_stereo;
        t->standby = NULL;
 
        return 0;