Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / media / video / tuner-core.c
index 6212388..1013b4d 100644 (file)
@@ -1,5 +1,4 @@
 /*
- * $Id: tuner-core.c,v 1.5 2005/02/15 15:59:35 kraxel Exp $
  *
  * i2c tv tuner chip device driver
  * core core, i.e. kernel interfaces, registering and so on
 #include <linux/init.h>
 
 #include <media/tuner.h>
-#include <media/audiochip.h>
+#include <media/v4l2-common.h>
 
 #define UNSET (-1U)
 
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
-       0x4b, /* tda8290 */
-       I2C_CLIENT_END
-};
-static unsigned short normal_i2c_range[] = {
-       0x60, 0x6f,
+       0x42, 0x43, 0x4a, 0x4b,                 /* tda8290 */
+       0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+       0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
        I2C_CLIENT_END
 };
+
 I2C_CLIENT_INSMOD;
 
 /* insmod options used at init time => read/only */
-static unsigned int addr  =  0;
-module_param(addr, int, 0444);
+static unsigned int addr = 0;
+static unsigned int no_autodetect = 0;
+static unsigned int show_i2c = 0;
 
 /* insmod options used at runtime => read/write */
-unsigned int tuner_debug   = 0;
-module_param(tuner_debug,       int, 0644);
+static unsigned int tuner_debug_old = 0;
+int tuner_debug = 0;
 
-static unsigned int tv_range[2]    = { 44, 958 };
+static unsigned int tv_range[2] = { 44, 958 };
 static unsigned int radio_range[2] = { 65, 108 };
 
-module_param_array(tv_range,    int, NULL, 0644);
+static char pal[] = "--";
+static char secam[] = "--";
+static char ntsc[] = "-";
+
+
+module_param(addr, int, 0444);
+module_param(no_autodetect, int, 0444);
+module_param(show_i2c, int, 0444);
+/* Note: tuner_debug is deprecated and will be removed in 2.6.17 */
+module_param_named(tuner_debug,tuner_debug_old, int, 0444);
+module_param_named(debug,tuner_debug, int, 0644);
+module_param_string(pal, pal, sizeof(pal), 0644);
+module_param_string(secam, secam, sizeof(secam), 0644);
+module_param_string(ntsc, ntsc, sizeof(ntsc), 0644);
+module_param_array(tv_range, int, NULL, 0644);
 module_param_array(radio_range, int, NULL, 0644);
 
 MODULE_DESCRIPTION("device driver for various TV and TV+FM radio tuners");
 MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer");
 MODULE_LICENSE("GPL");
 
-static int this_adap;
-
 static struct i2c_driver driver;
 static struct i2c_client client_template;
 
 /* ---------------------------------------------------------------------- */
 
