Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / arch / arm / plat-samsung / include / plat / regs-fb.h

diff --git a/arch/arm/plat-samsung/include/plat/regs-fb.h b/arch/arm/plat-samsung/include/plat/regs-fb.h
index 0ef806e..8f39aa5 100644 (file)
--- a/arch/arm/plat-samsung/include/plat/regs-fb.h
+++ b/arch/arm/plat-samsung/include/plat/regs-fb.h
@@ -112,6 +112,13 @@
 #define VIDCON2_ORGYCbCr                       (1 << 8)
 #define VIDCON2_YUVORDCrCb                     (1 << 7)
 
+/* PRTCON (S3C6410, S5PC100)
+ * Might not be present in the S3C6410 documentation,
+ * but tests prove it's there almost for sure; shouldn't hurt in any case.
+ */
+#define PRTCON                                 (0x0c)
+#define PRTCON_PROTECT                         (1 << 11)
+
 /* VIDTCON0 */
 
 #define VIDTCON0_VBPDE_MASK                    (0xff << 24)
@@ -173,6 +180,7 @@
 #define WINCONx_BITSWP                         (1 << 18)
 #define WINCONx_BYTSWP                         (1 << 17)
 #define WINCONx_HAWSWP                         (1 << 16)
+#define WINCONx_WSWP                           (1 << 15)
 #define WINCONx_BURSTLEN_MASK                  (0x3 << 9)
 #define WINCONx_BURSTLEN_SHIFT                 (9)
 #define WINCONx_BURSTLEN_16WORD                        (0x0 << 9)
@@ -212,6 +220,13 @@
 #define WINCON1_BPPMODE_25BPP_A1888            (0xd << 2)
 #define WINCON1_BPPMODE_28BPP_A4888            (0xd << 2)
 
+/* S5PV210 */
+#define SHADOWCON                              (0x34)
+#define SHADOWCON_WINx_PROTECT(_win)           (1 << (10 + (_win)))
+/* DMA channels (all windows) */
+#define SHADOWCON_CHx_ENABLE(_win)             (1 << (_win))
+/* Local input channels (windows 0-2) */
+#define SHADOWCON_CHx_LOCAL_ENABLE(_win)       (1 << (5 + (_win)))
 
 #define VIDOSDxA_TOPLEFT_X_MASK                        (0x7ff << 11)
 #define VIDOSDxA_TOPLEFT_X_SHIFT               (11)
@@ -291,11 +306,12 @@
 #define VIDINTCON0_FRAMESEL0_ACTIVE            (0x2 << 15)
 #define VIDINTCON0_FRAMESEL0_FRONTPORCH                (0x3 << 15)
 
-#define VIDINTCON0_FRAMESEL1                   (1 << 14)
-#define VIDINTCON0_FRAMESEL1_NONE              (0x0 << 14)
-#define VIDINTCON0_FRAMESEL1_BACKPORCH         (0x1 << 14)
-#define VIDINTCON0_FRAMESEL1_VSYNC             (0x2 << 14)
-#define VIDINTCON0_FRAMESEL1_FRONTPORCH                (0x3 << 14)
+#define VIDINTCON0_FRAMESEL1                   (1 << 13)
+#define VIDINTCON0_FRAMESEL1_MASK              (0x3 << 13)
+#define VIDINTCON0_FRAMESEL1_NONE              (0x0 << 13)
+#define VIDINTCON0_FRAMESEL1_BACKPORCH         (0x1 << 13)
+#define VIDINTCON0_FRAMESEL1_VSYNC             (0x2 << 13)
+#define VIDINTCON0_FRAMESEL1_FRONTPORCH                (0x3 << 13)
 
 #define VIDINTCON0_INT_FRAME                   (1 << 12)
 #define VIDINTCON0_FIFIOSEL_MASK               (0x7f << 5)
@@ -321,6 +337,10 @@
 #define VIDINTCON1_INT_FIFO                    (1 << 0)
 
 /* Window colour-key control registers */
+#define WKEYCON                                        (0x140) /* 6410,V210 */
+
+#define WKEYCON0                               (0x00)
+#define WKEYCON1                               (0x04)
 
 #define WxKEYCON0_KEYBL_EN                     (1 << 26)
 #define WxKEYCON0_KEYEN_F                      (1 << 25)