From: 杜坤明 <dkm@rock-chips.com>
Date: Tue, 9 Nov 2010 13:27:59 +0000 (+0800)
Subject: Update gpu pmem config
X-Git-Tag: firefly_0821_release~11032^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bf26b81a8d92ee1e71769e8b6a1de3d4345b03fd;p=firefly-linux-kernel-4.4.55.git

Update gpu pmem config
---

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 518313984201..26201e6ab342 100755
--- 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 = {
 	},
 };
 
-static struct android_pmem_platform_data android_pmem_gpu_pdata = {
-	.name		= "pmem_gpu",
-	.start		= PMEM_GPU_BASE,
-	.size		= PMEM_GPU_SIZE,
-	.no_allocator	= 0,
-	.cached		= 0,
-};
-
-static struct platform_device android_pmem_gpu_device = {
-	.name		= "android_pmem",
-	.id		= 1,
-	.dev		= {
-		.platform_data = &android_pmem_gpu_pdata,
-	},
-};
 
 static struct android_pmem_platform_data android_pmem_vpu_pdata = {
 	.name		= "pmem_vpu",
@@ -408,6 +393,35 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
 };
 #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  = PMEM_GPU_BASE,
+        .end    = PMEM_GPU_BASE + PMEM_GPU_SIZE,
+        .flags  = IORESOURCE_MEM,
+    },
+};
+struct platform_device rk29_device_gpu = {
+    .name             = "galcore",
+    .id               = 0,
+    .num_resources    = ARRAY_SIZE(resources_gpu),
+    .resource         = resources_gpu,
+};
+#endif
+
 static void __init rk29_board_iomux_init(void)
 {
 	#ifdef CONFIG_UART0_RK29	
@@ -461,7 +475,6 @@ static struct platform_device *devices[] __initdata = {
 	&rk29_device_gpu,
 #endif
 	&android_pmem_device,
-	&android_pmem_gpu_device,
 	&android_pmem_vpu_device,
 };
 
diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
index b62ba8979ee1..492fc69ea471 100755
--- 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 8d34b1f4e44f..fd1fe6e5d97b 100755
--- 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;