1 files changed, 110 insertions, 67 deletions

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 0292c5abf14a..b582943a0d3e 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -31,6 +31,7 @@
 #include <linux/smp_lock.h>
 
 #include <media/audiochip.h>
+#include <media/v4l2-common.h>
 
 #include "tvaudio.h"
 
@@ -46,17 +47,6 @@ MODULE_LICENSE("GPL");
 
 #define UNSET    (-1U)
 
-#define tvaudio_info(fmt, arg...) do {\
-        printk(KERN_INFO "tvaudio %d-%04x: " fmt, \
-                        chip->c.adapter->nr, chip->c.addr , ##arg); } while (0)
-#define tvaudio_warn(fmt, arg...) do {\
-        printk(KERN_WARNING "tvaudio %d-%04x: " fmt, \
-                        chip->c.adapter->nr, chip->c.addr , ##arg); } while (0)
-#define tvaudio_dbg(fmt, arg...) do {\
-        if (debug) \
-                printk(KERN_INFO "tvaudio %d-%04x: " fmt, \
-                        chip->c.adapter->nr, chip->c.addr , ##arg); } while (0)
-
 /* ---------------------------------------------------------------------- */
 /* our structs                                                            */
 
@@ -131,7 +121,7 @@ struct CHIPSTATE {
         /* current settings */
         __u16 left,right,treble,bass,mode;
         int prevmode;
-        int norm;
+        int radio;
 
         /* thread */
         pid_t                tpid;
@@ -142,8 +132,6 @@ struct CHIPSTATE {
         int                  watch_stereo;
 };
 
-#define VIDEO_MODE_RADIO 16      /* norm magic for radio mode */
-
 /* ---------------------------------------------------------------------- */
 /* i2c addresses                                                          */
 
@@ -171,23 +159,23 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
         unsigned char buffer[2];
 
         if (-1 == subaddr) {
-                tvaudio_dbg("%s: chip_write: 0x%x\n",
+                v4l_dbg(1, &chip->c, "%s: chip_write: 0x%x\n",
                         chip->c.name, 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",
+                        v4l_warn(&chip->c, "%s: I/O error (write 0x%x)\n",
                                 chip->c.name, val);
                         return -1;
                 }
         } else {
-                tvaudio_dbg("%s: chip_write: reg%d=0x%x\n",
+                v4l_dbg(1, &chip->c, "%s: chip_write: reg%d=0x%x\n",
                         chip->c.name, 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",
+                        v4l_warn(&chip->c, "%s: I/O error (write reg%d=0x%x)\n",
                         chip->c.name, subaddr, val);
                         return -1;
                 }
@@ -212,11 +200,11 @@ static int chip_read(struct CHIPSTATE *chip)
         unsigned char buffer;
 
         if (1 != i2c_master_recv(&chip->c,&buffer,1)) {
-                tvaudio_warn("%s: I/O error (read)\n",
+                v4l_warn(&chip->c, "%s: I/O error (read)\n",
                 chip->c.name);
                 return -1;
         }
-        tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer);
+        v4l_dbg(1, &chip->c, "%s: chip_read: 0x%x\n",chip->c.name, buffer);
         return buffer;
 }
 
@@ -231,10 +219,10 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
         write[0] = subaddr;
 
         if (2 != i2c_transfer(chip->c.adapter,msgs,2)) {
-                tvaudio_warn("%s: I/O error (read2)\n", chip->c.name);
+                v4l_warn(&chip->c, "%s: I/O error (read2)\n", chip->c.name);
                 return -1;
         }
-        tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n",
+        v4l_dbg(1, &chip->c, "%s: chip_read2: reg%d=0x%x\n",
                 chip->c.name, subaddr,read[0]);
         return read[0];
 }
@@ -247,7 +235,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
                 return 0;
 
         /* update our shadow register set; print bytes if (debug > 0) */
-        tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:",
+        v4l_dbg(1, &chip->c, "%s: chip_cmd(%s): reg=%d, data:",
                 chip->c.name, name,cmd->bytes[0]);
         for (i = 1; i < cmd->count; i++) {
                 if (debug)
@@ -259,7 +247,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 
         /* 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);
+                v4l_warn(&chip->c, "%s: I/O error (%s)\n", chip->c.name, name);
                 return -1;
         }
         return 0;
@@ -286,7 +274,7 @@ static int chip_thread(void *data)
 
         daemonize("%s", chip->c.name);
         allow_signal(SIGTERM);
-        tvaudio_dbg("%s: thread started\n", chip->c.name);
+        v4l_dbg(1, &chip->c, "%s: thread started\n", chip->c.name);
 
         for (;;) {
                 add_wait_queue(&chip->wq, &wait);
@@ -298,10 +286,10 @@ static int chip_thread(void *data)
                 try_to_freeze();
                 if (chip->done || signal_pending(current))
                         break;
-                tvaudio_dbg("%s: thread wakeup\n", chip->c.name);
+                v4l_dbg(1, &chip->c, "%s: thread wakeup\n", chip->c.name);
 
                 /* don't do anything for radio or if mode != auto */
-                if (chip->norm == VIDEO_MODE_RADIO || chip->mode != 0)
+                if (chip->radio || chip->mode != 0)
                         continue;
 
                 /* have a look what's going on */
@@ -311,7 +299,7 @@ static int chip_thread(void *data)
                 mod_timer(&chip->wt, jiffies+2*HZ);
         }
 
-        tvaudio_dbg("%s: thread exiting\n", chip->c.name);
+        v4l_dbg(1, &chip->c, "%s: thread exiting\n", chip->c.name);
         complete_and_exit(&chip->texit, 0);
         return 0;
 }
@@ -324,7 +312,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
         if (mode == chip->prevmode)
         return;
 
-        tvaudio_dbg("%s: thread checkmode\n", chip->c.name);
+        v4l_dbg(1, &chip->c, "%s: thread checkmode\n", chip->c.name);
         chip->prevmode = mode;
 
         if (mode & VIDEO_SOUND_STEREO)
@@ -371,7 +359,7 @@ static int tda9840_getmode(struct CHIPSTATE *chip)
         if (val & TDA9840_ST_STEREO)
                 mode |= VIDEO_SOUND_STEREO;
 
-        tvaudio_dbg ("tda9840_getmode(): raw chip read: %d, return: %d\n",
+        v4l_dbg(1, &chip->c, "tda9840_getmode(): raw chip read: %d, return: %d\n",
                 val, mode);
         return mode;
 }
@@ -667,7 +655,7 @@ static int tda9873_getmode(struct CHIPSTATE *chip)
                 mode |= VIDEO_SOUND_STEREO;
         if (val & TDA9873_DUAL)
                 mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
-        tvaudio_dbg ("tda9873_getmode(): raw chip read: %d, return: %d\n",
+        v4l_dbg(1, &chip->c, "tda9873_getmode(): raw chip read: %d, return: %d\n",
                 val, mode);
         return mode;
 }
@@ -678,12 +666,12 @@ static void tda9873_setmode(struct CHIPSTATE *chip, int mode)
         /*      int adj_data = chip->shadow.bytes[TDA9873_AD+1] ; */
 
         if ((sw_data & TDA9873_INP_MASK) != TDA9873_INTERNAL) {
-                tvaudio_dbg("tda9873_setmode(): external input\n");
+                v4l_dbg(1, &chip->c, "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);
+        v4l_dbg(1, &chip->c, "tda9873_setmode(): chip->shadow.bytes[%d] = %d\n", TDA9873_SW+1, chip->shadow.bytes[TDA9873_SW+1]);
+        v4l_dbg(1, &chip->c, "tda9873_setmode(): sw_data  = %d\n", sw_data);
 
         switch (mode) {
         case VIDEO_SOUND_MONO:
@@ -704,7 +692,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",
+        v4l_dbg(1, &chip->c, "tda9873_setmode(): req. mode %d; chip_write: %d\n",
                 mode, sw_data);
 }
 
@@ -843,7 +831,7 @@ 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",
+        v4l_dbg(1, &chip->c, "tda9874a_setup(): %s [0x%02X].\n",
                 tda9874a_modelist[tda9874a_STD].name,tda9874a_STD);
         return 1;
 }
@@ -886,7 +874,7 @@ static int tda9874a_getmode(struct CHIPSTATE *chip)
                         mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
         }
 
-        tvaudio_dbg("tda9874a_getmode(): DSR=0x%X, NSR=0x%X, NECR=0x%X, return: %d.\n",
+        v4l_dbg(1, &chip->c, "tda9874a_getmode(): DSR=0x%X, NSR=0x%X, NECR=0x%X, return: %d.\n",
                  dsr, nsr, necr, mode);
         return mode;
 }
@@ -932,7 +920,7 @@ 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",
+                v4l_dbg(1, &chip->c, "tda9874a_setmode(): req. mode %d; AOSR=0x%X, MDACOSR=0x%X.\n",
                         mode, aosr, mdacosr);
 
         } else { /* dic == 0x07 */
@@ -967,7 +955,7 @@ 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",
+                v4l_dbg(1, &chip->c, "tda9874a_setmode(): req. mode %d; FMMR=0x%X, AOSR=0x%X.\n",
                         mode, fmmr, aosr);
         }
 }
@@ -981,10 +969,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);
+        v4l_dbg(1, &chip->c, "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");
+                v4l_info(&chip->c, "found tda9874%s.\n", (dic == 0x11) ? "a":"h");
                 tda9874a_dic = dic;     /* remember device id. */
                 return 1;
         }
