[media] dt3155: move out of staging into drivers/media/pci
authorHans Verkuil <hans.verkuil@cisco.com>
Sat, 25 Apr 2015 15:36:18 +0000 (12:36 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 1 May 2015 11:25:41 +0000 (08:25 -0300)
The dt3155 code is now in good shape, so move it out of staging into
drivers/media/pci. Mark in MAINTAINERS that I'll do Odd Fixes for this
driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
13 files changed:
MAINTAINERS
drivers/media/pci/Kconfig
drivers/media/pci/Makefile
drivers/media/pci/dt3155/Kconfig [new file with mode: 0644]
drivers/media/pci/dt3155/Makefile [new file with mode: 0644]
drivers/media/pci/dt3155/dt3155.c [new file with mode: 0644]
drivers/media/pci/dt3155/dt3155.h [new file with mode: 0644]
drivers/staging/media/Kconfig
drivers/staging/media/Makefile
drivers/staging/media/dt3155v4l/Kconfig [deleted file]
drivers/staging/media/dt3155v4l/Makefile [deleted file]
drivers/staging/media/dt3155v4l/dt3155v4l.c [deleted file]
drivers/staging/media/dt3155v4l/dt3155v4l.h [deleted file]

index 2e5bbc0d68b26e188e2d7e8154cf80e47fabdda1..ef403f5d51274943d55e8f8ca71be7155264f414 100644 (file)
@@ -3426,6 +3426,14 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wan/dscc4.c
 
+DT3155 MEDIA DRIVER
+M:     Hans Verkuil <hverkuil@xs4all.nl>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+W:     http://linuxtv.org
+S:     Odd Fixes
+F:     drivers/media/pci/dt3155/
+
 DVB_USB_AF9015 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
index 218144a990161f5faaf0c8cca96449557216cedf..fd359fb15e69ffb9ac72f793e5f7d03eaef27c42 100644 (file)
@@ -21,6 +21,7 @@ source "drivers/media/pci/zoran/Kconfig"
 source "drivers/media/pci/saa7146/Kconfig"
 source "drivers/media/pci/solo6x10/Kconfig"
 source "drivers/media/pci/tw68/Kconfig"
+source "drivers/media/pci/dt3155/Kconfig"
 endif
 
 if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
index 0baf0d2967ee26b1d8e6c2770b5d7a76ad3c9efb..3471ab6b9f2220589f063581b9f5b1d8371a7c9f 100644 (file)
@@ -24,6 +24,7 @@ obj-$(CONFIG_VIDEO_BT848) += bt8xx/
 obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_VIDEO_SAA7164) += saa7164/
 obj-$(CONFIG_VIDEO_TW68) += tw68/
+obj-$(CONFIG_VIDEO_DT3155) += dt3155/
 obj-$(CONFIG_VIDEO_MEYE) += meye/
 obj-$(CONFIG_STA2X11_VIP) += sta2x11/
 obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/