-// Set tuner frequency,  freq in Units of 62.5kHz = 1/16MHz
+/* Set tuner frequency,  freq in Units of 62.5kHz = 1/16MHz */
 static void set_tv_freq(struct i2c_client *c, unsigned int freq)
 {
        struct tuner *t = i2c_get_clientdata(c);
 
        if (t->type == UNSET) {
-               tuner_info("tuner type not set\n");
+               tuner_warn ("tuner type not set\n");
                return;
        }
-       if (NULL == t->tv_freq) {
-               tuner_info("Huh? tv_set is NULL?\n");
+       if (NULL == t->set_tv_freq) {
+               tuner_warn ("Tuner has no way to set tv freq\n");
                return;
        }
-       if (freq < tv_range[0]*16 || freq > tv_range[1]*16) {
-               /* FIXME: better do that chip-specific, but
-                  right now we don't have that in the config
-                  struct and this way is still better than no
-                  check at all */
-               tuner_info("TV freq (%d.%02d) out of range (%d-%d)\n",
-                          freq/16,freq%16*100/16,tv_range[0],tv_range[1]);
-               return;
+       if (freq < tv_range[0] * 16 || freq > tv_range[1] * 16) {
+               tuner_dbg ("TV freq (%d.%02d) out of range (%d-%d)\n",
+                          freq / 16, freq % 16 * 100 / 16, tv_range[0],
+                          tv_range[1]);
+               /* V4L2 spec: if the freq is not possible then the closest
+                  possible value should be selected */
+               if (freq < tv_range[0] * 16)
+                       freq = tv_range[0] * 16;
+               else
+                       freq = tv_range[1] * 16;
        }
-       t->tv_freq(c,freq);
+       t->set_tv_freq(c, freq);
 }
 
 static void set_radio_freq(struct i2c_client *c, unsigned int freq)
@@ -91,20 +104,26 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq)
        struct tuner *t = i2c_get_clientdata(c);
 
        if (t->type == UNSET) {
-               tuner_info("tuner type not set\n");
+               tuner_warn ("tuner type not set\n");
                return;
        }
-       if (NULL == t->radio_freq) {
-               tuner_info("no radio tuning for this one, sorry.\n");
+       if (NULL == t->set_radio_freq) {
+               tuner_warn ("tuner has no way to set radio frequency\n");
                return;
        }
-       if (freq < radio_range[0]*16 || freq > radio_range[1]*16) {
-               tuner_info("radio freq (%d.%02d) out of range (%d-%d)\n",
-                          freq/16,freq%16*100/16,
-                          radio_range[0],radio_range[1]);
-               return;
+       if (freq < radio_range[0] * 16000 || freq > radio_range[1] * 16000) {
+               tuner_dbg ("radio freq (%d.%02d) out of range (%d-%d)\n",
+                          freq / 16000, freq % 16000 * 100 / 16000,
+                          radio_range[0], radio_range[1]);
+               /* V4L2 spec: if the freq is not possible then the closest
+                  possible value should be selected */
+               if (freq < radio_range[0] * 16000)
+                       freq = radio_range[0] * 16000;
+               else
+                       freq = radio_range[1] * 16000;
        }
-       t->radio_freq(c,freq);
+
+       t->set_radio_freq(c, freq);
 }
 
 static void set_freq(struct i2c_client *c, unsigned long freq)
@@ -114,39 +133,44 @@ static void set_freq(struct i2c_client *c, unsigned long freq)
        switch (t->mode) {
        case V4L2_TUNER_RADIO:
                tuner_dbg("radio freq set to %lu.%02lu\n",
-                         freq/16,freq%16*100/16);
-               set_radio_freq(c,freq);
+                         freq / 16000, freq % 16000 * 100 / 16000);
+               set_radio_freq(c, freq);
+               t->radio_freq = freq;
                break;
        case V4L2_TUNER_ANALOG_TV:
        case V4L2_TUNER_DIGITAL_TV:
                tuner_dbg("tv freq set to %lu.%02lu\n",
-                         freq/16,freq%16*100/16);
+                         freq / 16, freq % 16 * 100 / 16);
                set_tv_freq(c, freq);
+               t->tv_freq = freq;
                break;
        }
-       t->freq = freq;
 }
 
-static void set_type(struct i2c_client *c, unsigned int type)
+static void set_type(struct i2c_client *c, unsigned int type,
+                    unsigned int new_mode_mask)
 {
        struct tuner *t = i2c_get_clientdata(c);
+       unsigned char buffer[4];
 
-       /* sanity check */
-       if (type == UNSET  ||  type == TUNER_ABSENT)
+       if (type == UNSET || type == TUNER_ABSENT) {
+               tuner_dbg ("tuner 0x%02x: Tuner type absent\n",c->addr);
                return;
-       if (type >= tuner_count)
+       }
+
+       if (type >= tuner_count) {
+               tuner_warn ("tuner 0x%02x: Tuner count greater than %d\n",c->addr,tuner_count);
                return;
+       }
 
+       /* This code detects calls by card attach_inform */
        if (NULL == t->i2c.dev.driver) {
-               /* not registered yet */
-               t->type = type;
+               tuner_dbg ("tuner 0x%02x: called during i2c_client register by adapter's attach_inform\n", c->addr);
+
+               t->type=type;
                return;
        }
-       if (t->initialized)
-               /* run only once */
-               return;
 
-       t->initialized = 1;
        t->type = type;
        switch (t->type) {
        case TUNER_MT2032:
@@ -155,81 +179,334 @@ static void set_type(struct i2c_client *c, unsigned int type)
        case TUNER_PHILIPS_TDA8290:
                tda8290_init(c);
                break;
+       case TUNER_TEA5767:
+               if (tea5767_tuner_init(c) == EINVAL) {
+                       t->type = TUNER_ABSENT;
+                       t->mode_mask = T_UNINITIALIZED;
+                       return;
+               }
+               t->mode_mask = T_RADIO;
+               break;
+       case TUNER_PHILIPS_FMD1216ME_MK3:
+               buffer[0] = 0x0b;
+               buffer[1] = 0xdc;
+               buffer[2] = 0x9c;
+               buffer[3] = 0x60;
+               i2c_master_send(c, buffer, 4);
+               mdelay(1);
+               buffer[2] = 0x86;
+               buffer[3] = 0x54;
+               i2c_master_send(c, buffer, 4);
+               default_tuner_init(c);
+               break;
+       case TUNER_LG_TDVS_H062F:
+               /* Set the Auxiliary Byte. */
+               buffer[2] &= ~0x20;
+               buffer[2] |= 0x18;
+               buffer[3] = 0x20;
+               i2c_master_send(c, buffer, 4);
+               default_tuner_init(c);
+               break;
+       case TUNER_PHILIPS_TD1316:
+               buffer[0] = 0x0b;
+               buffer[1] = 0xdc;
+               buffer[2] = 0x86;
+               buffer[3] = 0xa4;
+               i2c_master_send(c,buffer,4);
+               default_tuner_init(c);
+               break;
        default:
                default_tuner_init(c);
                break;
        }
+
+       if (t->mode_mask == T_UNINITIALIZED)
+               t->mode_mask = new_mode_mask;
+
+       set_freq(c, (V4L2_TUNER_RADIO == t->mode) ? t->radio_freq : t->tv_freq);
+       tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
+                 c->adapter->name, c->driver->driver.name, c->addr << 1, type,
+                 t->mode_mask);
 }
 
