1 files changed, 41 insertions, 37 deletions

diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 736c31d23194..5f37952c75cf 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -126,7 +126,7 @@ static int mx1_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
 {
         struct soc_camera_device *icd = vq->priv_data;
 
-        *size = icd->width * icd->height *
+        *size = icd->user_width * icd->user_height *
                 ((icd->current_fmt->depth + 7) >> 3);
 
         if (!*count)
@@ -135,7 +135,7 @@ static int mx1_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
         while (*size * *count > MAX_VIDEO_MEM * 1024 * 1024)
                 (*count)--;
 
-        dev_dbg(&icd->dev, "count=%d, size=%d\n", *count, *size);
+        dev_dbg(icd->dev.parent, "count=%d, size=%d\n", *count, *size);
 
         return 0;
 }
@@ -147,7 +147,7 @@ static void free_buffer(struct videobuf_queue *vq, struct mx1_buffer *buf)
 
         BUG_ON(in_interrupt());
 
-        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+        dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 vb, vb->baddr, vb->bsize);
 
         /* This waits until this buffer is out of danger, i.e., until it is no
@@ -165,7 +165,7 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq,
         struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
         int ret;
 
-        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+        dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 vb, vb->baddr, vb->bsize);
 
         /* Added list head initialization on alloc */
@@ -178,12 +178,12 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq,
         buf->inwork = 1;
 
         if (buf->fmt    != icd->current_fmt ||
-            vb->width   != icd->width ||
-            vb->height  != icd->height ||
+            vb->width   != icd->user_width ||
+            vb->height  != icd->user_height ||
             vb->field   != field) {
                 buf->fmt        = icd->current_fmt;
-                vb->width       = icd->width;
-                vb->height      = icd->height;
+                vb->width       = icd->user_width;
+                vb->height      = icd->user_height;
                 vb->field       = field;
                 vb->state       = VIDEOBUF_NEEDS_INIT;
         }
@@ -216,10 +216,11 @@ out:
 static int mx1_camera_setup_dma(struct mx1_camera_dev *pcdev)
 {
         struct videobuf_buffer *vbuf = &pcdev->active->vb;
+        struct device *dev = pcdev->icd->dev.parent;
         int ret;
 
         if (unlikely(!pcdev->active)) {
-                dev_err(pcdev->soc_host.dev, "DMA End IRQ with no active buffer\n");
+                dev_err(dev, "DMA End IRQ with no active buffer\n");
                 return -EFAULT;
         }
 
@@ -229,7 +230,7 @@ static int mx1_camera_setup_dma(struct mx1_camera_dev *pcdev)
                 vbuf->size, pcdev->res->start +
                 CSIRXR, DMA_MODE_READ);
         if (unlikely(ret))
-                dev_err(pcdev->soc_host.dev, "Failed to setup DMA sg list\n");
+                dev_err(dev, "Failed to setup DMA sg list\n");
 
         return ret;
 }
