some file lost for rga modify

diff --git a/drivers/video/rockchip/rga/rga_reg_info.h b/drivers/video/rockchip/rga/rga_reg_info.h
index 049de87e65c6e4d7ad681234ba8b5777be929778..07e79fe67467c51e51b81fdb32acdd2d1ea0ddcc 100755 (executable)
--- a/drivers/video/rockchip/rga/rga_reg_info.h
+++ b/drivers/video/rockchip/rga/rga_reg_info.h
@@ -26,72 +26,72 @@
 //RGA register map\r
 \r
 //General Registers\r
-#define rRGA_SYS_CTRL             (*(volatile uint32 *)(RGA_BASE + RGA_SYS_CTRL))\r
-#define rRGA_CMD_CTRL             (*(volatile uint32 *)(RGA_BASE + RGA_CMD_CTRL))\r
-#define rRGA_CMD_ADDR             (*(volatile uint32 *)(RGA_BASE + RGA_CMD_ADDR))\r
-#define rRGA_STATUS               (*(volatile uint32 *)(RGA_BASE + RGA_STATUS))\r
-#define rRGA_INT                  (*(volatile uint32 *)(RGA_BASE + RGA_INT))\r
-#define rRGA_AXI_ID               (*(volatile uint32 *)(RGA_BASE + RGA_AXI_ID))\r
-#define rRGA_MMU_STA_CTRL         (*(volatile uint32 *)(RGA_BASE + RGA_MMU_STA_CTRL))\r
-#define rRGA_MMU_STA              (*(volatile uint32 *)(RGA_BASE + RGA_MMU_STA))\r
+#define rRGA_SYS_CTRL             (*(volatile uint32_t *)(RGA_BASE + RGA_SYS_CTRL))\r
+#define rRGA_CMD_CTRL             (*(volatile uint32_t *)(RGA_BASE + RGA_CMD_CTRL))\r
+#define rRGA_CMD_ADDR             (*(volatile uint32_t *)(RGA_BASE + RGA_CMD_ADDR))\r
+#define rRGA_STATUS               (*(volatile uint32_t *)(RGA_BASE + RGA_STATUS))\r
+#define rRGA_INT                  (*(volatile uint32_t *)(RGA_BASE + RGA_INT))\r
+#define rRGA_AXI_ID               (*(volatile uint32_t *)(RGA_BASE + RGA_AXI_ID))\r
+#define rRGA_MMU_STA_CTRL         (*(volatile uint32_t *)(RGA_BASE + RGA_MMU_STA_CTRL))\r
+#define rRGA_MMU_STA              (*(volatile uint32_t *)(RGA_BASE + RGA_MMU_STA))\r
 \r
 //Command code start\r
-#define rRGA_MODE_CTRL            (*(volatile uint32 *)(RGA_BASE + RGA_MODE_CTRL))\r
+#define rRGA_MODE_CTRL            (*(volatile uint32_t *)(RGA_BASE + RGA_MODE_CTRL))\r
 \r
 //Source Image Registers\r