-static char pal[] = "-";
-module_param_string(pal, pal, sizeof(pal), 0644);
+/*
+ * This function apply tuner config to tuner specified
+ * by tun_setup structure. I addr is unset, then admin status
+ * and tun addr status is more precise then current status,
+ * it's applied. Otherwise status and type are applied only to
+ * tuner with exactly the same addr.
+*/
+
+static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup)
+{
+       struct tuner *t = i2c_get_clientdata(c);
+
+       if ( t->type == UNSET && ((tun_setup->addr == ADDR_UNSET &&
+               (t->mode_mask & tun_setup->mode_mask)) ||
+               tun_setup->addr == c->addr)) {
+                       set_type(c, tun_setup->type, tun_setup->mode_mask);
+       }
+}
+
+static inline int check_mode(struct tuner *t, char *cmd)
+{
+       if ((1 << t->mode & t->mode_mask) == 0) {
+               return EINVAL;
+       }
+
+       switch (t->mode) {
+       case V4L2_TUNER_RADIO:
+               tuner_dbg("Cmd %s accepted for radio\n", cmd);
+               break;
+       case V4L2_TUNER_ANALOG_TV:
+               tuner_dbg("Cmd %s accepted for analog TV\n", cmd);
+               break;
+       case V4L2_TUNER_DIGITAL_TV:
+               tuner_dbg("Cmd %s accepted for digital TV\n", cmd);
+               break;
+       }
+       return 0;
+}
 
+/* get more precise norm info from insmod option */
 static int tuner_fixup_std(struct tuner *t)
 {
        if ((t->std & V4L2_STD_PAL) == V4L2_STD_PAL) {
-               /* get more precise norm info from insmod option */
                switch (pal[0]) {
                case 'b':
                case 'B':
                case 'g':
                case 'G':
-                       tuner_dbg("insmod fixup: PAL => PAL-BG\n");
+                       tuner_dbg ("insmod fixup: PAL => PAL-BG\n");
                        t->std = V4L2_STD_PAL_BG;
                        break;
                case 'i':
                case 'I':
-                       tuner_dbg("insmod fixup: PAL => PAL-I\n");
+                       tuner_dbg ("insmod fixup: PAL => PAL-I\n");
                        t->std = V4L2_STD_PAL_I;
                        break;
                case 'd':
                case 'D':
                case 'k':
                case 'K':
-                       tuner_dbg("insmod fixup: PAL => PAL-DK\n");
+                       tuner_dbg ("insmod fixup: PAL => PAL-DK\n");
                        t->std = V4L2_STD_PAL_DK;
                        break;
+               case 'M':
+               case 'm':
+                       tuner_dbg ("insmod fixup: PAL => PAL-M\n");
+                       t->std = V4L2_STD_PAL_M;
+                       break;
+               case 'N':
+               case 'n':
+                       if (pal[1] == 'c' || pal[1] == 'C') {
+                               tuner_dbg("insmod fixup: PAL => PAL-Nc\n");
+                               t->std = V4L2_STD_PAL_Nc;
+                       } else {
+                               tuner_dbg ("insmod fixup: PAL => PAL-N\n");
+                               t->std = V4L2_STD_PAL_N;
+                       }
+                       break;
+               case '-':
+                       /* default parameter, do nothing */
+                       break;
+               default:
+                       tuner_warn ("pal= argument not recognised\n");
+                       break;
+               }
+       }
+       if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
+               switch (secam[0]) {
+               case 'b':
+               case 'B':
+               case 'g':
+               case 'G':
+               case 'h':
+               case 'H':
+                       tuner_dbg("insmod fixup: SECAM => SECAM-BGH\n");
+                       t->std = V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H;
+                       break;
+               case 'd':
+               case 'D':
+               case 'k':
+               case 'K':
+                       tuner_dbg ("insmod fixup: SECAM => SECAM-DK\n");
+                       t->std = V4L2_STD_SECAM_DK;
+                       break;
+               case 'l':
+               case 'L':
+                       if ((secam[1]=='C')||(secam[1]=='c')) {
+                               tuner_dbg ("insmod fixup: SECAM => SECAM-L'\n");
+                               t->std = V4L2_STD_SECAM_LC;
+                       } else {
+                               tuner_dbg ("insmod fixup: SECAM => SECAM-L\n");
+                               t->std = V4L2_STD_SECAM_L;
+                       }
+                       break;
+               case '-':
+                       /* default parameter, do nothing */
+                       break;
+               default:
+                       tuner_warn ("secam= argument not recognised\n");
+                       break;
+               }
+       }
+
+       if ((t->std & V4L2_STD_NTSC) == V4L2_STD_NTSC) {
+               switch (ntsc[0]) {
+               case 'm':
+               case 'M':
+                       tuner_dbg("insmod fixup: NTSC => NTSC-M\n");
+                       t->std = V4L2_STD_NTSC_M;
+                       break;
+               case 'j':
+               case 'J':
+                       tuner_dbg("insmod fixup: NTSC => NTSC_M_JP\n");
+                       t->std = V4L2_STD_NTSC_M_JP;
+                       break;
+               case 'k':
+               case 'K':
+                       tuner_dbg("insmod fixup: NTSC => NTSC_M_KR\n");
+                       t->std = V4L2_STD_NTSC_M_KR;
+                       break;
+               case '-':
+                       /* default parameter, do nothing */
+                       break;
+               default:
+                       tuner_info("ntsc= argument not recognised\n");
+                       break;
                }
        }
        return 0;
 }
 
