fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / media / video / tda9887.c
index 941f2c4..fde576f 100644 (file)
@@ -9,52 +9,30 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 
-#include <media/audiochip.h>
+#include <media/v4l2-common.h>
 #include <media/tuner.h>
-#include <media/id.h>
+
 
 /* Chips:
    TDA9885 (PAL, NTSC)
    TDA9886 (PAL, SECAM, NTSC)
    TDA9887 (PAL, SECAM, NTSC, FM Radio)
 
-   found on:
-   - Pinnacle PCTV (Jul.2002 Version with MT2032, bttv)
-      TDA9887 (world), TDA9885 (USA)
-      Note: OP2 of tda988x must be set to 1, else MT2032 is disabled!
-   - KNC One TV-Station RDS (saa7134)
+   Used as part of several tuners
 */
 
+#define tda9887_info(fmt, arg...) do {\
+       printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.name, \
+                       i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+#define tda9887_dbg(fmt, arg...) do {\
+       if (tuner_debug) \
+               printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.name, \
+                       i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] = {
-       0x84 >>1,
-       0x86 >>1,
-       0x96 >>1,
-       I2C_CLIENT_END,
-};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
-I2C_CLIENT_INSMOD;
-
-/* insmod options */
-static unsigned int debug = 0;
-module_param(debug, int, 0644);
-MODULE_LICENSE("GPL");
 
 /* ---------------------------------------------------------------------- */
 
 #define UNSET       (-1U)
-#define PREFIX      "tda9885/6/7: "
-#define dprintk     if (debug) printk
-
-struct tda9887 {
-       struct i2c_client  client;
-       v4l2_std_id        std;
-       unsigned int       radio;
-       unsigned int       config;
-       unsigned int       pinnacle_id;
-       unsigned int       using_v4l2;
-};
 
 struct tvnorm {
        v4l2_std_id       std;
@@ -64,9 +42,6 @@ struct tvnorm {
        unsigned char     e;
 };
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
-
 /* ---------------------------------------------------------------------- */
 
 //
@@ -108,6 +83,8 @@ static struct i2c_client client_template;
 #define cAudioGain0             0x00    // bit c7
 #define cAudioGain6             0x80    // bit c7
 
+#define cTopMask                0x1f    // bit c0:4
+#define cTopDefault            0x10    // bit c0:4
 
 //// third reg (e)
 #define cAudioIF_4_5             0x00    // bit e0:1
@@ -139,13 +116,15 @@ static struct i2c_client client_template;
 
 static struct tvnorm tvnorms[] = {
        {
-               .std   = V4L2_STD_PAL_BG,
-               .name  = "PAL-BG",
+               .std   = V4L2_STD_PAL_BG | V4L2_STD_PAL_H | V4L2_STD_PAL_N,
+               .name  = "PAL-BGHN",
                .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cDeemphasisON  |
-                          cDeemphasis50  ),
-               .e     = ( cAudioIF_5_5   |
+                          cDeemphasis50  |
+                          cTopDefault),
+               .e     = ( cGating_36     |
+                          cAudioIF_5_5   |
                           cVideoIF_38_90 ),
        },{
                .std   = V4L2_STD_PAL_I,
@@ -153,8 +132,10 @@ static struct tvnorm tvnorms[] = {
                .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cDeemphasisON  |
-                          cDeemphasis50  ),
-               .e     = ( cAudioIF_6_0   |
+                          cDeemphasis50  |
+                          cTopDefault),
+               .e     = ( cGating_36     |
+                          cAudioIF_6_0   |
                           cVideoIF_38_90 ),
        },{
                .std   = V4L2_STD_PAL_DK,
@@ -162,70 +143,113 @@ static struct tvnorm tvnorms[] = {
                .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cDeemphasisON  |
-                          cDeemphasis50  ),
-               .e     = ( cAudioIF_6_5   |
-                          cVideoIF_38_00 ),
+                          cDeemphasis50  |
+                          cTopDefault),
+               .e     = ( cGating_36     |
+                          cAudioIF_6_5   |
+                          cVideoIF_38_90 ),
        },{
-               .std   = V4L2_STD_PAL_M | V4L2_STD_PAL_N,
-               .name  = "PAL-M/N",
+               .std   = V4L2_STD_PAL_M | V4L2_STD_PAL_Nc,
+               .name  = "PAL-M/Nc",
                .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cDeemphasisON  |
-                          cDeemphasis75  ),
-               .e     = ( cAudioIF_4_5   |
+                          cDeemphasis75  |
+                          cTopDefault),
+               .e     = ( cGating_36     |
+                          cAudioIF_4_5   |
                           cVideoIF_45_75 ),
