From 7e63c5ca0bbb8b3246007a26a5c063f3b883c8a1 Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Thu, 29 Mar 2012 23:01:59 -0500 Subject: OMAP4: ion: remove hardcoded carveout sizes These are no longer used as android-display is calculating the carveout sizes. Change-Id: I3dcaec56158da1a573cb8de9ec3761db94d1a698 Signed-off-by: Lajos Molnar Singed-off-by: Dima Svetlov Conflicts: arch/arm/mach-omap2/include/mach/omap4_ion.h --- arch/arm/mach-omap2/include/mach/omap4_ion.h | 2 -- arch/arm/mach-omap2/omap4_ion.c | 2 -- 2 files changed, 4 deletions(-) (limited to 'arch/arm/mach-omap2') diff --git a/arch/arm/mach-omap2/include/mach/omap4_ion.h b/arch/arm/mach-omap2/include/mach/omap4_ion.h index ea4bb32..8071585 100755 --- a/arch/arm/mach-omap2/include/mach/omap4_ion.h +++ b/arch/arm/mach-omap2/include/mach/omap4_ion.h @@ -20,8 +20,6 @@ #include #define OMAP4_ION_HEAP_SECURE_INPUT_SIZE (SZ_1M * 90) -#define OMAP4_ION_HEAP_TILER_SIZE (SZ_1M * 81) -#define OMAP4_ION_HEAP_NONSECURE_TILER_SIZE (SZ_1M * 15) #define PHYS_ADDR_SMC_SIZE (SZ_1M * 3) #define PHYS_ADDR_SMC_MEM (0x80000000 + SZ_1G - PHYS_ADDR_SMC_SIZE) diff --git a/arch/arm/mach-omap2/omap4_ion.c b/arch/arm/mach-omap2/omap4_ion.c index 423f571..0134c1d 100755 --- a/arch/arm/mach-omap2/omap4_ion.c +++ b/arch/arm/mach-omap2/omap4_ion.c @@ -55,8 +55,6 @@ static struct ion_platform_data omap4_ion_data = { static struct omap_ion_platform_data omap4_ion_pdata = { .ion = &omap4_ion_data, - .tiler2d_size = OMAP4_ION_HEAP_TILER_SIZE, - .nonsecure_tiler2d_size = OMAP4_ION_HEAP_NONSECURE_TILER_SIZE, }; static struct platform_device omap4_ion_device = { -- cgit v1.1