diff options
| author | Ziyan <jaraidaniel@gmail.com> | 2016-09-14 21:41:39 +0200 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2016-09-15 16:29:15 +0200 |
| commit | c39b2a10a65dad5eb2f4567196a77cc0ecd22a82 (patch) | |
| tree | 855fa4044c494e48958435f2e4abcae2d419df67 | |
| parent | 9978362cfc25e23f6732d2f50e6443f6a05726c8 (diff) | |
| download | kernel_samsung_espresso10-c39b2a10a65dad5eb2f4567196a77cc0ecd22a82.zip kernel_samsung_espresso10-c39b2a10a65dad5eb2f4567196a77cc0ecd22a82.tar.gz kernel_samsung_espresso10-c39b2a10a65dad5eb2f4567196a77cc0ecd22a82.tar.bz2 | |
OMAP4: espresso: adapt to dynamic secure_input heap allocation
Change-Id: I574027d05632c363be830dfd5e618f55bbd33fff
| -rw-r--r-- | arch/arm/mach-omap2/board-espresso.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap4_ion.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-espresso.c b/arch/arm/mach-omap2/board-espresso.c index 0f6fcd5..712a1d0 100644 --- a/arch/arm/mach-omap2/board-espresso.c +++ b/arch/arm/mach-omap2/board-espresso.c @@ -431,11 +431,11 @@ static void __init espresso_map_io(void) static void omap4_espresso_init_carveout_sizes( struct omap_ion_platform_data *ion) { - ion->tiler1d_size = (SZ_1M * 14); /* WFD is not supported in espresso So the size is zero */ ion->secure_output_wfdhdcp_size = 0; ion->ducati_heap_size = (SZ_1M * 65); #ifndef CONFIG_ION_OMAP_TILER_DYNAMIC_ALLOC + ion->tiler1d_size = (SZ_1M * 14); if (board_is_espresso10()) ion->nonsecure_tiler2d_size = (SZ_1M * 19); else diff --git a/arch/arm/mach-omap2/omap4_ion.c b/arch/arm/mach-omap2/omap4_ion.c index f3900c2..f5b4edd 100644 --- a/arch/arm/mach-omap2/omap4_ion.c +++ b/arch/arm/mach-omap2/omap4_ion.c @@ -18,6 +18,8 @@ #include <mach/omap4_ion.h> +#define ESPRESSO_DUCATI_HEAP_ADDR 0xbae00000 + /* * Carveouts from higher end of RAM * - SMC @@ -140,8 +142,12 @@ void __init omap_ion_init(void) omap4_ion_heap_secure_output_wfdhdcp_addr = omap4_ion_heap_secure_input_addr - omap4_ion_heap_secure_output_wfdhdcp_size; +#ifdef CONFIG_MACH_OMAP4_ESPRESSO + omap4_ducati_heap_addr = ESPRESSO_DUCATI_HEAP_ADDR; +#else omap4_ducati_heap_addr = omap4_ion_heap_secure_output_wfdhdcp_addr - omap4_ducati_heap_size; +#endif omap4_ion_heap_tiler_mem_addr = omap4_ducati_heap_addr - omap4_ion_heap_tiler_mem_size; omap4_ion_heap_nonsec_tiler_mem_addr = omap4_ion_heap_tiler_mem_addr - |