aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chen <b02280@freescale.com>2011-10-27 10:31:51 +0800
committerEric Miao <eric.miao@canonical.com>2011-11-10 07:39:04 +0800
commite1d6d2ccd2aebda38ce5627d3179a670e204731f (patch)
tree428ddd96ebd1751e4e554eb9d93c9711657c21ae
parenta425f75ee8b518523410d7491770ed996f7b520f (diff)
downloadlinux-linaro-e1d6d2ccd2aebda38ce5627d3179a670e204731f.tar.gz
ENGR00160878-1 mxc v4l2 output: new mxc v4l2 output driver based on videobuf
This new v4l2 output driver is based on videobuf, using dma contig alloc method. It creates video dev node for each display framebuffer begin from /dev/video16 by default. If need post-processing, this driver will do it by ipu pp driver which support: - resizing - CSC - rotate - deinterlacing If no need post-processing, the IPU IC will be bypassed as old driver, the buf will be set to fb buffer directly by crack fb smem_start. The user should do setting before streamon like below: 1. set output crop 2. set ctrl like rotate/vflip/hflip/deinterlacing motion 3. set fmt 4. reqbuf The new features compare to old driver: - support multi-instance - support user point buffer - runtime suspend/resume For suspend/resume, still has chance to meet issue on mx6q, will fix later. This patch for head file. Signed-off-by: Jason Chen <b02280@freescale.com>
-rw-r--r--include/linux/mxc_v4l2.h23
1 files changed, 1 insertions, 22 deletions
diff --git a/include/linux/mxc_v4l2.h b/include/linux/mxc_v4l2.h
index e83e5923c2a..95e8d9e64c7 100644
--- a/include/linux/mxc_v4l2.h
+++ b/include/linux/mxc_v4l2.h
@@ -22,27 +22,6 @@
#ifndef __ASM_ARCH_MXC_V4L2_H__
#define __ASM_ARCH_MXC_V4L2_H__
-/*
- * For IPUv1 and IPUv3, V4L2_CID_MXC_ROT means encoder ioctl ID.
- * And V4L2_CID_MXC_VF_ROT is viewfinder ioctl ID only for IPUv1 and IPUv3.
- */
-#define V4L2_CID_MXC_ROT (V4L2_CID_PRIVATE_BASE + 0)
-#define V4L2_CID_MXC_FLASH (V4L2_CID_PRIVATE_BASE + 1)
-#define V4L2_CID_MXC_VF_ROT (V4L2_CID_PRIVATE_BASE + 2)
-#define V4L2_CID_MXC_MOTION (V4L2_CID_PRIVATE_BASE + 3)
-
-#define V4L2_MXC_ROTATE_NONE 0
-#define V4L2_MXC_ROTATE_VERT_FLIP 1
-#define V4L2_MXC_ROTATE_HORIZ_FLIP 2
-#define V4L2_MXC_ROTATE_180 3
-#define V4L2_MXC_ROTATE_90_RIGHT 4
-#define V4L2_MXC_ROTATE_90_RIGHT_VFLIP 5
-#define V4L2_MXC_ROTATE_90_RIGHT_HFLIP 6
-#define V4L2_MXC_ROTATE_90_LEFT 7
-
-struct v4l2_mxc_offset {
- uint32_t u_offset;
- uint32_t v_offset;
-};
+#define V4L2_CID_MXC_MOTION (V4L2_CID_PRIVATE_BASE + 0)
#endif