Updated OMAP 2 camera driver and N800 platform camera patches

Hi,

Here are the new OMAP 2 camera driver and N800 platform camera patches. I have posted the updates to V4L int if and TCM825x driver to the V4L list already as they have been integrated into V4L tree at <URL:http://linuxtv.org/hg/v4l-dvb> (excluding the new patches, sorry).

The changes since the last update include the following:

- Update to use vidioc_int_g_ifparm.

- VIDIOC_DQBUF fix.

The driver assumed that every slave would return zero from vidioc_int_g_needs_reset. This doesn't hold true for the slaves that do not implement that ioctl at all.

- Small cleanups, remove useless & characters.

Add a driver for the OMAP 2 camera block. OMAP 2 is used in e.g. Nokia N800 internet tablet.

This driver uses the new V4L2 internal ioctl interface.

Signed-off-by Sakari Ailus <[email protected]>

---
 drivers/media/video/Kconfig           |    8 +
 drivers/media/video/Makefile          |    1 +
 drivers/media/video/omap24xxcam-dma.c |  603 +++++++++++
 drivers/media/video/omap24xxcam.c     | 1847 +++++++++++++++++++++++++++++++++
 drivers/media/video/omap24xxcam.h     |  584 +++++++++++
 5 files changed, 3043 insertions(+), 0 deletions(-)
 create mode 100644 drivers/media/video/omap24xxcam-dma.c
 create mode 100644 drivers/media/video/omap24xxcam.c
 create mode 100644 drivers/media/video/omap24xxcam.h

drivers/media/video/Kconfig +8 -0

index c6b5011..7328375 100644
@@ -700,6 +700,14 @@ config VIDEO_CAFE_CCIC
          CMOS camera controller.  This is the controller found on first-
          generation OLPC systems.
 
+config VIDEO_OMAP2
+       tristate "OMAP 2 Camera support (EXPERIMENTAL)"
+       select VIDEO_BUF
+       depends on VIDEO_V4L2 && ARCH_OMAP24XX
+       ---help---
+         Driver for an OMAP 2 camera controller.
+
+
 #
 # USB Multimedia device configuration
 #

drivers/media/video/Makefile +1 -0

index 0c0c5f5..658d8d9 100644
@@ -99,6 +99,7 @@ obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
 obj-$(CONFIG_VIDEO_OV7670)     += ov7670.o
 
+obj-$(CONFIG_VIDEO_OMAP2) += omap24xxcam.o omap24xxcam-dma.o
 obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
 
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o

drivers/media/video/omap24xxcam.c new file +45 -0

new file mode 100644
index 0000000..a6e481f
@@ -0,0 +1,1847 @@
+/*
+ * drivers/media/video/omap24xxcam.c
+ *
+ * OMAP 2 camera block driver.
+ *
+ * Copyright (C) 2004 MontaVista Software, Inc.
+ * Copyright (C) 2004 Texas Instruments.
+ * Copyright (C) 2007 Nokia Corporation.
+ *
+ * Contact: Sakari Ailus <[email protected]>
+ *
+ * Based on code from Andy Lowe <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/videodev2.h>
+#include <linux/pci.h>         /* needed for videobufs */
+#include <linux/version.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+
+#include <media/v4l2-common.h>
+
+#include "omap24xxcam.h"
+
+#define OMAP24XXCAM_VERSION KERNEL_VERSION(0, 0, 0)
+
+#define RESET_TIMEOUT_NS 10000

drivers/media/video/omap24xxcam.c new file +29 -0

