include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / drivers / media / video / cs53l32a.c
index 60484f9..3cc135a 100644 (file)
 
 #include <linux/module.h>
 #include <linux/types.h>
+#include <linux/slab.h>
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
-#include <linux/videodev.h>
-#include <media/audiochip.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
 MODULE_AUTHOR("Martin Vaughan");
 MODULE_LICENSE("GPL");
 
-static int debug = 0;
+static int debug;
 
 module_param(debug, bool, 0644);
 
-MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
+MODULE_PARM_DESC(debug, "Debugging messages0=Off (default), 1=On");
 
-#define cs53l32a_dbg(fmt, arg...) \
-       do { \
-               if (debug) \
-                       printk(KERN_INFO "%s debug %d-%04x: " fmt, \
-                              client->driver->driver.name, \
-                              i2c_adapter_id(client->adapter), client->addr , ## arg); \
-       } while (0)
-
-#define cs53l32a_err(fmt, arg...) do { \
-       printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
-               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
-#define cs53l32a_info(fmt, arg...) do { \
-       printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
-               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
-
-static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
-
-
-I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
 
-static int cs53l32a_write(struct i2c_client *client, u8 reg, u8 value)
+static int cs53l32a_write(struct v4l2_subdev *sd, u8 reg, u8 value)
 {
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+
        return i2c_smbus_write_byte_data(client, reg, value);
 }
 
-static int cs53l32a_read(struct i2c_client *client, u8 reg)
+static int cs53l32a_read(struct v4l2_subdev *sd, u8 reg)
 {
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+
        return i2c_smbus_read_byte_data(client, reg);
 }
 
-static int cs53l32a_command(struct i2c_client *client, unsigned int cmd,
-                           void *arg)
+static int cs53l32a_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
-       int *input = arg;
-
-       switch (cmd) {
-       case AUDC_SET_INPUT:
-               switch (*input) {
-               case AUDIO_TUNER:
-                       cs53l32a_write(client, 0x01, 0x01);
-                       break;
-               case AUDIO_EXTERN:
-                       cs53l32a_write(client, 0x01, 0x21);
-                       break;
-               case AUDIO_MUTE:
-                       cs53l32a_write(client, 0x03, 0xF0);
-                       break;
-               case AUDIO_UNMUTE:
-                       cs53l32a_write(client, 0x03, 0x30);
-                       break;
-               default:
-                       cs53l32a_err("Invalid input %d.\n", *input);
-                       return -EINVAL;
-               }
-               break;
-
-       case VIDIOC_S_CTRL:
-               {
-                       struct v4l2_control *ctrl = arg;
-
-                       if (ctrl->id != V4L2_CID_AUDIO_VOLUME)
-                               return -EINVAL;
-                       if (ctrl->value > 12 || ctrl->value < -90)
-                               return -EINVAL;
-                       cs53l32a_write(client, 0x04, (u8) ctrl->value);
-                       cs53l32a_write(client, 0x05, (u8) ctrl->value);
-                       break;
-               }
-
-       case VIDIOC_LOG_STATUS:
-               {
-                       u8 v = cs53l32a_read(client, 0x01);
-                       u8 m = cs53l32a_read(client, 0x03);
-
-                       cs53l32a_info("Input: %s%s\n",
-                                     v == 0x21 ? "external line in" : "tuner",
-                                     (m & 0xC0) ? " (muted)" : "");
-                       break;
-               }
-
-       default:
+       /* There are 2 physical inputs, but the second input can be
+          placed in two modes, the first mode bypasses the PGA (gain),
+          the second goes through the PGA. Hence there are three
+          possible inputs to choose from. */
+       if (input > 2) {
+               v4l2_err(sd, "Invalid input %d.\n", input);
                return -EINVAL;
        }
+       cs53l32a_write(sd, 0x01, 0x01 + (input << 4));
+       return 0;
+}
+
+static int cs53l32a_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+{
+       if (ctrl->id == V4L2_CID_AUDIO_MUTE) {
+               ctrl->value = (cs53l32a_read(sd, 0x03) & 0xc0) != 0;
+               return 0;
+       }
+       if (ctrl->id != V4L2_CID_AUDIO_VOLUME)
+               return -EINVAL;
+       ctrl->value = (s8)cs53l32a_read(sd, 0x04);
+       return 0;
+}
+
+static int cs53l32a_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+{
+       if (ctrl->id == V4L2_CID_AUDIO_MUTE) {
+               cs53l32a_write(sd, 0x03, ctrl->value ? 0xf0 : 0x30);
+               return 0;
+       }
+       if (ctrl->id != V4L2_CID_AUDIO_VOLUME)
+               return -EINVAL;
+       if (ctrl->value > 12 || ctrl->value < -96)
+               return -EINVAL;
+       cs53l32a_write(sd, 0x04, (u8) ctrl->value);
+       cs53l32a_write(sd, 0x05, (u8) ctrl->value);
+       return 0;
+}
+
+static int cs53l32a_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)
+{
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+
+       return v4l2_chip_ident_i2c_client(client,
+                       chip, V4L2_IDENT_CS53l32A, 0);
+}
+
+static int cs53l32a_log_status(struct v4l2_subdev *sd)
+{
+       u8 v = cs53l32a_read(sd, 0x01);
+       u8 m = cs53l32a_read(sd, 0x03);
+       s8 vol = cs53l32a_read(sd, 0x04);
+
+       v4l2_info(sd, "Input:  %d%s\n", (v >> 4) & 3,
+                       (m & 0xC0) ? " (muted)" : "");
+       v4l2_info(sd, "Volume: %d dB\n", vol);
        return 0;
 }
 
 /* ----------------------------------------------------------------------- */
 
