diff --git a/arch/arm/mach-msm/board-htcleo.c b/arch/arm/mach-msm/board-htcleo.c index 4640da68..6dd5eb1f 100644 --- a/arch/arm/mach-msm/board-htcleo.c +++ b/arch/arm/mach-msm/board-htcleo.c @@ -348,20 +348,24 @@ static struct platform_device msm_kgsl_device = static struct android_pmem_platform_data android_pmem_pdata = { .name = "pmem", + .start = MSM_PMEM_MDP_BASE, + .size = MSM_PMEM_MDP_SIZE, .no_allocator = 0, .cached = 1, }; static struct android_pmem_platform_data android_pmem_adsp_pdata = { .name = "pmem_adsp", + .start = MSM_PMEM_ADSP_BASE, + .size = MSM_PMEM_ADSP_SIZE, .no_allocator = 0, .cached = 1, }; static struct android_pmem_platform_data android_pmem_camera_pdata = { .name = "pmem_camera", - .start = MSM_PMEM_CAMERA_BASE, - .size = MSM_PMEM_CAMERA_SIZE, + .start = MSM_PMEM_CAMERA_BASE, + .size = MSM_PMEM_CAMERA_SIZE, .no_allocator = 1, .cached = 1, }; @@ -376,7 +380,7 @@ static struct platform_device android_pmem_device = { static struct platform_device android_pmem_adsp_device = { .name = "android_pmem", - .id = 1, + .id = 4, .dev = { .platform_data = &android_pmem_adsp_pdata, }, @@ -384,7 +388,7 @@ static struct platform_device android_pmem_adsp_device = { static struct platform_device android_pmem_camera_device = { .name = "android_pmem", - .id = 2, + .id = 6, .dev = { .platform_data = &android_pmem_camera_pdata, }, diff --git a/arch/arm/mach-msm/board-htcleo.h b/arch/arm/mach-msm/board-htcleo.h index 36435646..a592eb2d 100644 --- a/arch/arm/mach-msm/board-htcleo.h +++ b/arch/arm/mach-msm/board-htcleo.h @@ -20,7 +20,13 @@ #define MSM_EBI1_BANK0_BASE 0x11800000 //#define MSM_EBI1_BANK0_SIZE 0x1E800000 /* 488MB */ -#define MSM_EBI1_BANK0_SIZE 0x1E7C0000 /* 488MB - 0x00040000 RAM CONSOLE*/ +#define MSM_EBI1_BANK0_SIZE 0x1A7C0000 /* 424MB - 0x00040000 RAM CONSOLE*/ + +#define MSM_PMEM_MDP_BASE (MSM_EBI1_BANK0_BASE+MSM_EBI1_BANK0_SIZE) +#define MSM_PMEM_MDP_SIZE 0x02000000 + +#define MSM_PMEM_ADSP_BASE (MSM_PMEM_MDP_BASE+MSM_PMEM_MDP_SIZE) +#define MSM_PMEM_ADSP_SIZE 0x02000000 /* Don't change that */ #define MSM_SMI_BASE 0x00000000 @@ -50,7 +56,7 @@ #define MSM_PMEM_SF_SIZE 0x02000000 -#define MSM_PMEM_ADSP_SIZE 0x02196000 +//#define MSM_PMEM_ADSP_SIZE 0x02196000 /* MSM_RAM_CONSOLE uses the last 0x00040000 of EBI memory, defined in msm_iomap.h #define MSM_RAM_CONSOLE_SIZE 0x00040000