V4L/DVB (10861): vino/indycam/saa7191: convert to i2c modules to V4L2.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 76 insertions, 158 deletions

diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index 84b9e4f2b3b3..54099e303c8d 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -19,10 +19,11 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
-#include <linux/videodev.h>
 /* IndyCam decodes stream of photons into digital image representation ;-) */
-#include <linux/video_decoder.h>
+#include <linux/videodev2.h>
 #include <linux/i2c.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 
 #include "indycam.h"
 
@@ -33,6 +34,10 @@ MODULE_VERSION(INDYCAM_MODULE_VERSION);
 MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
 MODULE_LICENSE("GPL");
 
+static unsigned short normal_i2c[] = { 0x56 >> 1, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+
 // #define INDYCAM_DEBUG
 
 #ifdef INDYCAM_DEBUG
@@ -48,8 +53,6 @@ struct indycam {
         u8 version;
 };
 
-static struct i2c_driver i2c_driver_indycam;
-
 static const u8 initseq[] = {
         INDYCAM_CONTROL_AGCENA,         /* INDYCAM_CONTROL */
         INDYCAM_SHUTTER_60,             /* INDYCAM_SHUTTER */
@@ -138,44 +141,44 @@ static void indycam_regdump_debug(struct i2c_client *client)
 #endif
 
 static int indycam_get_control(struct i2c_client *client,
-                               struct indycam_control *ctrl)
+                               struct v4l2_control *ctrl)
 {
         struct indycam *camera = i2c_get_clientdata(client);
         u8 reg;
         int ret = 0;
 
-        switch (ctrl->type) {
-        case INDYCAM_CONTROL_AGC:
-        case INDYCAM_CONTROL_AWB:
+        switch (ctrl->id) {
+        case V4L2_CID_AUTOGAIN:
+        case V4L2_CID_AUTO_WHITE_BALANCE:
                 ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
                 if (ret)
                         return -EIO;
-                if (ctrl->type == INDYCAM_CONTROL_AGC)
+                if (ctrl->id == V4L2_CID_AUTOGAIN)
                         ctrl->value = (reg & INDYCAM_CONTROL_AGCENA)
                                 ? 1 : 0;
                 else
                         ctrl->value = (reg & INDYCAM_CONTROL_AWBCTL)
                                 ? 1 : 0;
                 break;
-        case INDYCAM_CONTROL_SHUTTER:
+        case V4L2_CID_EXPOSURE:
                 ret = indycam_read_reg(client, INDYCAM_REG_SHUTTER, &reg);
                 if (ret)
                         return -EIO;
                 ctrl->value = ((s32)reg == 0x00) ? 0xff : ((s32)reg - 1);
                 break;
-        case INDYCAM_CONTROL_GAIN:
+        case V4L2_CID_GAIN:
                 ret = indycam_read_reg(client, INDYCAM_REG_GAIN, &reg);
                 if (ret)
                         return -EIO;
                 ctrl->value = (s32)reg;
                 break;
-        case INDYCAM_CONTROL_RED_BALANCE:
+        case V4L2_CID_RED_BALANCE:
                 ret = indycam_read_reg(client, INDYCAM_REG_RED_BALANCE, &reg);
                 if (ret)
                         return -EIO;
                 ctrl->value = (s32)reg;
                 break;
-        case INDYCAM_CONTROL_BLUE_BALANCE:
+        case V4L2_CID_BLUE_BALANCE:
                 ret = indycam_read_reg(client, INDYCAM_REG_BLUE_BALANCE, &reg);
                 if (ret)
                         return -EIO;
@@ -195,7 +198,7 @@ static int indycam_get_control(struct i2c_client *client,
                         return -EIO;
                 ctrl->value = (s32)reg;
                 break;
-        case INDYCAM_CONTROL_GAMMA:
+        case V4L2_CID_GAMMA:
                 if (camera->version == CAMERA_VERSION_MOOSE) {
                         ret = indycam_read_reg(client,
                                                INDYCAM_REG_GAMMA, &reg);
@@ -214,20 +217,20 @@ static int indycam_get_control(struct i2c_client *client,
 }
 
 static int indycam_set_control(struct i2c_client *client,
-                               struct indycam_control *ctrl)
+                               struct v4l2_control *ctrl)
 {
         struct indycam *camera = i2c_get_clientdata(client);
         u8 reg;
         int ret = 0;
 
-        switch (ctrl->type) {
-        case INDYCAM_CONTROL_AGC:
-        case INDYCAM_CONTROL_AWB:
+        switch (ctrl->id) {
+        case V4L2_CID_AUTOGAIN:
+        case V4L2_CID_AUTO_WHITE_BALANCE:
                 ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
                 if (ret)
                         break;
 
-                if (ctrl->type == INDYCAM_CONTROL_AGC) {
+                if (ctrl->id == V4L2_CID_AUTOGAIN) {
                         if (ctrl->value)
                                 reg |= INDYCAM_CONTROL_AGCENA;
                         else
@@ -241,18 +244,18 @@ static int indycam_set_control(struct i2c_client *client,
 
                 ret = indycam_write_reg(client, INDYCAM_REG_CONTROL, reg);
                 break;
-        case INDYCAM_CONTROL_SHUTTER:
+        case V4L2_CID_EXPOSURE:
                 reg = (ctrl->value == 0xff) ? 0x00 : (ctrl->value + 1);
                 ret = indycam_write_reg(client, INDYCAM_REG_SHUTTER, reg);
                 break;
-        case INDYCAM_CONTROL_GAIN:
+        case V4L2_CID_GAIN:
                 ret = indycam_write_reg(client, INDYCAM_REG_GAIN, ctrl->value);
                 break;
-        case INDYCAM_CONTROL_RED_BALANCE:
+        case V4L2_CID_RED_BALANCE:
                 ret = indycam_write_reg(client, INDYCAM_REG_RED_BALANCE,
                                         ctrl->value);
                 break;
-        case INDYCAM_CONTROL_BLUE_BALANCE:
+        case V4L2_CID_BLUE_BALANCE:
                 ret = indycam_write_reg(client, INDYCAM_REG_BLUE_BALANCE,
                                         ctrl->value);
                 break;
@@ -264,7 +267,7 @@ static int indycam_set_control(struct i2c_client *client,
                 ret = indycam_write_reg(client, INDYCAM_REG_BLUE_SATURATION,
                                         ctrl->value);
                 break;
-        case INDYCAM_CONTROL_GAMMA:
+        case V4L2_CID_GAMMA:
                 if (camera->version == CAMERA_VERSION_MOOSE) {
                         ret = indycam_write_reg(client, INDYCAM_REG_GAMMA,
                                                 ctrl->value);
@@ -279,44 +282,50 @@ static int indycam_set_control(struct i2c_client *client,
 
 /* I2C-interface */
 
-static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
+static int indycam_command(struct i2c_client *client, unsigned int cmd,
+                           void *arg)
+{
+        /* The old video_decoder interface just isn't enough,
+         * so we'll use some custom commands. */
+        switch (cmd) {
+        case VIDIOC_G_CTRL:
+                return indycam_get_control(client, arg);
+
+        case VIDIOC_S_CTRL:
+                return indycam_set_control(client, arg);
+
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int indycam_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
 {
         int err = 0;
         struct indycam *camera;
-        struct i2c_client *client;
 
-        printk(KERN_INFO "SGI IndyCam driver version %s\n",
-               INDYCAM_MODULE_VERSION);
+        v4l_info(client, "chip found @ 0x%x (%s)\n",
+                        client->addr << 1, client->adapter->name);
 
-        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (!client)
-                return -ENOMEM;
         camera = kzalloc(sizeof(struct indycam), GFP_KERNEL);
-        if (!camera) {
-                err = -ENOMEM;
-                goto out_free_client;
-        }
+        if (!camera)
+                return -ENOMEM;
 
-        client->addr = addr;
-        client->adapter = adap;
-        client->driver = &i2c_driver_indycam;
-        client->flags = 0;
-        strcpy(client->name, "IndyCam client");
         i2c_set_clientdata(client, camera);
 
         camera->client = client;
 
-        err = i2c_attach_client(client);
-        if (err)
-                goto out_free_camera;
-
         camera->version = i2c_smbus_read_byte_data(client,
                                                    INDYCAM_REG_VERSION);
         if (camera->version != CAMERA_VERSION_INDY &&
             camera->version != CAMERA_VERSION_MOOSE) {
-                err = -ENODEV;
-                goto out_detach_client;
+                kfree(camera);
+                return -ENODEV;
         }
+
         printk(KERN_INFO "IndyCam v%d.%d detected\n",
                INDYCAM_VERSION_MAJOR(camera->version),
                INDYCAM_VERSION_MINOR(camera->version));
@@ -327,8 +336,8 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
         err = indycam_write_block(client, 0, sizeof(initseq), (u8 *)&initseq);
         if (err) {
                 printk(KERN_ERR "IndyCam initialization failed\n");
-                err = -EIO;
-                goto out_detach_client;
+                kfree(camera);
+                return -EIO;
         }
 
         indycam_regdump(client);
@@ -338,8 +347,8 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
                           INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL);
         if (err) {
                 printk(KERN_ERR "IndyCam: White balancing camera failed\n");
-                err = -EIO;
-                goto out_detach_client;
+                kfree(camera);
+                return -EIO;
         }
 
         indycam_regdump(client);
@@ -347,124 +356,33 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
         printk(KERN_INFO "IndyCam initialized\n");
 
         return 0;
-
-out_detach_client:
-        i2c_detach_client(client);
-out_free_camera:
-        kfree(camera);
-out_free_client:
-        kfree(client);
-        return err;
 }
 
-static int indycam_probe(struct i2c_adapter *adap)
-{
-        /* Indy specific crap */
-        if (adap->id == I2C_HW_SGI_VINO)
-                return indycam_attach(adap, INDYCAM_ADDR, 0);
-        /* Feel free to add probe here :-) */
-        return -ENODEV;
-}
-
-static int indycam_detach(struct i2c_client *client)
+static int indycam_remove(struct i2c_client *client)
 {
         struct indycam *camera = i2c_get_clientdata(client);
 
-        i2c_detach_client(client);
         kfree(camera);
-        kfree(client);
         return 0;
 }
 
-static int indycam_command(struct i2c_client *client, unsigned int cmd,
-                           void *arg)
+static int indycam_legacy_probe(struct i2c_adapter *adapter)
 {
-        // struct indycam *camera = i2c_get_clientdata(client);
-
-        /* The old video_decoder interface just isn't enough,
-         * so we'll use some custom commands. */
-        switch (cmd) {
-        case DECODER_GET_CAPABILITIES: {
-                struct video_decoder_capability *cap = arg;
-
-                cap->flags  = VIDEO_DECODER_NTSC;
-                cap->inputs = 1;
-                cap->outputs = 1;
-                break;
-        }
-        case DECODER_GET_STATUS: {
-                int *iarg = arg;
-
-                *iarg = DECODER_STATUS_GOOD | DECODER_STATUS_NTSC |
-                        DECODER_STATUS_COLOR;
-                break;
-        }
-        case DECODER_SET_NORM: {
-                int *iarg = arg;
-
-                switch (*iarg) {
-                case VIDEO_MODE_NTSC:
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                break;
-        }
-        case DECODER_SET_INPUT: {
-                int *iarg = arg;
-
-                if (*iarg != 0)
-                        return -EINVAL;
-                break;
-        }
-        case DECODER_SET_OUTPUT: {
-                int *iarg = arg;
-
-                if (*iarg != 0)
-                        return -EINVAL;
-                break;
-        }
-        case DECODER_ENABLE_OUTPUT: {
-                /* Always enabled */
-                break;
-        }
-        case DECODER_SET_PICTURE: {
-                // struct video_picture *pic = arg;
-                /* TODO: convert values for indycam_set_controls() */
-                break;
-        }
-        case DECODER_INDYCAM_GET_CONTROL: {
-                return indycam_get_control(client, arg);
-        }
-        case DECODER_INDYCAM_SET_CONTROL: {
-                return indycam_set_control(client, arg);
-        }
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
+        return adapter->id == I2C_HW_SGI_VINO;
 }
 
-static struct i2c_driver i2c_driver_indycam = {
-        .driver = {
-                .name   = "indycam",
-        },
-        .id             = I2C_DRIVERID_INDYCAM,
-        .attach_adapter = indycam_probe,
-        .detach_client  = indycam_detach,
-        .command        = indycam_command,
+static const struct i2c_device_id indycam_id[] = {
+        { "indycam", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, indycam_id);
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+        .name = "indycam",
+        .driverid = I2C_DRIVERID_INDYCAM,
+        .command = indycam_command,
+        .probe = indycam_probe,
+        .remove = indycam_remove,
+        .legacy_probe = indycam_legacy_probe,
+        .id_table = indycam_id,
 };
-
-static int __init indycam_init(void)
-{
-        return i2c_add_driver(&i2c_driver_indycam);
-}
-
-static void __exit indycam_exit(void)
-{
-        i2c_del_driver(&i2c_driver_indycam);
-}
-
-module_init(indycam_init);
-module_exit(indycam_exit);