Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

[cascardo/linux.git] / include / video / samsung_fimd.h

diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
index d5fe38b..e755448 100644 (file)
--- a/include/video/samsung_fimd.h
+++ b/include/video/samsung_fimd.h
@@ -24,12 +24,15 @@
 
 #define VIDCON0                                        (0x00)
 #define VIDCON0_INTERLACE                      (1 << 29)
-#define VIDCON0_VIDOUT_MASK                    (0x3 << 26)
+#define VIDCON0_VIDOUT_MASK                    (0x7 << 26)
 #define VIDCON0_VIDOUT_SHIFT                   (26)
 #define VIDCON0_VIDOUT_RGB                     (0x0 << 26)
 #define VIDCON0_VIDOUT_TV                      (0x1 << 26)
 #define VIDCON0_VIDOUT_I80_LDI0                        (0x2 << 26)
 #define VIDCON0_VIDOUT_I80_LDI1                        (0x3 << 26)
+#define VIDCON0_VIDOUT_WB_RGB                  (0x4 << 26)
+#define VIDCON0_VIDOUT_WB_I80_LDI0             (0x6 << 26)
+#define VIDCON0_VIDOUT_WB_I80_LDI1             (0x7 << 26)
 
 #define VIDCON0_L1_DATA_MASK                   (0x7 << 23)
 #define VIDCON0_L1_DATA_SHIFT                  (23)
@@ -77,6 +80,7 @@
 #define VIDCON1_LINECNT_MASK                   (0x7ff << 16)
 #define VIDCON1_LINECNT_SHIFT                  (16)
 #define VIDCON1_LINECNT_GET(_v)                        (((_v) >> 16) & 0x7ff)
+#define VIDCON1_FSTATUS_EVEN                   (1 << 15)
 #define VIDCON1_VSTATUS_MASK                   (0x3 << 13)
 #define VIDCON1_VSTATUS_SHIFT                  (13)
 #define VIDCON1_VSTATUS_VSYNC                  (0x0 << 13)
@@ -376,6 +380,25 @@
 #define WxKEYCON1_COLVAL_LIMIT                 (0xffffff)
 #define WxKEYCON1_COLVAL(_x)                   ((_x) << 0)
 
+/* Dithering control */
+#define DITHMODE                               (0x170)
+#define DITHMODE_R_POS_MASK                    (0x3 << 5)
+#define DITHMODE_R_POS_SHIFT                   (5)
+#define DITHMODE_R_POS_8BIT                    (0x0 << 5)
+#define DITHMODE_R_POS_6BIT                    (0x1 << 5)
+#define DITHMODE_R_POS_5BIT                    (0x2 << 5)
+#define DITHMODE_G_POS_MASK                    (0x3 << 3)
+#define DITHMODE_G_POS_SHIFT                   (3)
+#define DITHMODE_G_POS_8BIT                    (0x0 << 3)
+#define DITHMODE_G_POS_6BIT                    (0x1 << 3)
+#define DITHMODE_G_POS_5BIT                    (0x2 << 3)
+#define DITHMODE_B_POS_MASK                    (0x3 << 1)
+#define DITHMODE_B_POS_SHIFT                   (1)
+#define DITHMODE_B_POS_8BIT                    (0x0 << 1)
+#define DITHMODE_B_POS_6BIT                    (0x1 << 1)
+#define DITHMODE_B_POS_5BIT                    (0x2 << 1)
+#define DITHMODE_DITH_EN                       (1 << 0)
+
 /* Window blanking (MAP) */
 #define WINxMAP(_win)                          (0x180 + ((_win) * 4))
 #define WINxMAP_MAP                            (1 << 24)
@@ -416,28 +439,6 @@
 #define BLENDCON_NEW_4BIT_ALPHA_VALUE          (0 << 0)
 
 #define S3C_FB_MAX_WIN (5)  /* number of hardware windows available. */
-#define VIDCON1_FSTATUS_EVEN   (1 << 15)
-
-#define DITHMODE                               (0x170)
-#define DITHMODE_R_POS_MASK                    (0x3 << 5)
-#define DITHMODE_R_POS_SHIFT                   (5)
-#define DITHMODE_R_POS_8BIT                    (0x0 << 5)
-#define DITHMODE_R_POS_6BIT                    (0x1 << 5)
-#define DITHMODE_R_POS_5BIT                    (0x2 << 5)
-
-#define DITHMODE_G_POS_MASK                    (0x3 << 3)
-#define DITHMODE_G_POS_SHIFT                   (3)
-#define DITHMODE_G_POS_8BIT                    (0x0 << 3)
-#define DITHMODE_G_POS_6BIT                    (0x1 << 3)
-#define DITHMODE_G_POS_5BIT                    (0x2 << 3)
-
-#define DITHMODE_B_POS_MASK                    (0x3 << 1)
-#define DITHMODE_B_POS_SHIFT                   (1)
-#define DITHMODE_B_POS_8BIT                    (0x0 << 1)
-#define DITHMODE_B_POS_6BIT                    (0x1 << 1)
-#define DITHMODE_B_POS_5BIT                    (0x2 << 1)
-
-#define DITHMODE_DITH_EN                       (1 << 0)
 
 /* Notes on per-window bpp settings
  *