+static void tuner_status(struct i2c_client *client)
+{
+       struct tuner *t = i2c_get_clientdata(client);
+       unsigned long freq, freq_fraction;
+       const char *p;
+
+       switch (t->mode) {
+               case V4L2_TUNER_RADIO:      p = "radio"; break;
+               case V4L2_TUNER_ANALOG_TV:  p = "analog TV"; break;
+               case V4L2_TUNER_DIGITAL_TV: p = "digital TV"; break;
+               default: p = "undefined"; break;
+       }
+       if (t->mode == V4L2_TUNER_RADIO) {
+               freq = t->radio_freq / 16000;
+               freq_fraction = (t->radio_freq % 16000) * 100 / 16000;
+       } else {
+               freq = t->tv_freq / 16;
+               freq_fraction = (t->tv_freq % 16) * 100 / 16;
+       }
+       tuner_info("Tuner mode:      %s\n", p);
+       tuner_info("Frequency:       %lu.%02lu MHz\n", freq, freq_fraction);
+       tuner_info("Standard:        0x%08lx\n", (unsigned long)t->std);
+       if (t->mode != V4L2_TUNER_RADIO)
+              return;
+       if (t->has_signal) {
+               tuner_info("Signal strength: %d\n", t->has_signal(client));
+       }
+       if (t->is_stereo) {
+               tuner_info("Stereo:          %s\n", t->is_stereo(client) ? "yes" : "no");
+       }
+}
+
 /* ---------------------------------------------------------------------- */
 
