[media] marvell-cam: Basic working MMP camera driver
[linux-2.6.git] / drivers / media / video / tda9840.c
index 77bfd24..22fa820 100644 (file)
 
 #include <linux/module.h>
 #include <linux/ioctl.h>
+#include <linux/slab.h>
 #include <linux/i2c.h>
-#include <media/v4l2-common.h>
-#include <media/v4l2-i2c-drv-legacy.h>
-#include "tda9840.h"
+#include <media/v4l2-device.h>
+#include <media/v4l2-chip-ident.h>
 
 MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
 MODULE_DESCRIPTION("tda9840 driver");
@@ -56,176 +56,167 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 #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 void tda9840_write(struct i2c_client *client, u8 reg, u8 val)
+static void tda9840_write(struct v4l2_subdev *sd, u8 reg, u8 val)
 {
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+
        if (i2c_smbus_write_byte_data(client, reg, val))
-               v4l_dbg(1, debug, client, "error writing %02x to %02x\n",
+               v4l2_dbg(1, debug, sd, "error writing %02x to %02x\n",
                                val, reg);
 }
 
-static int tda9840_command(struct i2c_client *client, unsigned cmd, void *arg)
+static int tda9840_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *t)
 {
-       int result = 0;
-       int byte = *(int *)arg;
-
-       switch (cmd) {
-       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);
+       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;
        }
+       v4l2_dbg(1, debug, sd, "TDA9840_SWITCH: 0x%02x\n", byte);
+       tda9840_write(sd, SWITCH, byte);
+       return 0;
+}
 
-       case VIDIOC_G_TUNER: {
-               struct v4l2_tuner *t = arg;
-               u8 byte;
+static int tda9840_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *t)
+{
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+       u8 byte;
 
-               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;
+       t->rxsubchans = V4L2_TUNER_SUB_MONO;
+       if (1 != i2c_master_recv(client, &byte, 1)) {
+               v4l2_dbg(1, debug, sd,
+                       "i2c_master_recv() failed\n");
+               return -EIO;
        }
 
-       case TDA9840_LEVEL_ADJUST:
-               v4l_dbg(1, debug, client, "TDA9840_LEVEL_ADJUST: %d\n", byte);
+       if (byte & 0x80) {
+               v4l2_dbg(1, debug, sd,
+                       "TDA9840_DETECT: register contents invalid\n");
+               return -EINVAL;
+       }
 
-               /* check for correct range */
-               if (byte > 25 || byte < -20)
-                       return -EINVAL;
+       v4l2_dbg(1, debug, sd, "TDA9840_DETECT: byte: 0x%02x\n", byte);
 
-               /* calculate actual value to set, see specs, page 18 */
-               byte /= 5;
-               if (0 < byte)
-                       byte += 0x8;
-               else
-                       byte = -byte;
-               tda9840_write(client, LEVEL_ADJUST, 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;
+       }
+       return 0;
+}
+
+static int tda9840_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
+{
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
 
-       case TDA9840_STEREO_ADJUST:
-               v4l_dbg(1, debug, client, "TDA9840_STEREO_ADJUST: %d\n", byte);
+       return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_TDA9840, 0);
+}
 
-               /* check for correct range */
-               if (byte > 25 || byte < -24)
-                       return -EINVAL;
+/* ----------------------------------------------------------------------- */
 
-               /* calculate actual value to set */
-               byte /= 5;
-               if (0 < byte)
-                       byte += 0x20;
-               else
-                       byte = -byte;
+static const struct v4l2_subdev_core_ops tda9840_core_ops = {
+       .g_chip_ident = tda9840_g_chip_ident,
+};
 
-               tda9840_write(client, STEREO_ADJUST, byte);
-               break;
-       default:
-               return -ENOIOCTLCMD;
-       }
+static const struct v4l2_subdev_tuner_ops tda9840_tuner_ops = {
+       .s_tuner = tda9840_s_tuner,
+       .g_tuner = tda9840_g_tuner,
+};
 
-       if (result)
-               return -EIO;
+static const struct v4l2_subdev_ops tda9840_ops = {
+       .core = &tda9840_core_ops,
+       .tuner = &tda9840_tuner_ops,
+};
 
-       return 0;
-}
+/* ----------------------------------------------------------------------- */
 
 static int tda9840_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
-       int result;
-       int byte;
+       struct v4l2_subdev *sd;
 
        /* let's see whether this adapter can support what we need */
        if (!i2c_check_functionality(client->adapter,
                        I2C_FUNC_SMBUS_READ_BYTE_DATA |
                        I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
-               return 0;
+               return -EIO;
 
        v4l_info(client, "chip found @ 0x%x (%s)\n",
                        client->addr << 1, client->adapter->name);
 
+       sd = kzalloc(sizeof(struct v4l2_subdev), GFP_KERNEL);
+       if (sd == NULL)
+               return -ENOMEM;
+       v4l2_i2c_subdev_init(sd, client, &tda9840_ops);
+
        /* set initial values for level & stereo - adjustment, mode */
-       byte = 0;
-       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) {
-               v4l_dbg(1, debug, client, "could not initialize tda9840\n");
-               return -ENODEV;
-       }
+       tda9840_write(sd, LEVEL_ADJUST, 0);
+       tda9840_write(sd, STEREO_ADJUST, 0);
+       tda9840_write(sd, SWITCH, TDA9840_SET_STEREO);
        return 0;
 }
 
-static int tda9840_legacy_probe(struct i2c_adapter *adapter)
+static int tda9840_remove(struct i2c_client *client)
 {
-       /* Let's see whether this is a known adapter we can attach to.
-          Prevents conflicts with tvaudio.c. */
-       return adapter->id == I2C_HW_SAA7146;
+       struct v4l2_subdev *sd = i2c_get_clientdata(client);
+
+       v4l2_device_unregister_subdev(sd);
+       kfree(sd);
+       return 0;
 }
+
 static const struct i2c_device_id tda9840_id[] = {
        { "tda9840", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tda9840_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-       .name = "tda9840",
-       .driverid = I2C_DRIVERID_TDA9840,
-       .command = tda9840_command,
-       .probe = tda9840_probe,
-       .legacy_probe = tda9840_legacy_probe,
-       .id_table = tda9840_id,
+static struct i2c_driver tda9840_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "tda9840",
+       },
+       .probe          = tda9840_probe,
+       .remove         = tda9840_remove,
+       .id_table       = tda9840_id,
 };
+
+static __init int init_tda9840(void)
+{
+       return i2c_add_driver(&tda9840_driver);
+}
+
+static __exit void exit_tda9840(void)
+{
+       i2c_del_driver(&tda9840_driver);
+}
+
+module_init(init_tda9840);
+module_exit(exit_tda9840);