+       },{
+               .std   = V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H,
+               .name  = "SECAM-BGH",
+               .b     = ( cPositiveAmTV  |
+                          cQSS           ),
+               .c     = ( cTopDefault),
+               .e     = ( cGating_36     |
+                          cAudioIF_5_5   |
+                          cVideoIF_38_90 ),
        },{
                .std   = V4L2_STD_SECAM_L,
                .name  = "SECAM-L",
                .b     = ( cPositiveAmTV  |
                           cQSS           ),
-               .e     = ( cAudioIF_6_5   |
+               .c     = ( cTopDefault),
+               .e     = ( cGating_36     |
+                          cAudioIF_6_5   |
                           cVideoIF_38_90 ),
+       },{
+               .std   = V4L2_STD_SECAM_LC,
+               .name  = "SECAM-L'",
+               .b     = ( cOutputPort2Inactive |
+                          cPositiveAmTV  |
+                          cQSS           ),
+               .c     = ( cTopDefault),
+               .e     = ( cGating_36     |
+                          cAudioIF_6_5   |
+                          cVideoIF_33_90 ),
        },{
                .std   = V4L2_STD_SECAM_DK,
                .name  = "SECAM-DK",
                .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cDeemphasisON  |
-                          cDeemphasis50  ),
-               .e     = ( cAudioIF_6_5   |
-                          cVideoIF_38_00 ),
+                          cDeemphasis50  |
+                          cTopDefault),
+               .e     = ( cGating_36     |
+                          cAudioIF_6_5   |
+                          cVideoIF_38_90 ),
        },{
-               .std   = V4L2_STD_NTSC_M,
+               .std   = V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_KR,
                .name  = "NTSC-M",
                .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cDeemphasisON  |
-                          cDeemphasis50  ),
+                          cDeemphasis75  |
+                          cTopDefault),
                .e     = ( cGating_36     |
                           cAudioIF_4_5   |
                           cVideoIF_45_75 ),
        },{
                .std   = V4L2_STD_NTSC_M_JP,
-               .name  = "NTSC-JP",
+               .name  = "NTSC-M-JP",
                .b     = ( cNegativeFmTV  |
                           cQSS           ),
                .c     = ( cDeemphasisON  |
-                          cDeemphasis50  ),
+                          cDeemphasis50  |
+                          cTopDefault),
                .e     = ( cGating_36     |
                           cAudioIF_4_5   |
                           cVideoIF_58_75 ),
        }
 };
 
