V4L/DVB (10714): zoran et al: convert zoran i2c modules to V4L2.

The zoran i2c modules were still using V4L1 internally. Replace this
with V4L2. Also deleted saa7111.c and saa7114.c, we use saa7115.c instead.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
[mchehab@redhat.com: fix v4l2_ctrl_query_fill_std merge conflict]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 142 insertions, 129 deletions

diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index a07b7b88e5b8..b8109a1b50ce 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -54,7 +54,7 @@ struct bt819 {
         unsigned char reg[32];
 
         int initialized;
-        int norm;
+        v4l2_std_id norm;
         int input;
         int enable;
         int bright;
@@ -178,7 +178,7 @@ static int bt819_init(struct i2c_client *client)
                 0x1a, 0x80,     /* 0x1a ADC Interface */
         };
 
-        struct timing *timing = &timing_data[decoder->norm];
+        struct timing *timing = &timing_data[(decoder->norm & V4L2_STD_525_60) ? 1 : 0];
 
         init[0x03 * 2 - 1] =
             (((timing->vdelay >> 8) & 0x03) << 6) |
@@ -192,7 +192,7 @@ static int bt819_init(struct i2c_client *client)
         init[0x08 * 2 - 1] = timing->hscale >> 8;
         init[0x09 * 2 - 1] = timing->hscale & 0xff;
         /* 0x15 in array is address 0x19 */
-        init[0x15 * 2 - 1] = (decoder->norm == 0) ? 115 : 93;   /* Chroma burst delay */
+        init[0x15 * 2 - 1] = (decoder->norm & V4L2_STD_625_50) ? 115 : 93;      /* Chroma burst delay */
         /* reset */
         bt819_write(client, 0x1f, 0x00);
         mdelay(1);
