aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2011-11-04 18:19:45 +0800
committerEric Miao <eric.miao@canonical.com>2011-11-10 07:39:06 +0800
commit2ed5ef1c9be37481a4926e2e58fde3ce8a8bbda1 (patch)
tree30b6837f6cf0994614af40008e94dac986df9840
parentbd86da85b507d701b14dab9c9fe77b2c8d9844a1 (diff)
downloadlinux-linaro-2ed5ef1c9be37481a4926e2e58fde3ce8a8bbda1.tar.gz
ENGR00161444 V4L2: Fix v4l2 capture build error
Fix v4l2 build error. revert mxc_v4l2.h to 01c98ebc63d Signed-off-by: Frank Li <Frank.Li@freescale.com>
-rw-r--r--include/linux/mxc_v4l2.h23
1 files changed, 22 insertions, 1 deletions
diff --git a/include/linux/mxc_v4l2.h b/include/linux/mxc_v4l2.h
index 95e8d9e64c7..e83e5923c2a 100644
--- a/include/linux/mxc_v4l2.h
+++ b/include/linux/mxc_v4l2.h
@@ -22,6 +22,27 @@
#ifndef __ASM_ARCH_MXC_V4L2_H__
#define __ASM_ARCH_MXC_V4L2_H__
-#define V4L2_CID_MXC_MOTION (V4L2_CID_PRIVATE_BASE + 0)
+/*
+ * 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;
+};
#endif