Merge branch 'master' of git://git.denx.de/u-boot-arm into master

[karo-tx-uboot.git] / include / radeon.h

diff --git a/include/radeon.h b/include/radeon.h
index 3d11b0572b2619ca2de99c47f4cbd076817a25e1..da6c26bbe3bf4d4e7c9bdb813b42f2009467a502 100644 (file)
--- a/include/radeon.h
+++ b/include/radeon.h
@@ -154,8 +154,10 @@
 #define PALETTE_30_DATA                        0x00B8
 #define CRTC_H_TOTAL_DISP              0x0200
 #define CRTC_H_SYNC_STRT_WID           0x0204
+#define CRTC_H_SYNC_POL                        (1 << 23)
 #define CRTC_V_TOTAL_DISP              0x0208
 #define CRTC_V_SYNC_STRT_WID           0x020C
+#define CRTC_V_SYNC_POL                        (1 << 23)
 #define CRTC_VLINE_CRNT_VLINE          0x0210
 #define CRTC_CRNT_FRAME                        0x0214
 #define CRTC_GUI_TRIG_VLINE            0x0218
@@ -511,11 +513,11 @@
 #define PLL_WR_EN                      0x00000080
 
 /* CONFIG_CNTL bit constants */
-#define CFG_VGA_RAM_EN                 0x00000100
-#define CFG_ATI_REV_ID_MASK            (0xf << 16)
-#define CFG_ATI_REV_A11                        (0 << 16)
-#define CFG_ATI_REV_A12                        (1 << 16)
-#define CFG_ATI_REV_A13                        (2 << 16)
+#define CONFIG_SYS_VGA_RAM_EN                  0x00000100
+#define CONFIG_SYS_ATI_REV_ID_MASK             (0xf << 16)
+#define CONFIG_SYS_ATI_REV_A11                 (0 << 16)
+#define CONFIG_SYS_ATI_REV_A12                 (1 << 16)
+#define CONFIG_SYS_ATI_REV_A13                 (2 << 16)
 
 /* CRTC_EXT_CNTL bit constants */
 #define VGA_ATI_LINEAR                 0x00000008
@@ -749,6 +751,8 @@
 #define NONSURF_AP1_SWP_16BPP          (1 << 22)
 #define NONSURF_AP1_SWP_32BPP          (1 << 23)
 
+#define R200_SURF_TILE_COLOR_MACRO     (1 << 16)
+
 /* DEFAULT_SC_BOTTOM_RIGHT bit constants */
 #define DEFAULT_SC_RIGHT_MAX           (0x1fff << 0)
 #define DEFAULT_SC_BOTTOM_MAX          (0x1fff << 16)