diff options
| author | Jesse Villarreal <jesse.villarreal@ti.com> | 2012-06-14 19:54:32 -0500 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-26 22:50:42 +0100 |
| commit | 9ca8d5b1c0eac7c45b0c36a80cb19be1af6b2e51 (patch) | |
| tree | 3939a55db5959a54cdf8273f846565c7cb70daed /arch | |
| parent | f9bd13d105c51f9d6cb90cae41d79a8c91753a5c (diff) | |
| download | kernel_samsung_tuna-9ca8d5b1c0eac7c45b0c36a80cb19be1af6b2e51.zip kernel_samsung_tuna-9ca8d5b1c0eac7c45b0c36a80cb19be1af6b2e51.tar.gz kernel_samsung_tuna-9ca8d5b1c0eac7c45b0c36a80cb19be1af6b2e51.tar.bz2 | |
Revert "omap4: sdp/panda/tablet: reserve memory for dsp"
This reverts commit e699cc2c4cc3f369108d83370172138294f9840f.
DSP currently requires 4MB of memory to be set-aside to meet its
firmware requirements and can use either a fixed carveout or
a dynamically assigned carveout. The above commit uses static
carveouts for DSP in various board files. DSP does not have a
mandatory requirement to use this fixed carveout, and has been
switched over to use a dynamically allocated carveout address.
The above commit is therefore being reverted to free up unused
carveout memory.
This change simultaneously fixes a build error when the DSP
remoteproc is included in the build configuration. The build
was by the following commit:
"OMAP4: ion: remove hardcoded carveout sizes"
Conflicts:
arch/arm/mach-omap2/include/mach/omap4_ion.h
Change-Id: Iee9be7dbc19dd580fabce6ae966cf86d1f54b5cb
Signed-off-by: Jesse Villarreal <jesse.villarreal@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-44xx-tablet.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/include/mach/omap4_ion.h
Diffstat (limited to 'arch')
| -rwxr-xr-x | arch/arm/mach-omap2/board-tuna.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-tuna.c b/arch/arm/mach-omap2/board-tuna.c index 41d315f..5023c44 100755 --- a/arch/arm/mach-omap2/board-tuna.c +++ b/arch/arm/mach-omap2/board-tuna.c @@ -1386,12 +1386,6 @@ static void __init tuna_reserve(void) omap_ipu_set_static_mempool(PHYS_ADDR_DUCATI_MEM, PHYS_ADDR_DUCATI_SIZE + OMAP4_ION_HEAP_SECURE_INPUT_SIZE); -#ifdef CONFIG_OMAP_REMOTE_PROC_DSP - memblock_remove(PHYS_ADDR_TESLA_MEM, PHYS_ADDR_TESLA_SIZE); - omap_dsp_set_static_mempool(PHYS_ADDR_TESLA_MEM, - PHYS_ADDR_TESLA_SIZE); -#endif - omap_reserve(); } |