Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / include / video / samsung_fimd.h

diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
index be7b853485b8fc182ca3c2089d944a93b5c76c55..b0393209679b083e14aa2adeb5077a20975c3321 100644 (file)
--- a/include/video/samsung_fimd.h
+++ b/include/video/samsung_fimd.h
@@ -82,7 +82,7 @@
 #define VIDCON1_VSTATUS_VSYNC                  (0x0 << 13)
 #define VIDCON1_VSTATUS_BACKPORCH              (0x1 << 13)
 #define VIDCON1_VSTATUS_ACTIVE                 (0x2 << 13)
-#define VIDCON1_VSTATUS_FRONTPORCH             (0x0 << 13)
+#define VIDCON1_VSTATUS_FRONTPORCH             (0x3 << 13)
 #define VIDCON1_VCLK_MASK                      (0x3 << 9)
 #define VIDCON1_VCLK_HOLD                      (0x0 << 9)
 #define VIDCON1_VCLK_RUN                       (0x1 << 9)
@@ -176,6 +176,8 @@
 /* WINCONx */
 
 #define WINCON(_win)                           (0x20 + ((_win) * 4))
+#define WINCONx_CSCCON_EQ601                   (0x0 << 28)
+#define WINCONx_CSCCON_EQ709                   (0x1 << 28)
 #define WINCONx_CSCWIDTH_MASK                  (0x3 << 26)
 #define WINCONx_CSCWIDTH_SHIFT                 26
 #define WINCONx_CSCWIDTH_WIDE                  (0x0 << 26)