+/* static var Used only in tuner_attach and tuner_probe */
+static unsigned default_mode_mask;
+
+/* During client attach, set_type is called by adapter's attach_inform callback.
+   set_type must then be completed by tuner_attach.
+ */
 static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 {
        struct tuner *t;
 
-       if (this_adap > 0)
-               return -1;
-       this_adap++;
+       client_template.adapter = adap;
+       client_template.addr = addr;
 
-        client_template.adapter = adap;
-        client_template.addr = addr;
-
-        t = kmalloc(sizeof(struct tuner),GFP_KERNEL);
-        if (NULL == t)
-                return -ENOMEM;
-        memset(t,0,sizeof(struct tuner));
-        memcpy(&t->i2c,&client_template,sizeof(struct i2c_client));
+       t = kzalloc(sizeof(struct tuner), GFP_KERNEL);
+       if (NULL == t)
+               return -ENOMEM;
+       memcpy(&t->i2c, &client_template, sizeof(struct i2c_client));
        i2c_set_clientdata(&t->i2c, t);
-       t->type       = UNSET;
-       t->radio_if2  = 10700*1000; // 10.7MHz - FM radio
+       t->type = UNSET;
+       t->radio_if2 = 10700 * 1000;    /* 10.7MHz - FM radio */
+       t->audmode = V4L2_TUNER_MODE_STEREO;
+       t->mode_mask = T_UNINITIALIZED;
+       if (tuner_debug_old) {
+               tuner_debug = tuner_debug_old;
+               printk(KERN_ERR "tuner: tuner_debug is deprecated and will be removed in 2.6.17.\n");
+               printk(KERN_ERR "tuner: use the debug option instead.\n");
+       }
+
+       if (show_i2c) {
+               unsigned char buffer[16];
+               int i,rc;
+
+               memset(buffer, 0, sizeof(buffer));
+               rc = i2c_master_recv(&t->i2c, buffer, sizeof(buffer));
+               tuner_info("I2C RECV = ");
+               for (i=0;i<rc;i++)
+                       printk("%02x ",buffer[i]);
+               printk("\n");
+       }
+       /* autodetection code based on the i2c addr */
+       if (!no_autodetect) {
+               switch (addr) {
+               case 0x42:
+               case 0x43:
+               case 0x4a:
+               case 0x4b:
+                       /* If chip is not tda8290, don't register.
+                          since it can be tda9887*/
+                       if (tda8290_probe(&t->i2c) != 0) {
+                               tuner_dbg("chip at addr %x is not a tda8290\n", addr);
+                               kfree(t);
+                               return 0;
+                       }
+                       break;
+               case 0x60:
+                       if (tea5767_autodetection(&t->i2c) != EINVAL) {
+                               t->type = TUNER_TEA5767;
+                               t->mode_mask = T_RADIO;
+                               t->mode = T_STANDBY;
+                               t->radio_freq = 87.5 * 16000; /* Sets freq to FM range */
+                               default_mode_mask &= ~T_RADIO;
+
+                               goto register_client;
+                       }
+                       break;
+               }
+       }
+
+       /* Initializes only the first adapter found */
+       if (default_mode_mask != T_UNINITIALIZED) {
+               tuner_dbg ("Setting mode_mask to 0x%02x\n", default_mode_mask);
+               t->mode_mask = default_mode_mask;
+               t->tv_freq = 400 * 16; /* Sets freq to VHF High */
+               t->radio_freq = 87.5 * 16000; /* Sets freq to FM range */
+               default_mode_mask = T_UNINITIALIZED;
+       }
 
-        i2c_attach_client(&t->i2c);
-       tuner_info("chip found @ 0x%x (%s)\n",
-                  addr << 1, adap->name);
-       set_type(&t->i2c, t->type);
+       /* Should be just before return */
+register_client:
+       tuner_info("chip found @ 0x%x (%s)\n", addr << 1, adap->name);
+       i2c_attach_client (&t->i2c);
+       set_type (&t->i2c,t->type, t->mode_mask);
        return 0;
 }
 
 static int tuner_probe(struct i2c_adapter *adap)
 {
        if (0 != addr) {
-               normal_i2c[0]       = addr;
-               normal_i2c_range[0] = addr;
-               normal_i2c_range[1] = addr;
+               normal_i2c[0] = addr;
+               normal_i2c[1] = I2C_CLIENT_END;
        }
-       this_adap = 0;
+
+       default_mode_mask = T_RADIO | T_ANALOG_TV | T_DIGITAL_TV;
 
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, tuner_attach);
@@ -239,196 +516,326 @@ static int tuner_probe(struct i2c_adapter *adap)
 static int tuner_detach(struct i2c_client *client)
 {
        struct tuner *t = i2c_get_clientdata(client);
+       int err;
+
+       err = i2c_detach_client(&t->i2c);
+       if (err) {
+               tuner_warn
+                   ("Client deregistration failed, client not detached.\n");
+               return err;
+       }
 
-       i2c_detach_client(&t->i2c);
        kfree(t);
        return 0;
 }
 
-#define SWITCH_V4L2    if (!t->using_v4l2 && tuner_debug) \
-                         tuner_info("switching to v4l2\n"); \
-                         t->using_v4l2 = 1;
-#define CHECK_V4L2     if (t->using_v4l2) { if (tuner_debug) \
-                         tuner_info("ignore v4l1 call\n"); \
-                         return 0; }
+/*
+ * Switch tuner to other mode. If tuner support both tv and radio,
+ * set another frequency to some value (This is needed for some pal
+ * tuners to avoid locking). Otherwise, just put second tuner in
+ * standby mode.
+ */
 
