Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/include/video/permedia2.h b/include/video/permedia2.h
index 144c81c..9ce9adb 100644 (file)
--- a/include/video/permedia2.h
+++ b/include/video/permedia2.h
@@ -58,7 +58,14 @@
 #define PM2R_RD_PALETTE_DATA                           0x4008
 #define PM2R_RD_PIXEL_MASK                             0x4010
 #define PM2R_RD_PALETTE_READ_ADDRESS                   0x4018
+#define PM2R_RD_CURSOR_COLOR_ADDRESS                   0x4020
+#define PM2R_RD_CURSOR_COLOR_DATA                      0x4028
 #define PM2R_RD_INDEXED_DATA                           0x4050
+#define PM2R_RD_CURSOR_DATA                            0x4058
+#define PM2R_RD_CURSOR_X_LSB                           0x4060
+#define PM2R_RD_CURSOR_X_MSB                           0x4068
+#define PM2R_RD_CURSOR_Y_LSB                           0x4070
+#define PM2R_RD_CURSOR_Y_MSB                           0x4078
 
 #define PM2R_START_X_DOM                               0x8000
 #define PM2R_D_X_DOM                                   0x8008
@@ -153,6 +160,7 @@
 #define PM2VI_RD_CURSOR_Y_HIGH                         0x00A
 #define PM2VI_RD_CURSOR_X_HOT                          0x00B
 #define PM2VI_RD_CURSOR_Y_HOT                          0x00C
+#define PM2VI_RD_OVERLAY_KEY                           0x00D
 #define PM2VI_RD_CLK0_PRESCALE                         0x201
 #define PM2VI_RD_CLK0_FEEDBACK                         0x202
 #define PM2VI_RD_CLK0_POSTSCALE                                0x203
@@ -231,6 +239,8 @@
 #define PM2F_APERTURE_STANDARD                         0
 #define PM2F_APERTURE_BYTESWAP                         1
 #define PM2F_APERTURE_HALFWORDSWAP                     2
+#define PM2F_CURSORMODE_CURSOR_ENABLE                  (1 << 0)
+#define PM2F_CURSORMODE_TYPE_X                         (1 << 4)
 
 typedef enum {
        PM2_TYPE_PERMEDIA2,