]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (9199): adv7175: convert i2c driver for new i2c API
authorHans Verkuil <hverkuil@xs4all.nl>
Sun, 7 Sep 2008 10:58:46 +0000 (07:58 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 17 Oct 2008 20:16:08 +0000 (17:16 -0300)
- Convert to use v4l2-i2c-drv-legacy.h to be able to handle the new i2c API
- Cleanups
- Use v4l_dbg/v4l_info to have uniform kernel messages

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/adv7175.c

index 8ee07a68f7026527ed2eb4e5f8624955f27464d6..6008e84653f1d67fd13eaaf7946c3913494e4f03 100644 (file)
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/signal.h>
 #include <linux/types.h>
-#include <linux/i2c.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
+#include <linux/ioctl.h>
 #include <asm/uaccess.h>
-
+#include <linux/i2c.h>
+#include <linux/i2c-id.h>
 #include <linux/videodev.h>
 #include <linux/video_encoder.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-i2c-drv-legacy.h>
 
 MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");
 MODULE_AUTHOR("Dave Perks");
 MODULE_LICENSE("GPL");
 
-
-#define I2C_NAME(s) (s)->name
-
-
 static int debug;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
-#define dprintk(num, format, args...) \
-       do { \
-               if (debug >= num) \
-                       printk(format, ##args); \
-       } while (0)
-
 /* ----------------------------------------------------------------------- */
 
 struct adv7175 {
@@ -77,33 +58,23 @@ struct adv7175 {
 #define   I2C_ADV7175        0xd4
 #define   I2C_ADV7176        0x54
 
-static char adv7175_name[] = "adv7175";
-static char adv7176_name[] = "adv7176";
-
 static char *inputs[] = { "pass_through", "play_back", "color_bar" };
 static char *norms[] = { "PAL", "NTSC", "SECAM->PAL (may not work!)" };
 
 /* ----------------------------------------------------------------------- */
 
-static inline int
-adv7175_write (struct i2c_client *client,
-              u8                 reg,
-              u8                 value)
+static inline int adv7175_write(struct i2c_client *client, u8 reg, u8 value)
 {
        return i2c_smbus_write_byte_data(client, reg, value);
 }
 
-static inline int
-adv7175_read (struct i2c_client *client,
-             u8                 reg)
+static inline int adv7175_read(struct i2c_client *client, u8 reg)
 {
        return i2c_smbus_read_byte_data(client, reg);
 }
 
-static int
-adv7175_write_block (struct i2c_client *client,
-                    const u8          *data,
-                    unsigned int       len)
+static int adv7175_write_block(struct i2c_client *client,
+                    const u8 *data, unsigned int len)
 {
        int ret = -1;
        u8 reg;
@@ -123,18 +94,17 @@ adv7175_write_block (struct i2c_client *client,
                                reg++;
                                len -= 2;
                                data += 2;
-                       } while (len >= 2 && data[0] == reg &&
-                                block_len < 32);
-                       if ((ret = i2c_master_send(client, block_data,
-                                                  block_len)) < 0)
+                       } while (len >= 2 && data[0] == reg && block_len < 32);
+                       ret = i2c_master_send(client, block_data, block_len);
+                       if (ret < 0)
                                break;
                }
        } else {
                /* do some slow I2C emulation kind of thing */
                while (len >= 2) {
                        reg = *data++;
-                       if ((ret = adv7175_write(client, reg,
-                                                *data++)) < 0)
+                       ret = adv7175_write(client, reg, *data++);
+                       if (ret < 0)
                                break;
                        len -= 2;
                }
@@ -143,13 +113,11 @@ adv7175_write_block (struct i2c_client *client,
        return ret;
 }
 
-static void
-set_subcarrier_freq (struct i2c_client *client,
-                    int                pass_through)
+static void set_subcarrier_freq(struct i2c_client *client, int pass_through)
 {
        /* for some reason pass_through NTSC needs
         * a different sub-carrier freq to remain stable. */
-       if(pass_through)
+       if (pass_through)
                adv7175_write(client, 0x02, 0x00);
        else
                adv7175_write(client, 0x02, 0x55);
@@ -160,12 +128,12 @@ set_subcarrier_freq (struct i2c_client *client,
 }
 
 /* ----------------------------------------------------------------------- */
-// Output filter:  S-Video  Composite
+/* Output filter:  S-Video  Composite */
 
-#define MR050       0x11       //0x09
-#define MR060       0x14       //0x0c
+#define MR050       0x11       /* 0x09 */
+#define MR060       0x14       /* 0x0c */
 
-//---------------------------------------------------------------------------
+/* ----------------------------------------------------------------------- */
 
 #define TR0MODE     0x46
 #define TR0RST     0x80
@@ -216,15 +184,11 @@ static const unsigned char init_ntsc[] = {
        0x06, 0x1a,             /* subc. phase */
 };
 
-static int
-adv7175_command (struct i2c_client *client,
-                unsigned int       cmd,
-                void              *arg)
+static int adv7175_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
        struct adv7175 *encoder = i2c_get_clientdata(client);
 
        switch (cmd) {
-
        case 0:
                /* This is just for testing!!! */
                adv7175_write_block(client, init_common,
@@ -242,15 +206,14 @@ adv7175_command (struct i2c_client *client,
                             VIDEO_ENCODER_SECAM; /* well, hacky */
                cap->inputs = 2;
                cap->outputs = 1;
-       }
                break;
+       }
 
        case ENCODER_SET_NORM:
        {
                int iarg = *(int *) arg;
 
                switch (iarg) {
-
                case VIDEO_MODE_NTSC:
                        adv7175_write_block(client, init_ntsc,
                                            sizeof(init_ntsc));
@@ -284,16 +247,13 @@ adv7175_command (struct i2c_client *client,
                        adv7175_write(client, 0x07, TR0MODE);
                        break;
                default:
-                       dprintk(1, KERN_ERR "%s: illegal norm: %d\n",
-                               I2C_NAME(client), iarg);
+                       v4l_dbg(1, debug, client, "illegal norm: %d\n", iarg);
                        return -EINVAL;
-
                }
-               dprintk(1, KERN_INFO "%s: switched to %s\n", I2C_NAME(client),
-                       norms[iarg]);
+               v4l_dbg(1, debug, client, "switched to %s\n", norms[iarg]);
                encoder->norm = iarg;
-       }
                break;
+       }
 
        case ENCODER_SET_INPUT:
        {
@@ -304,7 +264,6 @@ adv7175_command (struct i2c_client *client,
                 *iarg = 2: color bar */
 
                switch (iarg) {
-
                case 0:
                        adv7175_write(client, 0x01, 0x00);
 
@@ -331,7 +290,7 @@ adv7175_command (struct i2c_client *client,
                        adv7175_write(client, 0x0d, 0x49);
                        adv7175_write(client, 0x07, TR0MODE | TR0RST);
                        adv7175_write(client, 0x07, TR0MODE);
-                       //udelay(10);
+                       /* udelay(10); */
                        break;
 
                case 2:
@@ -343,39 +302,35 @@ adv7175_command (struct i2c_client *client,
                        adv7175_write(client, 0x0d, 0x49);
                        adv7175_write(client, 0x07, TR0MODE | TR0RST);
                        adv7175_write(client, 0x07, TR0MODE);
-                       //udelay(10);
+                       /* udelay(10); */
                        break;
 
                default:
-                       dprintk(1, KERN_ERR "%s: illegal input: %d\n",
-                               I2C_NAME(client), iarg);
+                       v4l_dbg(1, debug, client, "illegal input: %d\n", iarg);
                        return -EINVAL;
-
                }
-               dprintk(1, KERN_INFO "%s: switched to %s\n", I2C_NAME(client),
-                       inputs[iarg]);
+               v4l_dbg(1, debug, client, "switched to %s\n", inputs[iarg]);
                encoder->input = iarg;
-       }
                break;
+       }
 
        case ENCODER_SET_OUTPUT:
        {
                int *iarg = arg;
 
                /* not much choice of outputs */
-               if (*iarg != 0) {
+               if (*iarg != 0)
                        return -EINVAL;
-               }
-       }
                break;
+       }
 
        case ENCODER_ENABLE_OUTPUT:
        {
                int *iarg = arg;
 
                encoder->enable = !!*iarg;
-       }
                break;
+       }
 
        default:
                return -EINVAL;
@@ -390,145 +345,67 @@ adv7175_command (struct i2c_client *client,
  * Generic i2c probe
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
-static unsigned short normal_i2c[] =
-    { I2C_ADV7175 >> 1, (I2C_ADV7175 >> 1) + 1,
+static unsigned short normal_i2c[] = {
+       I2C_ADV7175 >> 1, (I2C_ADV7175 >> 1) + 1,
        I2C_ADV7176 >> 1, (I2C_ADV7176 >> 1) + 1,
        I2C_CLIENT_END
 };
 
-static unsigned short ignore = I2C_CLIENT_END;
-
-static struct i2c_client_address_data addr_data = {
-       .normal_i2c             = normal_i2c,
-       .probe                  = &ignore,
-       .ignore                 = &ignore,
-};
-
-static struct i2c_driver i2c_driver_adv7175;
+I2C_CLIENT_INSMOD;
 
-static int
-adv7175_detect_client (struct i2c_adapter *adapter,
-                      int                 address,
-                      int                 kind)
+static int adv7175_probe(struct i2c_client *client,
+                       const struct i2c_device_id *id)
 {
        int i;
-       struct i2c_client *client;
        struct adv7175 *encoder;
-       char *dname;
-
-       dprintk(1,
-               KERN_INFO
-               "adv7175.c: detecting adv7175 client on address 0x%x\n",
-               address << 1);
 
        /* Check if the adapter supports the needed features */
-       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-               return 0;
+       if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+               return -ENODEV;
 
-       client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (!client)
-               return -ENOMEM;
-       client->addr = address;
-       client->adapter = adapter;
-       client->driver = &i2c_driver_adv7175;
-       if ((client->addr == I2C_ADV7175 >> 1) ||
-           (client->addr == (I2C_ADV7175 >> 1) + 1)) {
-               dname = adv7175_name;
-       } else if ((client->addr == I2C_ADV7176 >> 1) ||
-                  (client->addr == (I2C_ADV7176 >> 1) + 1)) {
-               dname = adv7176_name;
-       } else {
-               /* We should never get here!!! */
-               kfree(client);
-               return 0;
-       }
-       strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));
+       v4l_info(client, "chip found @ 0x%x (%s)\n",
+                       client->addr << 1, client->adapter->name);
 
        encoder = kzalloc(sizeof(struct adv7175), GFP_KERNEL);
-       if (encoder == NULL) {
-               kfree(client);
+       if (encoder == NULL)
                return -ENOMEM;
-       }
        encoder->norm = VIDEO_MODE_PAL;
        encoder->input = 0;
        encoder->enable = 1;
        i2c_set_clientdata(client, encoder);
 
-       i = i2c_attach_client(client);
-       if (i) {
-               kfree(client);
-               kfree(encoder);
-               return i;
-       }
-
        i = adv7175_write_block(client, init_common, sizeof(init_common));
        if (i >= 0) {
                i = adv7175_write(client, 0x07, TR0MODE | TR0RST);
                i = adv7175_write(client, 0x07, TR0MODE);
                i = adv7175_read(client, 0x12);
-               dprintk(1, KERN_INFO "%s_attach: rev. %d at 0x%x\n",
-                       I2C_NAME(client), i & 1, client->addr << 1);
+               v4l_dbg(1, debug, client, "revision %d\n", i & 1);
        }
-       if (i < 0) {
-               dprintk(1, KERN_ERR "%s_attach: init error 0x%x\n",
-                       I2C_NAME(client), i);
-       }
-
+       if (i < 0)
+               v4l_dbg(1, debug, client, "init error 0x%x\n", i);
        return 0;
 }
 
-static int
-adv7175_attach_adapter (struct i2c_adapter *adapter)
-{
-       dprintk(1,
-               KERN_INFO
-               "adv7175.c: starting probe for adapter %s (0x%x)\n",
-               I2C_NAME(adapter), adapter->id);
-       return i2c_probe(adapter, &addr_data, &adv7175_detect_client);
-}
-
-static int
-adv7175_detach_client (struct i2c_client *client)
+static int adv7175_remove(struct i2c_client *client)
 {
-       struct adv7175 *encoder = i2c_get_clientdata(client);
-       int err;
-
-       err = i2c_detach_client(client);
-       if (err) {
-               return err;
-       }
-
-       kfree(encoder);
-       kfree(client);
-
+       kfree(i2c_get_clientdata(client));
        return 0;
 }
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_driver i2c_driver_adv7175 = {
-       .driver = {
-               .name = "adv7175",      /* name */
-       },
-
-       .id = I2C_DRIVERID_ADV7175,
+static const struct i2c_device_id adv7175_id[] = {
+       { "adv7175", 0 },
+       { "adv7176", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, adv7175_id);
 
-       .attach_adapter = adv7175_attach_adapter,
-       .detach_client = adv7175_detach_client,
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+       .name = "adv7175",
+       .driverid = I2C_DRIVERID_ADV7175,
        .command = adv7175_command,
+       .probe = adv7175_probe,
+       .remove = adv7175_remove,
+       .id_table = adv7175_id,
 };
-
-static int __init
-adv7175_init (void)
-{
-       return i2c_add_driver(&i2c_driver_adv7175);
-}
-
-static void __exit
-adv7175_exit (void)
-{
-       i2c_del_driver(&i2c_driver_adv7175);
-}
-
-module_init(adv7175_init);
-module_exit(adv7175_exit);