-static int
-tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
+static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode, char *cmd)
+{
+       if (mode == t->mode)
+               return 0;
+
+       t->mode = mode;
+
+       if (check_mode(t, cmd) == EINVAL) {
+               t->mode = T_STANDBY;
+               if (t->standby)
+                       t->standby (client);
+               return EINVAL;
+       }
+       return 0;
+}
+
+#define switch_v4l2()  if (!t->using_v4l2) \
+                           tuner_dbg("switching to v4l2\n"); \
+                       t->using_v4l2 = 1;
+
+static inline int check_v4l2(struct tuner *t)
+{
+       /* bttv still uses both v4l1 and v4l2 calls to the tuner (v4l2 for
+          TV, v4l1 for radio), until that is fixed this code is disabled.
+          Otherwise the radio (v4l1) wouldn't tune after using the TV (v4l2)
+          first. */
+       return 0;
+}
+
+static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
        struct tuner *t = i2c_get_clientdata(client);
-        unsigned int *iarg = (int*)arg;
 
-        switch (cmd) {
+       if (tuner_debug>1)
+               v4l_i2c_print_ioctl(&(t->i2c),cmd);
 
+       switch (cmd) {
        /* --- configuration --- */
-       case TUNER_SET_TYPE:
-               set_type(client,*iarg);
+       case TUNER_SET_TYPE_ADDR:
+               tuner_dbg ("Calling set_type_addr for type=%d, addr=0x%02x, mode=0x%02x\n",
+                               ((struct tuner_setup *)arg)->type,
+                               ((struct tuner_setup *)arg)->addr,
+                               ((struct tuner_setup *)arg)->mode_mask);
+
+               set_addr(client, (struct tuner_setup *)arg);
                break;
        case AUDC_SET_RADIO:
-               if (V4L2_TUNER_RADIO != t->mode) {
-                       set_tv_freq(client,400 * 16);
-                       t->mode = V4L2_TUNER_RADIO;
-               }
+               if (set_mode(client, t, V4L2_TUNER_RADIO, "AUDC_SET_RADIO")
+                               == EINVAL)
+                       return 0;
+               if (t->radio_freq)
+                       set_freq(client, t->radio_freq);
+               break;
+       case TUNER_SET_STANDBY:
+               if (check_mode(t, "TUNER_SET_STANDBY") == EINVAL)
+                       return 0;
+               if (t->standby)
+                       t->standby (client);
+               break;
+       case VIDIOCSAUDIO:
+               if (check_mode(t, "VIDIOCSAUDIO") == EINVAL)
+                       return 0;
+               if (check_v4l2(t) == EINVAL)
+                       return 0;
+
+               /* Should be implemented, since bttv calls it */
+               tuner_dbg("VIDIOCSAUDIO not implemented.\n");
                break;
-       case AUDC_CONFIG_PINNACLE:
-               switch (*iarg) {
-               case 2:
-                       tuner_dbg("pinnacle pal\n");
-                       t->radio_if2 = 33300 * 1000;
-                       break;
-               case 3:
-                       tuner_dbg("pinnacle ntsc\n");
-                       t->radio_if2 = 41300 * 1000;
-                       break;
-               }
-                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->mode = V4L2_TUNER_ANALOG_TV;
-               if (vc->norm < ARRAY_SIZE(map))
-                       t->std = map[vc->norm];
-               tuner_fixup_std(t);
-               if (t->freq)
-                       set_tv_freq(client,t->freq);
-               return 0;
-       }
+               {
+                       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;
+
+                       if (check_v4l2(t) == EINVAL)
+                               return 0;
+
+                       if (set_mode(client,t,V4L2_TUNER_ANALOG_TV, "VIDIOCSCHAN")==EINVAL)
+                               return 0;
+
+                       if (vc->norm < ARRAY_SIZE(map))
+                               t->std = map[vc->norm];
+                       tuner_fixup_std(t);
+                       if (t->tv_freq)
+                               set_tv_freq(client, t->tv_freq);
+                       return 0;
+               }
        case VIDIOCSFREQ:
-       {
-               unsigned long *v = arg;
+               {
+                       unsigned long *v = arg;
 
-               CHECK_V4L2;
-               set_freq(client,*v);
-               return 0;
-       }
-       case VIDIOCGTUNER:
-       {
-               struct video_tuner *vt = arg;
+                       if (check_mode(t, "VIDIOCSFREQ") == EINVAL)
+                               return 0;
+                       if (check_v4l2(t) == EINVAL)
+                               return 0;
 
-               CHECK_V4L2;
-               if (V4L2_TUNER_RADIO == t->mode  &&  t->has_signal)
-                       vt->signal = t->has_signal(client);
-               return 0;
-       }
+                       set_freq(client, *v);
+                       return 0;
+               }
+       case VIDIOCGTUNER:
+               {
+                       struct video_tuner *vt = arg;
+
+                       if (check_mode(t, "VIDIOCGTUNER") == EINVAL)
+                               return 0;
+                       if (check_v4l2(t) == EINVAL)
+                               return 0;
+
+                       if (V4L2_TUNER_RADIO == t->mode) {
+                               if (t->has_signal)
+                                       vt->signal = t->has_signal(client);
+                               if (t->is_stereo) {
+                                       if (t->is_stereo(client))
+                                               vt->flags |=
+                                                   VIDEO_TUNER_STEREO_ON;
+                                       else
+                                               vt->flags &=
+                                                   ~VIDEO_TUNER_STEREO_ON;
+                               }
+                               vt->flags |= VIDEO_TUNER_LOW;   /* Allow freqs at 62.5 Hz */
+
+                               vt->rangelow = radio_range[0] * 16000;
+                               vt->rangehigh = radio_range[1] * 16000;
+
+                       } else {
+                               vt->rangelow = tv_range[0] * 16;
+                               vt->rangehigh = tv_range[1] * 16;
+                       }
+
+                       return 0;
+               }
        case VIDIOCGAUDIO:
-       {
-               struct video_audio *va = arg;
-
-               CHECK_V4L2;
-               if (V4L2_TUNER_RADIO == t->mode  &&  t->is_stereo)
-                       va->mode = t->is_stereo(client)
-                               ? VIDEO_SOUND_STEREO
-                               : VIDEO_SOUND_MONO;
-               return 0;
-       }
+               {
+                       struct video_audio *va = arg;
+
+                       if (check_mode(t, "VIDIOCGAUDIO") == EINVAL)
+                               return 0;
+                       if (check_v4l2(t) == EINVAL)
+                               return 0;
+
+                       if (V4L2_TUNER_RADIO == t->mode && t->is_stereo)
+                               va->mode = t->is_stereo(client)
+                                   ? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;
+                       return 0;
+               }
 
        case VIDIOC_S_STD:
-       {
-               v4l2_std_id *id = arg;
-
-               SWITCH_V4L2;
-               t->mode = V4L2_TUNER_ANALOG_TV;
-               t->std = *id;
-               tuner_fixup_std(t);
-               if (t->freq)
-                       set_freq(client,t->freq);
-               break;
-       }
+               {
+                       v4l2_std_id *id = arg;
+
+                       if (set_mode (client, t, V4L2_TUNER_ANALOG_TV, "VIDIOC_S_STD")
+                                       == EINVAL)
+                               return 0;
+
+                       switch_v4l2();
+
+                       t->std = *id;
+                       tuner_fixup_std(t);
+                       if (t->tv_freq)
+                               set_freq(client, t->tv_freq);
+                       break;
+               }
        case VIDIOC_S_FREQUENCY:
-       {
-               struct v4l2_frequency *f = arg;
-
-               SWITCH_V4L2;
-               if (V4L2_TUNER_RADIO == f->type &&
-                   V4L2_TUNER_RADIO != t->mode)
-                       set_tv_freq(client,400*16);
-               t->mode  = f->type;
-               set_freq(client,f->frequency);
-               break;
-       }
-       case VIDIOC_G_FREQUENCY:
-       {
-               struct v4l2_frequency *f = arg;
+               {
+                       struct v4l2_frequency *f = arg;
+
+                       switch_v4l2();
+                       if ((V4L2_TUNER_RADIO == f->type && V4L2_TUNER_RADIO != t->mode)
+                               || (V4L2_TUNER_DIGITAL_TV == f->type
+                                       && V4L2_TUNER_DIGITAL_TV != t->mode)) {
+                               if (set_mode (client, t, f->type, "VIDIOC_S_FREQUENCY")
+                                           == EINVAL)
+                                       return 0;
+                       }
+                       set_freq(client,f->frequency);
 
-               SWITCH_V4L2;
-               f->type = t->mode;
-               f->frequency = t->freq;
-               break;
-       }
+                       break;
+               }
+       case VIDIOC_G_FREQUENCY:
+               {
+                       struct v4l2_frequency *f = arg;
+
+                       if (check_mode(t, "VIDIOC_G_FREQUENCY") == EINVAL)
+                               return 0;
+                       switch_v4l2();
+                       f->type = t->mode;
+                       f->frequency = (V4L2_TUNER_RADIO == t->mode) ?
+                               t->radio_freq : t->tv_freq;
+                       break;
+               }
        case VIDIOC_G_TUNER:
-       {
-               struct v4l2_tuner *tuner = arg;
-
-               SWITCH_V4L2;
-               if (V4L2_TUNER_RADIO == t->mode  &&  t->has_signal)
-                       tuner->signal = t->has_signal(client);
-               tuner->rangelow = tv_range[0] * 16;
-               tuner->rangehigh = tv_range[1] * 16;
-               break;
-       }
-       default:
-               /* nothing */
+               {
+                       struct v4l2_tuner *tuner = arg;
+
+                       if (check_mode(t, "VIDIOC_G_TUNER") == EINVAL)
+                               return 0;
+                       switch_v4l2();
+
+                       tuner->type = t->mode;
+                       if (t->mode == V4L2_TUNER_ANALOG_TV)
+                               tuner->capability |= V4L2_TUNER_CAP_NORM;
+                       if (t->mode != V4L2_TUNER_RADIO) {
+                               tuner->rangelow = tv_range[0] * 16;
+                               tuner->rangehigh = tv_range[1] * 16;
+                               break;
+                       }
+
+                       /* radio mode */
+                       if (t->has_signal)
+                               tuner->signal = t->has_signal(client);
+
+                       tuner->rxsubchans =
+                               V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
+                       if (t->is_stereo) {
+                               tuner->rxsubchans = t->is_stereo(client) ?
+                                       V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO;
+                       }
+
+                       tuner->capability |=
+                           V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
+                       tuner->audmode = t->audmode;
+                       tuner->rangelow = radio_range[0] * 16000;
+                       tuner->rangehigh = radio_range[1] * 16000;
+                       break;
+               }
+       case VIDIOC_S_TUNER:
+               {
+                       struct v4l2_tuner *tuner = arg;
+
+                       if (check_mode(t, "VIDIOC_S_TUNER") == EINVAL)
+                               return 0;
+
+                       switch_v4l2();
+
+                       /* do nothing unless we're a radio tuner */
+                       if (t->mode != V4L2_TUNER_RADIO)
+                               break;
+                       t->audmode = tuner->audmode;
+                       set_radio_freq(client, t->radio_freq);
+                       break;
+               }
+       case VIDIOC_LOG_STATUS:
+               tuner_status(client);
                break;
        }
 
        return 0;
 }
 
