add some define for rga common platform used

diff --git a/arch/arm/mach-rk30/include/mach/io.h b/arch/arm/mach-rk30/include/mach/io.h
index 4e63be277cc7971814f6f712e5822fad45a3b42d..062123b5fcf43535a0f941e251b451b34d0a3999 100755 (executable)
--- a/arch/arm/mach-rk30/include/mach/io.h
+++ b/arch/arm/mach-rk30/include/mach/io.h
@@ -44,7 +44,7 @@
 #define RK30_LCDC1_SIZE         SZ_8K
 #define RK30_IPP_PHYS           0x10110000
 #define RK30_IPP_SIZE           SZ_16K
-#define RK30_RGA_PHYS           0x1010c000
+#define RK30_RGA_PHYS           0x10114000
 #define RK30_RGA_SIZE           SZ_8K
 #define RK30_HDMI_PHYS          0x10116000
 #define RK30_HDMI_SIZE          SZ_8K

diff --git a/drivers/video/rockchip/rga/rga.h b/drivers/video/rockchip/rga/rga.h
index ff741623f176b8a2ac6c5063718c6c1dceda9b4d..bbf5fa94833deb0a7f57ca3096dc6273a68fbb5b 100755 (executable)
--- a/drivers/video/rockchip/rga/rga.h
+++ b/drivers/video/rockchip/rga/rga.h
@@ -386,7 +386,11 @@ typedef struct rga_service_info {
 \r
 \r
 \r
+#if defined(CONFIG_ARCH_RK2928)\r
 #define RGA_BASE                 0x1010c000\r
+#elif defined(CONFIG_ARCH_RK30)\r
+#define RGA_BASE                 0x10114000\r
+#endif\r
 \r
 //General Registers\r
 #define RGA_SYS_CTRL             0x000\r

diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c
index 00fa3796019a12a5834cba17661db6db8af78b20..149769b85c1b1a37f17d841ad4558a78b53f78c2 100755 (executable)
--- a/drivers/video/rockchip/rga/rga_drv.c
+++ b/drivers/video/rockchip/rga/rga_drv.c
@@ -60,9 +60,17 @@
 \r
 #define RGA_MAJOR              255\r
 \r
+#if 0\r
+#if CONFIG_ARCH_RK2928\r
 #define RK30_RGA_PHYS  0x1010C000\r
 #define RK30_RGA_SIZE  SZ_8K\r
 #define RGA_RESET_TIMEOUT      1000\r
+#elif CONFIG_ARCH_RK30\r
+#define RK30_RGA_PHYS  0x10114000\r
+#define RK30_RGA_SIZE  SZ_8K\r
+#define RGA_RESET_TIMEOUT      1000\r
+#endif\r
+#endif\r
 \r
 /* Driver information */\r
 #define DRIVER_DESC            "RGA Device Driver"\r
@@ -100,7 +108,7 @@ static void rga_try_set_reg(void);
 \r
 \r
 /* Logging */\r
-#define RGA_DEBUG 1\r
+#define RGA_DEBUG 0\r
 #if RGA_DEBUG\r
 #define DBG(format, args...) printk(KERN_DEBUG "%s: " format, DRIVER_NAME, ## args)\r
 #define ERR(format, args...) printk(KERN_ERR "%s: " format, DRIVER_NAME, ## args)\r
@@ -124,7 +132,7 @@ static inline u32 rga_read(u32 r)
        return __raw_readl(drvdata->rga_base + r);\r
 }\r
 \r
-#if 0\r
+#if defined(CONFIG_ARCH_RK30)\r
 static void rga_soft_reset(void)\r
 {\r
        u32 i;\r
@@ -573,7 +581,10 @@ static void rga_try_set_reg(void)
             dmac_flush_range(&rga_service.cmd_buff[0], &rga_service.cmd_buff[28]);\r
             outer_flush_range(virt_to_phys(&rga_service.cmd_buff[0]),virt_to_phys(&rga_service.cmd_buff[28]));\r
 \r
-            //rga_soft_reset();\r
+            #if defined(CONFIG_ARCH_RK30)\r
+            rga_soft_reset();\r
+            #endif\r
+            \r
             rga_write(0, RGA_MMU_CTRL);\r
 \r
             /* CMD buff */\r
@@ -1097,13 +1108,23 @@ static int __devinit rga_drv_probe(struct platform_device *pdev)
        data->aclk_rga = clk_get(NULL, "aclk_rga");\r
        data->hclk_rga = clk_get(NULL, "hclk_rga");\r
 \r
+    \r
        /* map the memory */\r
-       if (!request_mem_region(RK30_RGA_PHYS, RK30_RGA_SIZE, "rga_io"))\r
+    #if defined(CONFIG_ARCH_RK2928)\r
+       if (!request_mem_region(RK2928_RGA_PHYS, RK2928_RGA_SIZE, "rga_io"))\r
+    #elif defined(CONFIG_ARCH_RK30)\r
+    if (!request_mem_region(RK30_RGA_PHYS, RK30_RGA_SIZE, "rga_io"))\r
+    #endif    \r
        {\r
                pr_info("failed to reserve rga HW regs\n");\r
                return -EBUSY;\r
        }\r
-       data->rga_base = (void*)ioremap_nocache(RK30_RGA_PHYS, RK30_RGA_SIZE);\r
+    \r
+    #if defined(CONFIG_ARCH_RK2928)\r
+       data->rga_base = (void*)ioremap_nocache(RK2928_RGA_PHYS, RK2928_RGA_SIZE);\r
+    #elif defined(CONFIG_ARCH_RK30)\r
+    data->rga_base = (void*)ioremap_nocache(RK30_RGA_PHYS, RK30_RGA_SIZE);\r
+    #endif\r
        if (data->rga_base == NULL)\r
        {\r
                ERR("rga ioremap failed\n");\r