V4L/DVB (13553): v4l: Use the video_is_registered function in device drivers
[safe/jmp/linux-2.6] / drivers / media / video / tvaudio.c
index 2bdbb39..800fc1b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * experimental driver for simple i2c audio chips.
+ * Driver for simple i2c audio chips.
  *
  * Copyright (c) 2000 Gerd Knorr
  * based on code by:
@@ -7,6 +7,10 @@
  *   Steve VanDeBogart (vandebo@uclink.berkeley.edu)
  *   Greg Alexander (galexand@acm.org)
  *
+ * Copyright(c) 2005-2008 Mauro Carvalho Chehab
+ *     - Some cleanups, code fixes, etc
+ *     - Convert it to V4L2 API
+ *
  * This code is placed under the terms of the GNU General Public License
  *
  * OPTIONS:
@@ -14,9 +18,7 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
+#include <linux/kthread.h>
+#include <linux/freezer.h>
 
-#include <media/audiochip.h>
+#include <media/tvaudio.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-i2c-drv.h>
 
-#include "tvaudio.h"
+#include <media/i2c-addr.h>
 
 /* ---------------------------------------------------------------------- */
 /* insmod args                                                            */
 
-static int debug = 0;  /* insmod parameter */
+static int debug;      /* insmod parameter */
 module_param(debug, int, 0644);
 
 MODULE_DESCRIPTION("device driver for various i2c TV sound decoder / audiomux chips");
@@ -46,23 +51,10 @@ MODULE_LICENSE("GPL");
 
 #define UNSET    (-1U)
 