-static int tuner_suspend(struct device * dev, pm_message_t state, u32 level)
+static int tuner_suspend(struct device *dev, pm_message_t state)
 {
-       struct i2c_client *c = container_of(dev, struct i2c_client, dev);
-       struct tuner *t = i2c_get_clientdata(c);
+       struct i2c_client *c = container_of (dev, struct i2c_client, dev);
+       struct tuner *t = i2c_get_clientdata (c);
 
-       tuner_dbg("suspend\n");
+       tuner_dbg ("suspend\n");
        /* FIXME: power down ??? */
        return 0;
 }
 
-static int tuner_resume(struct device * dev, u32 level)
+static int tuner_resume(struct device *dev)
 {
-       struct i2c_client *c = container_of(dev, struct i2c_client, dev);
-       struct tuner *t = i2c_get_clientdata(c);
-
-       tuner_dbg("resume\n");
-       if (t->freq)
-               set_freq(c,t->freq);
+       struct i2c_client *c = container_of (dev, struct i2c_client, dev);
+       struct tuner *t = i2c_get_clientdata (c);
+
+       tuner_dbg ("resume\n");
+       if (V4L2_TUNER_RADIO == t->mode) {
+               if (t->radio_freq)
+                       set_freq(c, t->radio_freq);
+       } else {
+               if (t->tv_freq)
+                       set_freq(c, t->tv_freq);
+       }
        return 0;
 }
 
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-       .owner          = THIS_MODULE,
-        .name           = "tuner",
-        .id             = I2C_DRIVERID_TUNER,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = tuner_probe,
-        .detach_client  = tuner_detach,
-        .command        = tuner_command,
+       .id = I2C_DRIVERID_TUNER,
+       .attach_adapter = tuner_probe,
+       .detach_client = tuner_detach,
+       .command = tuner_command,
        .driver = {
+               .name    = "tuner",
                .suspend = tuner_suspend,
                .resume  = tuner_resume,
        },
 };
-static struct i2c_client client_template =
-{
-       I2C_DEVNAME("(tuner unset)"),
-       .flags      = I2C_CLIENT_ALLOW_USE,
-        .driver     = &driver,
+static struct i2c_client client_template = {
+       .name = "(tuner unset)",
+       .driver = &driver,
 };
 
 static int __init tuner_init_module(void)