@@ -243,7 +244,7 @@ static void mx1_videobuf_queue(struct videobuf_queue *vq,
         struct mx1_camera_dev *pcdev = ici->priv;
         struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
 
-        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+        dev_dbg(icd->dev.parent, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 vb, vb->baddr, vb->bsize);
 
         list_add_tail(&vb->queue, &pcdev->capture);
@@ -270,22 +271,23 @@ static void mx1_videobuf_release(struct videobuf_queue *vq,
         struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
 #ifdef DEBUG
         struct soc_camera_device *icd = vq->priv_data;
+        struct device *dev = icd->dev.parent;
 
-        dev_dbg(&icd->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+        dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 vb, vb->baddr, vb->bsize);
 
         switch (vb->state) {
         case VIDEOBUF_ACTIVE:
-                dev_dbg(&icd->dev, "%s (active)\n", __func__);
+                dev_dbg(dev, "%s (active)\n", __func__);
                 break;
         case VIDEOBUF_QUEUED:
-                dev_dbg(&icd->dev, "%s (queued)\n", __func__);
+                dev_dbg(dev, "%s (queued)\n", __func__);
                 break;
         case VIDEOBUF_PREPARED:
-                dev_dbg(&icd->dev, "%s (prepared)\n", __func__);
+                dev_dbg(dev, "%s (prepared)\n", __func__);
                 break;
         default:
-                dev_dbg(&icd->dev, "%s (unknown)\n", __func__);
+                dev_dbg(dev, "%s (unknown)\n", __func__);
                 break;
         }
 #endif
@@ -325,6 +327,7 @@ static void mx1_camera_wakeup(struct mx1_camera_dev *pcdev,
 static void mx1_camera_dma_irq(int channel, void *data)
 {
         struct mx1_camera_dev *pcdev = data;
+        struct device *dev = pcdev->icd->dev.parent;
         struct mx1_buffer *buf;
         struct videobuf_buffer *vb;
         unsigned long flags;
@@ -334,14 +337,14 @@ static void mx1_camera_dma_irq(int channel, void *data)
         imx_dma_disable(channel);
 
         if (unlikely(!pcdev->active)) {
-                dev_err(pcdev->soc_host.dev, "DMA End IRQ with no active buffer\n");
+                dev_err(dev, "DMA End IRQ with no active buffer\n");
                 goto out;
         }
 
         vb = &pcdev->active->vb;
         buf = container_of(vb, struct mx1_buffer, vb);
         WARN_ON(buf->inwork || list_empty(&vb->queue));
-        dev_dbg(pcdev->soc_host.dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
+        dev_dbg(dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__,
                 vb, vb->baddr, vb->bsize);
 
         mx1_camera_wakeup(pcdev, vb, buf);
@@ -362,7 +365,7 @@ static void mx1_camera_init_videobuf(struct videobuf_queue *q,
         struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
         struct mx1_camera_dev *pcdev = ici->priv;
 
-        videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, ici->dev,
+        videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, icd->dev.parent,
                                         &pcdev->lock,
                                         V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                         V4L2_FIELD_NONE,
@@ -381,8 +384,9 @@ static int mclk_get_divisor(struct mx1_camera_dev *pcdev)
          * they get a nice Oops */
         div = (lcdclk + 2 * mclk - 1) / (2 * mclk) - 1;
 
-        dev_dbg(pcdev->soc_host.dev, "System clock %lukHz, target freq %dkHz, "
-                "divisor %lu\n", lcdclk / 1000, mclk / 1000, div);
+        dev_dbg(pcdev->icd->dev.parent,
+                "System clock %lukHz, target freq %dkHz, divisor %lu\n",
+                lcdclk / 1000, mclk / 1000, div);
 
         return div;
 }
@@ -391,7 +395,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
 {
         unsigned int csicr1 = CSICR1_EN;
 
-        dev_dbg(pcdev->soc_host.dev, "Activate device\n");
+        dev_dbg(pcdev->icd->dev.parent, "Activate device\n");
 
         clk_enable(pcdev->clk);
 
@@ -407,7 +411,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
 
 static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)
 {
-        dev_dbg(pcdev->soc_host.dev, "Deactivate device\n");
+        dev_dbg(pcdev->icd->dev.parent, "Deactivate device\n");
 
         /* Disable all CSI interface */
         __raw_writel(0x00, pcdev->base + CSICR1);
@@ -428,14 +432,12 @@ static int mx1_camera_add_device(struct soc_camera_device *icd)
                 goto ebusy;
         }
 
-        dev_info(&icd->dev, "MX1 Camera driver attached to camera %d\n",
+        dev_info(icd->dev.parent, "MX1 Camera driver attached to camera %d\n",
                  icd->devnum);
 
         mx1_camera_activate(pcdev);
-        ret = icd->ops->init(icd);
 
-        if (!ret)
-                pcdev->icd = icd;
+        pcdev->icd = icd;
 
 ebusy:
         return ret;
@@ -456,20 +458,20 @@ static void mx1_camera_remove_device(struct soc_camera_device *icd)
         /* Stop DMA engine */
         imx_dma_disable(pcdev->dma_chan);
 
-        dev_info(&icd->dev, "MX1 Camera driver detached from camera %d\n",
+        dev_info(icd->dev.parent, "MX1 Camera driver detached from camera %d\n",
                  icd->devnum);
 
-        icd->ops->release(icd);
-
         mx1_camera_deactivate(pcdev);
 
         pcdev->icd = NULL;
 }
 
 static int mx1_camera_set_crop(struct soc_camera_device *icd,
-                               struct v4l2_rect *rect)
+                               struct v4l2_crop *a)
 {
-        return icd->ops->set_crop(icd, rect);
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
+
+        return v4l2_subdev_call(sd, video, s_crop, a);
 }
 
 static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
@@ -539,18 +541,19 @@ static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
 static int mx1_camera_set_fmt(struct soc_camera_device *icd,
                               struct v4l2_format *f)
 {
-        struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         const struct soc_camera_format_xlate *xlate;
         struct v4l2_pix_format *pix = &f->fmt.pix;
         int ret;
 
         xlate = soc_camera_xlate_by_fourcc(icd, pix->pixelformat);
         if (!xlate) {
-                dev_warn(ici->dev, "Format %x not found\n", pix->pixelformat);
+                dev_warn(icd->dev.parent, "Format %x not found\n",
+                         pix->pixelformat);
                 return -EINVAL;
         }
 
-        ret = icd->ops->set_fmt(icd, f);
+        ret = v4l2_subdev_call(sd, video, s_fmt, f);
         if (!ret) {
                 icd->buswidth = xlate->buswidth;
                 icd->current_fmt = xlate->host_fmt;
@@ -562,10 +565,11 @@ static int mx1_camera_set_fmt(struct soc_camera_device *icd,
 static int mx1_camera_try_fmt(struct soc_camera_device *icd,
                               struct v4l2_format *f)
 {
+        struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         /* TODO: limit to mx1 hardware capabilities */
 
         /* limit to sensor capabilities */
-        return icd->ops->try_fmt(icd, f);
+        return v4l2_subdev_call(sd, video, try_fmt, f);
 }
 
 static int mx1_camera_reqbufs(struct soc_camera_file *icf,
@@ -737,7 +741,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev)
         pcdev->soc_host.drv_name        = DRIVER_NAME;
         pcdev->soc_host.ops             = &mx1_soc_camera_host_ops;
         pcdev->soc_host.priv            = pcdev;
-        pcdev->soc_host.dev             = &pdev->dev;
+        pcdev->soc_host.v4l2_dev.dev    = &pdev->dev;
         pcdev->soc_host.nr              = pdev->id;
         err = soc_camera_host_register(&pcdev->soc_host);
         if (err)