Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

1 files changed, 27 insertions, 17 deletions

diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index b6ea67221d1d..4a27862da30d 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -461,9 +461,9 @@ static void free_buffer(struct videobuf_queue *vq, struct mx2_buffer *buf)
 
         /*
          * This waits until this buffer is out of danger, i.e., until it is no
-         * longer in STATE_QUEUED or STATE_ACTIVE
+         * longer in state VIDEOBUF_QUEUED or VIDEOBUF_ACTIVE
          */
-        videobuf_waiton(vb, 0, 0);
+        videobuf_waiton(vq, vb, 0, 0);
 
         videobuf_dma_contig_free(vq, vb);
         dev_dbg(&icd->dev, "%s freed\n", __func__);
@@ -640,15 +640,27 @@ static void mx2_videobuf_release(struct videobuf_queue *vq,
          * Terminate only queued but inactive buffers. Active buffers are
          * released when they become inactive after videobuf_waiton().
          *
-         * FIXME: implement forced termination of active buffers, so that the
-         * user won't get stuck in an uninterruptible state. This requires a
-         * specific handling for each of the three DMA types that this driver
-         * supports.
+         * FIXME: implement forced termination of active buffers for mx27 and
+         * mx27 eMMA, so that the user won't get stuck in an uninterruptible
+         * state. This requires a specific handling for each of the these DMA
+         * types.
          */
         spin_lock_irqsave(&pcdev->lock, flags);
         if (vb->state == VIDEOBUF_QUEUED) {
                 list_del(&vb->queue);
                 vb->state = VIDEOBUF_ERROR;
+        } else if (cpu_is_mx25() && vb->state == VIDEOBUF_ACTIVE) {
+                if (pcdev->fb1_active == buf) {
+                        pcdev->csicr1 &= ~CSICR1_FB1_DMA_INTEN;
+                        writel(0, pcdev->base_csi + CSIDMASA_FB1);
+                        pcdev->fb1_active = NULL;
+                } else if (pcdev->fb2_active == buf) {
+                        pcdev->csicr1 &= ~CSICR1_FB2_DMA_INTEN;
+                        writel(0, pcdev->base_csi + CSIDMASA_FB2);
+                        pcdev->fb2_active = NULL;
+                }
+                writel(pcdev->csicr1, pcdev->base_csi + CSICR1);
+                vb->state = VIDEOBUF_ERROR;
         }
         spin_unlock_irqrestore(&pcdev->lock, flags);
 
@@ -670,7 +682,7 @@ static void mx2_camera_init_videobuf(struct videobuf_queue *q,
 
         videobuf_queue_dma_contig_init(q, &mx2_videobuf_ops, pcdev->dev,
                         &pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                        V4L2_FIELD_NONE, sizeof(struct mx2_buffer), icd);
+                        V4L2_FIELD_NONE, sizeof(struct mx2_buffer), icd, NULL);
 }
 
 #define MX2_BUS_FLAGS   (SOCAM_DATAWIDTH_8 | \
@@ -716,8 +728,11 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd,
         /*
          * We only use the EMMA engine to get rid of the broken
          * DMA Engine. No color space consversion at the moment.
-         * We adjust incoming and outgoing pixelformat to rgb16
-         * and adjust the bytesperline accordingly.
+         * We set the incomming and outgoing pixelformat to an
+         * 16 Bit wide format and adjust the bytesperline
+         * accordingly. With this configuration the inputdata
+         * will not be changed by the emma and could be any type
+         * of 16 Bit Pixelformat.
          */
         writel(PRP_CNTL_CH1EN |
                         PRP_CNTL_CSIEN |
@@ -903,10 +918,6 @@ static int mx2_camera_set_fmt(struct soc_camera_device *icd,
                 return -EINVAL;
         }
 
-        /* eMMA can only do RGB565 */
-        if (mx27_camera_emma(pcdev) && pix->pixelformat != V4L2_PIX_FMT_RGB565)
-                return -EINVAL;
-
         mf.width        = pix->width;
         mf.height       = pix->height;
         mf.field        = pix->field;
@@ -950,10 +961,6 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,
 
         /* FIXME: implement MX27 limits */
 
-        /* eMMA can only do RGB565 */
-        if (mx27_camera_emma(pcdev) && pixfmt != V4L2_PIX_FMT_RGB565)
-                return -EINVAL;
-
         /* limit to MX25 hardware capabilities */
         if (cpu_is_mx25()) {
                 if (xlate->host_fmt->bits_per_sample <= 8)
@@ -1426,6 +1433,9 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
         if (err)
                 goto exit_free_emma;
 
+        dev_info(&pdev->dev, "MX2 Camera (CSI) driver probed, clock frequency: %ld\n",
+                        clk_get_rate(pcdev->clk_csi));
+
         return 0;
 
 exit_free_emma: