Update gpu pmem config

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 5183139842017d2094268aa957affe2191a4e750..26201e6ab342511dac8dc39f6e4b971ab908280a 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -316,21 +316,6 @@ static struct platform_device android_pmem_device = {
        },\r
 };\r
 \r
-static struct android_pmem_platform_data android_pmem_gpu_pdata = {\r
-       .name           = "pmem_gpu",\r
-       .start          = PMEM_GPU_BASE,\r
-       .size           = PMEM_GPU_SIZE,\r
-       .no_allocator   = 0,\r
-       .cached         = 0,\r
-};\r
-\r
-static struct platform_device android_pmem_gpu_device = {\r
-       .name           = "android_pmem",\r
-       .id             = 1,\r
-       .dev            = {\r
-               .platform_data = &android_pmem_gpu_pdata,\r
-       },\r
-};\r
 \r
 static struct android_pmem_platform_data android_pmem_vpu_pdata = {\r
        .name           = "pmem_vpu",\r
@@ -408,6 +393,35 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
 };\r
 #endif\r
 \r
+#ifdef CONFIG_VIVANTE
+static struct resource resources_gpu[] = {
+    [0] = {
+               .name   = "gpu_irq",
+        .start         = IRQ_GPU,
+        .end    = IRQ_GPU,
+        .flags  = IORESOURCE_IRQ,
+    },
+    [1] = {
+               .name = "gpu_base",
+        .start  = RK29_GPU_PHYS,
+        .end    = RK29_GPU_PHYS + (256 << 10),
+        .flags  = IORESOURCE_MEM,
+    },
+    [2] = {
+               .name = "gpu_mem",
+        .start  = PMEM_GPU_BASE,\r
+        .end    = PMEM_GPU_BASE + PMEM_GPU_SIZE,\r
+        .flags  = IORESOURCE_MEM,
+    },
+};
+struct platform_device rk29_device_gpu = {
+    .name             = "galcore",
+    .id               = 0,
+    .num_resources    = ARRAY_SIZE(resources_gpu),
+    .resource         = resources_gpu,
+};
+#endif\r
+\r
 static void __init rk29_board_iomux_init(void)\r
 {\r
        #ifdef CONFIG_UART0_RK29        \r
@@ -461,7 +475,6 @@ static struct platform_device *devices[] __initdata = {
        &rk29_device_gpu,\r
 #endif\r
        &android_pmem_device,\r
-       &android_pmem_gpu_device,\r
        &android_pmem_vpu_device,\r
 };\r
 \r

diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
index b62ba8979ee1696ae7021209f58e5677ad99666d..492fc69ea47125136c7e4899a923a48bff6f9684 100755 (executable)
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@ -167,35 +167,6 @@ struct platform_device rk29_device_uart3 = {
 };
 #endif
 
-#ifdef CONFIG_VIVANTE
-static struct resource resources_gpu[] = {
-    [0] = {
-               .name   = "gpu_irq",
-        .start         = IRQ_GPU,
-        .end    = IRQ_GPU,
-        .flags  = IORESOURCE_IRQ,
-    },
-    [1] = {
-               .name = "gpu_base",
-        .start  = RK29_GPU_PHYS,
-        .end    = RK29_GPU_PHYS + (256 << 10),
-        .flags  = IORESOURCE_MEM,
-    },
-    [2] = {
-               .name = "gpu_mem",
-        .start  = 0x66400000,               //0x67C00000,
-        .end    = 0x66400000 + (28 << 20),  //0x67C00000 + (4 << 20),
-        .flags  = IORESOURCE_MEM,
-    },
-};
-struct platform_device rk29_device_gpu = {
-    .name             = "galcore",
-    .id               = 0,
-    .num_resources    = ARRAY_SIZE(resources_gpu),
-    .resource         = resources_gpu,
-};
-#endif
-
 #ifdef CONFIG_FB_RK29
 /* rk29 fb resource */
 static struct resource rk29_fb_resource[] = {

diff --git a/arch/arm/mach-rk29/devices.h b/arch/arm/mach-rk29/devices.h
index 8d34b1f4e44fa21b1724d07ca277dc5c70462d2e..fd1fe6e5d97bd8ca3bcd761406ede1bcff5fc7f4 100755 (executable)
--- a/arch/arm/mach-rk29/devices.h
+++ b/arch/arm/mach-rk29/devices.h
@@ -22,7 +22,6 @@ extern struct platform_device rk29_device_uart0;
 extern struct platform_device rk29_device_uart1;
 extern struct platform_device rk29_device_uart2;
 extern struct platform_device rk29_device_uart3;
-extern struct platform_device rk29_device_gpu;
 extern struct platform_device rk29_device_fb;
 extern struct platform_device rk29_device_nand;
 extern struct rk29_sdmmc_platform_data default_sdmmc0_data;