From 3ecb0d18dbf2aeb2a14c004fe97026511ded0e9f Mon Sep 17 00:00:00 2001 From: Tobias Droste Date: Sat, 5 May 2012 05:34:35 +0200 Subject: [PATCH] arch/msm: remove pmem_camera it is and was never used! this gives us more RAM for the camera. Signed-off-by: Tobias Droste --- arch/arm/mach-msm/board-liberty.c | 2 -- arch/arm/mach-msm/board-liberty.h | 7 ++----- arch/arm/mach-msm/board-marvel.c | 2 -- arch/arm/mach-msm/board-marvel.h | 7 ++----- arch/arm/mach-msm/board-marvelc.c | 2 -- arch/arm/mach-msm/board-marvelc.h | 7 ++----- arch/arm/mach-msm/board-marvelct.c | 2 -- arch/arm/mach-msm/board-marvelct.h | 7 ++----- 8 files changed, 8 insertions(+), 28 deletions(-) diff --git a/arch/arm/mach-msm/board-liberty.c b/arch/arm/mach-msm/board-liberty.c index 68351c8..0a9be40 100644 --- a/arch/arm/mach-msm/board-liberty.c +++ b/arch/arm/mach-msm/board-liberty.c @@ -573,8 +573,6 @@ static struct msm_pmem_setting pmem_setting = { .pmem_size = MSM_PMEM_MDP_SIZE, .pmem_adsp_start = MSM_PMEM_ADSP_BASE, .pmem_adsp_size = MSM_PMEM_ADSP_SIZE, - .pmem_camera_start = MSM_PMEM_CAMERA_BASE, - .pmem_camera_size = MSM_PMEM_CAMERA_SIZE, .ram_console_start = MSM_RAM_CONSOLE_BASE, .ram_console_size = MSM_RAM_CONSOLE_SIZE, .kgsl_start = MSM_GPU_MEM_BASE, diff --git a/arch/arm/mach-msm/board-liberty.h b/arch/arm/mach-msm/board-liberty.h index 9c4b9f7..abb2174 100644 --- a/arch/arm/mach-msm/board-liberty.h +++ b/arch/arm/mach-msm/board-liberty.h @@ -36,13 +36,10 @@ #define MSM_PMEM_MDP_SIZE 0x01000000 #define MSM_PMEM_ADSP_BASE MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE -#define MSM_PMEM_ADSP_SIZE 0x00C1B000 - -#define MSM_PMEM_CAMERA_BASE MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE -#define MSM_PMEM_CAMERA_SIZE 0x00800000 +#define MSM_PMEM_ADSP_SIZE 0x0141B000 /* TODO: To save space, we can move RAM_CONSOLE to 0x00000000 */ -#define MSM_RAM_CONSOLE_BASE MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE +#define MSM_RAM_CONSOLE_BASE MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE #define MSM_RAM_CONSOLE_SIZE 128 * SZ_1K #define LIBERTY_GPIO_TO_INT(x) (x+64) /* from gpio_to_irq */ diff --git a/arch/arm/mach-msm/board-marvel.c b/arch/arm/mach-msm/board-marvel.c index b7337fb..76a3827 100644 --- a/arch/arm/mach-msm/board-marvel.c +++ b/arch/arm/mach-msm/board-marvel.c @@ -1042,8 +1042,6 @@ static struct msm_pmem_setting pmem_setting = { .pmem_size = MSM_PMEM_MDP_SIZE, .pmem_adsp_start = MSM_PMEM_ADSP_BASE, .pmem_adsp_size = MSM_PMEM_ADSP_SIZE, - .pmem_camera_start = MSM_PMEM_CAMERA_BASE, - .pmem_camera_size = MSM_PMEM_CAMERA_SIZE, .ram_console_start = MSM_RAM_CONSOLE_BASE, .ram_console_size = MSM_RAM_CONSOLE_SIZE, .kgsl_start = MSM_GPU_MEM_BASE, diff --git a/arch/arm/mach-msm/board-marvel.h b/arch/arm/mach-msm/board-marvel.h index 2e94127..9a6743b 100644 --- a/arch/arm/mach-msm/board-marvel.h +++ b/arch/arm/mach-msm/board-marvel.h @@ -36,13 +36,10 @@ #define MSM_PMEM_MDP_SIZE 0x01000000 #define MSM_PMEM_ADSP_BASE MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE -#define MSM_PMEM_ADSP_SIZE 0x00C1B000 - -#define MSM_PMEM_CAMERA_BASE MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE -#define MSM_PMEM_CAMERA_SIZE 0x00800000 +#define MSM_PMEM_ADSP_SIZE 0x0141B000 /* TODO: To save space, we can move RAM_CONSOLE to 0x00000000 */ -#define MSM_RAM_CONSOLE_BASE MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE +#define MSM_RAM_CONSOLE_BASE MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE #define MSM_RAM_CONSOLE_SIZE 128 * SZ_1K #define MARVEL_GPIO_TO_INT(x) (x+64) /* from gpio_to_irq */ diff --git a/arch/arm/mach-msm/board-marvelc.c b/arch/arm/mach-msm/board-marvelc.c index b2cdf1e..6683a3d 100644 --- a/arch/arm/mach-msm/board-marvelc.c +++ b/arch/arm/mach-msm/board-marvelc.c @@ -554,8 +554,6 @@ static struct msm_pmem_setting pmem_setting = { .pmem_size = MSM_PMEM_MDP_SIZE, .pmem_adsp_start = MSM_PMEM_ADSP_BASE, .pmem_adsp_size = MSM_PMEM_ADSP_SIZE, - .pmem_camera_start = MSM_PMEM_CAMERA_BASE, - .pmem_camera_size = MSM_PMEM_CAMERA_SIZE, .ram_console_start = MSM_RAM_CONSOLE_BASE, .ram_console_size = MSM_RAM_CONSOLE_SIZE, .kgsl_start = MSM_GPU_MEM_BASE, diff --git a/arch/arm/mach-msm/board-marvelc.h b/arch/arm/mach-msm/board-marvelc.h index a39ee78..5b4c5c5 100644 --- a/arch/arm/mach-msm/board-marvelc.h +++ b/arch/arm/mach-msm/board-marvelc.h @@ -36,13 +36,10 @@ #define MSM_PMEM_MDP_SIZE 0x01000000 #define MSM_PMEM_ADSP_BASE MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE -#define MSM_PMEM_ADSP_SIZE 0x00C1B000 - -#define MSM_PMEM_CAMERA_BASE MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE -#define MSM_PMEM_CAMERA_SIZE 0x00800000 +#define MSM_PMEM_ADSP_SIZE 0x0141B000 /* TODO: To save space, we can move RAM_CONSOLE to 0x00000000 */ -#define MSM_RAM_CONSOLE_BASE MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE +#define MSM_RAM_CONSOLE_BASE MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE #define MSM_RAM_CONSOLE_SIZE 128 * SZ_1K #define MARVELC_GPIO_TO_INT(x) (x+64) /* from gpio_to_irq */ diff --git a/arch/arm/mach-msm/board-marvelct.c b/arch/arm/mach-msm/board-marvelct.c index 0f0ebce..c0c0cdb 100644 --- a/arch/arm/mach-msm/board-marvelct.c +++ b/arch/arm/mach-msm/board-marvelct.c @@ -556,8 +556,6 @@ static struct msm_pmem_setting pmem_setting = { .pmem_size = MSM_PMEM_MDP_SIZE, .pmem_adsp_start = MSM_PMEM_ADSP_BASE, .pmem_adsp_size = MSM_PMEM_ADSP_SIZE, - .pmem_camera_start = MSM_PMEM_CAMERA_BASE, - .pmem_camera_size = MSM_PMEM_CAMERA_SIZE, .ram_console_start = MSM_RAM_CONSOLE_BASE, .ram_console_size = MSM_RAM_CONSOLE_SIZE, .kgsl_start = MSM_GPU_MEM_BASE, diff --git a/arch/arm/mach-msm/board-marvelct.h b/arch/arm/mach-msm/board-marvelct.h index 7c50b9b..971a2a7 100644 --- a/arch/arm/mach-msm/board-marvelct.h +++ b/arch/arm/mach-msm/board-marvelct.h @@ -36,13 +36,10 @@ #define MSM_PMEM_MDP_SIZE 0x01000000 #define MSM_PMEM_ADSP_BASE MSM_PMEM_MDP_BASE + MSM_PMEM_MDP_SIZE -#define MSM_PMEM_ADSP_SIZE 0x00C1B000 - -#define MSM_PMEM_CAMERA_BASE MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE -#define MSM_PMEM_CAMERA_SIZE 0x00800000 +#define MSM_PMEM_ADSP_SIZE 0x0141B000 /* TODO: To save space, we can move RAM_CONSOLE to 0x00000000 */ -#define MSM_RAM_CONSOLE_BASE MSM_PMEM_CAMERA_BASE + MSM_PMEM_CAMERA_SIZE +#define MSM_RAM_CONSOLE_BASE MSM_PMEM_ADSP_BASE + MSM_PMEM_ADSP_SIZE #define MSM_RAM_CONSOLE_SIZE 128 * SZ_1K #define MARVELCT_GPIO_TO_INT(x) (x+64) /* from gpio_to_irq */ -- 1.7.7