-#define tvaudio_info(fmt, arg...) do { \
-       printk(KERN_INFO "%s %d-%04x: " fmt, chip->c.driver->name, \
-              i2c_adapter_id(chip->c.adapter), chip->c.addr , ## arg); } while (0)
-#define tvaudio_warn(fmt, arg...) do { \
-       printk(KERN_WARNING "%s %d-%04x: " fmt, chip->c.driver->name, \
-              i2c_adapter_id(chip->c.adapter), chip->c.addr , ## arg); } while (0)
-#define tvaudio_dbg(fmt, arg...) \
-       do { \
-               if (debug) \
-                       printk(KERN_INFO "%s debug %d-%04x: " fmt, chip->c.driver->name, \
-                              i2c_adapter_id(chip->c.adapter), chip->c.addr , ## arg); \
-       } while (0)
-
 /* ---------------------------------------------------------------------- */
 /* our structs                                                            */
 
-#define MAXREGS 64
+#define MAXREGS 256
 
 struct CHIPSTATE;
 typedef int  (*getvalue)(int);
@@ -70,7 +62,6 @@ typedef int  (*checkit)(struct CHIPSTATE*);
 typedef int  (*initialize)(struct CHIPSTATE*);
 typedef int  (*getmode)(struct CHIPSTATE*);
 typedef void (*setmode)(struct CHIPSTATE*, int mode);
-typedef void (*checkmode)(struct CHIPSTATE*);
 
 /* i2c command */
 typedef struct AUDIOCMD {
@@ -81,7 +72,6 @@ typedef struct AUDIOCMD {
 /* chip description */
 struct CHIPDESC {
        char       *name;             /* chip name         */
-       int        id;                /* ID */
        int        addr_lo, addr_hi;  /* i2c address range */
        int        registers;         /* # of registers    */
 
@@ -92,6 +82,7 @@ struct CHIPDESC {
 #define CHIP_HAS_VOLUME      1
 #define CHIP_HAS_BASSTREBLE  2
 #define CHIP_HAS_INPUTSEL    4
+#define CHIP_NEED_CHECKMODE  8
 
        /* various i2c command sequences */
        audiocmd   init;
@@ -109,58 +100,41 @@ struct CHIPDESC {
        getmode  getmode;
        setmode  setmode;
 
-       /* check / autoswitch audio after channel switches */
-       checkmode  checkmode;
-
        /* input switch register + values for v4l inputs */
        int  inputreg;
-       int  inputmap[8];
+       int  inputmap[4];
        int  inputmute;
        int  inputmask;
 };
-static struct CHIPDESC chiplist[];
 
 /* current state of the chip */
 struct CHIPSTATE {
-       struct i2c_client c;
+       struct v4l2_subdev sd;
 
-       /* index into CHIPDESC array */
-       int type;
+       /* chip-specific description - should point to
+          an entry at CHIPDESC table */
+       struct CHIPDESC *desc;
 
        /* shadow register set */
        audiocmd   shadow;
 
        /* current settings */
-       __u16 left,right,treble,bass,mode;
+       __u16 left,right,treble,bass,muted,mode;
        int prevmode;
        int radio;
+       int input;
 
        /* thread */
-       pid_t                tpid;
-       struct completion    texit;
-       wait_queue_head_t    wq;
+       struct task_struct   *thread;
        struct timer_list    wt;
-       int                  done;
        int                  watch_stereo;
+       int                  audmode;
 };
 
-/* ---------------------------------------------------------------------- */
-/* i2c addresses                                                          */
-
-static unsigned short normal_i2c[] = {
-       I2C_TDA8425   >> 1,
-       I2C_TEA6300   >> 1,
-       I2C_TEA6420   >> 1,
-       I2C_TDA9840   >> 1,
-       I2C_TDA985x_L >> 1,
-       I2C_TDA985x_H >> 1,
-       I2C_TDA9874   >> 1,
-       I2C_PIC16C54  >> 1,
-       I2C_CLIENT_END };
-I2C_CLIENT_INSMOD;
-
-static struct i2c_driver driver;
-static struct i2c_client client_template;
+static inline struct CHIPSTATE *to_state(struct v4l2_subdev *sd)
+{
+       return container_of(sd, struct CHIPSTATE, sd);
+}
 
 
 /* ---------------------------------------------------------------------- */
@@ -168,39 +142,56 @@ static struct i2c_client client_template;
 
 static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
 {
+       struct v4l2_subdev *sd = &chip->sd;
+       struct i2c_client *c = v4l2_get_subdevdata(sd);
        unsigned char buffer[2];
 
-       if (-1 == subaddr) {
-               tvaudio_dbg("%s: chip_write: 0x%x\n",
-                       chip->c.name, val);
+       if (subaddr < 0) {
+               v4l2_dbg(1, debug, sd, "chip_write: 0x%x\n", val);
                chip->shadow.bytes[1] = val;
                buffer[0] = val;
-               if (1 != i2c_master_send(&chip->c,buffer,1)) {
-                       tvaudio_warn("%s: I/O error (write 0x%x)\n",
-                               chip->c.name, val);
+               if (1 != i2c_master_send(c, buffer, 1)) {
+                       v4l2_warn(sd, "I/O error (write 0x%x)\n", val);
                        return -1;
                }
        } else {
-               tvaudio_dbg("%s: chip_write: reg%d=0x%x\n",
-                       chip->c.name, subaddr, val);
+               if (subaddr + 1 >= ARRAY_SIZE(chip->shadow.bytes)) {
+                       v4l2_info(sd,
+                               "Tried to access a non-existent register: %d\n",
+                               subaddr);
+                       return -EINVAL;
+               }
+
+               v4l2_dbg(1, debug, sd, "chip_write: reg%d=0x%x\n",
+                       subaddr, val);
                chip->shadow.bytes[subaddr+1] = val;
                buffer[0] = subaddr;
                buffer[1] = val;
-               if (2 != i2c_master_send(&chip->c,buffer,2)) {
-                       tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n",
-                       chip->c.name, subaddr, val);
+               if (2 != i2c_master_send(c, buffer, 2)) {
+                       v4l2_warn(sd, "I/O error (write reg%d=0x%x)\n",
+                               subaddr, val);
                        return -1;
                }
        }
        return 0;
 }
 
-static int chip_write_masked(struct CHIPSTATE *chip, int subaddr, int val, int mask)
+static int chip_write_masked(struct CHIPSTATE *chip,
+                            int subaddr, int val, int mask)
 {
+       struct v4l2_subdev *sd = &chip->sd;
+
        if (mask != 0) {
-               if (-1 == subaddr) {
+               if (subaddr < 0) {
                        val = (chip->shadow.bytes[1] & ~mask) | (val & mask);
                } else {
+                       if (subaddr + 1 >= ARRAY_SIZE(chip->shadow.bytes)) {
+                               v4l2_info(sd,
+                                       "Tried to access a non-existent register: %d\n",
+                                       subaddr);
+                               return -EINVAL;
+                       }
+
                        val = (chip->shadow.bytes[subaddr+1] & ~mask) | (val & mask);
                }
        }
@@ -209,57 +200,72 @@ static int chip_write_masked(struct CHIPSTATE *chip, int subaddr, int val, int m
 
 static int chip_read(struct CHIPSTATE *chip)
 {
+       struct v4l2_subdev *sd = &chip->sd;
+       struct i2c_client *c = v4l2_get_subdevdata(sd);
        unsigned char buffer;
 
-       if (1 != i2c_master_recv(&chip->c,&buffer,1)) {
-               tvaudio_warn("%s: I/O error (read)\n",
-               chip->c.name);
+       if (1 != i2c_master_recv(c, &buffer, 1)) {
+               v4l2_warn(sd, "I/O error (read)\n");
                return -1;
        }
-       tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer);
+       v4l2_dbg(1, debug, sd, "chip_read: 0x%x\n", buffer);
        return buffer;
 }
 
 static int chip_read2(struct CHIPSTATE *chip, int subaddr)
 {
+       struct v4l2_subdev *sd = &chip->sd;
+       struct i2c_client *c = v4l2_get_subdevdata(sd);
        unsigned char write[1];
        unsigned char read[1];
        struct i2c_msg msgs[2] = {
-               { chip->c.addr, 0,        1, write },
-               { chip->c.addr, I2C_M_RD, 1, read  }
+               { c->addr, 0,        1, write },
+               { c->addr, I2C_M_RD, 1, read  }
        };
+
        write[0] = subaddr;
 
-       if (2 != i2c_transfer(chip->c.adapter,msgs,2)) {
-               tvaudio_warn("%s: I/O error (read2)\n", chip->c.name);
+       if (2 != i2c_transfer(c->adapter, msgs, 2)) {
+               v4l2_warn(sd, "I/O error (read2)\n");
                return -1;
        }
-       tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n",
-               chip->c.name, subaddr,read[0]);
+       v4l2_dbg(1, debug, sd, "chip_read2: reg%d=0x%x\n",
+               subaddr, read[0]);
        return read[0];
 }
 
 static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 {
+       struct v4l2_subdev *sd = &chip->sd;
+       struct i2c_client *c = v4l2_get_subdevdata(sd);
        int i;
 
        if (0 == cmd->count)
                return 0;
 
+       if (cmd->count + cmd->bytes[0] - 1 >= ARRAY_SIZE(chip->shadow.bytes)) {
+               v4l2_info(sd,
+                        "Tried to access a non-existent register range: %d to %d\n",
+                        cmd->bytes[0] + 1, cmd->bytes[0] + cmd->count - 1);
+               return -EINVAL;
+       }
+
+       /* FIXME: it seems that the shadow bytes are wrong bellow !*/
+
        /* update our shadow register set; print bytes if (debug > 0) */
-       tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:",
-               chip->c.name, name,cmd->bytes[0]);
+       v4l2_dbg(1, debug, sd, "chip_cmd(%s): reg=%d, data:",
+               name, cmd->bytes[0]);
        for (i = 1; i < cmd->count; i++) {
                if (debug)
-                       printk(" 0x%x",cmd->bytes[i]);
+                       printk(KERN_CONT " 0x%x", cmd->bytes[i]);
                chip->shadow.bytes[i+cmd->bytes[0]] = cmd->bytes[i];
        }
        if (debug)
-               printk("\n");
+               printk(KERN_CONT "\n");
 
        /* send data to the chip */
-       if (cmd->count != i2c_master_send(&chip->c,cmd->bytes,cmd->count)) {
-               tvaudio_warn("%s: I/O error (%s)\n", chip->c.name, name);
+       if (cmd->count != i2c_master_send(c, cmd->bytes, cmd->count)) {
+               v4l2_warn(sd, "I/O error (%s)\n", name);
                return -1;
        }
        return 0;
@@ -275,66 +281,59 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 static void chip_thread_wake(unsigned long data)
 {
        struct CHIPSTATE *chip = (struct CHIPSTATE*)data;
-       wake_up_interruptible(&chip->wq);
+       wake_up_process(chip->thread);
 }
 
 static int chip_thread(void *data)
 {
-       DECLARE_WAITQUEUE(wait, current);
        struct CHIPSTATE *chip = data;
-       struct CHIPDESC  *desc = chiplist + chip->type;
-
-       daemonize("%s", chip->c.name);
-       allow_signal(SIGTERM);
-       tvaudio_dbg("%s: thread started\n", chip->c.name);
+       struct CHIPDESC  *desc = chip->desc;
+       struct v4l2_subdev *sd = &chip->sd;
+       int mode;
 
+       v4l2_dbg(1, debug, sd, "thread started\n");
+       set_freezable();
        for (;;) {
-               add_wait_queue(&chip->wq, &wait);
-               if (!chip->done) {
-                       set_current_state(TASK_INTERRUPTIBLE);
+               set_current_state(TASK_INTERRUPTIBLE);
+               if (!kthread_should_stop())
                        schedule();
-               }
-               remove_wait_queue(&chip->wq, &wait);
+               set_current_state(TASK_RUNNING);
                try_to_freeze();
-               if (chip->done || signal_pending(current))
+               if (kthread_should_stop())
                        break;
-               tvaudio_dbg("%s: thread wakeup\n", chip->c.name);
+               v4l2_dbg(1, debug, sd, "thread wakeup\n");
 
                /* don't do anything for radio or if mode != auto */
                if (chip->radio || chip->mode != 0)
                        continue;
 
                /* have a look what's going on */
-               desc->checkmode(chip);
-
-               /* schedule next check */
-               mod_timer(&chip->wt, jiffies+2*HZ);
-       }
+               mode = desc->getmode(chip);
+               if (mode == chip->prevmode)
+                       continue;
 
-       tvaudio_dbg("%s: thread exiting\n", chip->c.name);
-       complete_and_exit(&chip->texit, 0);
-       return 0;
-}
+               /* chip detected a new audio mode - set it */
+               v4l2_dbg(1, debug, sd, "thread checkmode\n");
 
-static void generic_checkmode(struct CHIPSTATE *chip)
-{
-       struct CHIPDESC  *desc = chiplist + chip->type;
-       int mode = desc->getmode(chip);
+               chip->prevmode = mode;
 
-       if (mode == chip->prevmode)
-       return;
+               if (mode & V4L2_TUNER_MODE_STEREO)
+                       desc->setmode(chip, V4L2_TUNER_MODE_STEREO);
+               if (mode & V4L2_TUNER_MODE_LANG1_LANG2)
+                       desc->setmode(chip, V4L2_TUNER_MODE_STEREO);
+               else if (mode & V4L2_TUNER_MODE_LANG1)
+                       desc->setmode(chip, V4L2_TUNER_MODE_LANG1);
+               else if (mode & V4L2_TUNER_MODE_LANG2)
+                       desc->setmode(chip, V4L2_TUNER_MODE_LANG2);
+               else
+                       desc->setmode(chip, V4L2_TUNER_MODE_MONO);
 
-       tvaudio_dbg("%s: thread checkmode\n", chip->c.name);
-       chip->prevmode = mode;
+               /* schedule next check */
+               mod_timer(&chip->wt, jiffies+msecs_to_jiffies(2000));
+       }
 
-       if (mode & VIDEO_SOUND_STEREO)
-               desc->setmode(chip,VIDEO_SOUND_STEREO);
-       else if (mode & VIDEO_SOUND_LANG1)
-               desc->setmode(chip,VIDEO_SOUND_LANG1);
-       else if (mode & VIDEO_SOUND_LANG2)
-               desc->setmode(chip,VIDEO_SOUND_LANG2);
-       else
-               desc->setmode(chip,VIDEO_SOUND_MONO);
+       v4l2_dbg(1, debug, sd, "thread exiting\n");
+       return 0;
 }
 
 /* ---------------------------------------------------------------------- */
@@ -362,16 +361,17 @@ static void generic_checkmode(struct CHIPSTATE *chip)
 
 static int tda9840_getmode(struct CHIPSTATE *chip)
 {
+       struct v4l2_subdev *sd = &chip->sd;
        int val, mode;
 
        val = chip_read(chip);
-       mode = VIDEO_SOUND_MONO;
+       mode = V4L2_TUNER_MODE_MONO;
        if (val & TDA9840_DS_DUAL)
-               mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
+               mode |= V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
        if (val & TDA9840_ST_STEREO)
-               mode |= VIDEO_SOUND_STEREO;
+               mode |= V4L2_TUNER_MODE_STEREO;
 
-       tvaudio_dbg ("tda9840_getmode(): raw chip read: %d, return: %d\n",
+       v4l2_dbg(1, debug, sd, "tda9840_getmode(): raw chip read: %d, return: %d\n",
                val, mode);
        return mode;
 }
@@ -382,16 +382,16 @@ static void tda9840_setmode(struct CHIPSTATE *chip, int mode)
        int t = chip->shadow.bytes[TDA9840_SW + 1] & ~0x7e;
 
        switch (mode) {
-       case VIDEO_SOUND_MONO:
+       case V4L2_TUNER_MODE_MONO:
                t |= TDA9840_MONO;
                break;
-       case VIDEO_SOUND_STEREO:
+       case V4L2_TUNER_MODE_STEREO:
                t |= TDA9840_STEREO;
                break;
-       case VIDEO_SOUND_LANG1:
+       case V4L2_TUNER_MODE_LANG1:
                t |= TDA9840_DUALA;
                break;
-       case VIDEO_SOUND_LANG2:
+       case V4L2_TUNER_MODE_LANG2:
                t |= TDA9840_DUALB;
                break;
        default:
@@ -402,6 +402,14 @@ static void tda9840_setmode(struct CHIPSTATE *chip, int mode)
                chip_write(chip, TDA9840_SW, t);
 }
 
+static int tda9840_checkit(struct CHIPSTATE *chip)
+{
+       int rc;
+       rc = chip_read(chip);
+       /* lower 5 bits should be 0 */
+       return ((rc & 0x1f) == 0) ? 1 : 0;
+}
+
 /* ---------------------------------------------------------------------- */
 /* audio chip descriptions - defines+functions for tda985x                */
 
@@ -514,7 +522,7 @@ static int  tda985x_getmode(struct CHIPSTATE *chip)
                chip_read(chip)) >> 4;
        /* Add mono mode regardless of SAP and stereo */
        /* Allows forced mono */
-       return mode | VIDEO_SOUND_MONO;
+       return mode | V4L2_TUNER_MODE_MONO;
 }
 
 static void tda985x_setmode(struct CHIPSTATE *chip, int mode)
@@ -523,13 +531,13 @@ static void tda985x_setmode(struct CHIPSTATE *chip, int mode)
        int c6 = chip->shadow.bytes[TDA985x_C6+1] & 0x3f;
 
        switch (mode) {
-       case VIDEO_SOUND_MONO:
+       case V4L2_TUNER_MODE_MONO:
                c6 |= TDA985x_MONO;
                break;
-       case VIDEO_SOUND_STEREO:
+       case V4L2_TUNER_MODE_STEREO:
                c6 |= TDA985x_STEREO;
                break;
-       case VIDEO_SOUND_LANG1:
+       case V4L2_TUNER_MODE_LANG1:
                c6 |= TDA985x_SAP;
                break;
        default:
@@ -659,43 +667,45 @@ static void tda985x_setmode(struct CHIPSTATE *chip, int mode)
 
 static int tda9873_getmode(struct CHIPSTATE *chip)
 {
+       struct v4l2_subdev *sd = &chip->sd;
        int val,mode;
 
        val = chip_read(chip);
-       mode = VIDEO_SOUND_MONO;
+       mode = V4L2_TUNER_MODE_MONO;
        if (val & TDA9873_STEREO)
-               mode |= VIDEO_SOUND_STEREO;
+               mode |= V4L2_TUNER_MODE_STEREO;
        if (val & TDA9873_DUAL)
-               mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
-       tvaudio_dbg ("tda9873_getmode(): raw chip read: %d, return: %d\n",
+               mode |= V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
+       v4l2_dbg(1, debug, sd, "tda9873_getmode(): raw chip read: %d, return: %d\n",
                val, mode);
        return mode;
 }
 
 static void tda9873_setmode(struct CHIPSTATE *chip, int mode)
 {
+       struct v4l2_subdev *sd = &chip->sd;
        int sw_data  = chip->shadow.bytes[TDA9873_SW+1] & ~ TDA9873_TR_MASK;
        /*      int adj_data = chip->shadow.bytes[TDA9873_AD+1] ; */
 
        if ((sw_data & TDA9873_INP_MASK) != TDA9873_INTERNAL) {
-               tvaudio_dbg("tda9873_setmode(): external input\n");
+               v4l2_dbg(1, debug, sd, "tda9873_setmode(): external input\n");
                return;
        }
 
-       tvaudio_dbg("tda9873_setmode(): chip->shadow.bytes[%d] = %d\n", TDA9873_SW+1, chip->shadow.bytes[TDA9873_SW+1]);
-       tvaudio_dbg("tda9873_setmode(): sw_data  = %d\n", sw_data);
+       v4l2_dbg(1, debug, sd, "tda9873_setmode(): chip->shadow.bytes[%d] = %d\n", TDA9873_SW+1, chip->shadow.bytes[TDA9873_SW+1]);
+       v4l2_dbg(1, debug, sd, "tda9873_setmode(): sw_data  = %d\n", sw_data);
 
        switch (mode) {
-       case VIDEO_SOUND_MONO:
+       case V4L2_TUNER_MODE_MONO:
                sw_data |= TDA9873_TR_MONO;
                break;
-       case VIDEO_SOUND_STEREO:
+       case V4L2_TUNER_MODE_STEREO:
                sw_data |= TDA9873_TR_STEREO;
                break;
-       case VIDEO_SOUND_LANG1:
+       case V4L2_TUNER_MODE_LANG1:
                sw_data |= TDA9873_TR_DUALA;
                break;
-       case VIDEO_SOUND_LANG2:
+       case V4L2_TUNER_MODE_LANG2:
                sw_data |= TDA9873_TR_DUALB;
                break;
        default:
@@ -704,7 +714,7 @@ static void tda9873_setmode(struct CHIPSTATE *chip, int mode)
        }
 
        chip_write(chip, TDA9873_SW, sw_data);
-       tvaudio_dbg("tda9873_setmode(): req. mode %d; chip_write: %d\n",
+       v4l2_dbg(1, debug, sd, "tda9873_setmode(): req. mode %d; chip_write: %d\n",
                mode, sw_data);
 }
 
@@ -791,7 +801,7 @@ static struct tda9874a_MODES {
        char *name;
        audiocmd cmd;
 } tda9874a_modelist[9] = {
-  {    "A2, B/G",
+  {    "A2, B/G", /* default */
        { 9, { TDA9874A_C1FRA, 0x72,0x95,0x55, 0x77,0xA0,0x00, 0x00,0x00 }} },
   {    "A2, M (Korea)",
        { 9, { TDA9874A_C1FRA, 0x5D,0xC0,0x00, 0x62,0x6A,0xAA, 0x20,0x22 }} },
@@ -805,7 +815,7 @@ static struct tda9874a_MODES {
        { 9, { TDA9874A_C1FRA, 0x7D,0x00,0x00, 0x88,0x8A,0xAA, 0x08,0x33 }} },
   {    "NICAM, B/G",
        { 9, { TDA9874A_C1FRA, 0x72,0x95,0x55, 0x79,0xEA,0xAA, 0x08,0x33 }} },
-  {    "NICAM, D/K", /* default */
+  {    "NICAM, D/K",
        { 9, { TDA9874A_C1FRA, 0x87,0x6A,0xAA, 0x79,0xEA,0xAA, 0x08,0x33 }} },
   {    "NICAM, L",
        { 9, { TDA9874A_C1FRA, 0x87,0x6A,0xAA, 0x79,0xEA,0xAA, 0x09,0x33 }} }
@@ -813,6 +823,8 @@ static struct tda9874a_MODES {
 
 static int tda9874a_setup(struct CHIPSTATE *chip)
 {
+       struct v4l2_subdev *sd = &chip->sd;
+
        chip_write(chip, TDA9874A_AGCGR, 0x00); /* 0 dB */
        chip_write(chip, TDA9874A_GCONR, tda9874a_GCONR);
        chip_write(chip, TDA9874A_MSR, (tda9874a_mode) ? 0x03:0x02);
@@ -843,17 +855,18 @@ static int tda9874a_setup(struct CHIPSTATE *chip)
                chip_write(chip, TDA9874A_SDACOSR, (tda9874a_mode) ? 0x81:0x80);
                chip_write(chip, TDA9874A_AOSR, 0x00); /* or 0x10 */
        }
-       tvaudio_dbg("tda9874a_setup(): %s [0x%02X].\n",
+       v4l2_dbg(1, debug, sd, "tda9874a_setup(): %s [0x%02X].\n",
                tda9874a_modelist[tda9874a_STD].name,tda9874a_STD);
        return 1;
 }
 
 static int tda9874a_getmode(struct CHIPSTATE *chip)
 {
+       struct v4l2_subdev *sd = &chip->sd;
        int dsr,nsr,mode;
        int necr; /* just for debugging */
 
-       mode = VIDEO_SOUND_MONO;
+       mode = V4L2_TUNER_MODE_MONO;
 
        if(-1 == (dsr = chip_read2(chip,TDA9874A_DSR)))
                return mode;
@@ -872,30 +885,32 @@ static int tda9874a_getmode(struct CHIPSTATE *chip)
                 * that sound has (temporarily) switched from NICAM to
                 * mono FM (or AM) on 1st sound carrier due to high NICAM bit
                 * error count. So in fact there is no stereo in this case :-(
-                * But changing the mode to VIDEO_SOUND_MONO would switch
+                * But changing the mode to V4L2_TUNER_MODE_MONO would switch
                 * external 4052 multiplexer in audio_hook().
                 */
                if(nsr & 0x02) /* NSR.S/MB=1 */
-                       mode |= VIDEO_SOUND_STEREO;
+                       mode |= V4L2_TUNER_MODE_STEREO;
                if(nsr & 0x01) /* NSR.D/SB=1 */
-                       mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
+                       mode |= V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
        } else {
                if(dsr & 0x02) /* DSR.IDSTE=1 */
-                       mode |= VIDEO_SOUND_STEREO;
+                       mode |= V4L2_TUNER_MODE_STEREO;
                if(dsr & 0x04) /* DSR.IDDUA=1 */
-                       mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
+                       mode |= V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
        }
 
-       tvaudio_dbg("tda9874a_getmode(): DSR=0x%X, NSR=0x%X, NECR=0x%X, return: %d.\n",
+       v4l2_dbg(1, debug, sd, "tda9874a_getmode(): DSR=0x%X, NSR=0x%X, NECR=0x%X, return: %d.\n",
                 dsr, nsr, necr, mode);
        return mode;
 }
 
 static void tda9874a_setmode(struct CHIPSTATE *chip, int mode)
 {
+       struct v4l2_subdev *sd = &chip->sd;
+
        /* Disable/enable NICAM auto-muting (based on DSR.RSSF status bit). */
        /* If auto-muting is disabled, we can hear a signal of degrading quality. */
-       if(tda9874a_mode) {
+       if (tda9874a_mode) {
                if(chip->shadow.bytes[MAXREGS-2] & 0x20) /* DSR.RSSF=1 */
                        tda9874a_NCONR &= 0xfe; /* enable */
                else
@@ -914,14 +929,14 @@ static void tda9874a_setmode(struct CHIPSTATE *chip, int mode)
                int mdacosr = (tda9874a_mode) ? 0x82:0x80;
 
                switch(mode) {
-               case VIDEO_SOUND_MONO:
-               case VIDEO_SOUND_STEREO:
+               case V4L2_TUNER_MODE_MONO:
+               case V4L2_TUNER_MODE_STEREO:
                        break;
-               case VIDEO_SOUND_LANG1:
+               case V4L2_TUNER_MODE_LANG1:
                        aosr = 0x80; /* auto-select, dual A/A */
                        mdacosr = (tda9874a_mode) ? 0x82:0x80;
                        break;
-               case VIDEO_SOUND_LANG2:
+               case V4L2_TUNER_MODE_LANG2:
                        aosr = 0xa0; /* auto-select, dual B/B */
                        mdacosr = (tda9874a_mode) ? 0x83:0x81;
                        break;
@@ -932,18 +947,18 @@ static void tda9874a_setmode(struct CHIPSTATE *chip, int mode)
                chip_write(chip, TDA9874A_AOSR, aosr);
                chip_write(chip, TDA9874A_MDACOSR, mdacosr);
 
-               tvaudio_dbg("tda9874a_setmode(): req. mode %d; AOSR=0x%X, MDACOSR=0x%X.\n",
+               v4l2_dbg(1, debug, sd, "tda9874a_setmode(): req. mode %d; AOSR=0x%X, MDACOSR=0x%X.\n",
                        mode, aosr, mdacosr);
 
        } else { /* dic == 0x07 */
                int fmmr,aosr;
 
                switch(mode) {
-               case VIDEO_SOUND_MONO:
+               case V4L2_TUNER_MODE_MONO:
                        fmmr = 0x00; /* mono */
                        aosr = 0x10; /* A/A */
                        break;
-               case VIDEO_SOUND_STEREO:
+               case V4L2_TUNER_MODE_STEREO:
                        if(tda9874a_mode) {
                                fmmr = 0x00;
                                aosr = 0x00; /* handled by NICAM auto-mute */
@@ -952,11 +967,11 @@ static void tda9874a_setmode(struct CHIPSTATE *chip, int mode)
                                aosr = 0x00;
                        }
                        break;
-               case VIDEO_SOUND_LANG1:
+               case V4L2_TUNER_MODE_LANG1:
                        fmmr = 0x02; /* dual */
                        aosr = 0x10; /* dual A/A */
                        break;
-               case VIDEO_SOUND_LANG2:
+               case V4L2_TUNER_MODE_LANG2:
                        fmmr = 0x02; /* dual */
                        aosr = 0x20; /* dual B/B */
                        break;
@@ -967,13 +982,14 @@ static void tda9874a_setmode(struct CHIPSTATE *chip, int mode)
                chip_write(chip, TDA9874A_FMMR, fmmr);
                chip_write(chip, TDA9874A_AOSR, aosr);
 
-               tvaudio_dbg("tda9874a_setmode(): req. mode %d; FMMR=0x%X, AOSR=0x%X.\n",
+               v4l2_dbg(1, debug, sd, "tda9874a_setmode(): req. mode %d; FMMR=0x%X, AOSR=0x%X.\n",
                        mode, fmmr, aosr);
        }
 }
 
 static int tda9874a_checkit(struct CHIPSTATE *chip)
 {
+       struct v4l2_subdev *sd = &chip->sd;
        int dic,sic;    /* device id. and software id. codes */
 
        if(-1 == (dic = chip_read2(chip,TDA9874A_DIC)))
@@ -981,10 +997,10 @@ static int tda9874a_checkit(struct CHIPSTATE *chip)
        if(-1 == (sic = chip_read2(chip,TDA9874A_SIC)))
                return 0;
 
-       tvaudio_dbg("tda9874a_checkit(): DIC=0x%X, SIC=0x%X.\n", dic, sic);
+       v4l2_dbg(1, debug, sd, "tda9874a_checkit(): DIC=0x%X, SIC=0x%X.\n", dic, sic);
 
        if((dic == 0x11)||(dic == 0x07)) {
-               tvaudio_info("found tda9874%s.\n", (dic == 0x11) ? "a":"h");
+               v4l2_info(sd, "found tda9874%s.\n", (dic == 0x11) ? "a" : "h");
                tda9874a_dic = dic;     /* remember device id. */
                return 1;
        }
@@ -995,7 +1011,7 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
 {
        if (tda9874a_SIF > 2)
                tda9874a_SIF = 1;
-       if (tda9874a_STD > 8)
+       if (tda9874a_STD >= ARRAY_SIZE(tda9874a_modelist))
                tda9874a_STD = 0;
        if(tda9874a_AMSEL > 1)
                tda9874a_AMSEL = 0;
@@ -1017,6 +1033,116 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
        return 0;
 }
 
+/* ---------------------------------------------------------------------- */
+/* audio chip description - defines+functions for tda9875                 */
+/* The TDA9875 is made by Philips Semiconductor
+ * http://www.semiconductors.philips.com
+ * TDA9875: I2C-bus controlled DSP audio processor, FM demodulator
+ *
+ */
+
+/* subaddresses for TDA9875 */
+#define TDA9875_MUT         0x12  /*General mute  (value --> 0b11001100*/
+#define TDA9875_CFG         0x01  /* Config register (value --> 0b00000000 */
+#define TDA9875_DACOS       0x13  /*DAC i/o select (ADC) 0b0000100*/
+#define TDA9875_LOSR        0x16  /*Line output select regirter 0b0100 0001*/
+
+#define TDA9875_CH1V        0x0c  /*Channel 1 volume (mute)*/
+#define TDA9875_CH2V        0x0d  /*Channel 2 volume (mute)*/
+#define TDA9875_SC1         0x14  /*SCART 1 in (mono)*/
+#define TDA9875_SC2         0x15  /*SCART 2 in (mono)*/
+
+#define TDA9875_ADCIS       0x17  /*ADC input select (mono) 0b0110 000*/
+#define TDA9875_AER         0x19  /*Audio effect (AVL+Pseudo) 0b0000 0110*/
+#define TDA9875_MCS         0x18  /*Main channel select (DAC) 0b0000100*/
+#define TDA9875_MVL         0x1a  /* Main volume gauche */
+#define TDA9875_MVR         0x1b  /* Main volume droite */
+#define TDA9875_MBA         0x1d  /* Main Basse */
+#define TDA9875_MTR         0x1e  /* Main treble */
+#define TDA9875_ACS         0x1f  /* Auxilary channel select (FM) 0b0000000*/
+#define TDA9875_AVL         0x20  /* Auxilary volume gauche */
+#define TDA9875_AVR         0x21  /* Auxilary volume droite */
+#define TDA9875_ABA         0x22  /* Auxilary Basse */
+#define TDA9875_ATR         0x23  /* Auxilary treble */
+
+#define TDA9875_MSR         0x02  /* Monitor select register */
+#define TDA9875_C1MSB       0x03  /* Carrier 1 (FM) frequency register MSB */
+#define TDA9875_C1MIB       0x04  /* Carrier 1 (FM) frequency register (16-8]b */
+#define TDA9875_C1LSB       0x05  /* Carrier 1 (FM) frequency register LSB */
+#define TDA9875_C2MSB       0x06  /* Carrier 2 (nicam) frequency register MSB */
+#define TDA9875_C2MIB       0x07  /* Carrier 2 (nicam) frequency register (16-8]b */
+#define TDA9875_C2LSB       0x08  /* Carrier 2 (nicam) frequency register LSB */
+#define TDA9875_DCR         0x09  /* Demodulateur configuration regirter*/
+#define TDA9875_DEEM        0x0a  /* FM de-emphasis regirter*/
+#define TDA9875_FMAT        0x0b  /* FM Matrix regirter*/
+
+/* values */
+#define TDA9875_MUTE_ON            0xff /* general mute */
+#define TDA9875_MUTE_OFF    0xcc /* general no mute */
+
+static int tda9875_initialize(struct CHIPSTATE *chip)
+{
+       chip_write(chip, TDA9875_CFG, 0xd0); /*reg de config 0 (reset)*/
+       chip_write(chip, TDA9875_MSR, 0x03);    /* Monitor 0b00000XXX*/
+       chip_write(chip, TDA9875_C1MSB, 0x00);  /*Car1(FM) MSB XMHz*/
+       chip_write(chip, TDA9875_C1MIB, 0x00);  /*Car1(FM) MIB XMHz*/
+       chip_write(chip, TDA9875_C1LSB, 0x00);  /*Car1(FM) LSB XMHz*/
+       chip_write(chip, TDA9875_C2MSB, 0x00);  /*Car2(NICAM) MSB XMHz*/
+       chip_write(chip, TDA9875_C2MIB, 0x00);  /*Car2(NICAM) MIB XMHz*/
+       chip_write(chip, TDA9875_C2LSB, 0x00);  /*Car2(NICAM) LSB XMHz*/
+       chip_write(chip, TDA9875_DCR, 0x00);    /*Demod config 0x00*/
+       chip_write(chip, TDA9875_DEEM, 0x44);   /*DE-Emph 0b0100 0100*/
+       chip_write(chip, TDA9875_FMAT, 0x00);   /*FM Matrix reg 0x00*/
+       chip_write(chip, TDA9875_SC1, 0x00);    /* SCART 1 (SC1)*/
+       chip_write(chip, TDA9875_SC2, 0x01);    /* SCART 2 (sc2)*/
+
+       chip_write(chip, TDA9875_CH1V, 0x10);  /* Channel volume 1 mute*/
+       chip_write(chip, TDA9875_CH2V, 0x10);  /* Channel volume 2 mute */
+       chip_write(chip, TDA9875_DACOS, 0x02); /* sig DAC i/o(in:nicam)*/
+       chip_write(chip, TDA9875_ADCIS, 0x6f); /* sig ADC input(in:mono)*/
+       chip_write(chip, TDA9875_LOSR, 0x00);  /* line out (in:mono)*/
+       chip_write(chip, TDA9875_AER, 0x00);   /*06 Effect (AVL+PSEUDO) */
+       chip_write(chip, TDA9875_MCS, 0x44);   /* Main ch select (DAC) */
+       chip_write(chip, TDA9875_MVL, 0x03);   /* Vol Main left 10dB */
+       chip_write(chip, TDA9875_MVR, 0x03);   /* Vol Main right 10dB*/
+       chip_write(chip, TDA9875_MBA, 0x00);   /* Main Bass Main 0dB*/
+       chip_write(chip, TDA9875_MTR, 0x00);   /* Main Treble Main 0dB*/
+       chip_write(chip, TDA9875_ACS, 0x44);   /* Aux chan select (dac)*/
+       chip_write(chip, TDA9875_AVL, 0x00);   /* Vol Aux left 0dB*/
+       chip_write(chip, TDA9875_AVR, 0x00);   /* Vol Aux right 0dB*/
+       chip_write(chip, TDA9875_ABA, 0x00);   /* Aux Bass Main 0dB*/
+       chip_write(chip, TDA9875_ATR, 0x00);   /* Aux Aigus Main 0dB*/
+
+       chip_write(chip, TDA9875_MUT, 0xcc);   /* General mute  */
+       return 0;
+}
+
+static int tda9875_volume(int val) { return (unsigned char)(val / 602 - 84); }
+static int tda9875_bass(int val) { return (unsigned char)(max(-12, val / 2115 - 15)); }
+static int tda9875_treble(int val) { return (unsigned char)(val / 2622 - 12); }
+
+/* ----------------------------------------------------------------------- */
+
+
+/* *********************** *
+ * i2c interface functions *
+ * *********************** */
+
+static int tda9875_checkit(struct CHIPSTATE *chip)
+{
+       struct v4l2_subdev *sd = &chip->sd;
+       int dic, rev;
+
+       dic = chip_read2(chip, 254);
+       rev = chip_read2(chip, 255);
+
+       if (dic == 0 || dic == 2) { /* tda9875 and tda9875A */
+               v4l2_info(sd, "found tda9875%s rev. %d.\n",
+                       dic == 0 ? "" : "A", rev);
+               return 1;
+       }
+       return 0;
+}
 
 /* ---------------------------------------------------------------------- */
 /* audio chip descriptions - defines+functions for tea6420                */
@@ -1103,14 +1229,13 @@ static int tda8425_shift12(int val) { return (val >> 12) | 0xf0; }
 
 static int tda8425_initialize(struct CHIPSTATE *chip)
 {
-       struct CHIPDESC *desc = chiplist + chip->type;
-       int inputmap[8] = { /* tuner    */ TDA8425_S1_CH2, /* radio  */ TDA8425_S1_CH1,
-                           /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF,
-                           /* off      */ TDA8425_S1_OFF, /* on     */ TDA8425_S1_CH2};
+       struct CHIPDESC *desc = chip->desc;
+       struct i2c_client *c = v4l2_get_subdevdata(&chip->sd);
+       int inputmap[4] = { /* tuner    */ TDA8425_S1_CH2, /* radio  */ TDA8425_S1_CH1,
+                           /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF};
 
-       if (chip->c.adapter->id == I2C_HW_B_RIVA) {
-               memcpy (desc->inputmap, inputmap, sizeof (inputmap));
-       }
+       if (c->adapter->id == I2C_HW_B_RIVA)
+               memcpy(desc->inputmap, inputmap, sizeof(inputmap));
        return 0;
 }
 
@@ -1118,20 +1243,20 @@ static void tda8425_setmode(struct CHIPSTATE *chip, int mode)
 {
        int s1 = chip->shadow.bytes[TDA8425_S1+1] & 0xe1;
 
-       if (mode & VIDEO_SOUND_LANG1) {
+       if (mode & V4L2_TUNER_MODE_LANG1) {
                s1 |= TDA8425_S1_ML_SOUND_A;
                s1 |= TDA8425_S1_STEREO_PSEUDO;
 
-       } else if (mode & VIDEO_SOUND_LANG2) {
+       } else if (mode & V4L2_TUNER_MODE_LANG2) {
                s1 |= TDA8425_S1_ML_SOUND_B;
                s1 |= TDA8425_S1_STEREO_PSEUDO;
 
        } else {
                s1 |= TDA8425_S1_ML_STEREO;
 
-               if (mode & VIDEO_SOUND_MONO)
+               if (mode & V4L2_TUNER_MODE_MONO)
                        s1 |= TDA8425_S1_STEREO_MONO;
-               if (mode & VIDEO_SOUND_STEREO)
+               if (mode & V4L2_TUNER_MODE_STEREO)
                        s1 |= TDA8425_S1_STEREO_SPATIAL;
        }
        chip_write(chip,TDA8425_S1,s1);
@@ -1190,13 +1315,13 @@ static int ta8874z_getmode(struct CHIPSTATE *chip)
        int val, mode;
 
        val = chip_read(chip);
-       mode = VIDEO_SOUND_MONO;
+       mode = V4L2_TUNER_MODE_MONO;
        if (val & TA8874Z_B1){
-               mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
+               mode |= V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
        }else if (!(val & TA8874Z_B0)){
-               mode |= VIDEO_SOUND_STEREO;
+               mode |= V4L2_TUNER_MODE_STEREO;
        }
-       /* tvaudio_dbg ("ta8874z_getmode(): raw chip read: 0x%02x, return: 0x%02x\n", val, mode); */
+       /* v4l_dbg(1, debug, chip->c, "ta8874z_getmode(): raw chip read: 0x%02x, return: 0x%02x\n", val, mode); */
        return mode;
 }
 
@@ -1207,21 +1332,23 @@ static audiocmd ta8874z_sub = {2, { TA8874Z_MODE_SUB, TA8874Z_SEPARATION_DEFAULT
 
 static void ta8874z_setmode(struct CHIPSTATE *chip, int mode)
 {
+       struct v4l2_subdev *sd = &chip->sd;
        int update = 1;
        audiocmd *t = NULL;
-       tvaudio_dbg("ta8874z_setmode(): mode: 0x%02x\n", mode);
+
+       v4l2_dbg(1, debug, sd, "ta8874z_setmode(): mode: 0x%02x\n", mode);
 
        switch(mode){
-       case VIDEO_SOUND_MONO:
+       case V4L2_TUNER_MODE_MONO:
                t = &ta8874z_mono;
                break;
-       case VIDEO_SOUND_STEREO:
+       case V4L2_TUNER_MODE_STEREO:
                t = &ta8874z_stereo;
                break;
-       case VIDEO_SOUND_LANG1:
+       case V4L2_TUNER_MODE_LANG1:
                t = &ta8874z_main;
                break;
-       case VIDEO_SOUND_LANG2:
+       case V4L2_TUNER_MODE_LANG2:
                t = &ta8874z_sub;
                break;
        default:
@@ -1249,11 +1376,12 @@ static int tda9850  = 1;
 static int tda9855  = 1;
 static int tda9873  = 1;
 static int tda9874a = 1;
-static int tea6300  = 0;  /* address clash with msp34xx */
-static int tea6320  = 0;  /* address clash with msp34xx */
+static int tda9875  = 1;
+static int tea6300;    /* default 0 - address clash with msp34xx */
+static int tea6320;    /* default 0 - address clash with msp34xx */
 static int tea6420  = 1;
 static int pic16c54 = 1;
-static int ta8874z  = 0;  /* address clash with tda9840 */
+static int ta8874z;    /* default 0 - address clash with tda9840 */
 
 module_param(tda8425, int, 0444);
 module_param(tda9840, int, 0444);
@@ -1261,6 +1389,7 @@ module_param(tda9850, int, 0444);
 module_param(tda9855, int, 0444);
 module_param(tda9873, int, 0444);
 module_param(tda9874a, int, 0444);
+module_param(tda9875, int, 0444);
 module_param(tea6300, int, 0444);
 module_param(tea6320, int, 0444);
 module_param(tea6420, int, 0444);
@@ -1270,59 +1399,78 @@ module_param(ta8874z, int, 0444);
 static struct CHIPDESC chiplist[] = {
        {
                .name       = "tda9840",
-               .id         = I2C_DRIVERID_TDA9840,
                .insmodopt  = &tda9840,
-               .addr_lo    = I2C_TDA9840 >> 1,
-               .addr_hi    = I2C_TDA9840 >> 1,
+               .addr_lo    = I2C_ADDR_TDA9840 >> 1,
+               .addr_hi    = I2C_ADDR_TDA9840 >> 1,
                .registers  = 5,
+               .flags      = CHIP_NEED_CHECKMODE,
 
+               /* callbacks */
+               .checkit    = tda9840_checkit,
                .getmode    = tda9840_getmode,
                .setmode    = tda9840_setmode,
-               .checkmode  = generic_checkmode,
 
                .init       = { 2, { TDA9840_TEST, TDA9840_TEST_INT1SN
                                /* ,TDA9840_SW, TDA9840_MONO */} }
        },
        {
                .name       = "tda9873h",
-               .id         = I2C_DRIVERID_TDA9873,
-               .checkit    = tda9873_checkit,
                .insmodopt  = &tda9873,
-               .addr_lo    = I2C_TDA985x_L >> 1,
-               .addr_hi    = I2C_TDA985x_H >> 1,
+               .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+               .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                .registers  = 3,
-               .flags      = CHIP_HAS_INPUTSEL,
+               .flags      = CHIP_HAS_INPUTSEL | CHIP_NEED_CHECKMODE,
 
+               /* callbacks */
+               .checkit    = tda9873_checkit,
                .getmode    = tda9873_getmode,
                .setmode    = tda9873_setmode,
-               .checkmode  = generic_checkmode,
 
                .init       = { 4, { TDA9873_SW, 0xa4, 0x06, 0x03 } },
                .inputreg   = TDA9873_SW,
                .inputmute  = TDA9873_MUTE | TDA9873_AUTOMUTE,
-               .inputmap   = {0xa0, 0xa2, 0xa0, 0xa0, 0xc0},
+               .inputmap   = {0xa0, 0xa2, 0xa0, 0xa0},
                .inputmask  = TDA9873_INP_MASK|TDA9873_MUTE|TDA9873_AUTOMUTE,
 
        },
        {
                .name       = "tda9874h/a",
-               .id         = I2C_DRIVERID_TDA9874,
-               .checkit    = tda9874a_checkit,
-               .initialize = tda9874a_initialize,
                .insmodopt  = &tda9874a,
-               .addr_lo    = I2C_TDA9874 >> 1,
-               .addr_hi    = I2C_TDA9874 >> 1,
+               .addr_lo    = I2C_ADDR_TDA9874 >> 1,
+               .addr_hi    = I2C_ADDR_TDA9874 >> 1,
+               .flags      = CHIP_NEED_CHECKMODE,
 
+               /* callbacks */
+               .initialize = tda9874a_initialize,
+               .checkit    = tda9874a_checkit,
                .getmode    = tda9874a_getmode,
                .setmode    = tda9874a_setmode,
-               .checkmode  = generic_checkmode,
+       },
+       {
+               .name       = "tda9875",
+               .insmodopt  = &tda9875,
+               .addr_lo    = I2C_ADDR_TDA9875 >> 1,
+               .addr_hi    = I2C_ADDR_TDA9875 >> 1,
+               .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE,
+
+               /* callbacks */
+               .initialize = tda9875_initialize,
+               .checkit    = tda9875_checkit,
+               .volfunc    = tda9875_volume,
+               .bassfunc   = tda9875_bass,
+               .treblefunc = tda9875_treble,
+               .leftreg    = TDA9875_MVL,
+               .rightreg   = TDA9875_MVR,
+               .bassreg    = TDA9875_MBA,
+               .treblereg  = TDA9875_MTR,
+               .leftinit   = 58880,
+               .rightinit  = 58880,
        },
        {
                .name       = "tda9850",
-               .id         = I2C_DRIVERID_TDA9850,
                .insmodopt  = &tda9850,
-               .addr_lo    = I2C_TDA985x_L >> 1,
-               .addr_hi    = I2C_TDA985x_H >> 1,
+               .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+               .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                .registers  = 11,
 
                .getmode    = tda985x_getmode,
@@ -1332,10 +1480,9 @@ static struct CHIPDESC chiplist[] = {
        },
        {
                .name       = "tda9855",
-               .id         = I2C_DRIVERID_TDA9855,
                .insmodopt  = &tda9855,
-               .addr_lo    = I2C_TDA985x_L >> 1,
-               .addr_hi    = I2C_TDA985x_H >> 1,
+               .addr_lo    = I2C_ADDR_TDA985x_L >> 1,
+               .addr_hi    = I2C_ADDR_TDA985x_H >> 1,
                .registers  = 11,
                .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE,
 
@@ -1343,10 +1490,11 @@ static struct CHIPDESC chiplist[] = {
                .rightreg   = TDA9855_VR,
                .bassreg    = TDA9855_BA,
                .treblereg  = TDA9855_TR,
+
+               /* callbacks */
                .volfunc    = tda9855_volume,
                .bassfunc   = tda9855_bass,
                .treblefunc = tda9855_treble,
-
                .getmode    = tda985x_getmode,
                .setmode    = tda985x_setmode,
 
@@ -1357,10 +1505,9 @@ static struct CHIPDESC chiplist[] = {
        },
        {
                .name       = "tea6300",
-               .id         = I2C_DRIVERID_TEA6300,
                .insmodopt  = &tea6300,
-               .addr_lo    = I2C_TEA6300 >> 1,
-               .addr_hi    = I2C_TEA6300 >> 1,
+               .addr_lo    = I2C_ADDR_TEA6300 >> 1,
+               .addr_hi    = I2C_ADDR_TEA6300 >> 1,
                .registers  = 6,
                .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1368,6 +1515,8 @@ static struct CHIPDESC chiplist[] = {
                .rightreg   = TEA6300_VL,
                .bassreg    = TEA6300_BA,
                .treblereg  = TEA6300_TR,
+
+               /* callbacks */
                .volfunc    = tea6300_shift10,
                .bassfunc   = tea6300_shift12,
                .treblefunc = tea6300_shift12,
@@ -1378,11 +1527,9 @@ static struct CHIPDESC chiplist[] = {
        },
        {
                .name       = "tea6320",
-               .id         = I2C_DRIVERID_TEA6300,
-               .initialize = tea6320_initialize,
                .insmodopt  = &tea6320,
-               .addr_lo    = I2C_TEA6300 >> 1,
-               .addr_hi    = I2C_TEA6300 >> 1,
+               .addr_lo    = I2C_ADDR_TEA6300 >> 1,
+               .addr_hi    = I2C_ADDR_TEA6300 >> 1,
                .registers  = 8,
                .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1390,6 +1537,9 @@ static struct CHIPDESC chiplist[] = {
                .rightreg   = TEA6320_V,
                .bassreg    = TEA6320_BA,
                .treblereg  = TEA6320_TR,
+
+               /* callbacks */
+               .initialize = tea6320_initialize,
                .volfunc    = tea6320_volume,
                .bassfunc   = tea6320_shift11,
                .treblefunc = tea6320_shift11,
@@ -1400,10 +1550,9 @@ static struct CHIPDESC chiplist[] = {
        },
        {
                .name       = "tea6420",
-               .id         = I2C_DRIVERID_TEA6420,
                .insmodopt  = &tea6420,
-               .addr_lo    = I2C_TEA6420 >> 1,
-               .addr_hi    = I2C_TEA6420 >> 1,
+               .addr_lo    = I2C_ADDR_TEA6420 >> 1,
+               .addr_hi    = I2C_ADDR_TEA6420 >> 1,
                .registers  = 1,
                .flags      = CHIP_HAS_INPUTSEL,
 
@@ -1413,10 +1562,9 @@ static struct CHIPDESC chiplist[] = {
        },
        {
                .name       = "tda8425",
-               .id         = I2C_DRIVERID_TDA8425,
                .insmodopt  = &tda8425,
-               .addr_lo    = I2C_TDA8425 >> 1,
-               .addr_hi    = I2C_TDA8425 >> 1,
+               .addr_lo    = I2C_ADDR_TDA8425 >> 1,
+               .addr_hi    = I2C_ADDR_TDA8425 >> 1,
                .registers  = 9,
                .flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
 
@@ -1424,23 +1572,24 @@ static struct CHIPDESC chiplist[] = {
                .rightreg   = TDA8425_VR,
                .bassreg    = TDA8425_BA,
                .treblereg  = TDA8425_TR,
+
+               /* callbacks */
+               .initialize = tda8425_initialize,
                .volfunc    = tda8425_shift10,
                .bassfunc   = tda8425_shift12,
                .treblefunc = tda8425_shift12,
+               .setmode    = tda8425_setmode,
 
                .inputreg   = TDA8425_S1,
                .inputmap   = { TDA8425_S1_CH1, TDA8425_S1_CH1, TDA8425_S1_CH1 },
                .inputmute  = TDA8425_S1_OFF,
 
-               .setmode    = tda8425_setmode,
-               .initialize = tda8425_initialize,
        },
        {
                .name       = "pic16c54 (PV951)",
-               .id         = I2C_DRIVERID_PIC16C54_PV9,
                .insmodopt  = &pic16c54,
-               .addr_lo    = I2C_PIC16C54 >> 1,
-               .addr_hi    = I2C_PIC16C54>> 1,
+               .addr_lo    = I2C_ADDR_PIC16C54 >> 1,
+               .addr_hi    = I2C_ADDR_PIC16C54>> 1,
                .registers  = 2,
                .flags      = CHIP_HAS_INPUTSEL,
 
@@ -1448,23 +1597,21 @@ static struct CHIPDESC chiplist[] = {
                .inputmap   = {PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_TUNER,
                             PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_LINE,
                             PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_LINE,
-                            PIC16C54_MISC_SND_MUTE,PIC16C54_MISC_SND_MUTE,
-                            PIC16C54_MISC_SND_NOTMUTE},
+                            PIC16C54_MISC_SND_MUTE},
                .inputmute  = PIC16C54_MISC_SND_MUTE,
        },
        {
                .name       = "ta8874z",
-               .id         = -1,
-               /*.id         = I2C_DRIVERID_TA8874Z, */
                .checkit    = ta8874z_checkit,
                .insmodopt  = &ta8874z,
-               .addr_lo    = I2C_TDA9840 >> 1,
-               .addr_hi    = I2C_TDA9840 >> 1,
+               .addr_lo    = I2C_ADDR_TDA9840 >> 1,
+               .addr_hi    = I2C_ADDR_TDA9840 >> 1,
                .registers  = 2,
+               .flags      = CHIP_NEED_CHECKMODE,
 
+               /* callbacks */
                .getmode    = ta8874z_getmode,
                .setmode    = ta8874z_setmode,
-               .checkmode  = generic_checkmode,
 
                .init       = {2, { TA8874Z_MONO_SET, TA8874Z_SEPARATION_DEFAULT}},
        },
@@ -1473,309 +1620,328 @@ static struct CHIPDESC chiplist[] = {
 
 
 /* ---------------------------------------------------------------------- */
-/* i2c registration                                                       */
 
-static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
+static int tvaudio_g_ctrl(struct v4l2_subdev *sd,
+                           struct v4l2_control *ctrl)
 {
-       struct CHIPSTATE *chip;
-       struct CHIPDESC  *desc;
+       struct CHIPSTATE *chip = to_state(sd);
+       struct CHIPDESC *desc = chip->desc;
 
-       chip = kmalloc(sizeof(*chip),GFP_KERNEL);
-       if (!chip)
-               return -ENOMEM;
-       memset(chip,0,sizeof(*chip));
-       memcpy(&chip->c,&client_template,sizeof(struct i2c_client));
-       chip->c.adapter = adap;
-       chip->c.addr = addr;
-       i2c_set_clientdata(&chip->c, chip);
-
-       /* find description for the chip */
-       tvaudio_dbg("chip found @ 0x%x\n", addr<<1);
-       for (desc = chiplist; desc->name != NULL; desc++) {
-               if (0 == *(desc->insmodopt))
-                       continue;
-               if (addr < desc->addr_lo ||
-                   addr > desc->addr_hi)
-                       continue;
-               if (desc->checkit && !desc->checkit(chip))
-                       continue;
-               break;
-       }
-       if (desc->name == NULL) {
-               tvaudio_dbg("no matching chip description found\n");
-               return -EIO;
+       switch (ctrl->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               if (!(desc->flags & CHIP_HAS_INPUTSEL))
+                       break;
+               ctrl->value=chip->muted;
+               return 0;
+       case V4L2_CID_AUDIO_VOLUME:
+               if (!(desc->flags & CHIP_HAS_VOLUME))
+                       break;
+               ctrl->value = max(chip->left,chip->right);
+               return 0;
+       case V4L2_CID_AUDIO_BALANCE:
+       {
+               int volume;
+               if (!(desc->flags & CHIP_HAS_VOLUME))
+                       break;
+               volume = max(chip->left,chip->right);
+               if (volume)
+                       ctrl->value=(32768*min(chip->left,chip->right))/volume;
+               else
+                       ctrl->value=32768;
+               return 0;
        }
-       tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name);
-       if (desc->flags) {
-               tvaudio_dbg("matches:%s%s%s.\n",
-                       (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
-                       (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
-                       (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
+       case V4L2_CID_AUDIO_BASS:
+               if (!(desc->flags & CHIP_HAS_BASSTREBLE))
+                       break;
+               ctrl->value = chip->bass;
+               return 0;
+       case V4L2_CID_AUDIO_TREBLE:
+               if (!(desc->flags & CHIP_HAS_BASSTREBLE))
+                       break;
+               ctrl->value = chip->treble;
+               return 0;
        }
+       return -EINVAL;
+}
 
-       /* fill required data structures */
-       strcpy(chip->c.name, desc->name);
-       chip->type = desc-chiplist;
-       chip->shadow.count = desc->registers+1;
-       chip->prevmode = -1;
-       /* register */
-       i2c_attach_client(&chip->c);
+static int tvaudio_s_ctrl(struct v4l2_subdev *sd,
+                           struct v4l2_control *ctrl)
+{
+       struct CHIPSTATE *chip = to_state(sd);
+       struct CHIPDESC *desc = chip->desc;
 
-       /* initialization  */
-       if (desc->initialize != NULL)
-               desc->initialize(chip);
-       else
-               chip_cmd(chip,"init",&desc->init);
+       switch (ctrl->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               if (!(desc->flags & CHIP_HAS_INPUTSEL))
+                       break;
+
+               if (ctrl->value < 0 || ctrl->value >= 2)
+                       return -ERANGE;
+               chip->muted = ctrl->value;
+               if (chip->muted)
+                       chip_write_masked(chip,desc->inputreg,desc->inputmute,desc->inputmask);
+               else
+                       chip_write_masked(chip,desc->inputreg,
+                                       desc->inputmap[chip->input],desc->inputmask);
+               return 0;
+       case V4L2_CID_AUDIO_VOLUME:
+       {
+               int volume,balance;
+
+               if (!(desc->flags & CHIP_HAS_VOLUME))
+                       break;
+
+               volume = max(chip->left,chip->right);
+               if (volume)
+                       balance=(32768*min(chip->left,chip->right))/volume;
+               else
+                       balance=32768;
+
+               volume=ctrl->value;
+               chip->left = (min(65536 - balance,32768) * volume) / 32768;
+               chip->right = (min(balance,volume *(__u16)32768)) / 32768;
 
-       if (desc->flags & CHIP_HAS_VOLUME) {
-               chip->left   = desc->leftinit   ? desc->leftinit   : 65535;
-               chip->right  = desc->rightinit  ? desc->rightinit  : 65535;
                chip_write(chip,desc->leftreg,desc->volfunc(chip->left));
                chip_write(chip,desc->rightreg,desc->volfunc(chip->right));
+
+               return 0;
        }
-       if (desc->flags & CHIP_HAS_BASSTREBLE) {
-               chip->treble = desc->trebleinit ? desc->trebleinit : 32768;
-               chip->bass   = desc->bassinit   ? desc->bassinit   : 32768;
+       case V4L2_CID_AUDIO_BALANCE:
+       {
+               int volume, balance;
+               if (!(desc->flags & CHIP_HAS_VOLUME))
+                       break;
+
+               volume = max(chip->left,chip->right);
+               balance = ctrl->value;
+
+               chip_write(chip,desc->leftreg,desc->volfunc(chip->left));
+               chip_write(chip,desc->rightreg,desc->volfunc(chip->right));
+
+               return 0;
+       }
+       case V4L2_CID_AUDIO_BASS:
+               if (!(desc->flags & CHIP_HAS_BASSTREBLE))
+                       break;
+               chip->bass = ctrl->value;
                chip_write(chip,desc->bassreg,desc->bassfunc(chip->bass));
+
+               return 0;
+       case V4L2_CID_AUDIO_TREBLE:
+               if (!(desc->flags & CHIP_HAS_BASSTREBLE))
+                       break;
+               chip->treble = ctrl->value;
                chip_write(chip,desc->treblereg,desc->treblefunc(chip->treble));
-       }
 
-       chip->tpid = -1;
-       if (desc->checkmode) {
-               /* start async thread */
-               init_timer(&chip->wt);
-               chip->wt.function = chip_thread_wake;
-               chip->wt.data     = (unsigned long)chip;
-               init_waitqueue_head(&chip->wq);
-               init_completion(&chip->texit);
-               chip->tpid = kernel_thread(chip_thread,(void *)chip,0);
-               if (chip->tpid < 0)
-                       tvaudio_warn("%s: kernel_thread() failed\n",
-                              chip->c.name);
-               wake_up_interruptible(&chip->wq);
+               return 0;
        }
-       return 0;
+       return -EINVAL;
 }
 
-static int chip_probe(struct i2c_adapter *adap)
+
+/* ---------------------------------------------------------------------- */
+/* video4linux interface                                                  */
+
+static int tvaudio_s_radio(struct v4l2_subdev *sd)
 {
-       /* don't attach on saa7146 based cards,
-          because dedicated drivers are used */
-       if ((adap->id == I2C_HW_SAA7146))
-               return 0;
-       if (adap->class & I2C_CLASS_TV_ANALOG)
-               return i2c_probe(adap, &addr_data, chip_attach);
+       struct CHIPSTATE *chip = to_state(sd);
+
+       chip->radio = 1;
+       chip->watch_stereo = 0;
+       /* del_timer(&chip->wt); */
        return 0;
 }
 
-static int chip_detach(struct i2c_client *client)
+static int tvaudio_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
 {
-       struct CHIPSTATE *chip = i2c_get_clientdata(client);
+       struct CHIPSTATE *chip = to_state(sd);
+       struct CHIPDESC *desc = chip->desc;
 
-       del_timer_sync(&chip->wt);
-       if (chip->tpid >= 0) {
-               /* shutdown async thread */
-               chip->done = 1;
-               wake_up_interruptible(&chip->wq);
-               wait_for_completion(&chip->texit);
+       switch (qc->id) {
+       case V4L2_CID_AUDIO_MUTE:
+               if (desc->flags & CHIP_HAS_INPUTSEL)
+                       return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);
+               break;
+       case V4L2_CID_AUDIO_VOLUME:
+               if (desc->flags & CHIP_HAS_VOLUME)
+                       return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 58880);
+               break;
+       case V4L2_CID_AUDIO_BALANCE:
+               if (desc->flags & CHIP_HAS_VOLUME)
+                       return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
+               break;
+       case V4L2_CID_AUDIO_BASS:
+       case V4L2_CID_AUDIO_TREBLE:
+               if (desc->flags & CHIP_HAS_BASSTREBLE)
+                       return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
+               break;
+       default:
+               break;
        }
+       return -EINVAL;
+}
 
-       i2c_detach_client(&chip->c);
-       kfree(chip);
+static int tvaudio_s_routing(struct v4l2_subdev *sd,
+                            u32 input, u32 output, u32 config)
+{
+       struct CHIPSTATE *chip = to_state(sd);
+       struct CHIPDESC *desc = chip->desc;
+
+       if (!(desc->flags & CHIP_HAS_INPUTSEL))
+               return 0;
+       if (input >= 4)
+               return -EINVAL;
+       /* There are four inputs: tuner, radio, extern and intern. */
+       chip->input = input;
+       if (chip->muted)
+               return 0;
+       chip_write_masked(chip, desc->inputreg,
+                       desc->inputmap[chip->input], desc->inputmask);
        return 0;
 }
 
-/* ---------------------------------------------------------------------- */
-/* video4linux interface                                                  */
-
-static int chip_command(struct i2c_client *client,
-                       unsigned int cmd, void *arg)
+static int tvaudio_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
 {
-       __u16 *sarg = arg;
-       struct CHIPSTATE *chip = i2c_get_clientdata(client);
-       struct CHIPDESC  *desc = chiplist + chip->type;
-
-       tvaudio_dbg("%s: chip_command 0x%x\n", chip->c.name, cmd);
-
-       switch (cmd) {
-       case AUDC_SET_INPUT:
-               if (desc->flags & CHIP_HAS_INPUTSEL) {
-                       if (*sarg & 0x80)
-                               chip_write_masked(chip,desc->inputreg,desc->inputmute,desc->inputmask);
-                       else
-                               chip_write_masked(chip,desc->inputreg,desc->inputmap[*sarg],desc->inputmask);
-               }
-               break;
+       struct CHIPSTATE *chip = to_state(sd);
+       struct CHIPDESC *desc = chip->desc;
+       int mode = 0;
 
-       case AUDC_SET_RADIO:
-               chip->radio = 1;
-               chip->watch_stereo = 0;
-               /* del_timer(&chip->wt); */
-               break;
+       if (!desc->setmode)
+               return 0;
+       if (chip->radio)
+               return 0;
 
-       /* --- v4l ioctls --- */
-       /* take care: bttv does userspace copying, we'll get a
-       kernel pointer here... */
-       case VIDIOCGAUDIO:
-       {
-               struct video_audio *va = arg;
-
-               if (desc->flags & CHIP_HAS_VOLUME) {
-                       va->flags  |= VIDEO_AUDIO_VOLUME;
-                       va->volume  = max(chip->left,chip->right);
-                       if (va->volume)
-                               va->balance = (32768*min(chip->left,chip->right))/
-                                       va->volume;
-                       else
-                               va->balance = 32768;
-               }
-               if (desc->flags & CHIP_HAS_BASSTREBLE) {
-                       va->flags |= VIDEO_AUDIO_BASS | VIDEO_AUDIO_TREBLE;
-                       va->bass   = chip->bass;
-                       va->treble = chip->treble;
-               }
-               if (!chip->radio) {
-                       if (desc->getmode)
-                               va->mode = desc->getmode(chip);
-                       else
-                               va->mode = VIDEO_SOUND_MONO;
-               }
+       switch (vt->audmode) {
+       case V4L2_TUNER_MODE_MONO:
+       case V4L2_TUNER_MODE_STEREO:
+       case V4L2_TUNER_MODE_LANG1:
+       case V4L2_TUNER_MODE_LANG2:
+               mode = vt->audmode;
                break;
-       }
-
-       case VIDIOCSAUDIO:
-       {
-               struct video_audio *va = arg;
-
-               if (desc->flags & CHIP_HAS_VOLUME) {
-                       chip->left = (min(65536 - va->balance,32768) *
-                               va->volume) / 32768;
-                       chip->right = (min(va->balance,(__u16)32768) *
-                               va->volume) / 32768;
-                       chip_write(chip,desc->leftreg,desc->volfunc(chip->left));
-                       chip_write(chip,desc->rightreg,desc->volfunc(chip->right));
-               }
-               if (desc->flags & CHIP_HAS_BASSTREBLE) {
-                       chip->bass = va->bass;
-                       chip->treble = va->treble;
-                       chip_write(chip,desc->bassreg,desc->bassfunc(chip->bass));
-                       chip_write(chip,desc->treblereg,desc->treblefunc(chip->treble));
-               }
-               if (desc->setmode && va->mode) {
-                       chip->watch_stereo = 0;
-                       /* del_timer(&chip->wt); */
-                       chip->mode = va->mode;
-                       desc->setmode(chip,va->mode);
-               }
+       case V4L2_TUNER_MODE_LANG1_LANG2:
+               mode = V4L2_TUNER_MODE_STEREO;
                break;
+       default:
+               return -EINVAL;
        }
+       chip->audmode = vt->audmode;
 
-       case VIDIOC_S_TUNER:
-       {
-               struct v4l2_tuner *vt = arg;
-               int mode = 0;
+       if (mode) {
+               chip->watch_stereo = 0;
+               /* del_timer(&chip->wt); */
+               chip->mode = mode;
+               desc->setmode(chip, mode);
+       }
+       return 0;
+}
 
-               switch (vt->audmode) {
-               case V4L2_TUNER_MODE_MONO:
-                       mode = VIDEO_SOUND_MONO;
-                       break;
-               case V4L2_TUNER_MODE_STEREO:
-                       mode = VIDEO_SOUND_STEREO;
-                       break;
-               case V4L2_TUNER_MODE_LANG1:
-                       mode = VIDEO_SOUND_LANG1;
-                       break;
-               case V4L2_TUNER_MODE_LANG2:
-                       mode = VIDEO_SOUND_LANG2;
-                       break;
-               default:
-                       break;
-               }
+static int tvaudio_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
+{
+       struct CHIPSTATE *chip = to_state(sd);
+       struct CHIPDESC *desc = chip->desc;
+       int mode = V4L2_TUNER_MODE_MONO;
 
-               if (desc->setmode && mode) {
-                       chip->watch_stereo = 0;
-                       /* del_timer(&chip->wt); */
-                       chip->mode = mode;
-                       desc->setmode(chip, mode);
-               }
-               break;
-       }
+       if (!desc->getmode)
+               return 0;
+       if (chip->radio)
+               return 0;
 
-       case VIDIOC_G_TUNER:
-       {
-               struct v4l2_tuner *vt = arg;
-               int mode = VIDEO_SOUND_MONO;
-
-               vt->audmode = 0;
-               vt->rxsubchans = 0;
-               vt->capability = V4L2_TUNER_CAP_STEREO |
-                       V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
-               if (chip->radio)
-                       break;
+       vt->audmode = chip->audmode;
+       vt->rxsubchans = 0;
+       vt->capability = V4L2_TUNER_CAP_STEREO |
+               V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
+
+       mode = desc->getmode(chip);
+
+       if (mode & V4L2_TUNER_MODE_MONO)
+               vt->rxsubchans |= V4L2_TUNER_SUB_MONO;
+       if (mode & V4L2_TUNER_MODE_STEREO)
+               vt->rxsubchans |= V4L2_TUNER_SUB_STEREO;
+       /* Note: for SAP it should be mono/lang2 or stereo/lang2.
+          When this module is converted fully to v4l2, then this
+          should change for those chips that can detect SAP. */
+       if (mode & V4L2_TUNER_MODE_LANG1)
+               vt->rxsubchans = V4L2_TUNER_SUB_LANG1 |
+                       V4L2_TUNER_SUB_LANG2;
+       return 0;
+}
 
-               if (desc->getmode)
-                       mode = desc->getmode(chip);
-
-               if (mode & VIDEO_SOUND_MONO)
-                       vt->rxsubchans |= V4L2_TUNER_SUB_MONO;
-               if (mode & VIDEO_SOUND_STEREO)
-                       vt->rxsubchans |= V4L2_TUNER_SUB_STEREO;
-               if (mode & VIDEO_SOUND_LANG1)
-                       vt->rxsubchans |= V4L2_TUNER_SUB_LANG1 |
-                                         V4L2_TUNER_SUB_LANG2;
-
-               mode = chip->mode;
-               if (mode & VIDEO_SOUND_MONO)
-                       vt->audmode = V4L2_TUNER_MODE_MONO;
-               if (mode & VIDEO_SOUND_STEREO)
-                       vt->audmode = V4L2_TUNER_MODE_STEREO;
-               if (mode & VIDEO_SOUND_LANG1)
-                       vt->audmode = V4L2_TUNER_MODE_LANG1;
-               if (mode & VIDEO_SOUND_LANG2)
-                       vt->audmode = V4L2_TUNER_MODE_LANG2;
-               break;
-       }
+static int tvaudio_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
+{
+       struct CHIPSTATE *chip = to_state(sd);
 
-       case VIDIOCSCHAN:
-       case VIDIOC_S_STD:
-               chip->radio = 0;
-               break;
+       chip->radio = 0;
+       return 0;
+}
 
-       case VIDIOCSFREQ:
-       case VIDIOC_S_FREQUENCY:
-               chip->mode = 0; /* automatic */
-               if (desc->checkmode) {
-                       desc->setmode(chip,VIDEO_SOUND_MONO);
-                       if (chip->prevmode != VIDEO_SOUND_MONO)
-                               chip->prevmode = -1; /* reset previous mode */
-                       mod_timer(&chip->wt, jiffies+2*HZ);
-                       /* the thread will call checkmode() later */
-               }
-               break;
+static int tvaudio_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *freq)
+{
+       struct CHIPSTATE *chip = to_state(sd);
+       struct CHIPDESC *desc = chip->desc;
+
+       chip->mode = 0; /* automatic */
+
+       /* For chips that provide getmode and setmode, and doesn't
+          automatically follows the stereo carrier, a kthread is
+          created to set the audio standard. In this case, when then
+          the video channel is changed, tvaudio starts on MONO mode.
+          After waiting for 2 seconds, the kernel thread is called,
+          to follow whatever audio standard is pointed by the
+          audio carrier.
+        */
+       if (chip->thread) {
+               desc->setmode(chip, V4L2_TUNER_MODE_MONO);
+               if (chip->prevmode != V4L2_TUNER_MODE_MONO)
+                       chip->prevmode = -1; /* reset previous mode */
+               mod_timer(&chip->wt, jiffies+msecs_to_jiffies(2000));
        }
        return 0;
 }
 
+static int tvaudio_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
+{
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
 
-static struct i2c_driver driver = {
-       .driver = {
-               .name    = "generic i2c audio driver",
-       },
-       .id              = I2C_DRIVERID_TVAUDIO,
-       .attach_adapter  = chip_probe,
-       .detach_client   = chip_detach,
-       .command         = chip_command,
+       return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_TVAUDIO, 0);
+}
+
+/* ----------------------------------------------------------------------- */
+
+static const struct v4l2_subdev_core_ops tvaudio_core_ops = {
+       .g_chip_ident = tvaudio_g_chip_ident,
+       .queryctrl = tvaudio_queryctrl,
+       .g_ctrl = tvaudio_g_ctrl,
+       .s_ctrl = tvaudio_s_ctrl,
+       .s_std = tvaudio_s_std,
 };
 
-static struct i2c_client client_template =
-{
-       .name       = "(unset)",
-       .driver     = &driver,
+static const struct v4l2_subdev_tuner_ops tvaudio_tuner_ops = {
+       .s_radio = tvaudio_s_radio,
+       .s_frequency = tvaudio_s_frequency,
+       .s_tuner = tvaudio_s_tuner,
+       .g_tuner = tvaudio_g_tuner,
+};
+
+static const struct v4l2_subdev_audio_ops tvaudio_audio_ops = {
+       .s_routing = tvaudio_s_routing,
 };
 
-static int __init audiochip_init_module(void)
+static const struct v4l2_subdev_ops tvaudio_ops = {
+       .core = &tvaudio_core_ops,
+       .tuner = &tvaudio_tuner_ops,
+       .audio = &tvaudio_audio_ops,
+};
+
+/* ----------------------------------------------------------------------- */
+
+
+/* i2c registration                                                       */
+
+static int tvaudio_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
+       struct CHIPSTATE *chip;
        struct CHIPDESC  *desc;
+       struct v4l2_subdev *sd;
 
        if (debug) {
                printk(KERN_INFO "tvaudio: TV audio decoder + audio/video mux driver\n");
@@ -1785,19 +1951,137 @@ static int __init audiochip_init_module(void)
                printk("\n");
        }
 
-       return i2c_add_driver(&driver);
+       chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+       if (!chip)
+               return -ENOMEM;
+       sd = &chip->sd;
+       v4l2_i2c_subdev_init(sd, client, &tvaudio_ops);
+
+       /* find description for the chip */
+       v4l2_dbg(1, debug, sd, "chip found @ 0x%x\n", client->addr<<1);
+       for (desc = chiplist; desc->name != NULL; desc++) {
+               if (0 == *(desc->insmodopt))
+                       continue;
+               if (client->addr < desc->addr_lo ||
+                   client->addr > desc->addr_hi)
+                       continue;
+               if (desc->checkit && !desc->checkit(chip))
+                       continue;
+               break;
+       }
+       if (desc->name == NULL) {
+               v4l2_dbg(1, debug, sd, "no matching chip description found\n");
+               kfree(chip);
+               return -EIO;
+       }
+       v4l2_info(sd, "%s found @ 0x%x (%s)\n", desc->name, client->addr<<1, client->adapter->name);
+       if (desc->flags) {
+               v4l2_dbg(1, debug, sd, "matches:%s%s%s.\n",
+                       (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
+                       (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
+                       (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
+       }
+
+       /* fill required data structures */
+       if (!id)
+               strlcpy(client->name, desc->name, I2C_NAME_SIZE);
+       chip->desc = desc;
+       chip->shadow.count = desc->registers+1;
+       chip->prevmode = -1;
+       chip->audmode = V4L2_TUNER_MODE_LANG1;
+
+       /* initialization  */
+       if (desc->initialize != NULL)
+               desc->initialize(chip);
+       else
+               chip_cmd(chip, "init", &desc->init);
+
+       if (desc->flags & CHIP_HAS_VOLUME) {
+               if (!desc->volfunc) {
+                       /* This shouldn't be happen. Warn user, but keep working
+                          without volume controls
+                        */
+                       v4l2_info(sd, "volume callback undefined!\n");
+                       desc->flags &= ~CHIP_HAS_VOLUME;
+               } else {
+                       chip->left  = desc->leftinit  ? desc->leftinit  : 65535;
+                       chip->right = desc->rightinit ? desc->rightinit : 65535;
+                       chip_write(chip, desc->leftreg,
+                                  desc->volfunc(chip->left));
+                       chip_write(chip, desc->rightreg,
+                                  desc->volfunc(chip->right));
+               }
+       }
+       if (desc->flags & CHIP_HAS_BASSTREBLE) {
+               if (!desc->bassfunc || !desc->treblefunc) {
+                       /* This shouldn't be happen. Warn user, but keep working
+                          without bass/treble controls
+                        */
+                       v4l2_info(sd, "bass/treble callbacks undefined!\n");
+                       desc->flags &= ~CHIP_HAS_BASSTREBLE;
+               } else {
+                       chip->treble = desc->trebleinit ?
+                                               desc->trebleinit : 32768;
+                       chip->bass   = desc->bassinit   ?
+                                               desc->bassinit   : 32768;
+                       chip_write(chip, desc->bassreg,
+                                  desc->bassfunc(chip->bass));
+                       chip_write(chip, desc->treblereg,
+                                  desc->treblefunc(chip->treble));
+               }
+       }
+
+       chip->thread = NULL;
+       init_timer(&chip->wt);
+       if (desc->flags & CHIP_NEED_CHECKMODE) {
+               if (!desc->getmode || !desc->setmode) {
+                       /* This shouldn't be happen. Warn user, but keep working
+                          without kthread
+                        */
+                       v4l2_info(sd, "set/get mode callbacks undefined!\n");
+                       return 0;
+               }
+               /* start async thread */
+               chip->wt.function = chip_thread_wake;
+               chip->wt.data     = (unsigned long)chip;
+               chip->thread = kthread_run(chip_thread, chip, client->name);
+               if (IS_ERR(chip->thread)) {
+                       v4l2_warn(sd, "failed to create kthread\n");
+                       chip->thread = NULL;
+               }
+       }
+       return 0;
 }
 
-static void __exit audiochip_cleanup_module(void)
+static int tvaudio_remove(struct i2c_client *client)
 {
-       i2c_del_driver(&driver);
+       struct v4l2_subdev *sd = i2c_get_clientdata(client);
+       struct CHIPSTATE *chip = to_state(sd);
+
+       del_timer_sync(&chip->wt);
+       if (chip->thread) {
+               /* shutdown async thread */
+               kthread_stop(chip->thread);
+               chip->thread = NULL;
+       }
+
+       v4l2_device_unregister_subdev(sd);
+       kfree(chip);
+       return 0;
 }
 
-module_init(audiochip_init_module);
-module_exit(audiochip_cleanup_module);
+/* This driver supports many devices and the idea is to let the driver
+   detect which device is present. So rather than listing all supported
+   devices here, we pretend to support a single, fake device type. */
+static const struct i2c_device_id tvaudio_id[] = {
+       { "tvaudio", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, tvaudio_id);
 
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+       .name = "tvaudio",
+       .probe = tvaudio_probe,
+       .remove = tvaudio_remove,
+       .id_table = tvaudio_id,
+};