]> err.no Git - linux-2.6/blobdiff - drivers/media/video/tuner-simple.c
[PATCH] Fix I2O config-osm init to return proper error
[linux-2.6] / drivers / media / video / tuner-simple.c
index 539f305573170661664b4b1795f1a8e68b763135..8edd73abe1d8cb356c639ac904fb870ed2473b4e 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * $Id: tuner-simple.c,v 1.21 2005/06/10 19:53:26 nsh Exp $
  *
  * i2c tv tuner chip device driver
  * controls all those simple 4-control-bytes style tuners.
 #define PHILIPS_MF_SET_PAL_L   0x03 // France
 #define PHILIPS_MF_SET_PAL_L2  0x02 // L'
 
+/* Control byte */
+
+#define TUNER_RATIO_MASK        0x06 /* Bit cb1:cb2 */
+#define TUNER_RATIO_SELECT_50   0x00
+#define TUNER_RATIO_SELECT_32   0x02
+#define TUNER_RATIO_SELECT_166  0x04
+#define TUNER_RATIO_SELECT_62   0x06
+
+#define TUNER_CHARGE_PUMP       0x40  /* Bit cb6 */
+
+/* Status byte */
+
+#define TUNER_POR        0x80
+#define TUNER_FL          0x40
+#define TUNER_MODE        0x38
+#define TUNER_AFC         0x07
+#define TUNER_SIGNAL      0x07
+#define TUNER_STEREO      0x10
+
+#define TUNER_PLL_LOCKED   0x40
+#define TUNER_STEREO_MK3   0x04
 
 /* ---------------------------------------------------------------------- */
 
