diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-08-11 17:02:05 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-11 17:02:05 -0700 |
| commit | 41a6c7948df0e6d8d8c8c2c8b2045636b2253540 (patch) | |
| tree | c380d49c3fac05aeb79a0196945c5ed5a99f9b6d /arch/arm/mach-omap2/board-omap4panda.c | |
| parent | b401f83f9ee149774e9647576ba29d3f7d663f5b (diff) | |
| parent | 486efb7f755fdd4f1bc0d658119a2e6c1199d5d1 (diff) | |
| download | kernel_samsung_tuna-41a6c7948df0e6d8d8c8c2c8b2045636b2253540.zip kernel_samsung_tuna-41a6c7948df0e6d8d8c8c2c8b2045636b2253540.tar.gz kernel_samsung_tuna-41a6c7948df0e6d8d8c8c2c8b2045636b2253540.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 1cae155..76fccce 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -63,8 +63,10 @@ #define PHYS_ADDR_SMC_SIZE (SZ_1M * 3) #define PHYS_ADDR_SMC_MEM (0x80000000 + SZ_1G - PHYS_ADDR_SMC_SIZE) -#define PHYS_ADDR_DUCATI_SIZE (SZ_1M * 101) -#define PHYS_ADDR_DUCATI_MEM (PHYS_ADDR_SMC_MEM - PHYS_ADDR_DUCATI_SIZE) +#define OMAP_ION_HEAP_SECURE_INPUT_SIZE (SZ_1M * 30) +#define PHYS_ADDR_DUCATI_SIZE (SZ_1M * 103) +#define PHYS_ADDR_DUCATI_MEM (PHYS_ADDR_SMC_MEM - PHYS_ADDR_DUCATI_SIZE - \ + OMAP_ION_HEAP_SECURE_INPUT_SIZE) /* wl127x BT, FM, GPS connectivity chip */ static int wl1271_gpios[] = {46, -1, -1}; @@ -719,7 +721,9 @@ static void __init omap4_panda_reserve(void) /* do the static reservations first */ memblock_remove(PHYS_ADDR_SMC_MEM, PHYS_ADDR_SMC_SIZE); memblock_remove(PHYS_ADDR_DUCATI_MEM, PHYS_ADDR_DUCATI_SIZE); - omap_ipu_set_static_mempool(PHYS_ADDR_DUCATI_MEM, PHYS_ADDR_DUCATI_SIZE); + /* ipu needs to recognize secure input buffer area as well */ + omap_ipu_set_static_mempool(PHYS_ADDR_DUCATI_MEM, PHYS_ADDR_DUCATI_SIZE + + OMAP_ION_HEAP_SECURE_INPUT_SIZE); omap_reserve(); } |