Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn...
[sfrench/cifs-2.6.git] / drivers / media / video / saa7191.c
index 3ddbb62312be84acbc3a77b601159c8dfe8925a2..a2513772196bf41279bed4c65a2af61114b8ecc7 100644 (file)
 #include <linux/major.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <linux/sched.h>
 #include <linux/slab.h>
 
-#include <linux/videodev.h>
-#include <linux/video_decoder.h>
+#include <linux/videodev2.h>
 #include <linux/i2c.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-i2c-drv.h>
 
 #include "saa7191.h"
 
-#define SAA7191_MODULE_VERSION "0.0.3"
+#define SAA7191_MODULE_VERSION "0.0.5"
 
 MODULE_DESCRIPTION("Philips SAA7191 video decoder driver");
 MODULE_VERSION(SAA7191_MODULE_VERSION);
 MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
 MODULE_LICENSE("GPL");
 
+
+// #define SAA7191_DEBUG
+
+#ifdef SAA7191_DEBUG
+#define dprintk(x...) printk("SAA7191: " x);
+#else
+#define dprintk(x...)
+#endif
+
+#define SAA7191_SYNC_COUNT     30
+#define SAA7191_SYNC_DELAY     100     /* milliseconds */
+
 struct saa7191 {
-       struct i2c_client *client;
+       struct v4l2_subdev sd;
 
        /* the register values are stored here as the actual
         * I2C-registers are write-only */
-       unsigned char reg[25];
+       u8 reg[25];
 
-       unsigned char norm;
-       unsigned char input;
+       int input;
+       v4l2_std_id norm;
 };
 
-static struct i2c_driver i2c_driver_saa7191;
+static inline struct saa7191 *to_saa7191(struct v4l2_subdev *sd)
+{
+       return container_of(sd, struct saa7191, sd);
+}
 
-static const unsigned char initseq[] = {
+static const u8 initseq[] = {
        0,      /* Subaddress */
-       0x50,   /* SAA7191_REG_IDEL */
-       0x30,   /* SAA7191_REG_HSYB */
-       0x00,   /* SAA7191_REG_HSYS */
-       0xe8,   /* SAA7191_REG_HCLB */
-       0xb6,   /* SAA7191_REG_HCLS */
-       0xf4,   /* SAA7191_REG_HPHI */
-       0x01,   /* SAA7191_REG_LUMA - chrominance trap active (CVBS) */
-       0x00,   /* SAA7191_REG_HUEC */
-       0xf8,   /* SAA7191_REG_CKTQ */
-       0xf8,   /* SAA7191_REG_CKTS */
-       0x90,   /* SAA7191_REG_PLSE */
-       0x90,   /* SAA7191_REG_SESE */
-       0x00,   /* SAA7191_REG_GAIN */
-       0x0c,   /* SAA7191_REG_STDC - not SECAM, slow time constant */
-       0x78,   /* SAA7191_REG_IOCK - chrominance from CVBS, GPSW1 & 2 off */
-       0x99,   /* SAA7191_REG_CTL3 - automatic field detection */
-       0x00,   /* SAA7191_REG_CTL4 */
-       0x2c,   /* SAA7191_REG_CHCV */
+
+       0x50,   /* (0x50) SAA7191_REG_IDEL */
+
+       /* 50 Hz signal timing */
+       0x30,   /* (0x30) SAA7191_REG_HSYB */
+       0x00,   /* (0x00) SAA7191_REG_HSYS */
+       0xe8,   /* (0xe8) SAA7191_REG_HCLB */
+       0xb6,   /* (0xb6) SAA7191_REG_HCLS */
+       0xf4,   /* (0xf4) SAA7191_REG_HPHI */
+
+       /* control */
+       SAA7191_LUMA_APER_1,    /* (0x01) SAA7191_REG_LUMA - CVBS mode */
+       0x00,   /* (0x00) SAA7191_REG_HUEC */
+       0xf8,   /* (0xf8) SAA7191_REG_CKTQ */
+       0xf8,   /* (0xf8) SAA7191_REG_CKTS */
+       0x90,   /* (0x90) SAA7191_REG_PLSE */
+       0x90,   /* (0x90) SAA7191_REG_SESE */
+       0x00,   /* (0x00) SAA7191_REG_GAIN */
+       SAA7191_STDC_NFEN | SAA7191_STDC_HRMV,  /* (0x0c) SAA7191_REG_STDC
+                                                * - not SECAM,
+                                                * slow time constant */
+       SAA7191_IOCK_OEDC | SAA7191_IOCK_OEHS | SAA7191_IOCK_OEVS
+       | SAA7191_IOCK_OEDY,    /* (0x78) SAA7191_REG_IOCK
+                                * - chroma from CVBS, GPSW1 & 2 off */
+       SAA7191_CTL3_AUFD | SAA7191_CTL3_SCEN | SAA7191_CTL3_OFTS
+       | SAA7191_CTL3_YDEL0,   /* (0x99) SAA7191_REG_CTL3
+                                * - automatic field detection */
+       0x00,   /* (0x00) SAA7191_REG_CTL4 */
+       0x2c,   /* (0x2c) SAA7191_REG_CHCV - PAL nominal value */
        0x00,   /* unused */
        0x00,   /* unused */
-       0x34,   /* SAA7191_REG_HS6B */
-       0x0a,   /* SAA7191_REG_HS6S */
-       0xf4,   /* SAA7191_REG_HC6B */
-       0xce,   /* SAA7191_REG_HC6S */
-       0xf4,   /* SAA7191_REG_HP6I */
+
+       /* 60 Hz signal timing */
+       0x34,   /* (0x34) SAA7191_REG_HS6B */
+       0x0a,   /* (0x0a) SAA7191_REG_HS6S */
+       0xf4,   /* (0xf4) SAA7191_REG_HC6B */
+       0xce,   /* (0xce) SAA7191_REG_HC6S */
+       0xf4,   /* (0xf4) SAA7191_REG_HP6I */
 };
 
 /* SAA7191 register handling */
 
-static unsigned char saa7191_read_reg(struct i2c_client *client,
-                                     unsigned char reg)
+static u8 saa7191_read_reg(struct v4l2_subdev *sd, u8 reg)
 {
-       return ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg];
+       return to_saa7191(sd)->reg[reg];
 }
 