+
+}
+
+/*
+ *
+ * Sensor handling.
+ *
+ */
+
+/*
+ * Initialise the sensor hardware.
+ */
+static int omap24xxcam_sensor_init(struct omap24xxcam_device *cam)
+{
+       int err = 0;
+       struct v4l2_int_device *sdev = cam->sdev;
+       u32 xclk;
+       struct v4l2_ifparm p;
+
+       /*
+        * Get sensor interface parameters from sensor and prepare
+        * cc_ctrl value that can be used when enabling camera core.
+        */
+       cam->cc_ctrl = CC_CTRL_CC_EN;
+
+       err = vidioc_int_g_ifparm(cam->sdev, &p);
+       if (err) {
+               dev_err(cam->dev, "vidioc_int_g_ifparm failed with %d\n", err);
+               return err;

drivers/media/video/omap24xxcam.c new file +21 -0

+                       cam->cc_ctrl |= CC_CTRL_NOBT_VS_POL;
+
+               switch (p.u.parallel.mode) {
+               case V4L2_IF_TYPE_PARALLEL_MODE_NOBT_8BIT:
+                       cam->cc_ctrl |= CC_CTRL_PAR_MODE_NOBT8;
+                       break;
+               case V4L2_IF_TYPE_PARALLEL_MODE_NOBT_10BIT:
+                       cam->cc_ctrl |= CC_CTRL_PAR_MODE_NOBT10;
+                       break;
+               case V4L2_IF_TYPE_PARALLEL_MODE_NOBT_12BIT:
+                       cam->cc_ctrl |= CC_CTRL_PAR_MODE_NOBT12;
+                       break;
+               case V4L2_IF_TYPE_PARALLEL_MODE_BT_8BIT:
+                       cam->cc_ctrl |= CC_CTRL_PAR_MODE_BT8;
+                       break;
+               case V4L2_IF_TYPE_PARALLEL_MODE_BT_10BIT:
+                       cam->cc_ctrl |= CC_CTRL_PAR_MODE_BT10;
+                       break;
+               }
+               break;
+       default:

Hi Sakari,

drivers/media/video/omap24xxcam.c line 813

Quoted 8 lines

drivers/media/video/omap24xxcam.c new file +8 -0

+       switch (p.if_type) {
+       case V4L2_IF_TYPE_PARALLEL:
+               if (p.u.parallel.frame_start_on_rising_vs)
+                       cam->cc_ctrl |= CC_CTRL_NOBT_SYNCHRO;
+               if (p.u.parallel.bt_sync_correct)
+                       cam->cc_ctrl |= CC_CTRL_BT_CORRECT;
+               if (p.u.parallel.swap)
+                       cam->cc_ctrl |= CC_CTRL_PAR_ORDERCAM;

In case of earlier omap2 camera driver with ov9640 combination above bit was set based on the pixelformat being passed. I am just copying that code here.

-----------------------snip-------------------------------------

        switch (pix->pixelformat) {
        case V4L2_PIX_FMT_UYVY:
        case V4L2_PIX_FMT_RGB565:
        case V4L2_PIX_FMT_RGB555:
        default:
                /* These formats need a 16-bit byte swap */
                cam->cc_ctrl |= CC_CTRL_PAR_ORDERCAM;
        case V4L2_PIX_FMT_YUYV:
        case V4L2_PIX_FMT_RGB565X:
        case V4L2_PIX_FMT_RGB555X:
                /* These formats don't need a 16-bit byte swap */
                break;
        }

So, we might need to add support for above also.

drivers/media/video/omap24xxcam.c line 818

Quoted 5 lines

drivers/media/video/omap24xxcam.c new file +5 -0

+               if (p.u.parallel.latch_clk_inv)
+                       cam->cc_ctrl |= CC_CTRL_PAR_CLK_POL;
+               if (p.u.parallel.nobt_hs_inv)
+                       cam->cc_ctrl |= CC_CTRL_NOBT_HS_POL;
+               if (p.u.parallel.nobt_hs_inv)

Above should be nobt_vs_inv instead :)

I have updated ov9640 driver with the changes you have suggested and with new "ifparm" bits, but ov9640 on H4 is still not working. I will post that incremental patches for ov9640, so that someone can debug on H4/OMAP1(once that core gets converted to this new interface).

Hi Sakari,

Quoted 13 lines · Sakari Ailus

Hi,

Here are the new OMAP 2 camera driver and N800 platform camera patches. I have posted the updates to V4L int if and TCM825x driver to the V4L list already as they have been integrated into V4L tree at <URL:http://linuxtv.org/hg/v4l-dvb> (excluding the new patches, sorry).

The changes since the last update include the following:

- Update to use vidioc_int_g_ifparm.

- VIDIOC_DQBUF fix.

Quoted 5 lines

The driver assumed that every slave would return zero from vidioc_int_g_needs_reset. This doesn't hold true for the slaves that do not implement that ioctl at all.

- Small cleanups, remove useless & characters.

Thanx for the update. I will rebase ov9640 code with above v4l2-int changes and test with this updated omap2 camera driver.