Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
[sfrench/cifs-2.6.git] / drivers / media / video / tuner-simple.c
index a3f8e83f53147fe3dd06f694837576f1a4a212d6..d832205818f21ef94b0c0d85e4e2e016a938a5db 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * $Id: tuner-simple.c,v 1.39 2005/07/07 01:49:30 mkrufky Exp $
  *
  * i2c tv tuner chip device driver
  * controls all those simple 4-control-bytes style tuners.
@@ -102,7 +101,8 @@ struct tunertype
  *     "no float in kernel" rule.
  */
 static struct tunertype tuners[] = {
-        { "Temic PAL (4002 FH5)", TEMIC, PAL,
+       /* 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,
          16*140.25,16*463.25,0xa0,0x90,0x30,0x8e,623},
@@ -110,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,
@@ -119,43 +118,42 @@ 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,
+       { "Temic NTSC (4036 FY5)", TEMIC, NTSC,
          16*157.25,16*463.25,0xa0,0x90,0x30,0x8e,732},
-        { "Alps HSBH1", TEMIC, NTSC,
+       { "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 */
+       { "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. */
+       { "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. */
+       { "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,
-         16*137.25,16*385.25,0x14,0x12,0x11,0x8e,732},
-
-       { "Temic PAL_DK (4016 FY5)",TEMIC,PAL,
-         16*168.25,16*456.25,0xa0,0x90,0x30,0x8e,623},
-       { "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},
-
-        { "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,
-          16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
-        { "Temic PAL/SECAM multi (4046 FM5)", TEMIC, PAL,
-          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},
+       { "Alps TSCH6", Alps, NTSC,
+         16*137.25,16*385.25,0x14,0x12,0x11,0x8e,732},
+       { "Temic PAL_DK (4016 FY5)", TEMIC, PAL,
+         16*168.25,16*456.25,0xa0,0x90,0x30,0x8e,623},
+       { "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,
+         16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
+       { "Temic PAL/SECAM multi (4046 FM5)", TEMIC, PAL,
+         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,
@@ -164,70 +162,68 @@ 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 */
-          16*169,16*464,0xA0,0x90,0x30,0x8e,623},
-       { "MT20xx universal", Microtune,PAL|NTSC,
+       { "Samsung PAL TCPM9091PD27", Samsung, PAL, /* from sourceforge v3tv */
+         16*169,16*464,0xA0,0x90,0x30,0x8e,623},
+       { "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},
+         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},
-
+         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,
-          16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,623},
+         16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},
+       { "LG PAL (newer TAPC series)", LGINNOTEK, PAL,
+         16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,623},
        { "Philips PAL/SECAM multi (FM1216ME MK3)", Philips, PAL,
-         16*160.00,16*442.00,0x01,0x02,0x04,0x8e,623 },
+         16*158.00,16*442.00,0x01,0x02,0x04,0x8e,623 },
        { "LG NTSC (newer TAPC series)", LGINNOTEK, NTSC,
-          16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,732},
+         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,
+       { "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,
          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},
+       { "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},
-        { "TCL 2002N", TCL, NTSC,
-          16*172.00,16*448.00,0x01,0x02,0x08,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},
-
+       { "TCL 2002MB", TCL, 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,
@@ -237,14 +233,25 @@ static struct tunertype tuners[] = {
        { "Ymec TVision TVF-5533MF", Philips, NTSC,
          16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732},
 
+       /* 60-68 */
        { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC,
          16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},
        { "Tena TNF9533-D/IF/TNF9533-B/DF", Philips, PAL,
-          16*160.25,16*464.25,0x01,0x02,0x04,0x8e,623},
+         16*160.25,16*464.25,0x01,0x02,0x04,0x8e,623},
        { "Philips TEA5767HN FM Radio", Philips, RADIO,
-          /* see tea5767.c for details */},
+         /* 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 },
+       { "Philips TD1316 Hybrid Tuner", Philips, PAL,
+         16*160.00,16*442.00,0xa1,0xa2,0xa4,0xc8,623 },
+       { "Philips TUV1236D ATSC/NTSC dual in", Philips, ATSC,
+         16*157.25,16*454.00,0x01,0x02,0x04,0xce,732 },
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
@@ -274,7 +281,7 @@ static int tuner_stereo(struct i2c_client *c)
        status = tuner_getstatus (c);
 
        switch (t->type) {
-               case TUNER_PHILIPS_FM1216ME_MK3:
+               case TUNER_PHILIPS_FM1216ME_MK3:
                case TUNER_PHILIPS_FM1236_MK3:
                case TUNER_PHILIPS_FM1256_IH3:
                        stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
@@ -292,10 +299,10 @@ 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;
+       u8 config, tuneraddr;
        u16 div;
        struct tunertype *tun;
-        unsigned char buffer[4];
+       unsigned char buffer[4];
        int rc;
 
        tun = &tuners[t->type];
@@ -370,6 +377,31 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
                /* Set the charge pump for fast tuning */
                tun->config |= TUNER_CHARGE_PUMP;
                break;
+
+       case TUNER_PHILIPS_TUV1236D:
+               /* 0x40 -> ATSC antenna input 1 */
+               /* 0x48 -> ATSC antenna input 2 */
+               /* 0x00 -> NTSC antenna input 1 */
+               /* 0x08 -> NTSC antenna input 2 */
+               buffer[0] = 0x14;
+               buffer[1] = 0x00;
+               buffer[2] = 0x17;
+               buffer[3] = 0x00;
+               config &= ~0x40;
+               if (t->std & V4L2_STD_ATSC) {
+                       config |= 0x40;
+                       buffer[1] = 0x04;
+               }
+               /* set to the correct mode (analog or digital) */
+               tuneraddr = c->addr;
+               c->addr = 0x0a;
+               if (2 != (rc = i2c_master_send(c,&buffer[0],2)))
+                       tuner_warn("i2c i/o error: rc == %d (should be 2)\n",rc);
+               if (2 != (rc = i2c_master_send(c,&buffer[2],2)))
+                       tuner_warn("i2c i/o error: rc == %d (should be 2)\n",rc);
+               c->addr = tuneraddr;
+               /* FIXME: input */
+               break;
        }
 
        /*
@@ -401,7 +433,7 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
        tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
                  buffer[0],buffer[1],buffer[2],buffer[3]);
 
-        if (4 != (rc = i2c_master_send(c,buffer,4)))
+       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) {
@@ -440,7 +472,7 @@ 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 char buffer[4];
        unsigned div;
        int rc;
 
@@ -465,17 +497,21 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)
        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;
        }
-        buffer[0] = (div>>8) & 0x7f;
-        buffer[1] = div      & 0xff;
+       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]);
 
-        if (4 != (rc = i2c_master_send(c,buffer,4)))
+       if (4 != (rc = i2c_master_send(c,buffer,4)))
                tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);
 }
 
@@ -491,6 +527,7 @@ 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;
 }