-static int saa7191_read_status(struct i2c_client *client,
-                              unsigned char *value)
+static int saa7191_read_status(struct v4l2_subdev *sd, u8 *value)
 {
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
        int ret;
 
        ret = i2c_master_recv(client, value, 1);
        if (ret < 0) {
-               printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed");
+               printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed\n");
                return ret;
        }
 
@@ -98,22 +126,23 @@ static int saa7191_read_status(struct i2c_client *client,
 }
 
 
-static int saa7191_write_reg(struct i2c_client *client, unsigned char reg,
-                            unsigned char value)
+static int saa7191_write_reg(struct v4l2_subdev *sd, u8 reg, u8 value)
 {
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
 
-       ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg] = value;
+       to_saa7191(sd)->reg[reg] = value;
        return i2c_smbus_write_byte_data(client, reg, value);
 }
 
 /* the first byte of data must be the first subaddress number (register) */
-static int saa7191_write_block(struct i2c_client *client,
-                              unsigned char length, unsigned char *data)
+static int saa7191_write_block(struct v4l2_subdev *sd,
+                              u8 length, const u8 *data)
 {
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+       struct saa7191 *decoder = to_saa7191(sd);
        int i;
        int ret;
 
-       struct saa7191 *decoder = (struct saa7191 *)i2c_get_clientdata(client);
        for (i = 0; i < (length - 1); i++) {
                decoder->reg[data[0] + i] = data[i + 1];
        }
@@ -121,7 +150,7 @@ static int saa7191_write_block(struct i2c_client *client,
        ret = i2c_master_send(client, data, length);
        if (ret < 0) {
                printk(KERN_ERR "SAA7191: saa7191_write_block(): "
-                      "write failed");
+                      "write failed\n");
                return ret;
        }
 
@@ -130,10 +159,12 @@ static int saa7191_write_block(struct i2c_client *client,
 
 /* Helper functions */
 
-static int saa7191_set_input(struct i2c_client *client, int input)
+static int saa7191_s_routing(struct v4l2_subdev *sd,
+                            u32 input, u32 output, u32 config)
 {
-       unsigned char luma = saa7191_read_reg(client, SAA7191_REG_LUMA);
-       unsigned char iock = saa7191_read_reg(client, SAA7191_REG_IOCK);
+       struct saa7191 *decoder = to_saa7191(sd);
+       u8 luma = saa7191_read_reg(sd, SAA7191_REG_LUMA);
+       u8 iock = saa7191_read_reg(sd, SAA7191_REG_IOCK);
        int err;
 
        switch (input) {
@@ -152,359 +183,473 @@ static int saa7191_set_input(struct i2c_client *client, int input)
                return -EINVAL;
        }
 
-       err = saa7191_write_reg(client, SAA7191_REG_LUMA, luma);
+       err = saa7191_write_reg(sd, SAA7191_REG_LUMA, luma);
        if (err)
                return -EIO;
-       err = saa7191_write_reg(client, SAA7191_REG_IOCK, iock);
+       err = saa7191_write_reg(sd, SAA7191_REG_IOCK, iock);
        if (err)
                return -EIO;
 
+       decoder->input = input;
+
        return 0;
 }
 
-static int saa7191_set_norm(struct i2c_client *client, int norm)
+static int saa7191_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
 {
-       struct saa7191 *decoder = i2c_get_clientdata(client);
-       unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
-       unsigned char ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
-       unsigned char chcv = saa7191_read_reg(client, SAA7191_REG_CHCV);
+       struct saa7191 *decoder = to_saa7191(sd);
+       u8 stdc = saa7191_read_reg(sd, SAA7191_REG_STDC);
+       u8 ctl3 = saa7191_read_reg(sd, SAA7191_REG_CTL3);
+       u8 chcv = saa7191_read_reg(sd, SAA7191_REG_CHCV);
        int err;
 
-       switch(norm) {
-       case SAA7191_NORM_AUTO: {
-               unsigned char status;
-
-               // does status depend on current norm ?
-               if (saa7191_read_status(client, &status))
-                       return -EIO;
-
-               stdc &= ~SAA7191_STDC_SECS;
-               ctl3 &= ~SAA7191_CTL3_FSEL;
-               ctl3 |= SAA7191_CTL3_AUFD;
-               chcv = (status & SAA7191_STATUS_FIDT)
-                              ? SAA7191_CHCV_NTSC : SAA7191_CHCV_PAL;
-               break;
-       }
-       case SAA7191_NORM_PAL:
+       if (norm & V4L2_STD_PAL) {
                stdc &= ~SAA7191_STDC_SECS;
                ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
                chcv = SAA7191_CHCV_PAL;
-               break;
-       case SAA7191_NORM_NTSC:
+       } else if (norm & V4L2_STD_NTSC) {
                stdc &= ~SAA7191_STDC_SECS;
                ctl3 &= ~SAA7191_CTL3_AUFD;
                ctl3 |= SAA7191_CTL3_FSEL;
                chcv = SAA7191_CHCV_NTSC;
-               break;
-       case SAA7191_NORM_SECAM:
+       } else if (norm & V4L2_STD_SECAM) {
                stdc |= SAA7191_STDC_SECS;
                ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
                chcv = SAA7191_CHCV_PAL;
-               break;
-       default:
+       } else {
                return -EINVAL;
        }
 
-       err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
+       err = saa7191_write_reg(sd, SAA7191_REG_CTL3, ctl3);
        if (err)
                return -EIO;
-       err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
+       err = saa7191_write_reg(sd, SAA7191_REG_STDC, stdc);
        if (err)
                return -EIO;
-       err = saa7191_write_reg(client, SAA7191_REG_CHCV, chcv);
+       err = saa7191_write_reg(sd, SAA7191_REG_CHCV, chcv);
        if (err)
                return -EIO;
 
        decoder->norm = norm;
 
+       dprintk("ctl3: %02x stdc: %02x chcv: %02x\n", ctl3,
+               stdc, chcv);
+       dprintk("norm: %llx\n", norm);
+
        return 0;
 }
 
-static int saa7191_get_controls(struct i2c_client *client,
-                               struct saa7191_control *ctrl)
+static int saa7191_wait_for_signal(struct v4l2_subdev *sd, u8 *status)
 {
-       unsigned char hue = saa7191_read_reg(client, SAA7191_REG_HUEC);
-       unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
+       int i = 0;
 
-       if (hue < 0x80) {
-               hue += 0x80;
-       } else {
-               hue -= 0x80;
+       dprintk("Checking for signal...\n");
+
+       for (i = 0; i < SAA7191_SYNC_COUNT; i++) {
+               if (saa7191_read_status(sd, status))
+                       return -EIO;
+
+               if (((*status) & SAA7191_STATUS_HLCK) == 0) {
+                       dprintk("Signal found\n");
+                       return 0;
+               }
+
+               msleep(SAA7191_SYNC_DELAY);
        }
-       ctrl->hue = hue;
 
-       ctrl->vtrc = (stdc & SAA7191_STDC_VTRC)
-               ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+       dprintk("No signal\n");
 
-       return 0;
+       return -EBUSY;
 }
 
-static int saa7191_set_controls(struct i2c_client *client,
-                               struct saa7191_control *ctrl)
+static int saa7191_querystd(struct v4l2_subdev *sd, v4l2_std_id *norm)
 {
-       int err;
+       struct saa7191 *decoder = to_saa7191(sd);
+       u8 stdc = saa7191_read_reg(sd, SAA7191_REG_STDC);
+       u8 ctl3 = saa7191_read_reg(sd, SAA7191_REG_CTL3);
+       u8 status;
+       v4l2_std_id old_norm = decoder->norm;
+       int err = 0;
 
-       if (ctrl->hue >= 0) {
-               unsigned char hue = ctrl->hue & 0xff;
-               if (hue < 0x80) {
-                       hue += 0x80;
-               } else {
-                       hue -= 0x80;
-               }
-               err = saa7191_write_reg(client, SAA7191_REG_HUEC, hue);
-               if (err)
-                       return -EIO;
+       dprintk("SAA7191 extended signal auto-detection...\n");
+
+       *norm = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM;
+       stdc &= ~SAA7191_STDC_SECS;
+       ctl3 &= ~(SAA7191_CTL3_FSEL);
+
+       err = saa7191_write_reg(sd, SAA7191_REG_STDC, stdc);
+       if (err) {
+               err = -EIO;
+               goto out;
+       }
+       err = saa7191_write_reg(sd, SAA7191_REG_CTL3, ctl3);
+       if (err) {
+               err = -EIO;
+               goto out;
        }
-       if (ctrl->vtrc >= 0) {
-               unsigned char stdc =
-                       saa7191_read_reg(client, SAA7191_REG_STDC);
 
-               if (ctrl->vtrc) {
-                       stdc |= SAA7191_STDC_VTRC;
-               } else {
-                       stdc &= ~SAA7191_STDC_VTRC;
-               }
+       ctl3 |= SAA7191_CTL3_AUFD;
+       err = saa7191_write_reg(sd, SAA7191_REG_CTL3, ctl3);
+       if (err) {
+               err = -EIO;
+               goto out;
+       }
 
-               err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
-               if (err)
-                       return -EIO;
+       msleep(SAA7191_SYNC_DELAY);
+
+       err = saa7191_wait_for_signal(sd, &status);
+       if (err)
+               goto out;
+
+       if (status & SAA7191_STATUS_FIDT) {
+               /* 60Hz signal -> NTSC */
+               dprintk("60Hz signal: NTSC\n");
+               *norm = V4L2_STD_NTSC;
+               return 0;
        }
 
-       return 0;
-}
+       /* 50Hz signal */
+       dprintk("50Hz signal: Trying PAL...\n");
 
-/* I2C-interface */
+       /* try PAL first */
+       err = saa7191_s_std(sd, V4L2_STD_PAL);
+       if (err)
+               goto out;
 
-static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-       int err = 0;
-       struct saa7191 *decoder;
-       struct i2c_client *client;
+       msleep(SAA7191_SYNC_DELAY);
 
-       printk(KERN_INFO "Philips SAA7191 driver version %s\n",
-              SAA7191_MODULE_VERSION);
+       err = saa7191_wait_for_signal(sd, &status);
+       if (err)
+               goto out;
 
-       client = kmalloc(sizeof(*client), GFP_KERNEL);
-       if (!client)
-               return -ENOMEM;
-       decoder = kmalloc(sizeof(*decoder), GFP_KERNEL);
-       if (!decoder) {
-               err = -ENOMEM;
-               goto out_free_client;
+       /* not 50Hz ? */
+       if (status & SAA7191_STATUS_FIDT) {
+               dprintk("No 50Hz signal\n");
+               saa7191_s_std(sd, old_norm);
+               return -EAGAIN;
        }
 
-       memset(client, 0, sizeof(struct i2c_client));
-       memset(decoder, 0, sizeof(struct saa7191));
-
-       client->addr = addr;
-       client->adapter = adap;
-       client->driver = &i2c_driver_saa7191;
-       client->flags = 0;
-       strcpy(client->name, "saa7191 client");
-       i2c_set_clientdata(client, decoder);
+       if (status & SAA7191_STATUS_CODE) {
+               dprintk("PAL\n");
+               *norm = V4L2_STD_PAL;
+               return saa7191_s_std(sd, old_norm);
+       }
 
-       decoder->client = client;
+       dprintk("No color detected with PAL - Trying SECAM...\n");
 
-       err = i2c_attach_client(client);
+       /* no color detected ? -> try SECAM */
+       err = saa7191_s_std(sd, V4L2_STD_SECAM);
        if (err)
-               goto out_free_decoder;
+               goto out;
 
-       decoder->input = SAA7191_INPUT_COMPOSITE;
-       decoder->norm = SAA7191_NORM_AUTO;
+       msleep(SAA7191_SYNC_DELAY);
 
-       err = saa7191_write_block(client, sizeof(initseq),
-                                 (unsigned char *)initseq);
-       if (err) {
-               printk(KERN_ERR "SAA7191 initialization failed\n");
-               goto out_detach_client;
+       err = saa7191_wait_for_signal(sd, &status);
+       if (err)
+               goto out;
+
+       /* not 50Hz ? */
+       if (status & SAA7191_STATUS_FIDT) {
+               dprintk("No 50Hz signal\n");
+               err = -EAGAIN;
+               goto out;
        }
 
-       printk(KERN_INFO "SAA7191 initialized\n");
+       if (status & SAA7191_STATUS_CODE) {
+               /* Color detected -> SECAM */
+               dprintk("SECAM\n");
+               *norm = V4L2_STD_SECAM;
+               return saa7191_s_std(sd, old_norm);
+       }
 
-       return 0;
+       dprintk("No color detected with SECAM - Going back to PAL.\n");
 
-out_detach_client:
-       i2c_detach_client(client);
-out_free_decoder:
-       kfree(decoder);
-out_free_client:
-       kfree(client);
-       return err;
+out:
+       return saa7191_s_std(sd, old_norm);
 }
 
-static int saa7191_probe(struct i2c_adapter *adap)
+static int saa7191_autodetect_norm(struct v4l2_subdev *sd)
 {
-       /* Always connected to VINO */
-       if (adap->id == I2C_HW_SGI_VINO)
-               return saa7191_attach(adap, SAA7191_ADDR, 0);
-       /* Feel free to add probe here :-) */
-       return -ENODEV;
-}
+       u8 status;
 
-static int saa7191_detach(struct i2c_client *client)
-{
-       struct saa7191 *decoder = i2c_get_clientdata(client);
+       dprintk("SAA7191 signal auto-detection...\n");
 
-       i2c_detach_client(client);
-       kfree(decoder);
-       kfree(client);
-       return 0;
-}
+       dprintk("Reading status...\n");
 
-static int saa7191_command(struct i2c_client *client, unsigned int cmd,
-                          void *arg)
-{
-       struct saa7191 *decoder = i2c_get_clientdata(client);
+       if (saa7191_read_status(sd, &status))
+               return -EIO;
 
-       switch (cmd) {
-       case DECODER_GET_CAPABILITIES: {
-               struct video_decoder_capability *cap = arg;
+       dprintk("Checking for signal...\n");
 
-               cap->flags  = VIDEO_DECODER_PAL | VIDEO_DECODER_NTSC |
-                             VIDEO_DECODER_SECAM | VIDEO_DECODER_AUTO;
-               cap->inputs = (client->adapter->id == I2C_HW_SGI_VINO) ? 2 : 1;
-               cap->outputs = 1;
-               break;
+       /* no signal ? */
+       if (status & SAA7191_STATUS_HLCK) {
+               dprintk("No signal\n");
+               return -EBUSY;
        }
-       case DECODER_GET_STATUS: {
-               int *iarg = arg;
-               unsigned char status;
-               int res = 0;
 
-               if (saa7191_read_status(client, &status)) {
-                       return -EIO;
-               }
-               if ((status & SAA7191_STATUS_HLCK) == 0)
-                       res |= DECODER_STATUS_GOOD;
-               if (status & SAA7191_STATUS_CODE)
-                       res |= DECODER_STATUS_COLOR;
-               switch (decoder->norm) {
-               case SAA7191_NORM_NTSC:
-                       res |= DECODER_STATUS_NTSC;
-                       break;
-               case SAA7191_NORM_PAL:
-                       res |= DECODER_STATUS_PAL;
+       dprintk("Signal found\n");
+
+       if (status & SAA7191_STATUS_FIDT) {
+               /* 60hz signal -> NTSC */
+               dprintk("NTSC\n");
+               return saa7191_s_std(sd, V4L2_STD_NTSC);
+       } else {
+               /* 50hz signal -> PAL */
+               dprintk("PAL\n");
+               return saa7191_s_std(sd, V4L2_STD_PAL);
+       }
+}
+
+static int saa7191_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+{
+       u8 reg;
+       int ret = 0;
+
+       switch (ctrl->id) {
+       case SAA7191_CONTROL_BANDPASS:
+       case SAA7191_CONTROL_BANDPASS_WEIGHT:
+       case SAA7191_CONTROL_CORING:
+               reg = saa7191_read_reg(sd, SAA7191_REG_LUMA);
+               switch (ctrl->id) {
+               case SAA7191_CONTROL_BANDPASS:
+                       ctrl->value = ((s32)reg & SAA7191_LUMA_BPSS_MASK)
+                               >> SAA7191_LUMA_BPSS_SHIFT;
                        break;
-               case SAA7191_NORM_SECAM:
-                       res |= DECODER_STATUS_SECAM;
+               case SAA7191_CONTROL_BANDPASS_WEIGHT:
+                       ctrl->value = ((s32)reg & SAA7191_LUMA_APER_MASK)
+                               >> SAA7191_LUMA_APER_SHIFT;
                        break;
-               case SAA7191_NORM_AUTO:
-               default:
-                       if (status & SAA7191_STATUS_FIDT)
-                               res |= DECODER_STATUS_NTSC;
-                       else
-                               res |= DECODER_STATUS_PAL;
+               case SAA7191_CONTROL_CORING:
+                       ctrl->value = ((s32)reg & SAA7191_LUMA_CORI_MASK)
+                               >> SAA7191_LUMA_CORI_SHIFT;
                        break;
                }
-               *iarg = res;
                break;
+       case SAA7191_CONTROL_FORCE_COLOUR:
+       case SAA7191_CONTROL_CHROMA_GAIN:
+               reg = saa7191_read_reg(sd, SAA7191_REG_GAIN);
+               if (ctrl->id == SAA7191_CONTROL_FORCE_COLOUR)
+                       ctrl->value = ((s32)reg & SAA7191_GAIN_COLO) ? 1 : 0;
+               else
+                       ctrl->value = ((s32)reg & SAA7191_GAIN_LFIS_MASK)
+                               >> SAA7191_GAIN_LFIS_SHIFT;
+               break;
+       case V4L2_CID_HUE:
+               reg = saa7191_read_reg(sd, SAA7191_REG_HUEC);
+               if (reg < 0x80)
+                       reg += 0x80;
+               else
+                       reg -= 0x80;
+               ctrl->value = (s32)reg;
+               break;
+       case SAA7191_CONTROL_VTRC:
+               reg = saa7191_read_reg(sd, SAA7191_REG_STDC);
+               ctrl->value = ((s32)reg & SAA7191_STDC_VTRC) ? 1 : 0;
+               break;
+       case SAA7191_CONTROL_LUMA_DELAY:
+               reg = saa7191_read_reg(sd, SAA7191_REG_CTL3);
+               ctrl->value = ((s32)reg & SAA7191_CTL3_YDEL_MASK)
+                       >> SAA7191_CTL3_YDEL_SHIFT;
+               if (ctrl->value >= 4)
+                       ctrl->value -= 8;
+               break;
+       case SAA7191_CONTROL_VNR:
+               reg = saa7191_read_reg(sd, SAA7191_REG_CTL4);
+               ctrl->value = ((s32)reg & SAA7191_CTL4_VNOI_MASK)
+                       >> SAA7191_CTL4_VNOI_SHIFT;
+               break;
+       default:
+               ret = -EINVAL;
        }
-       case DECODER_SET_NORM: {
-               int *iarg = arg;
-
-               switch (*iarg) {
-               case VIDEO_MODE_AUTO:
-                       return saa7191_set_norm(client, SAA7191_NORM_AUTO);
-               case VIDEO_MODE_PAL:
-                       return saa7191_set_norm(client, SAA7191_NORM_PAL);
-               case VIDEO_MODE_NTSC:
-                       return saa7191_set_norm(client, SAA7191_NORM_NTSC);
-               case VIDEO_MODE_SECAM:
-                       return saa7191_set_norm(client, SAA7191_NORM_SECAM);
-               default:
-                       return -EINVAL;
+
+       return ret;
+}
+
+static int saa7191_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
+{
+       u8 reg;
+       int ret = 0;
+
+       switch (ctrl->id) {
+       case SAA7191_CONTROL_BANDPASS:
+       case SAA7191_CONTROL_BANDPASS_WEIGHT:
+       case SAA7191_CONTROL_CORING:
+               reg = saa7191_read_reg(sd, SAA7191_REG_LUMA);
+               switch (ctrl->id) {
+               case SAA7191_CONTROL_BANDPASS:
+                       reg &= ~SAA7191_LUMA_BPSS_MASK;
+                       reg |= (ctrl->value << SAA7191_LUMA_BPSS_SHIFT)
+                               & SAA7191_LUMA_BPSS_MASK;
+                       break;
+               case SAA7191_CONTROL_BANDPASS_WEIGHT:
+                       reg &= ~SAA7191_LUMA_APER_MASK;
+                       reg |= (ctrl->value << SAA7191_LUMA_APER_SHIFT)
+                               & SAA7191_LUMA_APER_MASK;
+                       break;
+               case SAA7191_CONTROL_CORING:
+                       reg &= ~SAA7191_LUMA_CORI_MASK;
+                       reg |= (ctrl->value << SAA7191_LUMA_CORI_SHIFT)
+                               & SAA7191_LUMA_CORI_MASK;
+                       break;
                }
+               ret = saa7191_write_reg(sd, SAA7191_REG_LUMA, reg);
                break;
-       }
-       case DECODER_SET_INPUT: {
-               int *iarg = arg;
-
-               switch (client->adapter->id) {
-               case I2C_HW_SGI_VINO:
-                       return saa7191_set_input(client, *iarg);
-               default:
-                       if (*iarg != 0)
-                               return -EINVAL;
+       case SAA7191_CONTROL_FORCE_COLOUR:
+       case SAA7191_CONTROL_CHROMA_GAIN:
+               reg = saa7191_read_reg(sd, SAA7191_REG_GAIN);
+               if (ctrl->id == SAA7191_CONTROL_FORCE_COLOUR) {
+                       if (ctrl->value)
+                               reg |= SAA7191_GAIN_COLO;
+                       else
+                               reg &= ~SAA7191_GAIN_COLO;
+               } else {
+                       reg &= ~SAA7191_GAIN_LFIS_MASK;
+                       reg |= (ctrl->value << SAA7191_GAIN_LFIS_SHIFT)
+                               & SAA7191_GAIN_LFIS_MASK;
                }
+               ret = saa7191_write_reg(sd, SAA7191_REG_GAIN, reg);
                break;
-       }
-       case DECODER_SET_OUTPUT: {
-               int *iarg = arg;
-
-               /* not much choice of outputs */
-               if (*iarg != 0)
-                       return -EINVAL;
+       case V4L2_CID_HUE:
+               reg = ctrl->value & 0xff;
+               if (reg < 0x80)
+                       reg += 0x80;
+               else
+                       reg -= 0x80;
+               ret = saa7191_write_reg(sd, SAA7191_REG_HUEC, reg);
                break;
-       }
-       case DECODER_ENABLE_OUTPUT: {
-               /* Always enabled */
+       case SAA7191_CONTROL_VTRC:
+               reg = saa7191_read_reg(sd, SAA7191_REG_STDC);
+               if (ctrl->value)
+                       reg |= SAA7191_STDC_VTRC;
+               else
+                       reg &= ~SAA7191_STDC_VTRC;
+               ret = saa7191_write_reg(sd, SAA7191_REG_STDC, reg);
                break;
-       }
-       case DECODER_SET_PICTURE: {
-               struct video_picture *pic = arg;
-               unsigned val;
-               int err;
-
-               val = (pic->hue >> 8) - 0x80;
-               err = saa7191_write_reg(client, SAA7191_REG_HUEC, val);
-               if (err)
-                       return -EIO;
+       case SAA7191_CONTROL_LUMA_DELAY: {
+               s32 value = ctrl->value;
+               if (value < 0)
+                       value += 8;
+               reg = saa7191_read_reg(sd, SAA7191_REG_CTL3);
+               reg &= ~SAA7191_CTL3_YDEL_MASK;
+               reg |= (value << SAA7191_CTL3_YDEL_SHIFT)
+                       & SAA7191_CTL3_YDEL_MASK;
+               ret = saa7191_write_reg(sd, SAA7191_REG_CTL3, reg);
                break;
        }
-       case DECODER_SAA7191_GET_STATUS: {
-               struct saa7191_status *status = arg;
-               unsigned char status_reg;
-
-               if (saa7191_read_status(client, &status_reg))
-                       return -EIO;
-               status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0)
-                       ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
-               status->ntsc = (status_reg & SAA7191_STATUS_FIDT)
-                       ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
-               status->color = (status_reg & SAA7191_STATUS_CODE)
-                       ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
-
-               status->input = decoder->input;
-               status->norm = decoder->norm;
-       }
-       case DECODER_SAA7191_SET_NORM: {
-               int *norm = arg;
-               return saa7191_set_norm(client, *norm);
-       }
-       case DECODER_SAA7191_GET_CONTROLS: {
-               struct saa7191_control *ctrl = arg;
-               return saa7191_get_controls(client, ctrl);
-       }
-       case DECODER_SAA7191_SET_CONTROLS: {
-               struct saa7191_control *ctrl = arg;
-               return saa7191_set_controls(client, ctrl);
-       }
+       case SAA7191_CONTROL_VNR:
+               reg = saa7191_read_reg(sd, SAA7191_REG_CTL4);
+               reg &= ~SAA7191_CTL4_VNOI_MASK;
+               reg |= (ctrl->value << SAA7191_CTL4_VNOI_SHIFT)
+                       & SAA7191_CTL4_VNOI_MASK;
+               ret = saa7191_write_reg(sd, SAA7191_REG_CTL4, reg);
+               break;
        default:
-               return -EINVAL;
+               ret = -EINVAL;
        }
 
+       return ret;
+}
+
+/* I2C-interface */
+
+static int saa7191_g_input_status(struct v4l2_subdev *sd, u32 *status)
+{
+       u8 status_reg;
+       int res = V4L2_IN_ST_NO_SIGNAL;
+
+       if (saa7191_read_status(sd, &status_reg))
+               return -EIO;
+       if ((status_reg & SAA7191_STATUS_HLCK) == 0)
+               res = 0;
+       if (!(status_reg & SAA7191_STATUS_CODE))
+               res |= V4L2_IN_ST_NO_COLOR;
+       *status = res;
        return 0;
 }
 
-static struct i2c_driver i2c_driver_saa7191 = {
-       .owner          = THIS_MODULE,
-       .name           = "saa7191",
-       .id             = I2C_DRIVERID_SAA7191,
-       .flags          = I2C_DF_NOTIFY,
-       .attach_adapter = saa7191_probe,
-       .detach_client  = saa7191_detach,
-       .command        = saa7191_command
+
+static int saa7191_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_SAA7191, 0);
+}
+
+/* ----------------------------------------------------------------------- */
+
+static const struct v4l2_subdev_core_ops saa7191_core_ops = {
+       .g_chip_ident = saa7191_g_chip_ident,
+       .g_ctrl = saa7191_g_ctrl,
+       .s_ctrl = saa7191_s_ctrl,
+       .s_std = saa7191_s_std,
+};
+
+static const struct v4l2_subdev_video_ops saa7191_video_ops = {
+       .s_routing = saa7191_s_routing,
+       .querystd = saa7191_querystd,
+       .g_input_status = saa7191_g_input_status,
+};
+
+static const struct v4l2_subdev_ops saa7191_ops = {
+       .core = &saa7191_core_ops,
+       .video = &saa7191_video_ops,
 };
 
-static int saa7191_init(void)
+static int saa7191_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
-       return i2c_add_driver(&i2c_driver_saa7191);
+       int err = 0;
+       struct saa7191 *decoder;
+       struct v4l2_subdev *sd;
+
+       v4l_info(client, "chip found @ 0x%x (%s)\n",
+                       client->addr << 1, client->adapter->name);
+
+       decoder = kzalloc(sizeof(*decoder), GFP_KERNEL);
+       if (!decoder)
+               return -ENOMEM;
+
+       sd = &decoder->sd;
+       v4l2_i2c_subdev_init(sd, client, &saa7191_ops);
+
+       err = saa7191_write_block(sd, sizeof(initseq), initseq);
+       if (err) {
+               printk(KERN_ERR "SAA7191 initialization failed\n");
+               kfree(decoder);
+               return err;
+       }
+
+       printk(KERN_INFO "SAA7191 initialized\n");
+
+       decoder->input = SAA7191_INPUT_COMPOSITE;
+       decoder->norm = V4L2_STD_PAL;
+
+       err = saa7191_autodetect_norm(sd);
+       if (err && (err != -EBUSY))
+               printk(KERN_ERR "SAA7191: Signal auto-detection failed\n");
+
+       return 0;
 }
 
-static void saa7191_exit(void)
+static int saa7191_remove(struct i2c_client *client)
 {
-       i2c_del_driver(&i2c_driver_saa7191);
+       struct v4l2_subdev *sd = i2c_get_clientdata(client);
+
+       v4l2_device_unregister_subdev(sd);
+       kfree(to_saa7191(sd));
+       return 0;
 }
 
-module_init(saa7191_init);
-module_exit(saa7191_exit);
+static const struct i2c_device_id saa7191_id[] = {
+       { "saa7191", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, saa7191_id);
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+       .name = "saa7191",
+       .probe = saa7191_probe,
+       .remove = saa7191_remove,
+       .id_table = saa7191_id,
+};