-#define rRGA_SRC_Y_MST            (*(volatile uint32 *)(RGA_BASE + RGA_SRC_Y_MST))\r
-#define rRGA_SRC_CB_MST           (*(volatile uint32 *)(RGA_BASE + RGA_SRC_CB_MST))\r
-#define rRGA_MASK_READ_MST        (*(volatile uint32 *)(RGA_BASE + RGA_MASK_READ_MST))  //repeat\r
-#define rRGA_SRC_CR_MST           (*(volatile uint32 *)(RGA_BASE + RGA_SRC_CR_MST))\r
-#define rRGA_SRC_VIR_INFO         (*(volatile uint32 *)(RGA_BASE + RGA_SRC_VIR_INFO))\r
-#define rRGA_SRC_ACT_INFO         (*(volatile uint32 *)(RGA_BASE + RGA_SRC_ACT_INFO))\r
-#define rRGA_SRC_X_PARA           (*(volatile uint32 *)(RGA_BASE + RGA_SRC_X_PARA))\r
-#define rRGA_SRC_Y_PARA           (*(volatile uint32 *)(RGA_BASE + RGA_SRC_Y_PARA))\r
-#define rRGA_SRC_TILE_XINFO       (*(volatile uint32 *)(RGA_BASE + RGA_SRC_TILE_XINFO))\r
-#define rRGA_SRC_TILE_YINFO       (*(volatile uint32 *)(RGA_BASE + RGA_SRC_TILE_YINFO))\r
-#define rRGA_SRC_TILE_H_INCR      (*(volatile uint32 *)(RGA_BASE + RGA_SRC_TILE_H_INCR))\r
-#define rRGA_SRC_TILE_V_INCR      (*(volatile uint32 *)(RGA_BASE + RGA_SRC_TILE_V_INCR))\r
-#define rRGA_SRC_TILE_OFFSETX     (*(volatile uint32 *)(RGA_BASE + RGA_SRC_TILE_OFFSETX))\r
-#define rRGA_SRC_TILE_OFFSETY     (*(volatile uint32 *)(RGA_BASE + RGA_SRC_TILE_OFFSETY))\r
-#define rRGA_SRC_BG_COLOR         (*(volatile uint32 *)(RGA_BASE + RGA_SRC_BG_COLOR))\r
-#define rRGA_SRC_FG_COLOR         (*(volatile uint32 *)(RGA_BASE + RGA_SRC_FG_COLOR))\r
-#define rRGA_LINE_DRAWING_COLOR   (*(volatile uint32 *)(RGA_BASE + RGA_LINE_DRAWING_COLOR))  //repeat\r
-#define rRGA_SRC_TR_COLOR0        (*(volatile uint32 *)(RGA_BASE + RGA_SRC_TR_COLOR0))\r
-#define rRGA_CP_GR_A              (*(volatile uint32 *)(RGA_BASE + RGA_CP_GR_A))  //repeat\r
-#define rRGA_SRC_TR_COLOR1        (*(volatile uint32 *)(RGA_BASE + RGA_SRC_TR_COLOR1))\r
-#define rRGA_CP_GR_B              (*(volatile uint32 *)(RGA_BASE + RGA_CP_GR_B))  //repeat\r
-\r
-#define rRGA_LINE_DRAW            (*(volatile uint32 *)(RGA_BASE + RGA_LINE_DRAW))\r
-#define rRGA_PAT_START_POINT      (*(volatile uint32 *)(RGA_BASE + RGA_PAT_START_POINT))  //repeat\r
+#define rRGA_SRC_Y_MST            (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_Y_MST))\r
+#define rRGA_SRC_CB_MST           (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_CB_MST))\r
+#define rRGA_MASK_READ_MST        (*(volatile uint32_t *)(RGA_BASE + RGA_MASK_READ_MST))  //repeat\r
+#define rRGA_SRC_CR_MST           (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_CR_MST))\r
+#define rRGA_SRC_VIR_INFO         (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_VIR_INFO))\r
+#define rRGA_SRC_ACT_INFO         (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_ACT_INFO))\r
+#define rRGA_SRC_X_PARA           (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_X_PARA))\r
+#define rRGA_SRC_Y_PARA           (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_Y_PARA))\r
+#define rRGA_SRC_TILE_XINFO       (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_TILE_XINFO))\r
+#define rRGA_SRC_TILE_YINFO       (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_TILE_YINFO))\r
+#define rRGA_SRC_TILE_H_INCR      (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_TILE_H_INCR))\r
+#define rRGA_SRC_TILE_V_INCR      (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_TILE_V_INCR))\r
+#define rRGA_SRC_TILE_OFFSETX     (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_TILE_OFFSETX))\r
+#define rRGA_SRC_TILE_OFFSETY     (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_TILE_OFFSETY))\r
+#define rRGA_SRC_BG_COLOR         (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_BG_COLOR))\r
+#define rRGA_SRC_FG_COLOR         (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_FG_COLOR))\r
+#define rRGA_LINE_DRAWING_COLOR   (*(volatile uint32_t *)(RGA_BASE + RGA_LINE_DRAWING_COLOR))  //repeat\r
+#define rRGA_SRC_TR_COLOR0        (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_TR_COLOR0))\r
+#define rRGA_CP_GR_A              (*(volatile uint32_t *)(RGA_BASE + RGA_CP_GR_A))  //repeat\r
+#define rRGA_SRC_TR_COLOR1        (*(volatile uint32_t *)(RGA_BASE + RGA_SRC_TR_COLOR1))\r
+#define rRGA_CP_GR_B              (*(volatile uint32_t *)(RGA_BASE + RGA_CP_GR_B))  //repeat\r
+\r
+#define rRGA_LINE_DRAW            (*(volatile uint32_t *)(RGA_BASE + RGA_LINE_DRAW))\r
+#define rRGA_PAT_START_POINT      (*(volatile uint32_t *)(RGA_BASE + RGA_PAT_START_POINT))  //repeat\r
 \r
 //Destination Image Registers\r
-#define rRGA_DST_MST              (*(volatile uint32 *)(RGA_BASE + RGA_DST_MST))\r
-#define rRGA_LUT_MST              (*(volatile uint32 *)(RGA_BASE + RGA_LUT_MST))  //repeat\r
-#define rRGA_PAT_MST              (*(volatile uint32 *)(RGA_BASE + RGA_PAT_MST))  //repeat\r
-#define rRGA_LINE_DRAWING_MST     (*(volatile uint32 *)(RGA_BASE + RGA_LINE_DRAWING_MST))  //repeat\r
+#define rRGA_DST_MST              (*(volatile uint32_t *)(RGA_BASE + RGA_DST_MST))\r
+#define rRGA_LUT_MST              (*(volatile uint32_t *)(RGA_BASE + RGA_LUT_MST))  //repeat\r
+#define rRGA_PAT_MST              (*(volatile uint32_t *)(RGA_BASE + RGA_PAT_MST))  //repeat\r
+#define rRGA_LINE_DRAWING_MST     (*(volatile uint32_t *)(RGA_BASE + RGA_LINE_DRAWING_MST))  //repeat\r
 \r
