Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspen...

[pandora-kernel.git] / drivers / media / video / s5p-fimc / regs-fimc.h

diff --git a/drivers/media/video/s5p-fimc/regs-fimc.h b/drivers/media/video/s5p-fimc/regs-fimc.h
index 57e33f8..0fea3e6 100644 (file)
--- a/drivers/media/video/s5p-fimc/regs-fimc.h
+++ b/drivers/media/video/s5p-fimc/regs-fimc.h
@@ -98,8 +98,8 @@
 #define S5P_CIOCTRL                    0x4c
 #define S5P_CIOCTRL_ORDER422_MASK      (3 << 0)
 #define S5P_CIOCTRL_ORDER422_CRYCBY    (0 << 0)
-#define S5P_CIOCTRL_ORDER422_YCRYCB    (1 << 0)
-#define S5P_CIOCTRL_ORDER422_CBYCRY    (2 << 0)
+#define S5P_CIOCTRL_ORDER422_CBYCRY    (1 << 0)
+#define S5P_CIOCTRL_ORDER422_YCRYCB    (2 << 0)
 #define S5P_CIOCTRL_ORDER422_YCBYCR    (3 << 0)
 #define S5P_CIOCTRL_LASTIRQ_ENABLE     (1 << 2)
 #define S5P_CIOCTRL_YCBCR_3PLANE       (0 << 3)
@@ -139,8 +139,12 @@
 #define S5P_CISCCTRL_OUTRGB_FMT_MASK   (3 << 11)
 #define S5P_CISCCTRL_RGB_EXT           (1 << 10)
 #define S5P_CISCCTRL_ONE2ONE           (1 << 9)
-#define S5P_CISCCTRL_SC_HORRATIO(x)    ((x) << 16)
-#define S5P_CISCCTRL_SC_VERRATIO(x)    ((x) << 0)
+#define S5P_CISCCTRL_MHRATIO(x)                ((x) << 16)
+#define S5P_CISCCTRL_MVRATIO(x)                ((x) << 0)
+#define S5P_CISCCTRL_MHRATIO_MASK      (0x1ff << 16)
+#define S5P_CISCCTRL_MVRATIO_MASK      (0x1ff << 0)
+#define S5P_CISCCTRL_MHRATIO_EXT(x)    (((x) >> 6) << 16)
+#define S5P_CISCCTRL_MVRATIO_EXT(x)    (((x) >> 6) << 0)
 
 /* Target area */
 #define S5P_CITAREA                    0x5c
@@ -210,7 +214,7 @@
 
 /* Input DMA control */
 #define S5P_MSCTRL                     0xfc
-#define S5P_MSCTRL_IN_BURST_COUNT_MASK (3 << 24)
+#define S5P_MSCTRL_IN_BURST_COUNT_MASK (0xF << 24)
 #define S5P_MSCTRL_2P_IN_ORDER_MASK    (3 << 16)
 #define S5P_MSCTRL_2P_IN_ORDER_SHIFT   16
 #define S5P_MSCTRL_C_INT_IN_3PLANE     (0 << 15)
@@ -222,11 +226,12 @@
 #define S5P_MSCTRL_FLIP_X_MIRROR       (1 << 13)
 #define S5P_MSCTRL_FLIP_Y_MIRROR       (2 << 13)
 #define S5P_MSCTRL_FLIP_180            (3 << 13)
+#define S5P_MSCTRL_FIFO_CTRL_FULL      (1 << 12)
 #define S5P_MSCTRL_ORDER422_SHIFT      4
-#define S5P_MSCTRL_ORDER422_CRYCBY     (0 << 4)
-#define S5P_MSCTRL_ORDER422_YCRYCB     (1 << 4)
-#define S5P_MSCTRL_ORDER422_CBYCRY     (2 << 4)
-#define S5P_MSCTRL_ORDER422_YCBYCR     (3 << 4)
+#define S5P_MSCTRL_ORDER422_YCBYCR     (0 << 4)
+#define S5P_MSCTRL_ORDER422_CBYCRY     (1 << 4)
+#define S5P_MSCTRL_ORDER422_YCRYCB     (2 << 4)
+#define S5P_MSCTRL_ORDER422_CRYCBY     (3 << 4)
 #define S5P_MSCTRL_ORDER422_MASK       (3 << 4)
 #define S5P_MSCTRL_INPUT_EXTCAM                (0 << 3)
 #define S5P_MSCTRL_INPUT_MEMORY                (1 << 3)
@@ -237,7 +242,7 @@
 #define S5P_MSCTRL_INFORMAT_RGB                (3 << 1)
 #define S5P_MSCTRL_INFORMAT_MASK       (3 << 1)
 #define S5P_MSCTRL_ENVID               (1 << 0)
-#define S5P_MSCTRL_FRAME_COUNT(x)      ((x) << 24)
+#define S5P_MSCTRL_IN_BURST_COUNT(x)   ((x) << 24)
 
 /* Output DMA Y/Cb/Cr offset */
 #define S5P_CIOYOFF                    0x168
@@ -263,6 +268,10 @@
 
 /* Real output DMA image size (extension register) */
 #define S5P_CIEXTEN                    0x188
+#define S5P_CIEXTEN_MHRATIO_EXT(x)     (((x) & 0x3f) << 10)
+#define S5P_CIEXTEN_MVRATIO_EXT(x)     ((x) & 0x3f)
+#define S5P_CIEXTEN_MHRATIO_EXT_MASK   (0x3f << 10)
+#define S5P_CIEXTEN_MVRATIO_EXT_MASK   0x3f
 
 #define S5P_CIDMAPARAM                 0x18c
 #define S5P_CIDMAPARAM_R_LINEAR                (0 << 29)