@@ -1196,7 +1184,7 @@ static int ta8874z_getmode(struct CHIPSTATE *chip)
         }else if (!(val & TA8874Z_B0)){
                 mode |= VIDEO_SOUND_STEREO;
         }
-        /* tvaudio_dbg ("ta8874z_getmode(): raw chip read: 0x%02x, return: 0x%02x\n", val, mode); */
+        /* v4l_dbg(1, &chip->c, "ta8874z_getmode(): raw chip read: 0x%02x, return: 0x%02x\n", val, mode); */
         return mode;
 }
 
@@ -1209,7 +1197,7 @@ static void ta8874z_setmode(struct CHIPSTATE *chip, int mode)
 {
         int update = 1;
         audiocmd *t = NULL;
-        tvaudio_dbg("ta8874z_setmode(): mode: 0x%02x\n", mode);
+        v4l_dbg(1, &chip->c, "ta8874z_setmode(): mode: 0x%02x\n", mode);
 
         switch(mode){
         case VIDEO_SOUND_MONO:
@@ -1490,7 +1478,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
         i2c_set_clientdata(&chip->c, chip);
 
         /* find description for the chip */
-        tvaudio_dbg("chip found @ 0x%x\n", addr<<1);
+        v4l_dbg(1, &chip->c, "chip found @ 0x%x\n", addr<<1);
         for (desc = chiplist; desc->name != NULL; desc++) {
                 if (0 == *(desc->insmodopt))
                         continue;
@@ -1502,12 +1490,12 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                 break;
         }
         if (desc->name == NULL) {
-                tvaudio_dbg("no matching chip description found\n");
+                v4l_dbg(1, &chip->c, "no matching chip description found\n");
                 return -EIO;
         }
-        tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name);
+        v4l_info(&chip->c, "%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name);
         if (desc->flags) {
-                tvaudio_dbg("matches:%s%s%s.\n",
+                v4l_dbg(1, &chip->c, "matches:%s%s%s.\n",
                         (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
                         (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
                         (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
@@ -1550,7 +1538,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                 init_completion(&chip->texit);
                 chip->tpid = kernel_thread(chip_thread,(void *)chip,0);
                 if (chip->tpid < 0)
-                        tvaudio_warn("%s: kernel_thread() failed\n",
+                        v4l_warn(&chip->c, "%s: kernel_thread() failed\n",
                                chip->c.name);
                 wake_up_interruptible(&chip->wq);
         }
@@ -1563,17 +1551,8 @@ static int chip_probe(struct i2c_adapter *adap)
            because dedicated drivers are used */
         if ((adap->id == I2C_HW_SAA7146))
                 return 0;
-#ifdef I2C_CLASS_TV_ANALOG
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, chip_attach);
-#else
-        switch (adap->id) {
-        case I2C_HW_B_BT848:
-        case I2C_HW_B_RIVA:
-        case I2C_HW_SAA7134:
-                return i2c_probe(adap, &addr_data, chip_attach);
-        }
-#endif
         return 0;
 }
 
@@ -1604,7 +1583,7 @@ static int chip_command(struct i2c_client *client,
         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);
+        v4l_dbg(1, &chip->c, "%s: chip_command 0x%x\n", chip->c.name, cmd);
 
         switch (cmd) {
         case AUDC_SET_INPUT:
@@ -1617,7 +1596,7 @@ static int chip_command(struct i2c_client *client,
                 break;
 
         case AUDC_SET_RADIO:
-                chip->norm = VIDEO_MODE_RADIO;
+                chip->radio = 1;
                 chip->watch_stereo = 0;
                 /* del_timer(&chip->wt); */
                 break;
@@ -1643,7 +1622,7 @@ static int chip_command(struct i2c_client *client,
                         va->bass   = chip->bass;
                         va->treble = chip->treble;
                 }
-                if (chip->norm != VIDEO_MODE_RADIO) {
+                if (!chip->radio) {
                         if (desc->getmode)
                                 va->mode = desc->getmode(chip);
                         else
@@ -1678,15 +1657,80 @@ static int chip_command(struct i2c_client *client,
                 }
                 break;
         }
-        case VIDIOCSCHAN:
+
+        case VIDIOC_S_TUNER:
         {
-                struct video_channel *vc = arg;
+                struct v4l2_tuner *vt = arg;
+                int mode = 0;
 
-                chip->norm = vc->norm;
+                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;
+                }
+
+                if (desc->setmode && mode) {
+                        chip->watch_stereo = 0;
+                        /* del_timer(&chip->wt); */
+                        chip->mode = mode;
+                        desc->setmode(chip, mode);
+                }
                 break;
         }
-        case VIDIOCSFREQ:
+
+        case VIDIOC_G_TUNER:
         {
+                struct v4l2_tuner *vt = arg;
+                int mode = VIDEO_SOUND_MONO;
+
+                if (chip->radio)
+                        break;
+                vt->audmode = 0;
+                vt->rxsubchans = 0;
+                vt->capability = V4L2_TUNER_CAP_STEREO |
+                        V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
+
+                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;
+        }
+
+        case VIDIOCSCHAN:
+        case VIDIOC_S_STD:
+                chip->radio = 0;
+                break;
+
+        case VIDIOCSFREQ:
+        case VIDIOC_S_FREQUENCY:
                 chip->mode = 0; /* automatic */
                 if (desc->checkmode) {
                         desc->setmode(chip,VIDEO_SOUND_MONO);
@@ -1695,15 +1739,14 @@ static int chip_command(struct i2c_client *client,
                         mod_timer(&chip->wt, jiffies+2*HZ);
                         /* the thread will call checkmode() later */
                 }
-        }
+                break;
         }
         return 0;
 }
 
-
 static struct i2c_driver driver = {
         .driver = {
-                .name    = "generic i2c audio driver",
+                .name    = "tvaudio",
         },
         .id              = I2C_DRIVERID_TVAUDIO,
         .attach_adapter  = chip_probe,