V4L/DVB (9598): cx18: Prevent CX23418 from clearing it's outgoing ack interrupts...
[safe/jmp/linux-2.6] / drivers / media / video / tda9840.c
index 56e08e1..1c391f0 100644 (file)
@@ -2,6 +2,7 @@
     tda9840 - i2c-driver for the tda9840 by SGS Thomson
 
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
+    Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
 
     The tda9840 is a stereo/dual sound processor with digital
     identification. It can be found at address 0x84 on the i2c-bus.
 #include <linux/module.h>
 #include <linux/ioctl.h>
 #include <linux/i2c.h>
-
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 #include "tda9840.h"
 
-static int debug = 0;          /* insmod parameter */
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_DESCRIPTION("tda9840 driver");
+MODULE_LICENSE("GPL");
+
+static int debug;
 module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
-#define dprintk(args...) \
-            do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
+
+MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 #define        SWITCH          0x00
 #define        LEVEL_ADJUST    0x02
 #define        STEREO_ADJUST   0x03
 #define        TEST            0x04
 
+#define TDA9840_SET_MUTE                0x00
+#define TDA9840_SET_MONO                0x10
+#define TDA9840_SET_STEREO              0x2a
+#define TDA9840_SET_LANG1               0x12
+#define TDA9840_SET_LANG2               0x1e
+#define TDA9840_SET_BOTH                0x1a
+#define TDA9840_SET_BOTH_R              0x16
+#define TDA9840_SET_EXTERNAL            0x7a
+
 /* addresses to scan, found only at 0x42 (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
 
-static struct i2c_driver driver;
-static struct i2c_client client_template;
+static void tda9840_write(struct i2c_client *client, u8 reg, u8 val)
+{
+       if (i2c_smbus_write_byte_data(client, reg, val))
+               v4l_dbg(1, debug, client, "error writing %02x to %02x\n",
+                               val, reg);
+}
 
-static int command(struct i2c_client *client, unsigned int cmd, void *arg)
+static int tda9840_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
-       int result;
        int byte = *(int *)arg;
 
        switch (cmd) {
-       case TDA9840_SWITCH:
-
-               dprintk("TDA9840_SWITCH: 0x%02x\n", byte);
-
-               if (byte != TDA9840_SET_MONO
-                   && byte != TDA9840_SET_MUTE
-                   && byte != TDA9840_SET_STEREO
-                   && byte != TDA9840_SET_LANG1
-                   && byte != TDA9840_SET_LANG2
-                   && byte != TDA9840_SET_BOTH
-                   && byte != TDA9840_SET_BOTH_R
-                   && byte != TDA9840_SET_EXTERNAL) {
+       case VIDIOC_S_TUNER: {
+               struct v4l2_tuner *t = arg;
+               int byte;
+
+               if (t->index)
                        return -EINVAL;
+
+               switch (t->audmode) {
+               case V4L2_TUNER_MODE_STEREO:
+                       byte = TDA9840_SET_STEREO;
+                       break;
+               case V4L2_TUNER_MODE_LANG1_LANG2:
+                       byte = TDA9840_SET_BOTH;
+                       break;
+               case V4L2_TUNER_MODE_LANG1:
+                       byte = TDA9840_SET_LANG1;
+                       break;
+               case V4L2_TUNER_MODE_LANG2:
+                       byte = TDA9840_SET_LANG2;
+                       break;
+               default:
+                       byte = TDA9840_SET_MONO;
+                       break;
                }
+               v4l_dbg(1, debug, client, "TDA9840_SWITCH: 0x%02x\n", byte);
+               tda9840_write(client, SWITCH, byte);
+               break;
+       }
+
+       case VIDIOC_G_TUNER: {
+               struct v4l2_tuner *t = arg;
+               u8 byte;
 
-               result = i2c_smbus_write_byte_data(client, SWITCH, byte);
-               if (result)
-                       dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+               t->rxsubchans = V4L2_TUNER_SUB_MONO;
+               if (1 != i2c_master_recv(client, &byte, 1)) {
+                       v4l_dbg(1, debug, client,
+                               "i2c_master_recv() failed\n");
+                       return -EIO;
+               }
+
+               if (byte & 0x80) {
+                       v4l_dbg(1, debug, client,
+                               "TDA9840_DETECT: register contents invalid\n");
+                       return -EINVAL;
+               }
+
+               v4l_dbg(1, debug, client, "TDA9840_DETECT: byte: 0x%02x\n", byte);
+
+               switch (byte & 0x60) {
+               case 0x00:
+                       t->rxsubchans = V4L2_TUNER_SUB_MONO;
+                       break;
+               case 0x20:
+                       t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
+                       break;
+               case 0x40:
+                       t->rxsubchans = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
+                       break;
+               default: /* Incorrect detect */
+                       t->rxsubchans = V4L2_TUNER_MODE_MONO;
+                       break;
+               }
                break;
+       }
 
        case TDA9840_LEVEL_ADJUST:
-
-               dprintk("TDA9840_LEVEL_ADJUST: %d\n", byte);
+               v4l_dbg(1, debug, client, "TDA9840_LEVEL_ADJUST: %d\n", byte);
 
                /* check for correct range */
                if (byte > 25 || byte < -20)
@@ -91,15 +152,11 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
                        byte += 0x8;
                else
                        byte = -byte;
-
-               result = i2c_smbus_write_byte_data(client, LEVEL_ADJUST, byte);
-               if (result)
-                       dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+               tda9840_write(client, LEVEL_ADJUST, byte);
                break;
 
        case TDA9840_STEREO_ADJUST:
-
-               dprintk("TDA9840_STEREO_ADJUST: %d\n", byte);
+               v4l_dbg(1, debug, client, "TDA9840_STEREO_ADJUST: %d\n", byte);
 
                /* check for correct range */
                if (byte > 25 || byte < -24)
@@ -112,143 +169,59 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
                else
                        byte = -byte;
 
-               result = i2c_smbus_write_byte_data(client, STEREO_ADJUST, byte);
-               if (result)
-                       dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
-               break;
-
-       case TDA9840_DETECT: {
-               int *ret = (int *)arg;
-
-               byte = i2c_smbus_read_byte_data(client, STEREO_ADJUST);
-               if (byte == -1) {
-                       dprintk("i2c_smbus_read_byte_data() failed\n");
-                       return -EIO;
-               }
-
-               if (0 != (byte & 0x80)) {
-                       dprintk("TDA9840_DETECT: register contents invalid\n");
-                       return -EINVAL;
-               }
-
-               dprintk("TDA9840_DETECT: byte: 0x%02x\n", byte);
-               *ret = ((byte & 0x60) >> 5);
-               result = 0;
-               break;
-       }
-       case TDA9840_TEST:
-               dprintk("TDA9840_TEST: 0x%02x\n", byte);
-
-               /* mask out irrelevant bits */
-               byte &= 0x3;
-
-               result = i2c_smbus_write_byte_data(client, TEST, byte);
-               if (result)
-                       dprintk("i2c_smbus_write_byte() failed, ret:%d\n", result);
+               tda9840_write(client, STEREO_ADJUST, byte);
                break;
        default:
                return -ENOIOCTLCMD;
        }
 
-       if (result)
-               return -EIO;
-
        return 0;
 }
 
-static int detect(struct i2c_adapter *adapter, int address, int kind)
+static int tda9840_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
-       struct i2c_client *client;
-       int result = 0;
-
-       int byte = 0x0;
+       int result;
+       int byte;
 
        /* let's see whether this adapter can support what we need */
-       if (0 == i2c_check_functionality(adapter,
-                                   I2C_FUNC_SMBUS_READ_BYTE_DATA |
-                                   I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) {
+       if (!i2c_check_functionality(client->adapter,
+                       I2C_FUNC_SMBUS_READ_BYTE_DATA |
+                       I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
                return 0;
-       }
-
-       /* allocate memory for client structure */
-       client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (0 == client) {
-               printk("not enough kernel memory\n");
-               return -ENOMEM;
-       }
-
-       /* fill client structure */
-       memcpy(client, &client_template, sizeof(struct i2c_client));
-       client->addr = address;
-       client->adapter = adapter;
 
-       /* tell the i2c layer a new client has arrived */
-       if (0 != (result = i2c_attach_client(client))) {
-               kfree(client);
-               return result;
-       }
+       v4l_info(client, "chip found @ 0x%x (%s)\n",
+                       client->addr << 1, client->adapter->name);
 
        /* set initial values for level & stereo - adjustment, mode */
        byte = 0;
-       result  = command(client, TDA9840_LEVEL_ADJUST, &byte);
-       result += command(client, TDA9840_STEREO_ADJUST, &byte);
-       byte = TDA9840_SET_MONO;
-       result = command(client, TDA9840_SWITCH, &byte);
+       result = tda9840_command(client, TDA9840_LEVEL_ADJUST, &byte);
+       result += tda9840_command(client, TDA9840_STEREO_ADJUST, &byte);
+       tda9840_write(client, SWITCH, TDA9840_SET_STEREO);
        if (result) {
-               dprintk("could not initialize tda9840\n");
+               v4l_dbg(1, debug, client, "could not initialize tda9840\n");
                return -ENODEV;
        }
-
-       printk("tda9840: detected @ 0x%02x on adapter %s\n", address, &client->adapter->name[0]);
        return 0;
 }
 
-static int attach(struct i2c_adapter *adapter)
+static int tda9840_legacy_probe(struct i2c_adapter *adapter)
 {
-       /* let's see whether this is a know adapter we can attach to */
-       if (adapter->id != I2C_HW_SAA7146) {
-               dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
-               return -ENODEV;
-       }
-
-       return i2c_probe(adapter, &addr_data, &detect);
-}
-
-static int detach(struct i2c_client *client)
-{
-       int ret = i2c_detach_client(client);
-       kfree(client);
-       return ret;
+       /* Let's see whether this is a known adapter we can attach to.
+          Prevents conflicts with tvaudio.c. */
+       return adapter->id == I2C_HW_SAA7146;
 }
-
-static struct i2c_driver driver = {
-       .driver = {
-               .name = "tda9840",
-       },
-       .id     = I2C_DRIVERID_TDA9840,
-       .attach_adapter = attach,
-       .detach_client  = detach,
-       .command        = command,
+static const struct i2c_device_id tda9840_id[] = {
+       { "tda9840", 0 },
+       { }
 };
+MODULE_DEVICE_TABLE(i2c, tda9840_id);
 
-static struct i2c_client client_template = {
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "tda9840",
-       .driver = &driver,
+       .driverid = I2C_DRIVERID_TDA9840,
+       .command = tda9840_command,
+       .probe = tda9840_probe,
+       .legacy_probe = tda9840_legacy_probe,
+       .id_table = tda9840_id,
 };
-
-static int __init this_module_init(void)
-{
-       return i2c_add_driver(&driver);
-}
-
-static void __exit this_module_exit(void)
-{
-       i2c_del_driver(&driver);
-}
-
-module_init(this_module_init);
-module_exit(this_module_exit);
-
-MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
-MODULE_DESCRIPTION("tda9840 driver");
-MODULE_LICENSE("GPL");