Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx231xx / cx231xx-video.c

diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 65430ecc180c2cca96b3775d06cea1f4f18ed81f..a23ae73fe63497a10dfb92942e6d4be54c0c3fcb 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -820,17 +820,12 @@ static struct videobuf_queue_ops cx231xx_video_qops = {
 
 void video_mux(struct cx231xx *dev, int index)
 {
-
-       struct v4l2_routing route;
-
-       route.input = INPUT(index)->vmux;
-       route.output = 0;
        dev->video_input = index;
        dev->ctl_ainput = INPUT(index)->amux;
 
        cx231xx_set_video_input_mux(dev, index);
 
-       cx25840_call(dev, video, s_routing, &route);
+       cx25840_call(dev, video, s_routing, INPUT(index)->vmux, 0, 0);
 
        cx231xx_set_audio_input(dev, dev->ctl_ainput);
 
@@ -1089,7 +1084,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)
        dev->height = f.fmt.pix.height;
        get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
 
-       call_all(dev, tuner, s_std, dev->norm);
+       call_all(dev, core, s_std, dev->norm);
 
        mutex_unlock(&dev->lock);
 
@@ -1421,36 +1416,36 @@ static int vidioc_g_register(struct file *file, void *priv,
                        reg->val = value[0] | value[1] << 8 |
                                   value[2] << 16 | value[3] << 24;
                        break;
-               case 1: /* Colibri - read byte */
-                       ret = cx231xx_read_i2c_data(dev, Colibri_DEVICE_ADDRESS,
+               case 1: /* AFE - read byte */
+                       ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
                                                  (u16)reg->reg, 2, &data, 1);
                        reg->val = le32_to_cpu(data & 0xff);
                        break;
-               case 14:        /* Colibri - read dword */
-                       ret = cx231xx_read_i2c_data(dev, Colibri_DEVICE_ADDRESS,
+               case 14: /* AFE - read dword */
+                       ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
                                                  (u16)reg->reg, 2, &data, 4);
                        reg->val = le32_to_cpu(data);
                        break;
-               case 2: /* Hammerhead - read byte */
-                       ret = cx231xx_read_i2c_data(dev, HAMMERHEAD_I2C_ADDRESS,
+               case 2: /* Video Block - read byte */
+                       ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
                                                  (u16)reg->reg, 2, &data, 1);
                        reg->val = le32_to_cpu(data & 0xff);
                        break;
-               case 24:        /* Hammerhead - read dword */
-                       ret = cx231xx_read_i2c_data(dev, HAMMERHEAD_I2C_ADDRESS,
+               case 24: /* Video Block - read dword */
+                       ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
                                                  (u16)reg->reg, 2, &data, 4);
                        reg->val = le32_to_cpu(data);
                        break;
-               case 3: /* flatiron - read byte */
+               case 3: /* I2S block - read byte */
                        ret = cx231xx_read_i2c_data(dev,
-                                                   Flatrion_DEVICE_ADDRESS,
+                                                   I2S_BLK_DEVICE_ADDRESS,
                                                    (u16)reg->reg, 1,
                                                    &data, 1);
                        reg->val = le32_to_cpu(data & 0xff);
                        break;
-               case 34:        /* flatiron - read dword */
+               case 34: /* I2S Block - read dword */
                        ret =
-                           cx231xx_read_i2c_data(dev, Flatrion_DEVICE_ADDRESS,
+                           cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
                                                  (u16)reg->reg, 1, &data, 4);
                        reg->val = le32_to_cpu(data);
                        break;
@@ -1503,43 +1498,43 @@ static int vidioc_s_register(struct file *file, void *priv,
                                                           (u16)reg->reg, data,
                                                           4);
                                break;
-                       case 1: /* Colibri - read byte */
+                       case 1: /* AFE - read byte */
                                ret = cx231xx_write_i2c_data(dev,
-                                                       Colibri_DEVICE_ADDRESS,
+                                                       AFE_DEVICE_ADDRESS,
                                                        (u16)reg->reg, 2,
                                                        value, 1);
                                break;
-                       case 14:        /* Colibri - read dword */
+                       case 14: /* AFE - read dword */
                                ret = cx231xx_write_i2c_data(dev,
-                                                       Colibri_DEVICE_ADDRESS,
+                                                       AFE_DEVICE_ADDRESS,
                                                        (u16)reg->reg, 2,
                                                        value, 4);
                                break;
-                       case 2: /* Hammerhead - read byte */
+                       case 2: /* Video Block - read byte */
                                ret =
                                    cx231xx_write_i2c_data(dev,
-                                                       HAMMERHEAD_I2C_ADDRESS,
+                                                       VID_BLK_I2C_ADDRESS,
                                                        (u16)reg->reg, 2,
                                                        value, 1);
                                break;
-                       case 24:        /* Hammerhead - read dword */
+                       case 24: /* Video Block - read dword */
                                ret =
                                    cx231xx_write_i2c_data(dev,
-                                                       HAMMERHEAD_I2C_ADDRESS,
+                                                       VID_BLK_I2C_ADDRESS,
                                                        (u16)reg->reg, 2,
                                                        value, 4);
                                break;
-                       case 3: /* flatiron - read byte */
+                       case 3: /* I2S block - read byte */
                                ret =
                                    cx231xx_write_i2c_data(dev,
-                                                       Flatrion_DEVICE_ADDRESS,
+                                                       I2S_BLK_DEVICE_ADDRESS,
                                                        (u16)reg->reg, 1,
                                                        value, 1);
                                break;
-                       case 34:        /* flatiron - read dword */
+                       case 34: /* I2S block - read dword */
                                ret =
                                    cx231xx_write_i2c_data(dev,
-                                                       Flatrion_DEVICE_ADDRESS,
+                                                       I2S_BLK_DEVICE_ADDRESS,
                                                        (u16)reg->reg, 1,
                                                        value, 4);
                                break;
@@ -1614,7 +1609,7 @@ static int vidioc_streamoff(struct file *file, void *priv,
        if (rc < 0)
                return rc;
 
-       if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
+       if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
            (fh->type != V4L2_BUF_TYPE_VBI_CAPTURE))
                return -EINVAL;
        if (type != fh->type)
@@ -1640,8 +1635,7 @@ static int vidioc_querycap(struct file *file, void *priv,
 
        strlcpy(cap->driver, "cx231xx", sizeof(cap->driver));
        strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card));
-       strlcpy(cap->bus_info, dev->v4l2_dev.name,
-               sizeof(cap->bus_info));
+       usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
 
        cap->version = CX231XX_VERSION_CODE;
 
@@ -2126,7 +2120,7 @@ static int cx231xx_v4l2_close(struct file *filp)
                }
 
                /* Save some power by putting tuner to sleep */
-               call_all(dev, core, s_standby, 0);
+               call_all(dev, tuner, s_standby);
 
                /* do this before setting alternate! */
                cx231xx_uninit_isoc(dev);
@@ -2353,8 +2347,6 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
 {
        int ret;
 
-       cx231xx_info("%s()\n", __func__);
-
        cx231xx_info("%s: v4l2 driver version %d.%d.%d\n",
                     dev->name,
                     (CX231XX_VERSION_CODE >> 16) & 0xff,