diff --git a/drivers/media/pci/dt3155/Kconfig b/drivers/media/pci/dt3155/Kconfig
new file mode 100644 (file)
index 0000000..5145e0d
--- /dev/null
@@ -0,0 +1,13 @@
+config VIDEO_DT3155
+       tristate "DT3155 frame grabber"
+       depends on PCI && VIDEO_DEV && VIDEO_V4L2
+       depends on HAS_DMA
+       select VIDEOBUF2_DMA_CONTIG
+       default n
+       ---help---
+         Enables dt3155 device driver for the DataTranslation DT3155 frame grabber.
+         Say Y here if you have this hardware.
+         In doubt, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called dt3155.
diff --git a/drivers/media/pci/dt3155/Makefile b/drivers/media/pci/dt3155/Makefile
new file mode 100644 (file)
index 0000000..89fa637
--- /dev/null
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_DT3155)     += dt3155.o
diff --git a/drivers/media/pci/dt3155/dt3155.c b/drivers/media/pci/dt3155/dt3155.c
new file mode 100644 (file)
index 0000000..3131c2e
--- /dev/null
@@ -0,0 +1,626 @@
+/***************************************************************************
+ *   Copyright (C) 2006-2010 by Marin Mitov                                *
+ *   mitov@issp.bas.bg                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   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.                          *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/stringify.h>
+#include <linux/delay.h>
+#include <linux/kthread.h>
+#include <linux/slab.h>
+#include <media/v4l2-dev.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-common.h>
+#include <media/videobuf2-dma-contig.h>
+
+#include "dt3155.h"
+
+#define DT3155_DEVICE_ID 0x1223
+
+/**
+ * read_i2c_reg - reads an internal i2c register
+ *
+ * @addr:      dt3155 mmio base address
+ * @index:     index (internal address) of register to read
+ * @data:      pointer to byte the read data will be placed in
+ *
+ * returns:    zero on success or error code
+ *
+ * This function starts reading the specified (by index) register
+ * and busy waits for the process to finish. The result is placed
+ * in a byte pointed by data.
+ */
+static int read_i2c_reg(void __iomem *addr, u8 index, u8 *data)
+{
+       u32 tmp = index;
+
+       iowrite32((tmp << 17) | IIC_READ, addr + IIC_CSR2);
+       mmiowb();
+       udelay(45); /* wait at least 43 usec for NEW_CYCLE to clear */
+       if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
+               return -EIO; /* error: NEW_CYCLE not cleared */
+       tmp = ioread32(addr + IIC_CSR1);
+       if (tmp & DIRECT_ABORT) {
+               /* reset DIRECT_ABORT bit */
+               iowrite32(DIRECT_ABORT, addr + IIC_CSR1);
+               return -EIO; /* error: DIRECT_ABORT set */
+       }
+       *data = tmp >> 24;
+       return 0;
+}
+
+/**
+ * write_i2c_reg - writes to an internal i2c register
+ *
+ * @addr:      dt3155 mmio base address
+ * @index:     index (internal address) of register to read
+ * @data:      data to be written
+ *
+ * returns:    zero on success or error code
+ *
+ * This function starts writing the specified (by index) register
+ * and busy waits for the process to finish.
+ */
+static int write_i2c_reg(void __iomem *addr, u8 index, u8 data)
+{
+       u32 tmp = index;
+
+       iowrite32((tmp << 17) | IIC_WRITE | data, addr + IIC_CSR2);
+       mmiowb();
+       udelay(65); /* wait at least 63 usec for NEW_CYCLE to clear */
+       if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
+               return -EIO; /* error: NEW_CYCLE not cleared */
+       if (ioread32(addr + IIC_CSR1) & DIRECT_ABORT) {
+               /* reset DIRECT_ABORT bit */
+               iowrite32(DIRECT_ABORT, addr + IIC_CSR1);
+               return -EIO; /* error: DIRECT_ABORT set */
+       }
+       return 0;
+}
+
+/**
+ * write_i2c_reg_nowait - writes to an internal i2c register
+ *
+ * @addr:      dt3155 mmio base address
+ * @index:     index (internal address) of register to read
+ * @data:      data to be written
+ *
+ * This function starts writing the specified (by index) register
+ * and then returns.
+ */
+static void write_i2c_reg_nowait(void __iomem *addr, u8 index, u8 data)
+{
+       u32 tmp = index;
+
+       iowrite32((tmp << 17) | IIC_WRITE | data, addr + IIC_CSR2);
+       mmiowb();
+}
+
+/**
+ * wait_i2c_reg - waits the read/write to finish
+ *
+ * @addr:      dt3155 mmio base address
+ *
+ * returns:    zero on success or error code
+ *
+ * This function waits reading/writing to finish.
+ */
+static int wait_i2c_reg(void __iomem *addr)
+{
+       if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
+               udelay(65); /* wait at least 63 usec for NEW_CYCLE to clear */
+       if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
+               return -EIO; /* error: NEW_CYCLE not cleared */
+       if (ioread32(addr + IIC_CSR1) & DIRECT_ABORT) {
+               /* reset DIRECT_ABORT bit */
+               iowrite32(DIRECT_ABORT, addr + IIC_CSR1);
+               return -EIO; /* error: DIRECT_ABORT set */
+       }
+       return 0;
+}
+
+static int
+dt3155_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
+               unsigned int *nbuffers, unsigned int *num_planes,
+               unsigned int sizes[], void *alloc_ctxs[])
+
+{
+       struct dt3155_priv *pd = vb2_get_drv_priv(vq);
+       unsigned size = pd->width * pd->height;
+
+       if (vq->num_buffers + *nbuffers < 2)
+               *nbuffers = 2 - vq->num_buffers;
+       if (fmt && fmt->fmt.pix.sizeimage < size)
+               return -EINVAL;
+       *num_planes = 1;
+       sizes[0] = fmt ? fmt->fmt.pix.sizeimage : size;
+       alloc_ctxs[0] = pd->alloc_ctx;
+       return 0;
+}
+
+static int dt3155_buf_prepare(struct vb2_buffer *vb)
+{
+       struct dt3155_priv *pd = vb2_get_drv_priv(vb->vb2_queue);
+
+       vb2_set_plane_payload(vb, 0, pd->width * pd->height);
+       return 0;
+}
+
+static int dt3155_start_streaming(struct vb2_queue *q, unsigned count)
+{
+       struct dt3155_priv *pd = vb2_get_drv_priv(q);
+       struct vb2_buffer *vb = pd->curr_buf;
+       dma_addr_t dma_addr;
+
+       pd->sequence = 0;
+       dma_addr = vb2_dma_contig_plane_dma_addr(vb, 0);
+       iowrite32(dma_addr, pd->regs + EVEN_DMA_START);
+       iowrite32(dma_addr + pd->width, pd->regs + ODD_DMA_START);
+       iowrite32(pd->width, pd->regs + EVEN_DMA_STRIDE);
+       iowrite32(pd->width, pd->regs + ODD_DMA_STRIDE);
+       /* enable interrupts, clear all irq flags */
+       iowrite32(FLD_START_EN | FLD_END_ODD_EN | FLD_START |
+                       FLD_END_EVEN | FLD_END_ODD, pd->regs + INT_CSR);
+       iowrite32(FIFO_EN | SRST | FLD_CRPT_ODD | FLD_CRPT_EVEN |
+                 FLD_DN_ODD | FLD_DN_EVEN | CAP_CONT_EVEN | CAP_CONT_ODD,
+                                                       pd->regs + CSR1);
+       wait_i2c_reg(pd->regs);
+       write_i2c_reg(pd->regs, CONFIG, pd->config);
+       write_i2c_reg(pd->regs, EVEN_CSR, CSR_ERROR | CSR_DONE);
+       write_i2c_reg(pd->regs, ODD_CSR, CSR_ERROR | CSR_DONE);
+
+       /*  start the board  */
+       write_i2c_reg(pd->regs, CSR2, pd->csr2 | BUSY_EVEN | BUSY_ODD);
+       return 0;
+}
+
+static void dt3155_stop_streaming(struct vb2_queue *q)
+{
+       struct dt3155_priv *pd = vb2_get_drv_priv(q);
+       struct vb2_buffer *vb;
+
+       spin_lock_irq(&pd->lock);
+       /* stop the board */
+       write_i2c_reg_nowait(pd->regs, CSR2, pd->csr2);
+       iowrite32(FIFO_EN | SRST | FLD_CRPT_ODD | FLD_CRPT_EVEN |
+                 FLD_DN_ODD | FLD_DN_EVEN, pd->regs + CSR1);
+       /* disable interrupts, clear all irq flags */
+       iowrite32(FLD_START | FLD_END_EVEN | FLD_END_ODD, pd->regs + INT_CSR);
+       spin_unlock_irq(&pd->lock);
+
+       /*
+        * It is not clear whether the DMA stops at once or whether it
+        * will finish the current frame or field first. To be on the
+        * safe side we wait a bit.
+        */
+       msleep(45);
+
+       spin_lock_irq(&pd->lock);
+       if (pd->curr_buf) {
+               vb2_buffer_done(pd->curr_buf, VB2_BUF_STATE_ERROR);
+               pd->curr_buf = NULL;
+       }
+
+       while (!list_empty(&pd->dmaq)) {
+               vb = list_first_entry(&pd->dmaq, typeof(*vb), done_entry);
+               list_del(&vb->done_entry);
+               vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
+       }
+       spin_unlock_irq(&pd->lock);
+}
+
+static void dt3155_buf_queue(struct vb2_buffer *vb)
+{
+       struct dt3155_priv *pd = vb2_get_drv_priv(vb->vb2_queue);
+
+       /*  pd->vidq.streaming = 1 when dt3155_buf_queue() is invoked  */
+       spin_lock_irq(&pd->lock);
+       if (pd->curr_buf)
+               list_add_tail(&vb->done_entry, &pd->dmaq);
+       else
+               pd->curr_buf = vb;
+       spin_unlock_irq(&pd->lock);
+}
+
+static const struct vb2_ops q_ops = {
+       .queue_setup = dt3155_queue_setup,
+       .wait_prepare = vb2_ops_wait_prepare,
+       .wait_finish = vb2_ops_wait_finish,
+       .buf_prepare = dt3155_buf_prepare,
+       .start_streaming = dt3155_start_streaming,
+       .stop_streaming = dt3155_stop_streaming,
+       .buf_queue = dt3155_buf_queue,
+};
+
+static irqreturn_t dt3155_irq_handler_even(int irq, void *dev_id)
+{
+       struct dt3155_priv *ipd = dev_id;
+       struct vb2_buffer *ivb;
+       dma_addr_t dma_addr;
+       u32 tmp;
+
+       tmp = ioread32(ipd->regs + INT_CSR) & (FLD_START | FLD_END_ODD);
+       if (!tmp)
+               return IRQ_NONE;  /* not our irq */
+       if ((tmp & FLD_START) && !(tmp & FLD_END_ODD)) {
+               iowrite32(FLD_START_EN | FLD_END_ODD_EN | FLD_START,
+                                                       ipd->regs + INT_CSR);
+               return IRQ_HANDLED; /* start of field irq */
+       }
+       tmp = ioread32(ipd->regs + CSR1) & (FLD_CRPT_EVEN | FLD_CRPT_ODD);
+       if (tmp) {
+               iowrite32(FIFO_EN | SRST | FLD_CRPT_ODD | FLD_CRPT_EVEN |
+                                               FLD_DN_ODD | FLD_DN_EVEN |
+                                               CAP_CONT_EVEN | CAP_CONT_ODD,
+                                                       ipd->regs + CSR1);
+               mmiowb();
+       }
+
+       spin_lock(&ipd->lock);
+       if (ipd->curr_buf && !list_empty(&ipd->dmaq)) {
+               v4l2_get_timestamp(&ipd->curr_buf->v4l2_buf.timestamp);
+               ipd->curr_buf->v4l2_buf.sequence = ipd->sequence++;
+               ipd->curr_buf->v4l2_buf.field = V4L2_FIELD_NONE;
+               vb2_buffer_done(ipd->curr_buf, VB2_BUF_STATE_DONE);
+
+               ivb = list_first_entry(&ipd->dmaq, typeof(*ivb), done_entry);
+               list_del(&ivb->done_entry);
+               ipd->curr_buf = ivb;
+               dma_addr = vb2_dma_contig_plane_dma_addr(ivb, 0);
+               iowrite32(dma_addr, ipd->regs + EVEN_DMA_START);
+               iowrite32(dma_addr + ipd->width, ipd->regs + ODD_DMA_START);
+               iowrite32(ipd->width, ipd->regs + EVEN_DMA_STRIDE);
+               iowrite32(ipd->width, ipd->regs + ODD_DMA_STRIDE);
+               mmiowb();
+       }
+
+       /* enable interrupts, clear all irq flags */
+       iowrite32(FLD_START_EN | FLD_END_ODD_EN | FLD_START |
+                       FLD_END_EVEN | FLD_END_ODD, ipd->regs + INT_CSR);
+       spin_unlock(&ipd->lock);
+       return IRQ_HANDLED;
+}
+
+static const struct v4l2_file_operations dt3155_fops = {
+       .owner = THIS_MODULE,
+       .open = v4l2_fh_open,
+       .release = vb2_fop_release,
+       .unlocked_ioctl = video_ioctl2,
+       .read = vb2_fop_read,
+       .mmap = vb2_fop_mmap,
+       .poll = vb2_fop_poll
+};
+
+static int dt3155_querycap(struct file *filp, void *p, struct v4l2_capability *cap)
+{
+       struct dt3155_priv *pd = video_drvdata(filp);
+
+       strcpy(cap->driver, DT3155_NAME);
+       strcpy(cap->card, DT3155_NAME " frame grabber");
+       sprintf(cap->bus_info, "PCI:%s", pci_name(pd->pdev));
+       cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
+               V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
+       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+       return 0;
+}
+
+static int dt3155_enum_fmt_vid_cap(struct file *filp, void *p, struct v4l2_fmtdesc *f)
+{
+       if (f->index)
+               return -EINVAL;
+       f->pixelformat = V4L2_PIX_FMT_GREY;
+       strcpy(f->description, "8-bit Greyscale");
+       return 0;
+}
+
+static int dt3155_fmt_vid_cap(struct file *filp, void *p, struct v4l2_format *f)
+{
+       struct dt3155_priv *pd = video_drvdata(filp);
+
+       f->fmt.pix.width = pd->width;
+       f->fmt.pix.height = pd->height;
+       f->fmt.pix.pixelformat = V4L2_PIX_FMT_GREY;
+       f->fmt.pix.field = V4L2_FIELD_NONE;
+       f->fmt.pix.bytesperline = f->fmt.pix.width;
+       f->fmt.pix.sizeimage = f->fmt.pix.width * f->fmt.pix.height;
+       f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+       return 0;
+}
+
+static int dt3155_g_std(struct file *filp, void *p, v4l2_std_id *norm)
+{
+       struct dt3155_priv *pd = video_drvdata(filp);
+
+       *norm = pd->std;
+       return 0;
+}
+
+static int dt3155_s_std(struct file *filp, void *p, v4l2_std_id norm)
+{
+       struct dt3155_priv *pd = video_drvdata(filp);
+
+       if (pd->std == norm)
+               return 0;
+       if (vb2_is_busy(&pd->vidq))
+               return -EBUSY;
+       pd->std = norm;
+       if (pd->std & V4L2_STD_525_60) {
+               pd->csr2 = VT_60HZ;
+               pd->width = 640;
+               pd->height = 480;
+       } else {
+               pd->csr2 = VT_50HZ;
+               pd->width = 768;
+               pd->height = 576;
+       }
+       return 0;
+}
+
+static int dt3155_enum_input(struct file *filp, void *p, struct v4l2_input *input)
+{
+       if (input->index > 3)
+               return -EINVAL;
+       if (input->index)
+               snprintf(input->name, sizeof(input->name), "VID%d", input->index);
+       else
+               strlcpy(input->name, "J2/VID0", sizeof(input->name));
+       input->type = V4L2_INPUT_TYPE_CAMERA;
+       input->std = V4L2_STD_ALL;
+       input->status = 0;
+       return 0;
+}
+
+static int dt3155_g_input(struct file *filp, void *p, unsigned int *i)
+{
+       struct dt3155_priv *pd = video_drvdata(filp);
+
+       *i = pd->input;
+       return 0;
+}
+
+static int dt3155_s_input(struct file *filp, void *p, unsigned int i)
+{
+       struct dt3155_priv *pd = video_drvdata(filp);
+
+       if (i > 3)
+               return -EINVAL;
+       pd->input = i;
+       write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);
+       write_i2c_reg(pd->regs, AD_CMD, (i << 6) | (i << 4) | SYNC_LVL_3);
+       return 0;
+}
+
+static const struct v4l2_ioctl_ops dt3155_ioctl_ops = {
+       .vidioc_querycap = dt3155_querycap,
+       .vidioc_enum_fmt_vid_cap = dt3155_enum_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = dt3155_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap = dt3155_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap = dt3155_fmt_vid_cap,
+       .vidioc_reqbufs = vb2_ioctl_reqbufs,
+       .vidioc_create_bufs = vb2_ioctl_create_bufs,
+       .vidioc_querybuf = vb2_ioctl_querybuf,
+       .vidioc_expbuf = vb2_ioctl_expbuf,
+       .vidioc_qbuf = vb2_ioctl_qbuf,
+       .vidioc_dqbuf = vb2_ioctl_dqbuf,
+       .vidioc_streamon = vb2_ioctl_streamon,
+       .vidioc_streamoff = vb2_ioctl_streamoff,
+       .vidioc_g_std = dt3155_g_std,
+       .vidioc_s_std = dt3155_s_std,
+       .vidioc_enum_input = dt3155_enum_input,
+       .vidioc_g_input = dt3155_g_input,
+       .vidioc_s_input = dt3155_s_input,
+};
+
+static int dt3155_init_board(struct dt3155_priv *pd)
+{
+       struct pci_dev *pdev = pd->pdev;
+       int i;
+       u8 tmp = 0;
+
+       pci_set_master(pdev); /* dt3155 needs it */
+
+       /*  resetting the adapter  */
+       iowrite32(ADDR_ERR_ODD | ADDR_ERR_EVEN | FLD_CRPT_ODD | FLD_CRPT_EVEN |
+                       FLD_DN_ODD | FLD_DN_EVEN, pd->regs + CSR1);
+       mmiowb();
+       msleep(20);
+
+       /*  initializing adapter registers  */
+       iowrite32(FIFO_EN | SRST, pd->regs + CSR1);
+       mmiowb();
+       iowrite32(0xEEEEEE01, pd->regs + EVEN_PIXEL_FMT);
+       iowrite32(0xEEEEEE01, pd->regs + ODD_PIXEL_FMT);
+       iowrite32(0x00000020, pd->regs + FIFO_TRIGER);
+       iowrite32(0x00000103, pd->regs + XFER_MODE);
+       iowrite32(0, pd->regs + RETRY_WAIT_CNT);
+       iowrite32(0, pd->regs + INT_CSR);
+       iowrite32(1, pd->regs + EVEN_FLD_MASK);
+       iowrite32(1, pd->regs + ODD_FLD_MASK);
+       iowrite32(0, pd->regs + MASK_LENGTH);
+       iowrite32(0x0005007C, pd->regs + FIFO_FLAG_CNT);
+       iowrite32(0x01010101, pd->regs + IIC_CLK_DUR);
+       mmiowb();
+
+       /* verifying that we have a DT3155 board (not just a SAA7116 chip) */
+       read_i2c_reg(pd->regs, DT_ID, &tmp);
+       if (tmp != DT3155_ID)
+               return -ENODEV;
+
+       /* initialize AD LUT */
+       write_i2c_reg(pd->regs, AD_ADDR, 0);
+       for (i = 0; i < 256; i++)
+               write_i2c_reg(pd->regs, AD_LUT, i);
+
+       /* initialize ADC references */
+       /* FIXME: pos_ref & neg_ref depend on VT_50HZ */
+       write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);
+       write_i2c_reg(pd->regs, AD_CMD, VIDEO_CNL_1 | SYNC_CNL_1 | SYNC_LVL_3);
+       write_i2c_reg(pd->regs, AD_ADDR, AD_POS_REF);
+       write_i2c_reg(pd->regs, AD_CMD, 34);
+       write_i2c_reg(pd->regs, AD_ADDR, AD_NEG_REF);
+       write_i2c_reg(pd->regs, AD_CMD, 0);
+
+       /* initialize PM LUT */
+       write_i2c_reg(pd->regs, CONFIG, pd->config | PM_LUT_PGM);
+       for (i = 0; i < 256; i++) {
+               write_i2c_reg(pd->regs, PM_LUT_ADDR, i);
+               write_i2c_reg(pd->regs, PM_LUT_DATA, i);
+       }
+       write_i2c_reg(pd->regs, CONFIG, pd->config | PM_LUT_PGM | PM_LUT_SEL);
+       for (i = 0; i < 256; i++) {
+               write_i2c_reg(pd->regs, PM_LUT_ADDR, i);
+               write_i2c_reg(pd->regs, PM_LUT_DATA, i);
+       }
+       write_i2c_reg(pd->regs, CONFIG, pd->config); /*  ACQ_MODE_EVEN  */
+
+       /* select channel 1 for input and set sync level */
+       write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);
+       write_i2c_reg(pd->regs, AD_CMD, VIDEO_CNL_1 | SYNC_CNL_1 | SYNC_LVL_3);
+
+       /* disable all irqs, clear all irq flags */
+       iowrite32(FLD_START | FLD_END_EVEN | FLD_END_ODD,
+                       pd->regs + INT_CSR);
+
+       return 0;
+}
+
+static struct video_device dt3155_vdev = {
+       .name = DT3155_NAME,
+       .fops = &dt3155_fops,
+       .ioctl_ops = &dt3155_ioctl_ops,
+       .minor = -1,
+       .release = video_device_release_empty,
+       .tvnorms = V4L2_STD_ALL,
+};
+
+static int dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+       int err;
+       struct dt3155_priv *pd;
+
+       err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+       if (err)
+               return -ENODEV;
+       pd = devm_kzalloc(&pdev->dev, sizeof(*pd), GFP_KERNEL);
+       if (!pd)
+               return -ENOMEM;
+
+       err = v4l2_device_register(&pdev->dev, &pd->v4l2_dev);
+       if (err)
+               return err;
+       pd->vdev = dt3155_vdev;
+       pd->vdev.v4l2_dev = &pd->v4l2_dev;
+       video_set_drvdata(&pd->vdev, pd);  /* for use in video_fops */
+       pd->pdev = pdev;
+       pd->std = V4L2_STD_625_50;
+       pd->csr2 = VT_50HZ;
+       pd->width = 768;
+       pd->height = 576;
+       INIT_LIST_HEAD(&pd->dmaq);
+       mutex_init(&pd->mux);
+       pd->vdev.lock = &pd->mux; /* for locking v4l2_file_operations */
+       pd->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       pd->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+       pd->vidq.io_modes = VB2_MMAP | VB2_DMABUF | VB2_READ;
+       pd->vidq.ops = &q_ops;
+       pd->vidq.mem_ops = &vb2_dma_contig_memops;
+       pd->vidq.drv_priv = pd;
+       pd->vidq.min_buffers_needed = 2;
+       pd->vidq.lock = &pd->mux; /* for locking v4l2_file_operations */
+       pd->vdev.queue = &pd->vidq;
+       err = vb2_queue_init(&pd->vidq);
+       if (err < 0)
+               goto err_v4l2_dev_unreg;
+       pd->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev);
+       if (IS_ERR(pd->alloc_ctx)) {
+               dev_err(&pdev->dev, "Can't allocate buffer context");
+               err = PTR_ERR(pd->alloc_ctx);
+               goto err_v4l2_dev_unreg;
+       }
+       spin_lock_init(&pd->lock);
+       pd->config = ACQ_MODE_EVEN;
+       err = pci_enable_device(pdev);
+       if (err)
+               goto err_free_ctx;
+       err = pci_request_region(pdev, 0, pci_name(pdev));
+       if (err)
+               goto err_pci_disable;
+       pd->regs = pci_iomap(pdev, 0, pci_resource_len(pd->pdev, 0));
+       if (!pd->regs) {
+               err = -ENOMEM;
+               goto err_free_reg;
+       }
+       err = dt3155_init_board(pd);
+       if (err)
+               goto err_iounmap;
+       err = request_irq(pd->pdev->irq, dt3155_irq_handler_even,
+                                       IRQF_SHARED, DT3155_NAME, pd);
+       if (err)
+               goto err_iounmap;
+       err = video_register_device(&pd->vdev, VFL_TYPE_GRABBER, -1);
+       if (err)
+               goto err_free_irq;
+       dev_info(&pdev->dev, "/dev/video%i is ready\n", pd->vdev.minor);
+       return 0;  /*   success   */
+
+err_free_irq:
+       free_irq(pd->pdev->irq, pd);
+err_iounmap:
+       pci_iounmap(pdev, pd->regs);
+err_free_reg:
+       pci_release_region(pdev, 0);
+err_pci_disable:
+       pci_disable_device(pdev);
+err_free_ctx:
+       vb2_dma_contig_cleanup_ctx(pd->alloc_ctx);
+err_v4l2_dev_unreg:
+       v4l2_device_unregister(&pd->v4l2_dev);
+       return err;
+}
+
+static void dt3155_remove(struct pci_dev *pdev)
+{
+       struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev);
+       struct dt3155_priv *pd = container_of(v4l2_dev, struct dt3155_priv, v4l2_dev);
+
+       video_unregister_device(&pd->vdev);
+       free_irq(pd->pdev->irq, pd);
+       vb2_queue_release(&pd->vidq);
+       v4l2_device_unregister(&pd->v4l2_dev);
+       pci_iounmap(pdev, pd->regs);
+       pci_release_region(pdev, 0);
+       pci_disable_device(pdev);
+       vb2_dma_contig_cleanup_ctx(pd->alloc_ctx);
+}
+
+static const struct pci_device_id pci_ids[] = {
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, DT3155_DEVICE_ID) },
+       { 0, /* zero marks the end */ },
+};
+MODULE_DEVICE_TABLE(pci, pci_ids);
+
+static struct pci_driver pci_driver = {
+       .name = DT3155_NAME,
+       .id_table = pci_ids,
+       .probe = dt3155_probe,
+       .remove = dt3155_remove,
+};
+
+module_pci_driver(pci_driver);
+
+MODULE_DESCRIPTION("video4linux pci-driver for dt3155 frame grabber");
+MODULE_AUTHOR("Marin Mitov <mitov@issp.bas.bg>");
+MODULE_VERSION(DT3155_VERSION);
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/pci/dt3155/dt3155.h b/drivers/media/pci/dt3155/dt3155.h
new file mode 100644 (file)
index 0000000..4e1f4d5
--- /dev/null
@@ -0,0 +1,196 @@
+/***************************************************************************
+ *   Copyright (C) 2006-2010 by Marin Mitov                                *
+ *   mitov@issp.bas.bg                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   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.                          *
+ *                                                                         *
+ ***************************************************************************/
+
+/*    DT3155 header file    */
+#ifndef _DT3155_H_
+#define _DT3155_H_
+
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-dev.h>
+
+#define DT3155_NAME "dt3155"
+#define DT3155_VER_MAJ 2
+#define DT3155_VER_MIN 0
+#define DT3155_VER_EXT 0
+#define DT3155_VERSION  __stringify(DT3155_VER_MAJ)    "."             \
+                       __stringify(DT3155_VER_MIN)     "."             \
+                       __stringify(DT3155_VER_EXT)
+
+/* DT3155 Base Register offsets (memory mapped) */
+#define EVEN_DMA_START  0x00
+#define ODD_DMA_START   0x0C
+#define EVEN_DMA_STRIDE  0x18
+#define ODD_DMA_STRIDE  0x24
+#define EVEN_PIXEL_FMT  0x30
+#define ODD_PIXEL_FMT   0x34
+#define FIFO_TRIGER     0x38
+#define XFER_MODE       0x3C
+#define CSR1            0x40
+#define RETRY_WAIT_CNT  0x44
+#define INT_CSR                 0x48
+#define EVEN_FLD_MASK   0x4C
+#define ODD_FLD_MASK    0x50
+#define MASK_LENGTH     0x54
+#define FIFO_FLAG_CNT   0x58
+#define IIC_CLK_DUR     0x5C
+#define IIC_CSR1        0x60
+#define IIC_CSR2        0x64
+
+/*  DT3155 Internal Registers indexes (i2c/IIC mapped) */
+#define CSR2        0x10
+#define EVEN_CSR     0x11
+#define ODD_CSR      0x12
+#define CONFIG      0x13
+#define DT_ID       0x1F
+#define X_CLIP_START 0x20
+#define Y_CLIP_START 0x22
+#define X_CLIP_END   0x24
+#define Y_CLIP_END   0x26
+#define AD_ADDR      0x30
+#define AD_LUT      0x31
+#define AD_CMD      0x32
+#define DIG_OUT      0x40
+#define PM_LUT_ADDR  0x50
+#define PM_LUT_DATA  0x51
+
+/* AD command register values  */
+#define AD_CMD_REG   0x00
+#define AD_POS_REF   0x01
+#define AD_NEG_REF   0x02
+
+/* CSR1 bit masks */
+#define RANGE_EN       0x00008000
+#define CRPT_DIS       0x00004000
+#define ADDR_ERR_ODD   0x00000800
+#define ADDR_ERR_EVEN  0x00000400
+#define FLD_CRPT_ODD   0x00000200
+#define FLD_CRPT_EVEN  0x00000100
+#define FIFO_EN        0x00000080
+#define SRST          0x00000040
+#define FLD_DN_ODD     0x00000020
+#define FLD_DN_EVEN    0x00000010
+/*   These should not be used.
+ *   Use CAP_CONT_ODD/EVEN instead
+#define CAP_SNGL_ODD   0x00000008
+#define CAP_SNGL_EVEN  0x00000004
+*/
+#define CAP_CONT_ODD   0x00000002
+#define CAP_CONT_EVEN  0x00000001
+
+/*  INT_CSR bit masks */
+#define FLD_START_EN    0x00000400
+#define FLD_END_ODD_EN  0x00000200
+#define FLD_END_EVEN_EN  0x00000100
+#define FLD_START       0x00000004
+#define FLD_END_ODD     0x00000002
+#define FLD_END_EVEN    0x00000001
+
+/* IIC_CSR1 bit masks */
+#define DIRECT_ABORT    0x00000200
+
+/* IIC_CSR2 bit masks */
+#define NEW_CYCLE   0x01000000
+#define DIR_RD     0x00010000
+#define IIC_READ    0x01010000
+#define IIC_WRITE   0x01000000
+
+/* CSR2 bit masks */
+#define DISP_PASS     0x40
+#define BUSY_ODD      0x20
+#define BUSY_EVEN     0x10
+#define SYNC_PRESENT  0x08
+#define VT_50HZ       0x04
+#define SYNC_SNTL     0x02
+#define CHROM_FILT    0x01
+#define VT_60HZ       0x00
+
+/* CSR_EVEN/ODD bit masks */
+#define CSR_ERROR      0x04
+#define CSR_SNGL       0x02
+#define CSR_DONE       0x01
+
+/* CONFIG bit masks */
+#define PM_LUT_PGM     0x80
+#define PM_LUT_SEL     0x40
+#define CLIP_EN        0x20
+#define HSCALE_EN      0x10
+#define EXT_TRIG_UP    0x0C
+#define EXT_TRIG_DOWN  0x04
+#define ACQ_MODE_NEXT  0x02
+#define ACQ_MODE_ODD   0x01
+#define ACQ_MODE_EVEN  0x00
+
+/* AD_CMD bit masks */
+#define VIDEO_CNL_1  0x00
+#define VIDEO_CNL_2  0x40
+#define VIDEO_CNL_3  0x80
+#define VIDEO_CNL_4  0xC0
+#define SYNC_CNL_1   0x00
+#define SYNC_CNL_2   0x10
+#define SYNC_CNL_3   0x20
+#define SYNC_CNL_4   0x30
+#define SYNC_LVL_1   0x00
+#define SYNC_LVL_2   0x04
+#define SYNC_LVL_3   0x08
+#define SYNC_LVL_4   0x0C
+
+/* DT3155 identificator */
+#define DT3155_ID   0x20
+
+/*    per board private data structure   */
+/**
+ * struct dt3155_priv - private data structure
+ *
+ * @v4l2_dev:          v4l2_device structure
+ * @vdev:              video_device structure
+ * @pdev:              pointer to pci_dev structure
+ * @vidq:              vb2_queue structure
+ * @alloc_ctx:         dma_contig allocation context
+ * @curr_buf:          pointer to curren buffer
+ * @mux:               mutex to protect the instance
+ * @dmaq:              queue for dma buffers
+ * @lock:              spinlock for dma queue
+ * @std:               input standard
+ * @width:             frame width
+ * @height:            frame height
+ * @input:             current input
+ * @sequence:          frame counter
+ * @stats:             statistics structure
+ * @regs:              local copy of mmio base register
+ * @csr2:              local copy of csr2 register
+ * @config:            local copy of config register
+ */
+struct dt3155_priv {
+       struct v4l2_device v4l2_dev;
+       struct video_device vdev;
+       struct pci_dev *pdev;
+       struct vb2_queue vidq;
+       struct vb2_alloc_ctx *alloc_ctx;
+       struct vb2_buffer *curr_buf;
+       struct mutex mux;
+       struct list_head dmaq;
+       spinlock_t lock;
+       v4l2_std_id std;
+       unsigned width, height;
+       unsigned input;
+       unsigned int sequence;
+       void __iomem *regs;
+       u8 csr2, config;
+};
+
+#endif /*  _DT3155_H_  */
index 96498b7fc20e2ad78fedde1cc5867befa3dac4b6..14697686eea54d1da49f44aa361f207a6859ffa8 100644 (file)
@@ -25,8 +25,6 @@ source "drivers/staging/media/cxd2099/Kconfig"
 
 source "drivers/staging/media/davinci_vpfe/Kconfig"
 
