board-eve: reserve pmem sizes as in lg-2.6.32. Saves 20 MB ram

Change-Id: I9c4b6cf3cc6c29dd12b2a796538afbca1d40810a
OpenEtna · Feb 5, 2011 · 22fee91 · 22fee91
1 parent 91e4659
commit 22fee91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/arch/arm/mach-msm/board-eve.c b/arch/arm/mach-msm/board-eve.c
@@ -137,13 +137,6 @@ static struct android_pmem_platform_data android_pmem_pdata = {
 	.cached = 1,
 };
 
-static struct android_pmem_platform_data android_pmem_camera_pdata = {
-    .name = "pmem_camera",
-    .cached = 1,
-    .start = MSM_PMEM_CAMERA_BASE,
-    .size = MSM_PMEM_CAMERA_SIZE,
-};
-
 static struct android_pmem_platform_data android_pmem_adsp_pdata = {
     .name = "pmem_adsp",
     .cached = 0,
@@ -157,12 +150,6 @@ static struct platform_device android_pmem_device = {
 	.dev = { .platform_data = &android_pmem_pdata },
 };
 
-static struct platform_device android_pmem_camera_device = {
-    .name = "android_pmem",
-    .id = 2,
-    .dev = { .platform_data = &android_pmem_camera_pdata },
-};
-
 static struct platform_device android_pmem_adsp_device = {
     .name = "android_pmem",
     .id = 1,
@@ -522,7 +509,6 @@ static struct platform_device *devices[] __initdata = {
 
 	&android_pmem_device,
 	&android_pmem_adsp_device,
-	&android_pmem_camera_device,
 	&hw3d_device,
 	&eve_snd,
 };

diff --git a/arch/arm/mach-msm/board-eve.h b/arch/arm/mach-msm/board-eve.h
@@ -17,19 +17,16 @@
 #define MSM_FB_SIZE               (1*SZ_1M)
 
 #define MSM_PMEM_MDP_BASE         (MSM_LINUX_BASE + MSM_LINUX_SIZE)
-#define MSM_PMEM_MDP_SIZE         (8*SZ_1M)
+#define MSM_PMEM_MDP_SIZE         (12*SZ_1M)
 
 #define MSM_PMEM_ADSP_BASE        (MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE)
-#define MSM_PMEM_ADSP_SIZE        (13*SZ_1M)
+#define MSM_PMEM_ADSP_SIZE        (8*SZ_1M)
 
-#define MSM_PMEM_CAMERA_BASE      (MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE)
-#define MSM_PMEM_CAMERA_SIZE      (11*SZ_1M)
-
-#define MSM_PMEM_GPU1_BASE        (MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE)
+#define MSM_PMEM_GPU1_BASE        (MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE)
 #define MSM_PMEM_GPU1_SIZE        (8*SZ_1M)
 
 #define MSM_LINUX_BASE            MSM_EBI_BASE
-#define MSM_LINUX_SIZE            (223*SZ_1M - MSM_PMEM_MDP_SIZE-MSM_PMEM_ADSP_SIZE-MSM_PMEM_CAMERA_SIZE-MSM_PMEM_GPU1_SIZE)
+#define MSM_LINUX_SIZE            (223*SZ_1M - MSM_PMEM_MDP_SIZE-MSM_PMEM_ADSP_SIZE-MSM_PMEM_GPU1_SIZE)
 
 #define MSM_RAM_CONSOLE_BASE      (MSM_PMEM_GPU1_SIZE+MSM_PMEM_GPU1_BASE)
 #define MSM_RAM_CONSOLE_SIZE      (128 * SZ_1K)