@@ -81,6 +101,7 @@ struct tunertype
  *     "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,623},
        { "Philips PAL_I (FI1246 and compatibles)", Philips, PAL_I,
@@ -89,7 +110,6 @@ static struct tunertype tuners[] = {
          16*157.25,16*451.25,0xA0,0x90,0x30,0x8e,732},
        { "Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)", Philips, SECAM,
          16*168.25,16*447.25,0xA7,0x97,0x37,0x8e,623},
-
        { "NoTuner", NoTuner, NOTUNER,
          0,0,0x00,0x00,0x00,0x00,0x00},
        { "Philips PAL_BG (FI1216 and compatibles)", Philips, PAL,
@@ -98,34 +118,34 @@ static struct tunertype tuners[] = {
          16*157.25,16*463.25,0x02,0x04,0x01,0x8e,732},
        { "Temic PAL_I (4062 FY5)", TEMIC, PAL_I,
          16*170.00,16*450.00,0x02,0x04,0x01,0x8e,623},
-
        { "Temic NTSC (4036 FY5)", TEMIC, NTSC,
          16*157.25,16*463.25,0xa0,0x90,0x30,0x8e,732},
         { "Alps HSBH1", TEMIC, NTSC,
          16*137.25,16*385.25,0x01,0x02,0x08,0x8e,732},
-        { "Alps TSBE1",TEMIC,PAL,
+
+       /* 10-19 */
+        { "Alps TSBE1", TEMIC, PAL,
          16*137.25,16*385.25,0x01,0x02,0x08,0x8e,732},
         { "Alps TSBB5", Alps, PAL_I, /* tested (UK UHF) with Modulartech MM205 */
          16*133.25,16*351.25,0x01,0x02,0x08,0x8e,632},
-
         { "Alps TSBE5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
          16*133.25,16*351.25,0x01,0x02,0x08,0x8e,622},
         { "Alps TSBC5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
          16*133.25,16*351.25,0x01,0x02,0x08,0x8e,608},
        { "Temic PAL_BG (4006FH5)", TEMIC, PAL,
          16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
-       { "Alps TSCH6",Alps,NTSC,
+       { "Alps TSCH6", Alps, NTSC,
          16*137.25,16*385.25,0x14,0x12,0x11,0x8e,732},
-
-       { "Temic PAL_DK (4016 FY5)",TEMIC,PAL,
+       { "Temic PAL_DK (4016 FY5)", TEMIC, PAL,
          16*168.25,16*456.25,0xa0,0x90,0x30,0x8e,623},
-       { "Philips NTSC_M (MK2)",Philips,NTSC,
+       { "Philips NTSC_M (MK2)", Philips, NTSC,
          16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732},
         { "Temic PAL_I (4066 FY5)", TEMIC, PAL_I,
           16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
         { "Temic PAL* auto (4006 FN5)", TEMIC, PAL,
           16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
 
+       /* 20-29 */
         { "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)", TEMIC, PAL,
           16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
         { "Temic NTSC (4039 FR5)", TEMIC, NTSC,
@@ -134,7 +154,6 @@ static struct tunertype tuners[] = {
           16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},
         { "Philips PAL_DK (FI1256 and compatibles)", Philips, PAL,
          16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
-
        { "Philips PAL/SECAM multi (FQ1216ME)", Philips, PAL,
          16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
        { "LG PAL_I+FM (TAPC-I001D)", LGINNOTEK, PAL_I,
@@ -143,25 +162,24 @@ static struct tunertype tuners[] = {
          16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
        { "LG NTSC+FM (TPI8NSR01F)", LGINNOTEK, NTSC,
          16*210.00,16*497.00,0xa0,0x90,0x30,0x8e,732},
-
        { "LG PAL_BG+FM (TPI8PSB01D)", LGINNOTEK, PAL,
          16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
        { "LG PAL_BG (TPI8PSB11D)", LGINNOTEK, PAL,
          16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},
+
+       /* 30-39 */
        { "Temic PAL* auto + FM (4009 FN5)", TEMIC, PAL,
          16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},
        { "SHARP NTSC_JP (2U5JF5540)", SHARP, NTSC, /* 940=16*58.75 NTSC@Japan */
          16*137.25,16*317.25,0x01,0x02,0x08,0x8e,940 },
-
-       { "Samsung PAL TCPM9091PD27", Samsung, PAL,  /* from sourceforge v3tv */
+       { "Samsung PAL TCPM9091PD27", Samsung, PAL, /* from sourceforge v3tv */
           16*169,16*464,0xA0,0x90,0x30,0x8e,623},
-       { "MT20xx universal", Microtune,PAL|NTSC,
+       { "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,623},
        { "Temic PAL_DK/SECAM_L (4012 FY5)", TEMIC, PAL,
           16*140.25, 16*463.25, 0x02,0x04,0x01,0x8e,623},
-
        { "Temic NTSC (4136 FY5)", TEMIC, NTSC,
           16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
         { "LG PAL (newer TAPC series)", LGINNOTEK, PAL,
@@ -171,64 +189,65 @@ static struct tunertype tuners[] = {
        { "LG NTSC (newer TAPC series)", LGINNOTEK, NTSC,
           16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,732},
 
+       /* 40-49 */
        { "HITACHI V7-J180AT", HITACHI, NTSC,
          16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,940 },
        { "Philips PAL_MK (FI1216 MK)", Philips, PAL,
          16*140.25,16*463.25,0x01,0xc2,0xcf,0x8e,623},
-       { "Philips 1236D ATSC/NTSC daul in",Philips,ATSC,
+       { "Philips 1236D ATSC/NTSC daul in", Philips, ATSC,
          16*157.25,16*454.00,0xa0,0x90,0x30,0x8e,732},
         { "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", Philips, NTSC,
           16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
-
         { "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)", Philips, NTSC,
           16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
-       { "Microtune 4049 FM5",Microtune,PAL,
+       { "Microtune 4049 FM5", Microtune, PAL,
          16*141.00,16*464.00,0xa0,0x90,0x30,0x8e,623},
        { "Panasonic VP27s/ENGE4324D", Panasonic, NTSC,
          16*160.00,16*454.00,0x01,0x02,0x08,0xce,940},
         { "LG NTSC (TAPE series)", LGINNOTEK, NTSC,
           16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
-
         { "Tenna TNF 8831 BGFF)", Philips, PAL,
           16*161.25,16*463.25,0xa0,0x90,0x30,0x8e,623},
        { "Microtune 4042 FI5 ATSC/NTSC dual in", Microtune, NTSC,
          16*162.00,16*457.00,0xa2,0x94,0x31,0x8e,732},
+
+       /* 50-59 */
         { "TCL 2002N", TCL, NTSC,
           16*172.00,16*448.00,0x01,0x02,0x08,0x8e,732},
        { "Philips PAL/SECAM_D (FM 1256 I-H3)", Philips, PAL,
          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,623 },
-
        { "Thomson DDT 7610 (ATSC/NTSC)", THOMSON, ATSC,
          16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},
        { "Philips FQ1286", Philips, NTSC,
-         16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, // UHF band untested
-       { "tda8290+75", Philips,PAL|NTSC,
+         16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, /* UHF band untested */
+       { "tda8290+75", Philips, PAL|NTSC,
          /* see tda8290.c for details */ },
        { "LG PAL (TAPE series)", LGINNOTEK, PAL,
           16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623},
-
-        { "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL,
-          16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
-        { "Philips FQ1236A MK4", Philips, NTSC,
-          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
-
-       /* Should work for TVF8531MF, TVF8831MF, TVF8731MF */
-       { "Ymec TVision TVF-8531MF", Philips, NTSC,
+       { "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL,
+         16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
+       { "Philips FQ1236A MK4", Philips, NTSC,
+         16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
+       { "Ymec TVision TVF-8531MF/8831MF/8731MF", Philips, NTSC,
          16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732},
        { "Ymec TVision TVF-5533MF", Philips, NTSC,
          16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732},
 
+       /* 60-66 */
        { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC,
          16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},
-       { "Tena TNF9533-D/IF", LGINNOTEK, PAL,
-         16*160.25, 16*464.25, 0x01,0x02,0x08,0x8e,623},
-
-       /*
-        * This entry is for TEA5767 FM radio only chip used on several boards
-        * w/TV tuner
-        */
-       { TEA5767_TUNER_NAME, Philips, RADIO,
-         -1, -1, 0, 0, 0, TEA5767_LOW_LO_32768,0},
+       { "Tena TNF9533-D/IF/TNF9533-B/DF", Philips, PAL,
+          16*160.25,16*464.25,0x01,0x02,0x04,0x8e,623},
+       { "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,623 },
+       { "LG TDVS-H062F/TUA6034", LGINNOTEK, ATSC,
+         16*160.00,16*455.00,0x01,0x02,0x04,0x8e,732},
+       { "Ymec TVF66T5-B/DFF", Philips, PAL,
+          16*160.25,16*464.25,0x01,0x02,0x08,0x8e,623},
+       { "LG NTSC (TALN mini series)", LGINNOTEK, NTSC,
+         16*137.25,16*373.25,0x01,0x02,0x08,0x8e,732 },
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
@@ -245,15 +264,6 @@ static int tuner_getstatus(struct i2c_client *c)
        return byte;
 }
 
-#define TUNER_POR       0x80
-#define TUNER_FL        0x40
-#define TUNER_MODE      0x38
-#define TUNER_AFC       0x07
-
-#define TUNER_STEREO       0x10 /* radio mode */
-#define TUNER_STEREO_MK3   0x04 /* radio mode */
-#define TUNER_SIGNAL       0x07 /* radio mode */
-
 static int tuner_signal(struct i2c_client *c)
 {
        return (tuner_getstatus(c) & TUNER_SIGNAL) << 13;
@@ -279,22 +289,6 @@ static int tuner_stereo(struct i2c_client *c)
        return stereo;
 }
 
-#if 0 /* unused */
-static int tuner_islocked (struct i2c_client *c)
-{
-        return (tuner_getstatus (c) & TUNER_FL);
-}
-
-static int tuner_afcstatus (struct i2c_client *c)
-{
-        return (tuner_getstatus (c) & TUNER_AFC) - 2;
-}
-
-static int tuner_mode (struct i2c_client *c)
-{
-        return (tuner_getstatus (c) & TUNER_MODE) >> 3;
-}
-#endif
 
 /* ---------------------------------------------------------------------- */
 
@@ -377,7 +371,7 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
 
        case TUNER_MICROTUNE_4042FI5:
                /* Set the charge pump for fast tuning */
-               tun->config |= 0x40;
+               tun->config |= TUNER_CHARGE_PUMP;
                break;
        }
 
@@ -426,14 +420,13 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                                tuner_warn("i2c i/o read error: rc == %d (should be 1)\n",rc);
                                break;
                        }
-                       /* bit 6 is PLL locked indicator */
-                       if (status_byte & 0x40)
+                       if (status_byte & TUNER_PLL_LOCKED)
                                break;
                        udelay(10);
                }
 
                /* Set the charge pump for optimized phase noise figure */
-               tun->config &= ~0x40;
+               tun->config &= ~TUNER_CHARGE_PUMP;
                buffer[0] = (div>>8) & 0x7f;
                buffer[1] = div      & 0xff;
                buffer[2] = tun->config;
@@ -454,31 +447,31 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
        unsigned div;
        int rc;
 
-       tun=&tuners[t->type];
-       div = freq + (int)(16*10.7);
-       buffer[2] = tun->config;
+       tun = &tuners[t->type];
+       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 */
 
        switch (t->type) {
        case TUNER_TENA_9533_DI:
        case TUNER_YMEC_TVF_5533MF:
-
-               /*These values are empirically determinated */
-               div = (freq*122)/16 - 20;
-               buffer[2] = 0x88; /* could be also 0x80 */
-               buffer[3] = 0x19; /* could be also 0x10, 0x18, 0x99 */
-               break;
+               tuner_dbg ("This tuner doesn't have FM. Most cards has a TEA5767 for FM\n");
+               return;
        case TUNER_PHILIPS_FM1216ME_MK3:
        case TUNER_PHILIPS_FM1236_MK3:
+       case TUNER_PHILIPS_FMD1216ME_MK3:
                buffer[3] = 0x19;
                break;
        case TUNER_PHILIPS_FM1256_IH3:
-               div = (20 * freq)/16 + 333 * 2;
-               buffer[2] = 0x80;
+               div = (20 * freq) / 16000 + (int)(33.3 * 20);  /* IF 33.3 MHz */
                buffer[3] = 0x19;
                break;
        case TUNER_LG_PAL_FM:
                buffer[3] = 0xa5;
                break;
+       case TUNER_MICROTUNE_4049FM5:
+               div = (20 * freq) / 16000 + (int)(33.3 * 20); /* IF 33.3 MHz */
+               buffer[3] = 0xa4;
+               break;
        default:
                buffer[3] = 0xa4;
                break;
@@ -505,6 +498,8 @@ int default_tuner_init(struct i2c_client *c)
        t->radio_freq = default_set_radio_freq;
        t->has_signal = tuner_signal;
        t->is_stereo  = tuner_stereo;
+       t->standby = NULL;
+
        return 0;
 }