-static struct tvnorm radio = {
-       .name = "radio",
+static struct tvnorm radio_stereo = {
+       .name = "Radio Stereo",
+       .b    = ( cFmRadio       |
+                 cQSS           ),
+       .c    = ( cDeemphasisOFF |
+                 cAudioGain6    |
+                 cTopDefault),
+       .e    = ( cTunerGainLow  |
+                 cAudioIF_5_5   |
+                 cRadioIF_38_90 ),
+};
+
+static struct tvnorm radio_mono = {
+       .name = "Radio Mono",
        .b    = ( cFmRadio       |
                  cQSS           ),
        .c    = ( cDeemphasisON  |
-                 cDeemphasis50  ),
-       .e    = ( cAudioIF_5_5   |
+                 cDeemphasis75  |
+                 cTopDefault),
+       .e    = ( cTunerGainLow  |
+                 cAudioIF_5_5   |
                  cRadioIF_38_90 ),
 };
 
 /* ---------------------------------------------------------------------- */
 
-static void dump_read_message(unsigned char *buf)
+static void dump_read_message(struct tuner *t, unsigned char *buf)
 {
        static char *afc[16] = {
                "- 12.5 kHz",
@@ -245,15 +269,15 @@ static void dump_read_message(unsigned char *buf)
                "+ 37.5 kHz",
                "+ 12.5 kHz",
        };
-       printk(PREFIX "read: 0x%2x\n", buf[0]);
-       printk("  after power on : %s\n", (buf[0] & 0x01) ? "yes" : "no");
-       printk("  afc            : %s\n", afc[(buf[0] >> 1) & 0x0f]);
-       printk("  fmif level     : %s\n", (buf[0] & 0x20) ? "high" : "low");
-       printk("  afc window     : %s\n", (buf[0] & 0x40) ? "in" : "out");
-       printk("  vfi level      : %s\n", (buf[0] & 0x80) ? "high" : "low");
+       tda9887_info("read: 0x%2x\n", buf[0]);
+       tda9887_info("  after power on : %s\n", (buf[0] & 0x01) ? "yes" : "no");
+       tda9887_info("  afc            : %s\n", afc[(buf[0] >> 1) & 0x0f]);
+       tda9887_info("  fmif level     : %s\n", (buf[0] & 0x20) ? "high" : "low");
+       tda9887_info("  afc window     : %s\n", (buf[0] & 0x40) ? "in" : "out");
+       tda9887_info("  vfi level      : %s\n", (buf[0] & 0x80) ? "high" : "low");
 }
 
-static void dump_write_message(unsigned char *buf)
+static void dump_write_message(struct tuner *t, unsigned char *buf)
 {
        static char *sound[4] = {
                "AM/TV",
@@ -293,69 +317,72 @@ static void dump_write_message(unsigned char *buf)
                "44 MHz",
        };
 
-       printk(PREFIX "write: byte B 0x%02x\n",buf[1]);
-       printk("  B0   video mode      : %s\n",
+       tda9887_info("write: byte B 0x%02x\n",buf[1]);
+       tda9887_info("  B0   video mode      : %s\n",
               (buf[1] & 0x01) ? "video trap" : "sound trap");
-       printk("  B1   auto mute fm    : %s\n",
+       tda9887_info("  B1   auto mute fm    : %s\n",
               (buf[1] & 0x02) ? "yes" : "no");
-       printk("  B2   carrier mode    : %s\n",
+       tda9887_info("  B2   carrier mode    : %s\n",
               (buf[1] & 0x04) ? "QSS" : "Intercarrier");
-       printk("  B3-4 tv sound/radio  : %s\n",
+       tda9887_info("  B3-4 tv sound/radio  : %s\n",
               sound[(buf[1] & 0x18) >> 3]);
-       printk("  B5   force mute audio: %s\n",
+       tda9887_info("  B5   force mute audio: %s\n",
               (buf[1] & 0x20) ? "yes" : "no");
-       printk("  B6   output port 1   : %s\n",
+       tda9887_info("  B6   output port 1   : %s\n",
               (buf[1] & 0x40) ? "high (inactive)" : "low (active)");
-       printk("  B7   output port 2   : %s\n",
+       tda9887_info("  B7   output port 2   : %s\n",
               (buf[1] & 0x80) ? "high (inactive)" : "low (active)");
 
-       printk(PREFIX "write: byte C 0x%02x\n",buf[2]);
-       printk("  C0-4 top adjustment  : %s dB\n", adjust[buf[2] & 0x1f]);
-       printk("  C5-6 de-emphasis     : %s\n", deemph[(buf[2] & 0x60) >> 5]);
-       printk("  C7   audio gain      : %s\n",
+       tda9887_info("write: byte C 0x%02x\n",buf[2]);
+       tda9887_info("  C0-4 top adjustment  : %s dB\n", adjust[buf[2] & 0x1f]);
+       tda9887_info("  C5-6 de-emphasis     : %s\n", deemph[(buf[2] & 0x60) >> 5]);
+       tda9887_info("  C7   audio gain      : %s\n",
               (buf[2] & 0x80) ? "-6" : "0");
 
-       printk(PREFIX "write: byte E 0x%02x\n",buf[3]);
-       printk("  E0-1 sound carrier   : %s\n",
+       tda9887_info("write: byte E 0x%02x\n",buf[3]);
+       tda9887_info("  E0-1 sound carrier   : %s\n",
               carrier[(buf[3] & 0x03)]);
-       printk("  E6   l pll ganting   : %s\n",
+       tda9887_info("  E6   l pll gating   : %s\n",
               (buf[3] & 0x40) ? "36" : "13");
 
        if (buf[1] & 0x08) {
                /* radio */
-               printk("  E2-4 video if        : %s\n",
+               tda9887_info("  E2-4 video if        : %s\n",
                       rif[(buf[3] & 0x0c) >> 2]);
-               printk("  E7   vif agc output  : %s\n",
+               tda9887_info("  E7   vif agc output  : %s\n",
                       (buf[3] & 0x80)
                       ? ((buf[3] & 0x10) ? "fm-agc radio" : "sif-agc radio")
                       : "fm radio carrier afc");
        } else {
                /* video */
-               printk("  E2-4 video if        : %s\n",
+               tda9887_info("  E2-4 video if        : %s\n",
                       vif[(buf[3] & 0x1c) >> 2]);
-               printk("  E5   tuner gain      : %s\n",
+               tda9887_info("  E5   tuner gain      : %s\n",
                       (buf[3] & 0x80)
                       ? ((buf[3] & 0x20) ? "external" : "normal")
                       : ((buf[3] & 0x20) ? "minimum"  : "normal"));
-               printk("  E7   vif agc output  : %s\n",
+               tda9887_info("  E7   vif agc output  : %s\n",
                       (buf[3] & 0x80)
                       ? ((buf[3] & 0x20)
                          ? "pin3 port, pin22 vif agc out"
                          : "pin22 port, pin3 vif acg ext in")
                       : "pin3+pin22 port");
        }
-       printk("--\n");
+       tda9887_info("--\n");
 }
 
 /* ---------------------------------------------------------------------- */
 
-static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
+static int tda9887_set_tvnorm(struct tuner *t, char *buf)
 {
        struct tvnorm *norm = NULL;
        int i;
 
-       if (t->radio) {
-               norm = &radio;
+       if (t->mode == V4L2_TUNER_RADIO) {
+               if (t->audmode == V4L2_TUNER_MODE_MONO)
+                       norm = &radio_mono;
+               else
+                       norm = &radio_stereo;
        } else {
                for (i = 0; i < ARRAY_SIZE(tvnorms); i++) {
                        if (tvnorms[i].std & t->std) {
@@ -365,11 +392,11 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
                }
        }
        if (NULL == norm) {
-               dprintk(PREFIX "Oops: no tvnorm entry found\n");
+               tda9887_dbg("Unsupported tvnorm entry - audio muted\n");
                return -1;
        }
 
-       dprintk(PREFIX "configure for: %s\n",norm->name);
+       tda9887_dbg("configure for: %s\n",norm->name);
        buf[1] = norm->b;
        buf[2] = norm->c;
        buf[3] = norm->e;
@@ -379,13 +406,14 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
 static unsigned int port1  = UNSET;
 static unsigned int port2  = UNSET;
 static unsigned int qss    = UNSET;
-static unsigned int adjust = 0x10;
+static unsigned int adjust = UNSET;
+
 module_param(port1, int, 0644);
 module_param(port2, int, 0644);
 module_param(qss, int, 0644);
 module_param(adjust, int, 0644);
 
-static int tda9887_set_insmod(struct tda9887 *t, char *buf)
+static int tda9887_set_insmod(struct tuner *t, char *buf)
 {
        if (UNSET != port1) {
                if (port1)
@@ -407,32 +435,34 @@ static int tda9887_set_insmod(struct tda9887 *t, char *buf)
                        buf[1] &= ~cQSS;
        }
 
-       if (adjust >= 0x00 && adjust < 0x20)
+       if (adjust >= 0x00 && adjust < 0x20) {
+               buf[2] &= ~cTopMask;
                buf[2] |= adjust;
+       }
        return 0;
 }
 
-static int tda9887_set_config(struct tda9887 *t, char *buf)
+static int tda9887_set_config(struct tuner *t, char *buf)
 {
-       if (t->config & TDA9887_PORT1_ACTIVE)
+       if (t->tda9887_config & TDA9887_PORT1_ACTIVE)
                buf[1] &= ~cOutputPort1Inactive;
-       if (t->config & TDA9887_PORT1_INACTIVE)
+       if (t->tda9887_config & TDA9887_PORT1_INACTIVE)
                buf[1] |= cOutputPort1Inactive;
-       if (t->config & TDA9887_PORT2_ACTIVE)
+       if (t->tda9887_config & TDA9887_PORT2_ACTIVE)
                buf[1] &= ~cOutputPort2Inactive;
-       if (t->config & TDA9887_PORT2_INACTIVE)
+       if (t->tda9887_config & TDA9887_PORT2_INACTIVE)
                buf[1] |= cOutputPort2Inactive;
 
-       if (t->config & TDA9887_QSS)
+       if (t->tda9887_config & TDA9887_QSS)
                buf[1] |= cQSS;
-       if (t->config & TDA9887_INTERCARRIER)
+       if (t->tda9887_config & TDA9887_INTERCARRIER)
                buf[1] &= ~cQSS;
 
-       if (t->config & TDA9887_AUTOMUTE)
+       if (t->tda9887_config & TDA9887_AUTOMUTE)
                buf[1] |= cAutoMuteFmActive;
-       if (t->config & TDA9887_DEEMPHASIS_MASK) {
+       if (t->tda9887_config & TDA9887_DEEMPHASIS_MASK) {
                buf[2] &= ~0x60;
-               switch (t->config & TDA9887_DEEMPHASIS_MASK) {
+               switch (t->tda9887_config & TDA9887_DEEMPHASIS_MASK) {
                case TDA9887_DEEMPHASIS_NONE:
                        buf[2] |= cDeemphasisOFF;
                        break;
@@ -444,354 +474,136 @@ static int tda9887_set_config(struct tda9887 *t, char *buf)
                        break;
                }
        }
-       return 0;
-}
-
-/* ---------------------------------------------------------------------- */
-
-static int tda9887_set_pinnacle(struct tda9887 *t, char *buf)
-{
-       unsigned int bCarrierMode = UNSET;
-
-       if (t->std & V4L2_STD_625_50) {
-               if ((1 == t->pinnacle_id) || (7 == t->pinnacle_id)) {
-                       bCarrierMode = cIntercarrier;
-               } else {
-                       bCarrierMode = cQSS;
-               }
-       }
-       if (t->std & V4L2_STD_525_60) {
-                if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) {
-                       bCarrierMode = cIntercarrier;
-               } else {
-                       bCarrierMode = cQSS;
-                }
+       if (t->tda9887_config & TDA9887_TOP_SET) {
+               buf[2] &= ~cTopMask;
+               buf[2] |= (t->tda9887_config >> 8) & cTopMask;
        }
+       if ((t->tda9887_config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
+               buf[1] &= ~cQSS;
+       if (t->tda9887_config & TDA9887_GATING_18)
+               buf[3] &= ~cGating_36;
 
-       if (bCarrierMode != UNSET) {
-               buf[1] &= ~0x04;
-               buf[1] |= bCarrierMode;
+       if (t->tda9887_config & TDA9887_GAIN_NORMAL) {
+               radio_stereo.e &= ~cTunerGainLow;
+               radio_mono.e &= ~cTunerGainLow;
        }
+
        return 0;
 }
 
 /* ---------------------------------------------------------------------- */
 
-static char pal[] = "-";
-module_param_string(pal, pal, 0644, sizeof(pal));
-static char secam[] = "-";
-module_param_string(secam, secam, 0644, sizeof(secam));
-
-static int tda9887_fixup_std(struct tda9887 *t)
-{
-       /* get more precise norm info from insmod option */
-       if ((t->std & V4L2_STD_PAL) == V4L2_STD_PAL) {
-               switch (pal[0]) {
-               case 'b':
-               case 'B':
-               case 'g':
-               case 'G':
-                       dprintk(PREFIX "insmod fixup: PAL => PAL-BG\n");
-                       t->std = V4L2_STD_PAL_BG;
-                       break;
-               case 'i':
-               case 'I':
-                       dprintk(PREFIX "insmod fixup: PAL => PAL-I\n");
-                       t->std = V4L2_STD_PAL_I;
-                       break;
-               case 'd':
-               case 'D':
-               case 'k':
-               case 'K':
-                       dprintk(PREFIX "insmod fixup: PAL => PAL-DK\n");
-                       t->std = V4L2_STD_PAL_DK;
-                       break;
-               }
-       }
-       if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
-               switch (secam[0]) {
-               case 'd':
-               case 'D':
-               case 'k':
-               case 'K':
-                       dprintk(PREFIX "insmod fixup: SECAM => SECAM-DK\n");
-                       t->std = V4L2_STD_SECAM_DK;
-                       break;
-               case 'l':
-               case 'L':
-                       dprintk(PREFIX "insmod fixup: SECAM => SECAM-L\n");
-                       t->std = V4L2_STD_SECAM_L;
-                       break;
-               }
-       }
-       return 0;
-}
-
-static int tda9887_status(struct tda9887 *t)
+static int tda9887_status(struct tuner *t)
 {
        unsigned char buf[1];
        int rc;
 
        memset(buf,0,sizeof(buf));
-        if (1 != (rc = i2c_master_recv(&t->client,buf,1)))
-                printk(PREFIX "i2c i/o error: rc == %d (should be 1)\n",rc);
-       dump_read_message(buf);
+       if (1 != (rc = i2c_master_recv(&t->i2c,buf,1)))
+               tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);
+       dump_read_message(t, buf);
        return 0;
 }
 
-static int tda9887_configure(struct tda9887 *t)
+static void tda9887_configure(struct i2c_client *client)
 {
-       unsigned char buf[4];
+       struct tuner *t = i2c_get_clientdata(client);
        int rc;
 
-       memset(buf,0,sizeof(buf));
-       tda9887_set_tvnorm(t,buf);
-       buf[1] |= cOutputPort1Inactive;
-       buf[1] |= cOutputPort2Inactive;
-       if (UNSET != t->pinnacle_id) {
-               tda9887_set_pinnacle(t,buf);
-       }
-       tda9887_set_config(t,buf);
-       tda9887_set_insmod(t,buf);
-
-#if 0
-       /* This as-is breaks some cards, must be fixed in a
-        * card-specific way, probably using TDA9887_SET_CONFIG to
-         * turn on/off port2 */
-       if (t->std & V4L2_STD_SECAM_L) {
-               /* secam fixup (FIXME: move this to tvnorms array?) */
-               buf[1] &= ~cOutputPort2Inactive;
+       memset(t->tda9887_data,0,sizeof(t->tda9887_data));
+       tda9887_set_tvnorm(t,t->tda9887_data);
+
+       /* A note on the port settings:
+          These settings tend to depend on the specifics of the board.
+          By default they are set to inactive (bit value 1) by this driver,
+          overwriting any changes made by the tvnorm. This means that it
+          is the responsibility of the module using the tda9887 to set
+          these values in case of changes in the tvnorm.
+          In many cases port 2 should be made active (0) when selecting
+          SECAM-L, and port 2 should remain inactive (1) for SECAM-L'.
+
+          For the other standards the tda9887 application note says that
+          the ports should be set to active (0), but, again, that may
+          differ depending on the precise hardware configuration.
+        */
+       t->tda9887_data[1] |= cOutputPort1Inactive;
+       t->tda9887_data[1] |= cOutputPort2Inactive;
+
+       tda9887_set_config(t,t->tda9887_data);
+       tda9887_set_insmod(t,t->tda9887_data);
+
+       if (t->mode == T_STANDBY) {
+               t->tda9887_data[1] |= cForcedMuteAudioON;
        }
-#endif
 
-       dprintk(PREFIX "writing: b=0x%02x c=0x%02x e=0x%02x\n",
-               buf[1],buf[2],buf[3]);
-       if (debug > 1)
-               dump_write_message(buf);
+       tda9887_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
+               t->tda9887_data[1],t->tda9887_data[2],t->tda9887_data[3]);
+       if (tuner_debug > 1)
+               dump_write_message(t, t->tda9887_data);
 
-        if (4 != (rc = i2c_master_send(&t->client,buf,4)))
-                printk(PREFIX "i2c i/o error: rc == %d (should be 4)\n",rc);
+       if (4 != (rc = i2c_master_send(&t->i2c,t->tda9887_data,4)))
+               tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
 
-       if (debug > 2) {
+       if (tuner_debug > 2) {
                msleep_interruptible(1000);
                tda9887_status(t);
        }
-       return 0;
 }
 
 /* ---------------------------------------------------------------------- */
 
-static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
+static void tda9887_tuner_status(struct i2c_client *client)
 {
-       struct tda9887 *t;
-
-        client_template.adapter = adap;
-        client_template.addr    = addr;
-
-        printk(PREFIX "chip found @ 0x%x\n", addr<<1);
-
-        if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
-                return -ENOMEM;
-       memset(t,0,sizeof(*t));
-       t->client      = client_template;
-       t->std         = 0;
-       t->pinnacle_id = UNSET;
-        i2c_set_clientdata(&t->client, t);
-        i2c_attach_client(&t->client);
-
-       return 0;
+       struct tuner *t = i2c_get_clientdata(client);
+       tda9887_info("Data bytes: b=0x%02x c=0x%02x e=0x%02x\n", t->tda9887_data[1], t->tda9887_data[2], t->tda9887_data[3]);
 }
 
-static int tda9887_probe(struct i2c_adapter *adap)
+static int tda9887_get_afc(struct i2c_client *client)
 {
-#ifdef I2C_CLASS_TV_ANALOG
-       if (adap->class & I2C_CLASS_TV_ANALOG)
-               return i2c_probe(adap, &addr_data, tda9887_attach);
-#else
-       switch (adap->id) {
-       case I2C_ALGO_BIT | I2C_HW_B_BT848:
-       case I2C_ALGO_BIT | I2C_HW_B_RIVA:
-       case I2C_ALGO_SAA7134:
-               return i2c_probe(adap, &addr_data, tda9887_attach);
-               break;
-       }
-#endif
-       return 0;
-}
+       struct tuner *t = i2c_get_clientdata(client);
+       static int AFC_BITS_2_kHz[] = {
+               -12500,  -37500,  -62500,  -97500,
+               -112500, -137500, -162500, -187500,
+               187500,  162500,  137500,  112500,
+               97500 ,  62500,   37500 ,  12500
+       };
+       int afc=0;
+       __u8 reg = 0;
 
-static int tda9887_detach(struct i2c_client *client)
-{
-       struct tda9887 *t = i2c_get_clientdata(client);
+       if (1 == i2c_master_recv(&t->i2c,&reg,1))
+               afc = AFC_BITS_2_kHz[(reg>>1)&0x0f];
 
-       i2c_detach_client(client);
-       kfree(t);
-       return 0;
+       return afc;
 }
 
-#define SWITCH_V4L2    if (!t->using_v4l2 && debug) \
-                         printk(PREFIX "switching to v4l2\n"); \
-                         t->using_v4l2 = 1;
-#define CHECK_V4L2     if (t->using_v4l2) { if (debug) \
-                         printk(PREFIX "ignore v4l1 call\n"); \
-                         return 0; }
-
-static int
-tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
+static void tda9887_standby(struct i2c_client *client)
 {
-       struct tda9887 *t = i2c_get_clientdata(client);
-
-        switch (cmd) {
-
-       /* --- configuration --- */
-       case AUDC_SET_RADIO:
-               t->radio = 1;
-               tda9887_configure(t);
-               break;
-
-       case AUDC_CONFIG_PINNACLE:
-       {
-               int *i = arg;
-
-               t->pinnacle_id = *i;
-               tda9887_configure(t);
-               break;
-       }
-       case TDA9887_SET_CONFIG:
-       {
-               int *i = arg;
-
-               t->config = *i;
-               tda9887_configure(t);
-               break;
-       }
-       /* --- v4l ioctls --- */
-       /* take care: bttv does userspace copying, we'll get a
-          kernel pointer here... */
-       case VIDIOCSCHAN:
-       {
-               static const v4l2_std_id map[] = {
-                       [ VIDEO_MODE_PAL   ] = V4L2_STD_PAL,
-                       [ VIDEO_MODE_NTSC  ] = V4L2_STD_NTSC_M,
-                       [ VIDEO_MODE_SECAM ] = V4L2_STD_SECAM,
-                       [ 4 /* bttv */     ] = V4L2_STD_PAL_M,
-                       [ 5 /* bttv */     ] = V4L2_STD_PAL_N,
-                       [ 6 /* bttv */     ] = V4L2_STD_NTSC_M_JP,
-               };
-               struct video_channel *vc = arg;
-
-               CHECK_V4L2;
-               t->radio = 0;
-               if (vc->norm < ARRAY_SIZE(map))
-                       t->std = map[vc->norm];
-               tda9887_fixup_std(t);
-               tda9887_configure(t);
-               break;
-       }
-       case VIDIOC_S_STD:
-       {
-               v4l2_std_id *id = arg;
-
-               SWITCH_V4L2;
-               t->radio = 0;
-               t->std   = *id;
-               tda9887_fixup_std(t);
-               tda9887_configure(t);
-               break;
-       }
-       case VIDIOC_S_FREQUENCY:
-       {
-               struct v4l2_frequency *f = arg;
-
-               SWITCH_V4L2;
-               if (V4L2_TUNER_ANALOG_TV == f->type) {
-                       if (t->radio == 0)
-                               return 0;
-                       t->radio = 0;
-               }
-               if (V4L2_TUNER_RADIO == f->type) {
-                       if (t->radio == 1)
-                               return 0;
-                       t->radio = 1;
-               }
-               tda9887_configure(t);
-               break;
-       }
-       case VIDIOC_G_TUNER:
-       {
-               static int AFC_BITS_2_kHz[] = {
-                       -12500,  -37500,  -62500,  -97500,
-                       -112500, -137500, -162500, -187500,
-                       187500,  162500,  137500,  112500,
-                       97500 ,  62500,   37500 ,  12500
-               };
-               struct v4l2_tuner* tuner = arg;
-
-               if (t->radio) {
-                       __u8 reg = 0;
-                       tuner->afc=0;
-                       if (1 == i2c_master_recv(&t->client,&reg,1))
-                               tuner->afc = AFC_BITS_2_kHz[(reg>>1)&0x0f];
-               }
-               break;
-       }
-       default:
-               /* nothing */
-               break;
-       }
-       return 0;
+       tda9887_configure(client);
 }
 
-static int tda9887_suspend(struct device * dev, u32 state, u32 level)
+static void tda9887_set_freq(struct i2c_client *client, unsigned int freq)
 {
-       dprintk("tda9887: suspend\n");
-       return 0;
+       tda9887_configure(client);
 }
 
-static int tda9887_resume(struct device * dev, u32 level)
+int tda9887_tuner_init(struct i2c_client *c)
 {
-       struct i2c_client *c = container_of(dev, struct i2c_client, dev);
-       struct tda9887 *t = i2c_get_clientdata(c);
+       struct tuner *t = i2c_get_clientdata(c);
 
-       dprintk("tda9887: resume\n");
-       tda9887_configure(t);
-       return 0;
-}
+       strlcpy(c->name, "tda9887", sizeof(c->name));
 
-/* ----------------------------------------------------------------------- */
-
-static struct i2c_driver driver = {
-       .owner          = THIS_MODULE,
-        .name           = "i2c tda9887 driver",
-        .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = tda9887_probe,
-        .detach_client  = tda9887_detach,
-        .command        = tda9887_command,
-       .driver = {
-               .suspend = tda9887_suspend,
-               .resume  = tda9887_resume,
-       },
-};
-static struct i2c_client client_template =
-{
-       I2C_DEVNAME("tda9887"),
-       .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
-};
+       tda9887_info("tda988[5/6/7] found @ 0x%x (%s)\n", t->i2c.addr,
+                                               t->i2c.driver->driver.name);
 
-static int __init tda9887_init_module(void)
-{
-       return i2c_add_driver(&driver);
-}
+       t->set_tv_freq = tda9887_set_freq;
+       t->set_radio_freq = tda9887_set_freq;
+       t->standby = tda9887_standby;
+       t->tuner_status = tda9887_tuner_status;
+       t->get_afc = tda9887_get_afc;
 
-static void __exit tda9887_cleanup_module(void)
-{
-       i2c_del_driver(&driver);
+       return 0;
 }
 
-module_init(tda9887_init_module);
-module_exit(tda9887_cleanup_module);
-
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * ---------------------------------------------------------------------------