diff options
| author | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:43:43 +0100 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:43:43 +0100 |
| commit | 1262361537e11b1b7d4a9cb155901bab03edb1a4 (patch) | |
| tree | 704f9061e3628b1a3b793b2ff23223a09f512b9e | |
| parent | b01a056a0b676685942d80886c069499e86058e0 (diff) | |
| download | kernel_samsung_tuna-1262361537e11b1b7d4a9cb155901bab03edb1a4.zip kernel_samsung_tuna-1262361537e11b1b7d4a9cb155901bab03edb1a4.tar.gz kernel_samsung_tuna-1262361537e11b1b7d4a9cb155901bab03edb1a4.tar.bz2 | |
tuna: adapt to reserve call to dynamic changes
Since system memory size and carveouts are calculated dynamically,
omap_ion_init() calls should be invoked upfront so as the address
and sizes are initialized properly.
Change-Id: I67a87e3d7973dc457d48e1df6a2277fdba09e02e
Signed-off-by: Devaraj Rangasamy <dev@ti.com>
| -rwxr-xr-x | arch/arm/mach-omap2/board-tuna.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-tuna.c b/arch/arm/mach-omap2/board-tuna.c index 5ffe9dc..41d315f 100755 --- a/arch/arm/mach-omap2/board-tuna.c +++ b/arch/arm/mach-omap2/board-tuna.c @@ -1367,8 +1367,15 @@ static void __init tuna_reserve(void) { omap_init_ram_size(); +#ifdef CONFIG_ION_OMAP + tuna_android_display_setup(get_omap_ion_platform_data()); + omap_ion_init(); +#else + tuna_android_display_setup(NULL); +#endif + omap_ram_console_init(OMAP_RAM_CONSOLE_START_DEFAULT, - OMAP_RAM_CONSOLE_SIZE_DEFAULT); + OMAP_RAM_CONSOLE_SIZE_DEFAULT); /* do the static reservations first */ @@ -1377,20 +1384,14 @@ static void __init tuna_reserve(void) /* ipu needs to recognize secure input buffer area as well */ omap_ipu_set_static_mempool(PHYS_ADDR_DUCATI_MEM, - PHYS_ADDR_DUCATI_SIZE + OMAP4_ION_HEAP_SECURE_INPUT_SIZE); + 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); + PHYS_ADDR_TESLA_SIZE); #endif -#ifdef CONFIG_ION_OMAP - tuna_android_display_setup(get_omap_ion_platform_data()); - omap_ion_init(); -#else - tuna_android_display_setup(NULL); -#endif omap_reserve(); } |