@@ -215,121 +215,93 @@ static int bt819_command(struct i2c_client *client, unsigned cmd, void *arg)
         }
 
         switch (cmd) {
-        case 0:
+        case VIDIOC_INT_INIT:
                 /* This is just for testing!!! */
                 bt819_init(client);
                 break;
 
-        case DECODER_GET_CAPABILITIES:
-        {
-                struct video_decoder_capability *cap = arg;
-
-                cap->flags = VIDEO_DECODER_PAL |
-                             VIDEO_DECODER_NTSC |
-                             VIDEO_DECODER_AUTO |
-                             VIDEO_DECODER_CCIR;
-                cap->inputs = 8;
-                cap->outputs = 1;
-                break;
-        }
-
-        case DECODER_GET_STATUS:
-        {
+        case VIDIOC_QUERYSTD:
+        case VIDIOC_INT_G_INPUT_STATUS: {
                 int *iarg = arg;
+                v4l2_std_id *istd = arg;
                 int status;
-                int res;
+                int res = V4L2_IN_ST_NO_SIGNAL;
+                v4l2_std_id std;
 
                 status = bt819_read(client, 0x00);
-                res = 0;
                 if ((status & 0x80))
-                        res |= DECODER_STATUS_GOOD;
+                        res = 0;
 
-                switch (decoder->norm) {
-                case VIDEO_MODE_NTSC:
-                        res |= DECODER_STATUS_NTSC;
-                        break;
-                case VIDEO_MODE_PAL:
-                        res |= DECODER_STATUS_PAL;
-                        break;
-                default:
-                case VIDEO_MODE_AUTO:
-                        if ((status & 0x10))
-                                res |= DECODER_STATUS_PAL;
-                        else
-                                res |= DECODER_STATUS_NTSC;
-                        break;
-                }
-                res |= DECODER_STATUS_COLOR;
-                *iarg = res;
+                if ((status & 0x10))
+                        std = V4L2_STD_PAL;
+                else
+                        std = V4L2_STD_NTSC;
+                if (cmd == VIDIOC_QUERYSTD)
+                        *istd = std;
+                else
+                        *iarg = res;
 
                 v4l_dbg(1, debug, client, "get status %x\n", *iarg);
                 break;
         }
 
-        case DECODER_SET_NORM:
+        case VIDIOC_S_STD:
         {
-                int *iarg = arg;
+                v4l2_std_id *iarg = arg;
                 struct timing *timing = NULL;
 
-                v4l_dbg(1, debug, client, "set norm %x\n", *iarg);
+                v4l_dbg(1, debug, client, "set norm %llx\n", *iarg);
 
-                switch (*iarg) {
-                case VIDEO_MODE_NTSC:
+                if (*iarg & V4L2_STD_NTSC) {
                         bt819_setbit(client, 0x01, 0, 1);
                         bt819_setbit(client, 0x01, 1, 0);
                         bt819_setbit(client, 0x01, 5, 0);
                         bt819_write(client, 0x18, 0x68);
                         bt819_write(client, 0x19, 0x5d);
                         /* bt819_setbit(client, 0x1a,  5, 1); */
-                        timing = &timing_data[VIDEO_MODE_NTSC];
-                        break;
-                case VIDEO_MODE_PAL:
+                        timing = &timing_data[1];
+                } else if (*iarg & V4L2_STD_PAL) {
                         bt819_setbit(client, 0x01, 0, 1);
                         bt819_setbit(client, 0x01, 1, 1);
                         bt819_setbit(client, 0x01, 5, 1);
                         bt819_write(client, 0x18, 0x7f);
                         bt819_write(client, 0x19, 0x72);
                         /* bt819_setbit(client, 0x1a,  5, 0); */
-                        timing = &timing_data[VIDEO_MODE_PAL];
-                        break;
-                case VIDEO_MODE_AUTO:
-                        bt819_setbit(client, 0x01, 0, 0);
-                        bt819_setbit(client, 0x01, 1, 0);
-                        break;
-                default:
-                        v4l_dbg(1, debug, client, "unsupported norm %x\n", *iarg);
+                        timing = &timing_data[0];
+                } else {
+                        v4l_dbg(1, debug, client, "unsupported norm %llx\n", *iarg);
                         return -EINVAL;
                 }
-
-                if (timing) {
-                        bt819_write(client, 0x03,
-                                    (((timing->vdelay >> 8) & 0x03) << 6) |
-                                    (((timing->vactive >> 8) & 0x03) << 4) |
-                                    (((timing->hdelay >> 8) & 0x03) << 2) |
-                                     ((timing->hactive >> 8) & 0x03) );
-                        bt819_write(client, 0x04, timing->vdelay & 0xff);
-                        bt819_write(client, 0x05, timing->vactive & 0xff);
-                        bt819_write(client, 0x06, timing->hdelay & 0xff);
-                        bt819_write(client, 0x07, timing->hactive & 0xff);
-                        bt819_write(client, 0x08, (timing->hscale >> 8) & 0xff);
-                        bt819_write(client, 0x09, timing->hscale & 0xff);
-                }
-
+/*              case VIDEO_MODE_AUTO:
+                        bt819_setbit(client, 0x01, 0, 0);
+                        bt819_setbit(client, 0x01, 1, 0);*/
+
+                bt819_write(client, 0x03,
+                            (((timing->vdelay >> 8) & 0x03) << 6) |
+                            (((timing->vactive >> 8) & 0x03) << 4) |
+                            (((timing->hdelay >> 8) & 0x03) << 2) |
+                             ((timing->hactive >> 8) & 0x03));
+                bt819_write(client, 0x04, timing->vdelay & 0xff);
+                bt819_write(client, 0x05, timing->vactive & 0xff);
+                bt819_write(client, 0x06, timing->hdelay & 0xff);
+                bt819_write(client, 0x07, timing->hactive & 0xff);
+                bt819_write(client, 0x08, (timing->hscale >> 8) & 0xff);
+                bt819_write(client, 0x09, timing->hscale & 0xff);
                 decoder->norm = *iarg;
                 break;
         }
 
-        case DECODER_SET_INPUT:
+        case VIDIOC_INT_S_VIDEO_ROUTING:
         {
-                int *iarg = arg;
+                struct v4l2_routing *route = arg;
 
-                v4l_dbg(1, debug, client, "set input %x\n", *iarg);
+                v4l_dbg(1, debug, client, "set input %x\n", route->input);
 
-                if (*iarg < 0 || *iarg > 7)
+                if (route->input < 0 || route->input > 7)
                         return -EINVAL;
 
-                if (decoder->input != *iarg) {
-                        decoder->input = *iarg;
+                if (decoder->input != route->input) {
+                        decoder->input = route->input;
                         /* select mode */
                         if (decoder->input == 0) {
                                 bt819_setbit(client, 0x0b, 6, 0);
@@ -342,75 +314,116 @@ static int bt819_command(struct i2c_client *client, unsigned cmd, void *arg)
                 break;
         }
 
-        case DECODER_SET_OUTPUT:
+        case VIDIOC_STREAMON:
+        case VIDIOC_STREAMOFF:
         {
-                int *iarg = arg;
+                int enable = cmd == VIDIOC_STREAMON;
 
-                v4l_dbg(1, debug, client, "set output %x\n", *iarg);
+                v4l_dbg(1, debug, client, "enable output %x\n", enable);
 
-                /* not much choice of outputs */
-                if (*iarg != 0)
-                        return -EINVAL;
+                if (decoder->enable != enable) {
+                        decoder->enable = enable;
+                        bt819_setbit(client, 0x16, 7, !enable);
+                }
                 break;
         }
 
-        case DECODER_ENABLE_OUTPUT:
+        case VIDIOC_QUERYCTRL:
         {
-                int *iarg = arg;
-                int enable = (*iarg != 0);
+                struct v4l2_queryctrl *qc = arg;
 
-                v4l_dbg(1, debug, client, "enable output %x\n", *iarg);
+                switch (qc->id) {
+                case V4L2_CID_BRIGHTNESS:
+                        v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
+                        break;
 
-                if (decoder->enable != enable) {
-                        decoder->enable = enable;
-                        bt819_setbit(client, 0x16, 7, !enable);
+                case V4L2_CID_CONTRAST:
+                        v4l2_ctrl_query_fill(qc, 0, 511, 1, 256);
+                        break;
+
+                case V4L2_CID_SATURATION:
+                        v4l2_ctrl_query_fill(qc, 0, 511, 1, 256);
+                        break;
+
+                case V4L2_CID_HUE:
+                        v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
+                        break;
+
+                default:
+                        return -EINVAL;
                 }
                 break;
         }
 
-        case DECODER_SET_PICTURE:
+        case VIDIOC_S_CTRL:
         {
-                struct video_picture *pic = arg;
+                struct v4l2_control *ctrl = arg;
 
-                v4l_dbg(1, debug, client,
-                        "set picture brightness %d contrast %d colour %d\n",
-                        pic->brightness, pic->contrast, pic->colour);
+                switch (ctrl->id) {
+                case V4L2_CID_BRIGHTNESS:
+                        if (decoder->bright != ctrl->value) {
+                                decoder->bright = ctrl->value;
+                                bt819_write(client, 0x0a, decoder->bright);
+                        }
+                        break;
 
+                case V4L2_CID_CONTRAST:
+                        if (decoder->contrast != ctrl->value) {
+                                decoder->contrast = ctrl->value;
+                                bt819_write(client, 0x0c,
+                                                decoder->contrast & 0xff);
+                                bt819_setbit(client, 0x0b, 2,
+                                                ((decoder->contrast >> 8) & 0x01));
+                        }
+                        break;
 
-                if (decoder->bright != pic->brightness) {
-                        /* We want -128 to 127 we get 0-65535 */
-                        decoder->bright = pic->brightness;
-                        bt819_write(client, 0x0a,
-                                    (decoder->bright >> 8) - 128);
-                }
+                case V4L2_CID_SATURATION:
+                        if (decoder->sat != ctrl->value) {
+                                decoder->sat = ctrl->value;
+                                bt819_write(client, 0x0d,
+                                                (decoder->sat >> 7) & 0xff);
+                                bt819_setbit(client, 0x0b, 1,
+                                                ((decoder->sat >> 15) & 0x01));
+
+                                /* Ratio between U gain and V gain must stay the same as
+                                   the ratio between the default U and V gain values. */
+                                temp = (decoder->sat * 180) / 254;
+                                bt819_write(client, 0x0e, (temp >> 7) & 0xff);
+                                bt819_setbit(client, 0x0b, 0, (temp >> 15) & 0x01);
+                        }
+                        break;
 
-                if (decoder->contrast != pic->contrast) {
-                        /* We want 0 to 511 we get 0-65535 */
-                        decoder->contrast = pic->contrast;
-                        bt819_write(client, 0x0c,
-                                    (decoder->contrast >> 7) & 0xff);
-                        bt819_setbit(client, 0x0b, 2,
-                                     ((decoder->contrast >> 15) & 0x01));
+                case V4L2_CID_HUE:
+                        if (decoder->hue != ctrl->value) {
+                                decoder->hue = ctrl->value;
+                                bt819_write(client, 0x0f, decoder->hue);
+                        }
+                        break;
+                default:
+                        return -EINVAL;
                 }
+                break;
+        }
 
-                if (decoder->sat != pic->colour) {
-                        /* We want 0 to 511 we get 0-65535 */
-                        decoder->sat = pic->colour;
-                        bt819_write(client, 0x0d,
-                                    (decoder->sat >> 7) & 0xff);
-                        bt819_setbit(client, 0x0b, 1,
-                                     ((decoder->sat >> 15) & 0x01));
-
-                        temp = (decoder->sat * 201) / 237;
-                        bt819_write(client, 0x0e, (temp >> 7) & 0xff);
-                        bt819_setbit(client, 0x0b, 0, (temp >> 15) & 0x01);
-                }
+        case VIDIOC_G_CTRL:
+        {
+                struct v4l2_control *ctrl = arg;
 
-                if (decoder->hue != pic->hue) {
-                        /* We want -128 to 127 we get 0-65535 */
-                        decoder->hue = pic->hue;
-                        bt819_write(client, 0x0f,
-                                    128 - (decoder->hue >> 8));
+                switch (ctrl->id) {
+                case V4L2_CID_BRIGHTNESS:
+                        ctrl->value = decoder->bright;
+                        break;
+                case V4L2_CID_CONTRAST:
+                        ctrl->value = decoder->contrast;
+                        break;
+                case V4L2_CID_SATURATION:
+                        ctrl->value = decoder->sat;
+                        break;
+                case V4L2_CID_HUE:
+                        ctrl->value = decoder->hue;
+                        break;
+                default:
+                        return -EINVAL;
                 }
                 break;
         }
@@ -462,13 +475,13 @@ static int bt819_probe(struct i2c_client *client,
         decoder = kzalloc(sizeof(struct bt819), GFP_KERNEL);
         if (decoder == NULL)
                 return -ENOMEM;
-        decoder->norm = VIDEO_MODE_NTSC;
+        decoder->norm = V4L2_STD_NTSC;
         decoder->input = 0;
         decoder->enable = 1;
-        decoder->bright = 32768;
-        decoder->contrast = 32768;
-        decoder->hue = 32768;
-        decoder->sat = 32768;
+        decoder->bright = 0;
+        decoder->contrast = 0xd8;       /* 100% of original signal */
+        decoder->hue = 0;
+        decoder->sat = 0xfe;    /* 100% of original signal */
         decoder->initialized = 0;
         i2c_set_clientdata(client, decoder);