+static const struct v4l2_subdev_core_ops cs53l32a_core_ops = {
+       .log_status = cs53l32a_log_status,
+       .g_chip_ident = cs53l32a_g_chip_ident,
+       .g_ctrl = cs53l32a_g_ctrl,
+       .s_ctrl = cs53l32a_s_ctrl,
+};
+
+static const struct v4l2_subdev_audio_ops cs53l32a_audio_ops = {
+       .s_routing = cs53l32a_s_routing,
+};
+
+static const struct v4l2_subdev_ops cs53l32a_ops = {
+       .core = &cs53l32a_core_ops,
+       .audio = &cs53l32a_audio_ops,
+};
+
+/* ----------------------------------------------------------------------- */
+
 /* i2c implementation */
 
 /*
@@ -136,106 +148,71 @@ static int cs53l32a_command(struct i2c_client *client, unsigned int cmd,
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 
-static struct i2c_driver i2c_driver;
-
-static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
+static int cs53l32a_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
-       struct i2c_client *client;
+       struct v4l2_subdev *sd;
        int i;
 
        /* 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 -EIO;
 
-       client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (client == 0)
-               return -ENOMEM;
+       if (!id)
+               strlcpy(client->name, "cs53l32a", sizeof(client->name));
 
-       memset(client, 0, sizeof(struct i2c_client));
-       client->addr = address;
-       client->adapter = adapter;
-       client->driver = &i2c_driver;
-       snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
+       v4l_info(client, "chip found @ 0x%x (%s)\n",
+                       client->addr << 1, client->adapter->name);
 
-       cs53l32a_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
+       sd = kmalloc(sizeof(struct v4l2_subdev), GFP_KERNEL);
+       if (sd == NULL)
+               return -ENOMEM;
+       v4l2_i2c_subdev_init(sd, client, &cs53l32a_ops);
 
        for (i = 1; i <= 7; i++) {
-               u8 v = cs53l32a_read(client, i);
+               u8 v = cs53l32a_read(sd, i);
 
-               cs53l32a_dbg("Read Reg %d %02x\n", i, v);
+               v4l2_dbg(1, debug, sd, "Read Reg %d %02x\n", i, v);
        }
 
        /* Set cs53l32a internal register for Adaptec 2010/2410 setup */
 
-       cs53l32a_write(client, 0x01, (u8) 0x21);
-       cs53l32a_write(client, 0x02, (u8) 0x29);
-       cs53l32a_write(client, 0x03, (u8) 0x30);
-       cs53l32a_write(client, 0x04, (u8) 0x00);
-       cs53l32a_write(client, 0x05, (u8) 0x00);
-       cs53l32a_write(client, 0x06, (u8) 0x00);
-       cs53l32a_write(client, 0x07, (u8) 0x00);
+       cs53l32a_write(sd, 0x01, (u8) 0x21);
+       cs53l32a_write(sd, 0x02, (u8) 0x29);
+       cs53l32a_write(sd, 0x03, (u8) 0x30);
+       cs53l32a_write(sd, 0x04, (u8) 0x00);
+       cs53l32a_write(sd, 0x05, (u8) 0x00);
+       cs53l32a_write(sd, 0x06, (u8) 0x00);
+       cs53l32a_write(sd, 0x07, (u8) 0x00);
 
        /* Display results, should be 0x21,0x29,0x30,0x00,0x00,0x00,0x00 */
 
        for (i = 1; i <= 7; i++) {
-               u8 v = cs53l32a_read(client, i);
+               u8 v = cs53l32a_read(sd, i);
 
-               cs53l32a_dbg("Read Reg %d %02x\n", i, v);
+               v4l2_dbg(1, debug, sd, "Read Reg %d %02x\n", i, v);
        }
-
-       i2c_attach_client(client);
-
-       return 0;
-}
-
-static int cs53l32a_probe(struct i2c_adapter *adapter)
-{
-#ifdef I2C_CLASS_TV_ANALOG
-       if (adapter->class & I2C_CLASS_TV_ANALOG)
-#else
-       if (adapter->id == I2C_HW_B_BT848)
-#endif
-               return i2c_probe(adapter, &addr_data, cs53l32a_attach);
        return 0;
 }
 
-static int cs53l32a_detach(struct i2c_client *client)
+static int cs53l32a_remove(struct i2c_client *client)
 {
-       int err;
-
-       err = i2c_detach_client(client);
-       if (err) {
-               return err;
-       }
-       kfree(client);
+       struct v4l2_subdev *sd = i2c_get_clientdata(client);
 
+       v4l2_device_unregister_subdev(sd);
+       kfree(sd);
        return 0;
 }
 
-/* ----------------------------------------------------------------------- */
-
-/* i2c implementation */
-static struct i2c_driver i2c_driver = {
-       .driver = {
-               .owner = THIS_MODULE,
-               .name = "cs53l32a",
-       },
-       .id = I2C_DRIVERID_CS53L32A,
-       .attach_adapter = cs53l32a_probe,
-       .detach_client = cs53l32a_detach,
-       .command = cs53l32a_command,
+static const struct i2c_device_id cs53l32a_id[] = {
+       { "cs53l32a", 0 },
+       { }
 };
+MODULE_DEVICE_TABLE(i2c, cs53l32a_id);
 
-
-static int __init cs53l32a_init_module(void)
-{
-       return i2c_add_driver(&i2c_driver);
-}
-
-static void __exit cs53l32a_cleanup_module(void)
-{
-       i2c_del_driver(&i2c_driver);
-}
-
-module_init(cs53l32a_init_module);
-module_exit(cs53l32a_cleanup_module);
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+       .name = "cs53l32a",
+       .remove = cs53l32a_remove,
+       .probe = cs53l32a_probe,
+       .id_table = cs53l32a_id,
+};