-source "drivers/staging/media/dt3155v4l/Kconfig"
-
 source "drivers/staging/media/mn88472/Kconfig"
 
 source "drivers/staging/media/mn88473/Kconfig"
index a9006bcb44727e375a0cf0614c8df3b2a8d17eb8..34c557b4c6d670eb859935642f4bd8274cb0690e 100644 (file)
@@ -1,7 +1,6 @@
 obj-$(CONFIG_I2C_BCM2048)      += bcm2048/
 obj-$(CONFIG_DVB_CXD2099)      += cxd2099/
 obj-$(CONFIG_LIRC_STAGING)     += lirc/
-obj-$(CONFIG_VIDEO_DT3155)     += dt3155v4l/
 obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)      += omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
diff --git a/drivers/staging/media/dt3155v4l/Kconfig b/drivers/staging/media/dt3155v4l/Kconfig
deleted file mode 100644 (file)
index fcbcba6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-config VIDEO_DT3155
-       tristate "DT3155 frame grabber, Video4Linux interface"
-       depends on PCI && VIDEO_DEV && VIDEO_V4L2
-       depends on HAS_DMA
-       select VIDEOBUF2_DMA_CONTIG
-       default n
-       ---help---
-         Enables dt3155 device driver for the DataTranslation DT3155 frame grabber.
-         Say Y here if you have this hardware.
-         In doubt, say N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called dt3155v4l.
diff --git a/drivers/staging/media/dt3155v4l/Makefile b/drivers/staging/media/dt3155v4l/Makefile
deleted file mode 100644 (file)
index ce7a3ec..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_VIDEO_DT3155)     += dt3155v4l.o
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
deleted file mode 100644 (file)
index 43c9e0f..0000000
+++ /dev/null
@@ -1,626 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2006-2010 by Marin Mitov                                *
- *   mitov@issp.bas.bg                                                     *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   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.                          *
- *                                                                         *
- ***************************************************************************/
-
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/stringify.h>
-#include <linux/delay.h>
-#include <linux/kthread.h>
-#include <linux/slab.h>
-#include <media/v4l2-dev.h>
-#include <media/v4l2-ioctl.h>
-#include <media/v4l2-common.h>
-#include <media/videobuf2-dma-contig.h>
-
-#include "dt3155v4l.h"
-
-#define DT3155_DEVICE_ID 0x1223
-
-/**
- * read_i2c_reg - reads an internal i2c register
- *
- * @addr:      dt3155 mmio base address
- * @index:     index (internal address) of register to read
- * @data:      pointer to byte the read data will be placed in
- *
- * returns:    zero on success or error code
- *
- * This function starts reading the specified (by index) register
- * and busy waits for the process to finish. The result is placed
- * in a byte pointed by data.
- */
-static int read_i2c_reg(void __iomem *addr, u8 index, u8 *data)
-{
-       u32 tmp = index;
-
-       iowrite32((tmp << 17) | IIC_READ, addr + IIC_CSR2);
-       mmiowb();
-       udelay(45); /* wait at least 43 usec for NEW_CYCLE to clear */
-       if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
-               return -EIO; /* error: NEW_CYCLE not cleared */
-       tmp = ioread32(addr + IIC_CSR1);
-       if (tmp & DIRECT_ABORT) {
-               /* reset DIRECT_ABORT bit */
-               iowrite32(DIRECT_ABORT, addr + IIC_CSR1);
-               return -EIO; /* error: DIRECT_ABORT set */
-       }
-       *data = tmp >> 24;
-       return 0;
-}
-
-/**
- * write_i2c_reg - writes to an internal i2c register
- *
- * @addr:      dt3155 mmio base address
- * @index:     index (internal address) of register to read
- * @data:      data to be written
- *
- * returns:    zero on success or error code
- *
- * This function starts writing the specified (by index) register
- * and busy waits for the process to finish.
- */
-static int write_i2c_reg(void __iomem *addr, u8 index, u8 data)
-{
-       u32 tmp = index;
-
-       iowrite32((tmp << 17) | IIC_WRITE | data, addr + IIC_CSR2);
-       mmiowb();
-       udelay(65); /* wait at least 63 usec for NEW_CYCLE to clear */
-       if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
-               return -EIO; /* error: NEW_CYCLE not cleared */
-       if (ioread32(addr + IIC_CSR1) & DIRECT_ABORT) {
-               /* reset DIRECT_ABORT bit */
-               iowrite32(DIRECT_ABORT, addr + IIC_CSR1);
-               return -EIO; /* error: DIRECT_ABORT set */
-       }
-       return 0;
-}
-
-/**
- * write_i2c_reg_nowait - writes to an internal i2c register
- *
- * @addr:      dt3155 mmio base address
- * @index:     index (internal address) of register to read
- * @data:      data to be written
- *
- * This function starts writing the specified (by index) register
- * and then returns.
- */
-static void write_i2c_reg_nowait(void __iomem *addr, u8 index, u8 data)
-{
-       u32 tmp = index;
-
-       iowrite32((tmp << 17) | IIC_WRITE | data, addr + IIC_CSR2);
-       mmiowb();
-}
-
-/**
- * wait_i2c_reg - waits the read/write to finish
- *
- * @addr:      dt3155 mmio base address
- *
- * returns:    zero on success or error code
- *
- * This function waits reading/writing to finish.
- */
-static int wait_i2c_reg(void __iomem *addr)
-{
-       if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
-               udelay(65); /* wait at least 63 usec for NEW_CYCLE to clear */
-       if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
-               return -EIO; /* error: NEW_CYCLE not cleared */
-       if (ioread32(addr + IIC_CSR1) & DIRECT_ABORT) {
-               /* reset DIRECT_ABORT bit */
-               iowrite32(DIRECT_ABORT, addr + IIC_CSR1);
-               return -EIO; /* error: DIRECT_ABORT set */
-       }
-       return 0;
-}
-
-static int
-dt3155_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
-               unsigned int *nbuffers, unsigned int *num_planes,
-               unsigned int sizes[], void *alloc_ctxs[])
-
-{
-       struct dt3155_priv *pd = vb2_get_drv_priv(vq);
-       unsigned size = pd->width * pd->height;
-
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2 - vq->num_buffers;
-       if (fmt && fmt->fmt.pix.sizeimage < size)
-               return -EINVAL;
-       *num_planes = 1;
-       sizes[0] = fmt ? fmt->fmt.pix.sizeimage : size;
-       alloc_ctxs[0] = pd->alloc_ctx;
-       return 0;
-}
-
-static int dt3155_buf_prepare(struct vb2_buffer *vb)
-{
-       struct dt3155_priv *pd = vb2_get_drv_priv(vb->vb2_queue);
-
-       vb2_set_plane_payload(vb, 0, pd->width * pd->height);
-       return 0;
-}
-
-static int dt3155_start_streaming(struct vb2_queue *q, unsigned count)
-{
-       struct dt3155_priv *pd = vb2_get_drv_priv(q);
-       struct vb2_buffer *vb = pd->curr_buf;
-       dma_addr_t dma_addr;
-
-       pd->sequence = 0;
-       dma_addr = vb2_dma_contig_plane_dma_addr(vb, 0);
-       iowrite32(dma_addr, pd->regs + EVEN_DMA_START);
-       iowrite32(dma_addr + pd->width, pd->regs + ODD_DMA_START);
-       iowrite32(pd->width, pd->regs + EVEN_DMA_STRIDE);
-       iowrite32(pd->width, pd->regs + ODD_DMA_STRIDE);
-       /* enable interrupts, clear all irq flags */
-       iowrite32(FLD_START_EN | FLD_END_ODD_EN | FLD_START |
-                       FLD_END_EVEN | FLD_END_ODD, pd->regs + INT_CSR);
-       iowrite32(FIFO_EN | SRST | FLD_CRPT_ODD | FLD_CRPT_EVEN |
-                 FLD_DN_ODD | FLD_DN_EVEN | CAP_CONT_EVEN | CAP_CONT_ODD,
-                                                       pd->regs + CSR1);
-       wait_i2c_reg(pd->regs);
-       write_i2c_reg(pd->regs, CONFIG, pd->config);
-       write_i2c_reg(pd->regs, EVEN_CSR, CSR_ERROR | CSR_DONE);
-       write_i2c_reg(pd->regs, ODD_CSR, CSR_ERROR | CSR_DONE);
-
-       /*  start the board  */
-       write_i2c_reg(pd->regs, CSR2, pd->csr2 | BUSY_EVEN | BUSY_ODD);
-       return 0;
-}
-
-static void dt3155_stop_streaming(struct vb2_queue *q)
-{
-       struct dt3155_priv *pd = vb2_get_drv_priv(q);
-       struct vb2_buffer *vb;
-
-       spin_lock_irq(&pd->lock);
-       /* stop the board */
-       write_i2c_reg_nowait(pd->regs, CSR2, pd->csr2);
-       iowrite32(FIFO_EN | SRST | FLD_CRPT_ODD | FLD_CRPT_EVEN |
-                 FLD_DN_ODD | FLD_DN_EVEN, pd->regs + CSR1);
-       /* disable interrupts, clear all irq flags */
-       iowrite32(FLD_START | FLD_END_EVEN | FLD_END_ODD, pd->regs + INT_CSR);
-       spin_unlock_irq(&pd->lock);
-
-       /*
-        * It is not clear whether the DMA stops at once or whether it
-        * will finish the current frame or field first. To be on the
-        * safe side we wait a bit.
-        */
-       msleep(45);
-
-       spin_lock_irq(&pd->lock);
-       if (pd->curr_buf) {
-               vb2_buffer_done(pd->curr_buf, VB2_BUF_STATE_ERROR);
-               pd->curr_buf = NULL;
-       }
-
-       while (!list_empty(&pd->dmaq)) {
-               vb = list_first_entry(&pd->dmaq, typeof(*vb), done_entry);
-               list_del(&vb->done_entry);
-               vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
-       }
-       spin_unlock_irq(&pd->lock);
-}
-
-static void dt3155_buf_queue(struct vb2_buffer *vb)
-{
-       struct dt3155_priv *pd = vb2_get_drv_priv(vb->vb2_queue);
-
-       /*  pd->vidq.streaming = 1 when dt3155_buf_queue() is invoked  */
-       spin_lock_irq(&pd->lock);
-       if (pd->curr_buf)
-               list_add_tail(&vb->done_entry, &pd->dmaq);
-       else
-               pd->curr_buf = vb;
-       spin_unlock_irq(&pd->lock);
-}
-
-static const struct vb2_ops q_ops = {
-       .queue_setup = dt3155_queue_setup,
-       .wait_prepare = vb2_ops_wait_prepare,
-       .wait_finish = vb2_ops_wait_finish,
-       .buf_prepare = dt3155_buf_prepare,
-       .start_streaming = dt3155_start_streaming,
-       .stop_streaming = dt3155_stop_streaming,
-       .buf_queue = dt3155_buf_queue,
-};
-
-static irqreturn_t dt3155_irq_handler_even(int irq, void *dev_id)
-{
-       struct dt3155_priv *ipd = dev_id;
-       struct vb2_buffer *ivb;
-       dma_addr_t dma_addr;
-       u32 tmp;
-
-       tmp = ioread32(ipd->regs + INT_CSR) & (FLD_START | FLD_END_ODD);
-       if (!tmp)
-               return IRQ_NONE;  /* not our irq */
-       if ((tmp & FLD_START) && !(tmp & FLD_END_ODD)) {
-               iowrite32(FLD_START_EN | FLD_END_ODD_EN | FLD_START,
-                                                       ipd->regs + INT_CSR);
-               return IRQ_HANDLED; /* start of field irq */
-       }
-       tmp = ioread32(ipd->regs + CSR1) & (FLD_CRPT_EVEN | FLD_CRPT_ODD);
-       if (tmp) {
-               iowrite32(FIFO_EN | SRST | FLD_CRPT_ODD | FLD_CRPT_EVEN |
-                                               FLD_DN_ODD | FLD_DN_EVEN |
-                                               CAP_CONT_EVEN | CAP_CONT_ODD,
-                                                       ipd->regs + CSR1);
-               mmiowb();
-       }
-
-       spin_lock(&ipd->lock);
-       if (ipd->curr_buf && !list_empty(&ipd->dmaq)) {
-               v4l2_get_timestamp(&ipd->curr_buf->v4l2_buf.timestamp);
-               ipd->curr_buf->v4l2_buf.sequence = ipd->sequence++;
-               ipd->curr_buf->v4l2_buf.field = V4L2_FIELD_NONE;
-               vb2_buffer_done(ipd->curr_buf, VB2_BUF_STATE_DONE);
-
-               ivb = list_first_entry(&ipd->dmaq, typeof(*ivb), done_entry);
-               list_del(&ivb->done_entry);
-               ipd->curr_buf = ivb;
-               dma_addr = vb2_dma_contig_plane_dma_addr(ivb, 0);
-               iowrite32(dma_addr, ipd->regs + EVEN_DMA_START);
-               iowrite32(dma_addr + ipd->width, ipd->regs + ODD_DMA_START);
-               iowrite32(ipd->width, ipd->regs + EVEN_DMA_STRIDE);
-               iowrite32(ipd->width, ipd->regs + ODD_DMA_STRIDE);
-               mmiowb();
-       }
-
-       /* enable interrupts, clear all irq flags */
-       iowrite32(FLD_START_EN | FLD_END_ODD_EN | FLD_START |
-                       FLD_END_EVEN | FLD_END_ODD, ipd->regs + INT_CSR);
-       spin_unlock(&ipd->lock);
-       return IRQ_HANDLED;
-}
-
-static const struct v4l2_file_operations dt3155_fops = {
-       .owner = THIS_MODULE,
-       .open = v4l2_fh_open,
-       .release = vb2_fop_release,
-       .unlocked_ioctl = video_ioctl2,
-       .read = vb2_fop_read,
-       .mmap = vb2_fop_mmap,
-       .poll = vb2_fop_poll
-};
-
-static int dt3155_querycap(struct file *filp, void *p, struct v4l2_capability *cap)
-{
-       struct dt3155_priv *pd = video_drvdata(filp);
-
-       strcpy(cap->driver, DT3155_NAME);
-       strcpy(cap->card, DT3155_NAME " frame grabber");
-       sprintf(cap->bus_info, "PCI:%s", pci_name(pd->pdev));
-       cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
-               V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
-       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
-       return 0;
-}
-
-static int dt3155_enum_fmt_vid_cap(struct file *filp, void *p, struct v4l2_fmtdesc *f)
-{
-       if (f->index)
-               return -EINVAL;
-       f->pixelformat = V4L2_PIX_FMT_GREY;
-       strcpy(f->description, "8-bit Greyscale");
-       return 0;
-}
-
-static int dt3155_fmt_vid_cap(struct file *filp, void *p, struct v4l2_format *f)
-{
-       struct dt3155_priv *pd = video_drvdata(filp);
-
-       f->fmt.pix.width = pd->width;
-       f->fmt.pix.height = pd->height;
-       f->fmt.pix.pixelformat = V4L2_PIX_FMT_GREY;
-       f->fmt.pix.field = V4L2_FIELD_NONE;
-       f->fmt.pix.bytesperline = f->fmt.pix.width;
-       f->fmt.pix.sizeimage = f->fmt.pix.width * f->fmt.pix.height;
-       f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
-       return 0;
-}
-
-static int dt3155_g_std(struct file *filp, void *p, v4l2_std_id *norm)
-{
-       struct dt3155_priv *pd = video_drvdata(filp);
-
-       *norm = pd->std;
-       return 0;
-}
-
-static int dt3155_s_std(struct file *filp, void *p, v4l2_std_id norm)
-{
-       struct dt3155_priv *pd = video_drvdata(filp);
-
-       if (pd->std == norm)
-               return 0;
-       if (vb2_is_busy(&pd->vidq))
-               return -EBUSY;
-       pd->std = norm;
-       if (pd->std & V4L2_STD_525_60) {
-               pd->csr2 = VT_60HZ;
-               pd->width = 640;
-               pd->height = 480;
-       } else {
-               pd->csr2 = VT_50HZ;
-               pd->width = 768;
-               pd->height = 576;
-       }
-       return 0;
-}
-
-static int dt3155_enum_input(struct file *filp, void *p, struct v4l2_input *input)
-{
-       if (input->index > 3)
-               return -EINVAL;
-       if (input->index)
-               snprintf(input->name, sizeof(input->name), "VID%d", input->index);
-       else
-               strlcpy(input->name, "J2/VID0", sizeof(input->name));
-       input->type = V4L2_INPUT_TYPE_CAMERA;
-       input->std = V4L2_STD_ALL;
-       input->status = 0;
-       return 0;
-}
-
-static int dt3155_g_input(struct file *filp, void *p, unsigned int *i)
-{
-       struct dt3155_priv *pd = video_drvdata(filp);
-
-       *i = pd->input;
-       return 0;
-}
-
-static int dt3155_s_input(struct file *filp, void *p, unsigned int i)
-{
-       struct dt3155_priv *pd = video_drvdata(filp);
-
-       if (i > 3)
-               return -EINVAL;
-       pd->input = i;
-       write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);
-       write_i2c_reg(pd->regs, AD_CMD, (i << 6) | (i << 4) | SYNC_LVL_3);
-       return 0;
-}
-
-static const struct v4l2_ioctl_ops dt3155_ioctl_ops = {
-       .vidioc_querycap = dt3155_querycap,
-       .vidioc_enum_fmt_vid_cap = dt3155_enum_fmt_vid_cap,
-       .vidioc_try_fmt_vid_cap = dt3155_fmt_vid_cap,
-       .vidioc_g_fmt_vid_cap = dt3155_fmt_vid_cap,
-       .vidioc_s_fmt_vid_cap = dt3155_fmt_vid_cap,
-       .vidioc_reqbufs = vb2_ioctl_reqbufs,
-       .vidioc_create_bufs = vb2_ioctl_create_bufs,
-       .vidioc_querybuf = vb2_ioctl_querybuf,
-       .vidioc_expbuf = vb2_ioctl_expbuf,
-       .vidioc_qbuf = vb2_ioctl_qbuf,
-       .vidioc_dqbuf = vb2_ioctl_dqbuf,
-       .vidioc_streamon = vb2_ioctl_streamon,
-       .vidioc_streamoff = vb2_ioctl_streamoff,
-       .vidioc_g_std = dt3155_g_std,
-       .vidioc_s_std = dt3155_s_std,
-       .vidioc_enum_input = dt3155_enum_input,
-       .vidioc_g_input = dt3155_g_input,
-       .vidioc_s_input = dt3155_s_input,
-};
-
-static int dt3155_init_board(struct dt3155_priv *pd)
-{
-       struct pci_dev *pdev = pd->pdev;
-       int i;
-       u8 tmp = 0;
-
-       pci_set_master(pdev); /* dt3155 needs it */
-
-       /*  resetting the adapter  */
-       iowrite32(ADDR_ERR_ODD | ADDR_ERR_EVEN | FLD_CRPT_ODD | FLD_CRPT_EVEN |
-                       FLD_DN_ODD | FLD_DN_EVEN, pd->regs + CSR1);
-       mmiowb();
-       msleep(20);
-
-       /*  initializing adapter registers  */
-       iowrite32(FIFO_EN | SRST, pd->regs + CSR1);
-       mmiowb();
-       iowrite32(0xEEEEEE01, pd->regs + EVEN_PIXEL_FMT);
-       iowrite32(0xEEEEEE01, pd->regs + ODD_PIXEL_FMT);
-       iowrite32(0x00000020, pd->regs + FIFO_TRIGER);
-       iowrite32(0x00000103, pd->regs + XFER_MODE);
-       iowrite32(0, pd->regs + RETRY_WAIT_CNT);
-       iowrite32(0, pd->regs + INT_CSR);
-       iowrite32(1, pd->regs + EVEN_FLD_MASK);
-       iowrite32(1, pd->regs + ODD_FLD_MASK);
-       iowrite32(0, pd->regs + MASK_LENGTH);
-       iowrite32(0x0005007C, pd->regs + FIFO_FLAG_CNT);
-       iowrite32(0x01010101, pd->regs + IIC_CLK_DUR);
-       mmiowb();
-
-       /* verifying that we have a DT3155 board (not just a SAA7116 chip) */
-       read_i2c_reg(pd->regs, DT_ID, &tmp);
-       if (tmp != DT3155_ID)
-               return -ENODEV;
-
-       /* initialize AD LUT */
-       write_i2c_reg(pd->regs, AD_ADDR, 0);
-       for (i = 0; i < 256; i++)
-               write_i2c_reg(pd->regs, AD_LUT, i);
-
-       /* initialize ADC references */
-       /* FIXME: pos_ref & neg_ref depend on VT_50HZ */
-       write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);
-       write_i2c_reg(pd->regs, AD_CMD, VIDEO_CNL_1 | SYNC_CNL_1 | SYNC_LVL_3);
-       write_i2c_reg(pd->regs, AD_ADDR, AD_POS_REF);
-       write_i2c_reg(pd->regs, AD_CMD, 34);
-       write_i2c_reg(pd->regs, AD_ADDR, AD_NEG_REF);
-       write_i2c_reg(pd->regs, AD_CMD, 0);
-
-       /* initialize PM LUT */
-       write_i2c_reg(pd->regs, CONFIG, pd->config | PM_LUT_PGM);
-       for (i = 0; i < 256; i++) {
-               write_i2c_reg(pd->regs, PM_LUT_ADDR, i);
-               write_i2c_reg(pd->regs, PM_LUT_DATA, i);
-       }
-       write_i2c_reg(pd->regs, CONFIG, pd->config | PM_LUT_PGM | PM_LUT_SEL);
-       for (i = 0; i < 256; i++) {
-               write_i2c_reg(pd->regs, PM_LUT_ADDR, i);
-               write_i2c_reg(pd->regs, PM_LUT_DATA, i);
-       }
-       write_i2c_reg(pd->regs, CONFIG, pd->config); /*  ACQ_MODE_EVEN  */
-
-       /* select channel 1 for input and set sync level */
-       write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);
-       write_i2c_reg(pd->regs, AD_CMD, VIDEO_CNL_1 | SYNC_CNL_1 | SYNC_LVL_3);
-
-       /* disable all irqs, clear all irq flags */
-       iowrite32(FLD_START | FLD_END_EVEN | FLD_END_ODD,
-                       pd->regs + INT_CSR);
-
-       return 0;
-}
-
-static struct video_device dt3155_vdev = {
-       .name = DT3155_NAME,
-       .fops = &dt3155_fops,
-       .ioctl_ops = &dt3155_ioctl_ops,
-       .minor = -1,
-       .release = video_device_release_empty,
-       .tvnorms = V4L2_STD_ALL,
-};
-
-static int dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
-{
-       int err;
-       struct dt3155_priv *pd;
-
-       err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
-       if (err)
-               return -ENODEV;
-       pd = devm_kzalloc(&pdev->dev, sizeof(*pd), GFP_KERNEL);
-       if (!pd)
-               return -ENOMEM;
-
-       err = v4l2_device_register(&pdev->dev, &pd->v4l2_dev);
-       if (err)
-               return err;
-       pd->vdev = dt3155_vdev;
-       pd->vdev.v4l2_dev = &pd->v4l2_dev;
-       video_set_drvdata(&pd->vdev, pd);  /* for use in video_fops */
-       pd->pdev = pdev;
-       pd->std = V4L2_STD_625_50;
-       pd->csr2 = VT_50HZ;
-       pd->width = 768;
-       pd->height = 576;
-       INIT_LIST_HEAD(&pd->dmaq);
-       mutex_init(&pd->mux);
-       pd->vdev.lock = &pd->mux; /* for locking v4l2_file_operations */
-       pd->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-       pd->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
-       pd->vidq.io_modes = VB2_MMAP | VB2_DMABUF | VB2_READ;
-       pd->vidq.ops = &q_ops;
-       pd->vidq.mem_ops = &vb2_dma_contig_memops;
-       pd->vidq.drv_priv = pd;
-       pd->vidq.min_buffers_needed = 2;
-       pd->vidq.lock = &pd->mux; /* for locking v4l2_file_operations */
-       pd->vdev.queue = &pd->vidq;
-       err = vb2_queue_init(&pd->vidq);
-       if (err < 0)
-               goto err_v4l2_dev_unreg;
-       pd->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev);
-       if (IS_ERR(pd->alloc_ctx)) {
-               dev_err(&pdev->dev, "Can't allocate buffer context");
-               err = PTR_ERR(pd->alloc_ctx);
-               goto err_v4l2_dev_unreg;
-       }
-       spin_lock_init(&pd->lock);
-       pd->config = ACQ_MODE_EVEN;
-       err = pci_enable_device(pdev);
-       if (err)
-               goto err_free_ctx;
-       err = pci_request_region(pdev, 0, pci_name(pdev));
-       if (err)
-               goto err_pci_disable;
-       pd->regs = pci_iomap(pdev, 0, pci_resource_len(pd->pdev, 0));
-       if (!pd->regs) {
-               err = -ENOMEM;
-               goto err_free_reg;
-       }
-       err = dt3155_init_board(pd);
-       if (err)
-               goto err_iounmap;
-       err = request_irq(pd->pdev->irq, dt3155_irq_handler_even,
-                                       IRQF_SHARED, DT3155_NAME, pd);
-       if (err)
-               goto err_iounmap;
-       err = video_register_device(&pd->vdev, VFL_TYPE_GRABBER, -1);
-       if (err)
-               goto err_free_irq;
-       dev_info(&pdev->dev, "/dev/video%i is ready\n", pd->vdev.minor);
-       return 0;  /*   success   */
-
-err_free_irq:
-       free_irq(pd->pdev->irq, pd);
-err_iounmap:
-       pci_iounmap(pdev, pd->regs);
-err_free_reg:
-       pci_release_region(pdev, 0);
-err_pci_disable:
-       pci_disable_device(pdev);
-err_free_ctx:
-       vb2_dma_contig_cleanup_ctx(pd->alloc_ctx);
-err_v4l2_dev_unreg:
-       v4l2_device_unregister(&pd->v4l2_dev);
-       return err;
-}
-
-static void dt3155_remove(struct pci_dev *pdev)
-{
-       struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev);
-       struct dt3155_priv *pd = container_of(v4l2_dev, struct dt3155_priv, v4l2_dev);
-
-       video_unregister_device(&pd->vdev);
-       free_irq(pd->pdev->irq, pd);
-       vb2_queue_release(&pd->vidq);
-       v4l2_device_unregister(&pd->v4l2_dev);
-       pci_iounmap(pdev, pd->regs);
-       pci_release_region(pdev, 0);
-       pci_disable_device(pdev);
-       vb2_dma_contig_cleanup_ctx(pd->alloc_ctx);
-}
-
-static const struct pci_device_id pci_ids[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, DT3155_DEVICE_ID) },
-       { 0, /* zero marks the end */ },
-};
-MODULE_DEVICE_TABLE(pci, pci_ids);
-
-static struct pci_driver pci_driver = {
-       .name = DT3155_NAME,
-       .id_table = pci_ids,
-       .probe = dt3155_probe,
-       .remove = dt3155_remove,
-};
-
-module_pci_driver(pci_driver);
-
-MODULE_DESCRIPTION("video4linux pci-driver for dt3155 frame grabber");
-MODULE_AUTHOR("Marin Mitov <mitov@issp.bas.bg>");
-MODULE_VERSION(DT3155_VERSION);
-MODULE_LICENSE("GPL");
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.h b/drivers/staging/media/dt3155v4l/dt3155v4l.h
deleted file mode 100644 (file)
index bcf7b5e..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2006-2010 by Marin Mitov                                *
- *   mitov@issp.bas.bg                                                     *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   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.                          *
- *                                                                         *
- ***************************************************************************/
-
-/*    DT3155 header file    */
-#ifndef _DT3155_H_
-#define _DT3155_H_
-
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <media/v4l2-device.h>
-#include <media/v4l2-dev.h>
-
-#define DT3155_NAME "dt3155"
-#define DT3155_VER_MAJ 1
-#define DT3155_VER_MIN 1
-#define DT3155_VER_EXT 0
-#define DT3155_VERSION  __stringify(DT3155_VER_MAJ)    "."             \
-                       __stringify(DT3155_VER_MIN)     "."             \
-                       __stringify(DT3155_VER_EXT)
-
-/* DT3155 Base Register offsets (memory mapped) */
-#define EVEN_DMA_START  0x00
-#define ODD_DMA_START   0x0C
-#define EVEN_DMA_STRIDE  0x18
-#define ODD_DMA_STRIDE  0x24
-#define EVEN_PIXEL_FMT  0x30
-#define ODD_PIXEL_FMT   0x34
-#define FIFO_TRIGER     0x38
-#define XFER_MODE       0x3C
-#define CSR1            0x40
-#define RETRY_WAIT_CNT  0x44
-#define INT_CSR                 0x48
-#define EVEN_FLD_MASK   0x4C
-#define ODD_FLD_MASK    0x50
-#define MASK_LENGTH     0x54
-#define FIFO_FLAG_CNT   0x58
-#define IIC_CLK_DUR     0x5C
-#define IIC_CSR1        0x60
-#define IIC_CSR2        0x64
-
-/*  DT3155 Internal Registers indexes (i2c/IIC mapped) */
-#define CSR2        0x10
-#define EVEN_CSR     0x11
-#define ODD_CSR      0x12
-#define CONFIG      0x13
-#define DT_ID       0x1F
-#define X_CLIP_START 0x20
-#define Y_CLIP_START 0x22
-#define X_CLIP_END   0x24
-#define Y_CLIP_END   0x26
-#define AD_ADDR      0x30
-#define AD_LUT      0x31
-#define AD_CMD      0x32
-#define DIG_OUT      0x40
-#define PM_LUT_ADDR  0x50
-#define PM_LUT_DATA  0x51
-
-/* AD command register values  */
-#define AD_CMD_REG   0x00
-#define AD_POS_REF   0x01
-#define AD_NEG_REF   0x02
-
-/* CSR1 bit masks */
-#define RANGE_EN       0x00008000
-#define CRPT_DIS       0x00004000
-#define ADDR_ERR_ODD   0x00000800
-#define ADDR_ERR_EVEN  0x00000400
-#define FLD_CRPT_ODD   0x00000200
-#define FLD_CRPT_EVEN  0x00000100
-#define FIFO_EN        0x00000080
-#define SRST          0x00000040
-#define FLD_DN_ODD     0x00000020
-#define FLD_DN_EVEN    0x00000010
-/*   These should not be used.
- *   Use CAP_CONT_ODD/EVEN instead
-#define CAP_SNGL_ODD   0x00000008
-#define CAP_SNGL_EVEN  0x00000004
-*/
-#define CAP_CONT_ODD   0x00000002
-#define CAP_CONT_EVEN  0x00000001
-
-/*  INT_CSR bit masks */
-#define FLD_START_EN    0x00000400
-#define FLD_END_ODD_EN  0x00000200
-#define FLD_END_EVEN_EN  0x00000100
-#define FLD_START       0x00000004
-#define FLD_END_ODD     0x00000002
-#define FLD_END_EVEN    0x00000001
-
-/* IIC_CSR1 bit masks */
-#define DIRECT_ABORT    0x00000200
-
-/* IIC_CSR2 bit masks */
-#define NEW_CYCLE   0x01000000
-#define DIR_RD     0x00010000
-#define IIC_READ    0x01010000
-#define IIC_WRITE   0x01000000
-
-/* CSR2 bit masks */
-#define DISP_PASS     0x40
-#define BUSY_ODD      0x20
-#define BUSY_EVEN     0x10
-#define SYNC_PRESENT  0x08
-#define VT_50HZ       0x04
-#define SYNC_SNTL     0x02
-#define CHROM_FILT    0x01
-#define VT_60HZ       0x00
-
-/* CSR_EVEN/ODD bit masks */
-#define CSR_ERROR      0x04
-#define CSR_SNGL       0x02
-#define CSR_DONE       0x01
-
-/* CONFIG bit masks */
-#define PM_LUT_PGM     0x80
-#define PM_LUT_SEL     0x40
-#define CLIP_EN        0x20
-#define HSCALE_EN      0x10
-#define EXT_TRIG_UP    0x0C
-#define EXT_TRIG_DOWN  0x04
-#define ACQ_MODE_NEXT  0x02
-#define ACQ_MODE_ODD   0x01
-#define ACQ_MODE_EVEN  0x00
-
-/* AD_CMD bit masks */
-#define VIDEO_CNL_1  0x00
-#define VIDEO_CNL_2  0x40
-#define VIDEO_CNL_3  0x80
-#define VIDEO_CNL_4  0xC0
-#define SYNC_CNL_1   0x00
-#define SYNC_CNL_2   0x10
-#define SYNC_CNL_3   0x20
-#define SYNC_CNL_4   0x30
-#define SYNC_LVL_1   0x00
-#define SYNC_LVL_2   0x04
-#define SYNC_LVL_3   0x08
-#define SYNC_LVL_4   0x0C
-
-/* DT3155 identificator */
-#define DT3155_ID   0x20
-
-/*    per board private data structure   */
-/**
- * struct dt3155_priv - private data structure
- *
- * @v4l2_dev:          v4l2_device structure
- * @vdev:              video_device structure
- * @pdev:              pointer to pci_dev structure
- * @vidq:              vb2_queue structure
- * @alloc_ctx:         dma_contig allocation context
- * @curr_buf:          pointer to curren buffer
- * @mux:               mutex to protect the instance
- * @dmaq:              queue for dma buffers
- * @lock:              spinlock for dma queue
- * @std:               input standard
- * @width:             frame width
- * @height:            frame height
- * @input:             current input
- * @sequence:          frame counter
- * @stats:             statistics structure
- * @regs:              local copy of mmio base register
- * @csr2:              local copy of csr2 register
- * @config:            local copy of config register
- */
-struct dt3155_priv {
-       struct v4l2_device v4l2_dev;
-       struct video_device vdev;
-       struct pci_dev *pdev;
-       struct vb2_queue vidq;
-       struct vb2_alloc_ctx *alloc_ctx;
-       struct vb2_buffer *curr_buf;
-       struct mutex mux;
-       struct list_head dmaq;
-       spinlock_t lock;
-       v4l2_std_id std;
-       unsigned width, height;
-       unsigned input;
-       unsigned int sequence;
-       void __iomem *regs;
-       u8 csr2, config;
-};
-
-#endif /*  _DT3155_H_  */
This page took 0.069568 seconds and 5 git commands to generate.