-#define rRGA_DST_VIR_INFO         (*(volatile uint32 *)(RGA_BASE + RGA_DST_VIR_INFO))\r
+#define rRGA_DST_VIR_INFO         (*(volatile uint32_t *)(RGA_BASE + RGA_DST_VIR_INFO))\r
 \r
-#define rRGA_DST_CTR_INFO         (*(volatile uint32 *)(RGA_BASE + RGA_DST_CTR_INFO))\r
-#define rRGA_LINE_DRAW_XY_INFO    (*(volatile uint32 *)(RGA_BASE + RGA_LINE_DRAW_XY_INFO))  //repeat \r
+#define rRGA_DST_CTR_INFO         (*(volatile uint32_t *)(RGA_BASE + RGA_DST_CTR_INFO))\r
+#define rRGA_LINE_DRAW_XY_INFO    (*(volatile uint32_t *)(RGA_BASE + RGA_LINE_DRAW_XY_INFO))  //repeat \r
 \r
 //Alpha/ROP Registers\r
-#define rRGA_ALPHA_CON            (*(volatile uint32 *)(RGA_BASE + RGA_ALPHA_CON))\r
-#define rRGA_FADING_CON           (*(volatile uint32 *)(RGA_BASE + RGA_FADING_CON))\r
+#define rRGA_ALPHA_CON            (*(volatile uint32_t *)(RGA_BASE + RGA_ALPHA_CON))\r
+#define rRGA_FADING_CON           (*(volatile uint32_t *)(RGA_BASE + RGA_FADING_CON))\r
 \r
-#define rRGA_PAT_CON              (*(volatile uint32 *)(RGA_BASE + RGA_PAT_CON))\r
-#define rRGA_DST_VIR_WIDTH_PIX    (*(volatile uint32 *)(RGA_BASE + RGA_DST_VIR_WIDTH_PIX))  //repeat\r
+#define rRGA_PAT_CON              (*(volatile uint32_t *)(RGA_BASE + RGA_PAT_CON))\r
+#define rRGA_DST_VIR_WIDTH_PIX    (*(volatile uint32_t *)(RGA_BASE + RGA_DST_VIR_WIDTH_PIX))  //repeat\r
 \r
-#define rRGA_ROP_CON0             (*(volatile uint32 *)(RGA_BASE + RGA_ROP_CON0))\r
-#define rRGA_CP_GR_G              (*(volatile uint32 *)(RGA_BASE + RGA_CP_GR_G))  //repeat\r
-#define rRGA_PRESCL_CB_MST        (*(volatile uint32 *)(RGA_BASE + RGA_PRESCL_CB_MST))  //repeat\r
+#define rRGA_ROP_CON0             (*(volatile uint32_t *)(RGA_BASE + RGA_ROP_CON0))\r
+#define rRGA_CP_GR_G              (*(volatile uint32_t *)(RGA_BASE + RGA_CP_GR_G))  //repeat\r
+#define rRGA_PRESCL_CB_MST        (*(volatile uint32_t *)(RGA_BASE + RGA_PRESCL_CB_MST))  //repeat\r
 \r
-#define rRGA_ROP_CON1             (*(volatile uint32 *)(RGA_BASE + RGA_ROP_CON1))\r
-#define rRGA_CP_GR_R              (*(volatile uint32 *)(RGA_BASE + RGA_CP_GR_R))  //repeat\r
-#define rRGA_PRESCL_CR_MST        (*(volatile uint32 *)(RGA_BASE + RGA_PRESCL_CR_MST))  //repeat\r
+#define rRGA_ROP_CON1             (*(volatile uint32_t *)(RGA_BASE + RGA_ROP_CON1))\r
+#define rRGA_CP_GR_R              (*(volatile uint32_t *)(RGA_BASE + RGA_CP_GR_R))  //repeat\r
+#define rRGA_PRESCL_CR_MST        (*(volatile uint32_t *)(RGA_BASE + RGA_PRESCL_CR_MST))  //repeat\r
 \r
 //MMU Register\r
-#define rRGA_MMU_CTRL             (*(volatile uint32 *)(RGA_BASE + RGA_MMU_CTRL))\r
+#define rRGA_MMU_CTRL             (*(volatile uint32_t *)(RGA_BASE + RGA_MMU_CTRL))\r
 \r
 \r
 \r